From 8f80fe5c76af9fbe98e5f9380e8fde05fd7bdcd3 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 6 Mar 2023 13:49:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java | 3 +++ .../com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java index f41e816546..2bbef6e64c 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java @@ -47,4 +47,7 @@ public class FlowTaskDoVo implements Vo { @ApiModelProperty("办理的url") @JsonIgnore private SysProUrlVo sysProUrlVo; + + @ApiModelProperty("流程ID") + private String procDefId; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java index cf0408e031..f889fe27f2 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java @@ -19,8 +19,9 @@ import java.util.Map; @Data public class FlowTaskFinishVo implements Vo { private static final long serialVersionUID = -5936470750210770833L; - - @ApiModelProperty(value = "流程id") + @ApiModelProperty("流程ID") + private String procDefId; + @ApiModelProperty(value = "流程部署id") private String deployId; @ApiModelProperty(value = "流程实例id") private String procInsId; From 46d301bdf902afc4d5c044cf9d5008973ca07199 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 6 Mar 2023 14:45:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basemodelmodprice/BaseModelModpriceService.java | 1 + .../java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index ab46a38cef..4f0213942a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -340,6 +340,7 @@ public class BaseModelModpriceService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index c6db63941b..d1d8dd8d13 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -75,7 +75,8 @@ public enum ProcDefEnum { SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"), SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"), CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"), - BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),; + BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"), + ; ProcDefEnum(String proDefName, String proDefId) { From 98a080d0c7114f438df6abfc8510e44a9b7144b0 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 6 Mar 2023 17:31:37 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=88=86=E4=BA=AB+=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusVehicleApplyService.java | 4 +- .../commoncontract/CommonContractService.java | 8 +- .../flowable/api/flow/FlowableFallback.java | 5 ++ .../flowable/api/flow/FlowableFeign.java | 5 ++ .../flowable/api/flow/FlowableShareQuery.java | 34 ++++++++ .../api/processcomment/ProcessComment.java | 2 + .../api/processcomment/ProcessCommentDto.java | 8 +- .../api/processcomment/ProcessCommentVo.java | 7 +- .../anrui/flowable/biz/flow/FlowableRest.java | 87 ++++++++++++++++++- .../processcomment/ProcessCommentMapper.xml | 4 +- .../processcomment/ProcessCommentRest.java | 9 +- .../processcomment/ProcessCommentService.java | 8 +- .../anrui/flowable/feign/MessageFeign.java | 4 + .../feign/form/MessageFlowableQuery.java | 2 + .../anrui/portal/api/sysuser/SysUserVo.java | 1 + .../anrui/portal/api/sysuser/app/OrgList.java | 2 + .../portal/biz/sysuser/SysUserService.java | 12 +++ .../api/app/flowable/ProcessComment.java | 8 +- .../api/app/flowable/ProcessCommentVo.java | 4 +- 19 files changed, 190 insertions(+), 24 deletions(-) create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableShareQuery.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 71b635a5f8..bbf26ede2b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -1018,12 +1018,12 @@ public class BusVehicleApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessageShare(mfq); log.info("分享成功-resultBean:{}", resultBean); if (!resultBean.getSuccess()) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 1657d5a98d..06d4bcbb63 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1841,10 +1841,12 @@ public class CommonContractService extends MybatisBaseService> selectFlow(@RequestParam("id")String id); + + @ApiOperation(value = "分享") + @PostMapping(value = "/shareFlowable") + @ResponseBody + ResultBean shareFlowable(@RequestBody FlowableShareQuery flowableShareQuery); } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableShareQuery.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableShareQuery.java new file mode 100644 index 0000000000..da799157e1 --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableShareQuery.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.flowable.api.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/3/6 13:36 + * @Description + */ +@Data +public class FlowableShareQuery implements Query { + private static final long serialVersionUID = 4840141159583232319L; + + private String taskId; + + private String taskDefKey; + + private String procInsId; + + private String procDefId; + + @ApiModelProperty("人员") + private List members; + @ApiModelProperty("部门") + private List groups; + + private String userSid; + + private String businessSid; +} diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java index 73cb5e3a8d..0340c1aea8 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java @@ -64,5 +64,7 @@ public class ProcessComment extends BaseEntity { private String processId; // 评论的流程id @ApiModelProperty("评论的流程实列的sid") private String processInstSid; // 评论的流程实列的sid + @ApiModelProperty("评论附件") + private String processFile; } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java index 08ff5e22ce..903af9ab32 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java @@ -27,12 +27,13 @@ package com.yxt.anrui.flowable.api.processcomment; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * Project: processcomment(流程评论)
@@ -66,4 +67,9 @@ public class ProcessCommentDto implements Dto { @ApiModelProperty("评论的流程实列的sid") private String processInstSid; // 评论的流程实列的sid + @ApiModelProperty("附件") + private List fileList = new ArrayList<>(); + + private String processFile; + } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java index e4dc90a066..2ce9509df4 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java @@ -28,12 +28,13 @@ package com.yxt.anrui.flowable.api.processcomment; import com.yxt.anrui.flowable.api.flowtask.AppUserVo; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * Project: processcomment(流程评论)
@@ -68,5 +69,9 @@ public class ProcessCommentVo implements Vo { private String processInstSid; // 评论的流程实列的sid @ApiModelProperty("taskUserInfo") private AppUserVo taskUserInfo; // AppUserVo + @ApiModelProperty("评论附件") + private String processFile; + + private List fileList = new ArrayList<>(); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 0d799834e8..f2fc28a236 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -41,10 +41,7 @@ import com.yxt.anrui.flowable.feign.form.MessageFlowableQuery; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysflowcc.SysFlowccFeign; import com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo; -import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.portal.api.sysuser.UserByRolesAndOrgQuery; -import com.yxt.anrui.portal.api.sysuser.UserQuery; +import com.yxt.anrui.portal.api.sysuser.*; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -618,4 +615,86 @@ public class FlowableRest implements FlowableFeign { } return rb.success().setData(process); } + + @Override + public ResultBean shareFlowable(FlowableShareQuery flowableShareQuery) { + ResultBean rb = ResultBean.fireSuccess(); + log.info("分享功能，参数：{}", JSONObject.toJSONString(flowableShareQuery)); + //勾选的人员sid + List memberSidList = flowableShareQuery.getMembers(); + //勾选的部门sid + List orgSidList = flowableShareQuery.getGroups(); + ShareUserQuery shareUserQuery = new ShareUserQuery(); + shareUserQuery.setOrgSids(orgSidList); + shareUserQuery.setMemberSids(memberSidList); + //查询所勾选的人员和勾选的部门下的去重后的所有人员的用户sid + ResultBean> staffList = sysUserFeign.shareSelectUser(shareUserQuery); + if(memberSidList == null && orgSidList != null && orgSidList.size()>0){ + if(staffList.getData() == null || staffList.getData().size() == 0){ + return rb.setMsg("所选部门下无分享人员"); + } + } + if(memberSidList == null && orgSidList == null && orgSidList.size() == 0){ + return rb.setMsg("请选择人员"); + } + //组装分享的消息数据 + String taskId = flowableShareQuery.getTaskId(); + //流程定义id + String modelId = flowableShareQuery.getProcDefId(); + String proInstId = flowableShareQuery.getProcInsId(); + String taskDefKey = flowableShareQuery.getTaskDefKey(); + //移动端参数 + Map appMap = new HashMap<>(); + HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery() + .includeProcessVariables().taskId(taskId).singleResult(); + if (historicTaskInstance == null) { + log.info("分享失败：没有获取到业务参数!"); + return rb.setMsg("分享失败！"); + } + Map processVariables = historicTaskInstance.getProcessVariables(); + if (historicTaskInstance == null) { + log.info("分享失败：没有获取到业务参数!"); + return rb.setMsg("分享失败！"); + } + Map app = new HashMap<>(); + if (processVariables.get("app") != null) { + app = (Map) processVariables.get("app"); + } + log.info("分享方法-historicTaskInstance:{}", JSONObject.toJSONString(historicTaskInstance)); + StringBuilder userSids = new StringBuilder(); + staffList.getData().forEach(f->{ + userSids.append(f).append(","); + }); + userSids.deleteCharAt(userSids.length() - 1); + MessageFlowableQuery mfq = new MessageFlowableQuery(); + mfq.setAppMap(app); + mfq.setBusinessSid(flowableShareQuery.getBusinessSid()); + mfq.setMsgContent("分享的流程审批，请查看"); + mfq.setUserSid(flowableShareQuery.getUserSid()); + mfq.setUserSids(userSids.toString()); + + UpdateFlowFieldVo uff = new UpdateFlowFieldVo(); + uff.setTaskDefKey(taskDefKey); + uff.setTaskId(taskId); + uff.setProcInsId(proInstId); + uff.setProcDefId(modelId); + Map process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId()); + log.info("分享成功-process:{}", process); + if (process == null) { + log.info("分享失败，流程定义不存在!"); + return rb.setMsg("分享失败，流程定义不存在！"); + } + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(uff, messageFlowVo); + mfq.setUfVo(messageFlowVo); + mfq.setModuleName(process.get("NAME_")); + mfq.setMsgTitle(process.get("NAME_")); + ResultBean resultBean = messageFeign.pushMessageCC(mfq); + log.info("分享成功-resultBean:{}", resultBean); + if (!resultBean.getSuccess()) { + log.info("分享失败，分享消息异常！:{}", JSONObject.toJSONString(resultBean)); + return rb.setMsg("分享失败，分享消息异常！"); + } + return rb.success(); + } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml index 4b3c0d8dd2..3551c99e56 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentMapper.xml @@ -14,7 +14,7 @@ select * from process_comment where processId=#{processId} - insert into `process_comment` ( `sid`, `reviewer`, `reviewerSid`, `time`, `content`, `processId`, `processInstSid`) - values(#{sid},#{reviewer},#{reviewerSid},#{time},#{content},#{processId},#{processInstSid}); + insert into `process_comment` ( `sid`, `reviewer`, `reviewerSid`, `time`, `content`, `processId`, `processInstSid`,processFile) + values(#{sid},#{reviewer},#{reviewerSid},#{time},#{content},#{processId},#{processInstSid},#{processFile}); \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java index cb660f5db3..38e3685cd0 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.flowable.biz.processcomment; import com.yxt.anrui.flowable.api.processcomment.*; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -36,7 +37,6 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; -import java.util.UUID; /** * Project: processcomment(流程评论)
@@ -59,6 +59,9 @@ public class ProcessCommentRest implements ProcessCommentFeign { @Autowired private ProcessCommentService processCommentService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Override @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @@ -74,6 +77,10 @@ public class ProcessCommentRest implements ProcessCommentFeign { public ResultBean save(@RequestBody ProcessCommentDto dto){ ResultBean rb = ResultBean.fireFail(); dto.setTime(new Date()); + if(!dto.getFileList().isEmpty()){ + String processFile = String.join(",", dto.getFileList()).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + dto.setProcessFile(processFile); + } processCommentService.saveOrUpdateDto(dto); return rb.success(); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java index a6ded5b701..b1b81b27d8 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java @@ -29,22 +29,20 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.flowable.api.flowtask.AppUserVo; -import com.yxt.anrui.flowable.api.flowtask.TaskUserInfo; import com.yxt.anrui.flowable.api.processcomment.*; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.config.component.FileUploadComponent; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.UUID; @@ -119,6 +117,8 @@ public class ProcessCommentService extends MybatisBaseService getCommentList(String processId) { List commentList = baseMapper.getCommentList(processId); for(ProcessCommentVo histIns:commentList){ + List processFile = Arrays.asList(histIns.getProcessFile()); + histIns.setFileList(processFile); ResultBean> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getReviewerSid());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee())); List data1 = sysUserVoResultBean.getData(); for( SysUserVo data:data1){ diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/feign/MessageFeign.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/feign/MessageFeign.java index 89a54bf1d3..60b3cb0d9e 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/feign/MessageFeign.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/feign/MessageFeign.java @@ -16,4 +16,8 @@ public interface MessageFeign { @ApiOperation("流程审批推送消息") @PostMapping("/pushMessageCC") ResultBean pushMessageCC(@RequestBody MessageFlowableQuery query); + + @ApiOperation("分享") + @PostMapping("/pushMessageShare") + ResultBean pushMessageShare(@RequestBody MessageFlowableQuery query); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/feign/form/MessageFlowableQuery.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/feign/form/MessageFlowableQuery.java index cbc6dcc7db..e514654c6e 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/feign/form/MessageFlowableQuery.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/feign/form/MessageFlowableQuery.java @@ -30,4 +30,6 @@ public class MessageFlowableQuery implements Query { @ApiModelProperty("抄送的用户的sid") private String userSids; + private String userSid; + } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java index 026a03663b..cdb54502bb 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java @@ -89,6 +89,7 @@ public class SysUserVo implements Vo { private String defaultOrgPathName; private String defaultDeptName; + private String defaultDeptSid; @ApiModelProperty("是否需要更换密码") private Boolean needResetPsd; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java index b7e65fb53d..394edef935 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java @@ -16,4 +16,6 @@ public class OrgList implements Vo { private String orgPath; private String deptName; + + private String deptSid; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 949404048b..363e43299a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -390,6 +390,7 @@ public class SysUserService extends MybatisBaseService { if (sysUserDefaultOrg == null) { String orgNamePath = ""; String defaultDeptName = ""; + String defaultDeptSid = ""; userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath()); if (StringUtils.isNotBlank(sysStaffOrg.getOrgSidPath())) { List split = Arrays.asList(sysStaffOrg.getOrgSidPath().split("/")); @@ -399,15 +400,18 @@ public class SysUserService extends MybatisBaseService { SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1)); orgNamePath = sysOrganization.getName() + "/" + sysOrganization1.getName(); defaultDeptName = sysOrganization1.getName(); + defaultDeptSid = sysOrganization1.getSid(); } else { SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0)); orgNamePath = sysOrganization.getName(); defaultDeptName = sysOrganization.getName(); + defaultDeptSid = sysOrganization.getSid(); } } // userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath()); userInfoOneVo.setDefaultOrgPathName(orgNamePath); userInfoOneVo.setDefaultDeptName(defaultDeptName); + userInfoOneVo.setDefaultDeptSid(defaultDeptSid); } else { String orgNamePath = ""; List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid()); @@ -418,6 +422,7 @@ public class SysUserService extends MybatisBaseService { } userInfoOneVo.setDefaultOrgPath(sysUserDefaultOrg.getOrgSidPath()); String defaultDeptName = ""; + String defaultDeptSid = ""; if (StringUtils.isNotBlank(sysUserDefaultOrg.getOrgSidPath())) { List split = Arrays.asList(sysUserDefaultOrg.getOrgSidPath().split("/")); if (split.size() > 1) { @@ -426,14 +431,17 @@ public class SysUserService extends MybatisBaseService { SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1)); orgNamePath = sysOrganization.getName() + "/" + sysOrganization1.getName(); defaultDeptName = sysOrganization1.getName(); + defaultDeptSid = sysOrganization1.getSid(); } else { SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0)); orgNamePath = sysOrganization.getName(); defaultDeptName = sysOrganization.getName(); + defaultDeptSid = sysOrganization.getSid(); } } userInfoOneVo.setDefaultOrgPathName(orgNamePath); userInfoOneVo.setDefaultDeptName(defaultDeptName); + userInfoOneVo.setDefaultDeptSid(defaultDeptSid); } } } @@ -452,6 +460,7 @@ public class SysUserService extends MybatisBaseService { orgList1.setOrgName(vv.getOrgNamePath()); String orgName = ""; String deptName = ""; + String deptSid = ""; if (StringUtils.isNotBlank(vv.getOrgSidPath())) { List split = Arrays.asList(vv.getOrgSidPath().split("/")); if(split.size()>1){ @@ -460,10 +469,12 @@ public class SysUserService extends MybatisBaseService { SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size()-1)); orgName = sysOrganization.getName()+"/"+sysOrganization1.getName(); deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); }else{ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0)); orgName = sysOrganization.getName(); deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); } /*String[] split = vv.getOrgSidPath().split("/"); for (int i = 0; i < split.length; i++) { @@ -481,6 +492,7 @@ public class SysUserService extends MybatisBaseService { }*/ orgList1.setOrgName(orgName); orgList1.setDeptName(deptName); + orgList1.setDeptSid(deptSid); } orgList.add(orgList1); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java index 5441ed3bc0..21696f8497 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java @@ -26,16 +26,14 @@ package com.yxt.anrui.terminal.api.app.flowable; -import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; +import java.util.ArrayList; +import java.util.List; /** * Project: processcomment(流程评论)
@@ -67,5 +65,7 @@ public class ProcessComment implements Vo { private String procInsId; // 评论的流程id @ApiModelProperty("评论的流程实列的sid") private String processInstSid; // 评论的流程实列的sid + @ApiModelProperty("附件") + private List fileList = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java index 1dc17d104a..e8fa36b7bc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java @@ -27,12 +27,10 @@ package com.yxt.anrui.terminal.api.app.flowable; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jdk.nashorn.internal.ir.annotations.Ignore; import lombok.Data; import java.util.Date; @@ -66,5 +64,7 @@ public class ProcessCommentVo implements Vo { @ApiModelProperty(value = "环节的办理人信息") @JsonProperty("handleBean") private AppUserVo taskUserInfo; + @ApiModelProperty("评论附件") + private List fileList; } From 27ca0634a863697226a6847f2eaf308333ce322d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 6 Mar 2023 17:58:03 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=88=86=E4=BA=AB+=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/biz/processcomment/ProcessCommentService.java | 7 +++++-- .../anrui/terminal/api/app/flowable/ProcessCommentVo.java | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java index b1b81b27d8..05da790cc9 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java @@ -45,6 +45,7 @@ import javax.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; /** * Project: processcomment(流程评论)
@@ -117,8 +118,10 @@ public class ProcessCommentService extends MybatisBaseService getCommentList(String processId) { List commentList = baseMapper.getCommentList(processId); for(ProcessCommentVo histIns:commentList){ - List processFile = Arrays.asList(histIns.getProcessFile()); - histIns.setFileList(processFile); + if(StringUtils.isNotBlank(histIns.getProcessFile())){ + List processFile = Arrays.asList(histIns.getProcessFile().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + histIns.setFileList(processFile); + } ResultBean> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getReviewerSid());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee())); List data1 = sysUserVoResultBean.getData(); for( SysUserVo data:data1){ diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java index e8fa36b7bc..fc30c03748 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessCommentVo.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -65,6 +66,6 @@ public class ProcessCommentVo implements Vo { @JsonProperty("handleBean") private AppUserVo taskUserInfo; @ApiModelProperty("评论附件") - private List fileList; + private List fileList = new ArrayList<>(); } From e34c41ec63560ff2963f5b170f5273df86afc44e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 7 Mar 2023 13:55:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=88=86?= =?UTF-8?q?=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/terminal/api/app/AppFeign.java | 13 ++++- .../terminal/api/app/ShareMessageQuery.java | 36 ++++++++++++ .../yxt/anrui/terminal/biz/app/AppRest.java | 16 ++++-- .../anrui/terminal/biz/app/AppService.java | 56 ++++++++++++------- 4 files changed, 92 insertions(+), 29 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/ShareMessageQuery.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java index bb9fdc93fa..09311a7bae 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java @@ -1,6 +1,9 @@ package com.yxt.anrui.terminal.api.app; -import com.yxt.anrui.terminal.api.app.flowable.*; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordAndCommentVo; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordQuery; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo; +import com.yxt.anrui.terminal.api.app.flowable.ProcessComment; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -12,7 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @Author dimengzhe @@ -40,5 +42,10 @@ public interface AppFeign { @ApiOperation("新增评论") @PostMapping("/addProgressComment") @ResponseBody - ResultBean addProgressComment(@RequestBody @Valid ProcessComment processComment); + ResultBean addProgressComment(@RequestBody @Valid ProcessComment processComment); + + @ApiOperation("分享") + @PostMapping("/addProgressComment") + @ResponseBody + ResultBean shareMessage(@Valid @RequestBody ShareMessageQuery shareMessageQuery); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/ShareMessageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/ShareMessageQuery.java new file mode 100644 index 0000000000..7801312455 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/ShareMessageQuery.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.terminal.api.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/3/7 13:49 + * @Description + */ +@Data +public class ShareMessageQuery implements Query { + private static final long serialVersionUID = 7606857713785882692L; + @NotBlank(message = "参数错误：taskId") + private String taskId; + @NotBlank(message = "taskDefKey") + private String taskDefKey; + @NotBlank(message = "procInsId") + private String procInsId; + @NotBlank(message = "procDefId") + private String procDefId; + + @ApiModelProperty("人员") + private List members = new ArrayList<>(); + @ApiModelProperty("部门") + private List groups = new ArrayList<>(); + @NotBlank(message = "参数错误：userSid") + private String userSid; + @NotBlank(message = "参数错误：businessSid") + private String businessSid; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java index 38b3d24cd2..eb1d513dc7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java @@ -3,16 +3,17 @@ package com.yxt.anrui.terminal.biz.app; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.terminal.api.app.AppFeign; -import com.yxt.anrui.terminal.api.app.flowable.*; +import com.yxt.anrui.terminal.api.app.ShareMessageQuery; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordAndCommentVo; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordQuery; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo; +import com.yxt.anrui.terminal.api.app.flowable.ProcessComment; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; /** * @Author dimengzhe @@ -54,4 +55,9 @@ public class AppRest implements AppFeign { processComment.setReviewer(sysUserVoResultBean.getData().getName()); return appService.addProgressComment(processComment); } + + @Override + public ResultBean shareMessage(ShareMessageQuery shareMessageQuery) { + return appService.shareMessage(shareMessageQuery); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java index c687838860..21ed76581e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java @@ -2,11 +2,14 @@ package com.yxt.anrui.terminal.biz.app; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.yxt.anrui.flowable.api.flow.FlowableFeign; +import com.yxt.anrui.flowable.api.flow.FlowableShareQuery; import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign; +import com.yxt.anrui.terminal.api.app.ShareMessageQuery; import com.yxt.anrui.terminal.api.app.flowable.*; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; @@ -29,6 +32,8 @@ public class AppService { private FlowTaskFeign flowTaskFeign; @Autowired private ProcessCommentFeign processCommentFeign; + @Autowired + private FlowableFeign flowableFeign; public ResultBean> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -38,8 +43,8 @@ public class AppService { ResultBean resultBean = flowTaskFeign.businessFlowRecord(procInsId); List voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList()); voList.removeAll(Collections.singleton(null)); - for (int i=0;i> getProgressAndCommentList(AppFlowableRecordQuery appFlowableRecordQuery) { ResultBean> rb = ResultBean.fireFail(); ResultBean> progressdata = getProgressList(appFlowableRecordQuery); ResultBean> commentList = getCommentList(appFlowableRecordQuery); - List list=new ArrayList<>(); + List list = new ArrayList<>(); List progressList = progressdata.getData(); - progressList.forEach(f->{ - AppFlowableRecordAndCommentVo a=new AppFlowableRecordAndCommentVo(); - a.setTime(f.getFinishTime()==null?new Date():f.getFinishTime()); - // a.setTime(f.getCreateTime()); + progressList.forEach(f -> { + AppFlowableRecordAndCommentVo a = new AppFlowableRecordAndCommentVo(); + a.setTime(f.getFinishTime() == null ? new Date() : f.getFinishTime()); + // a.setTime(f.getCreateTime()); a.setFlowableRecordVo(f); - a.setState(0+""); + a.setState(0 + ""); list.add(a); }); - commentList.getData().forEach(f->{ - AppFlowableRecordAndCommentVo a=new AppFlowableRecordAndCommentVo(); + commentList.getData().forEach(f -> { + AppFlowableRecordAndCommentVo a = new AppFlowableRecordAndCommentVo(); Date time = f.getCreateTime(); a.setTime(time); - f.setTitle(f.getTaskUserInfo().getAssigneeName()+"添加了评论"); + f.setTitle(f.getTaskUserInfo().getAssigneeName() + "添加了评论"); a.setProcessCommentVo(f); - a.setState(1+""); + a.setState(1 + ""); list.add(a); }); list.sort((t1, t2) -> t2.getTime().compareTo(t1.getTime())); - return rb.success().setData(list); + return rb.success().setData(list); } public ResultBean> getCommentList(AppFlowableRecordQuery appFlowableRecordQuery) { ResultBean> rb = ResultBean.fireFail(); ResultBean> commentList = processCommentFeign.getCommentList(appFlowableRecordQuery.getProgressId()); - List list=new ArrayList<>(); - commentList.getData().forEach(f->{ + List list = new ArrayList<>(); + commentList.getData().forEach(f -> { ProcessCommentVo processCommentVo = new ProcessCommentVo(); - BeanUtil.copyProperties(f,processCommentVo); + BeanUtil.copyProperties(f, processCommentVo); processCommentVo.setCreateTime(f.getTime()); - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String format = sdf.format(f.getTime()); processCommentVo.setTime(format); list.add(processCommentVo); @@ -115,10 +121,18 @@ public class AppService { } public ResultBean addProgressComment(ProcessComment processComment) { - ProcessCommentDto dto=new ProcessCommentDto(); - BeanUtil.copyProperties(processComment,dto); + ProcessCommentDto dto = new ProcessCommentDto(); + BeanUtil.copyProperties(processComment, dto); String procInsId = processComment.getProcInsId(); dto.setProcessId(procInsId); return processCommentFeign.save(dto); } + + public ResultBean shareMessage(ShareMessageQuery shareMessageQuery) { + ResultBean rb = ResultBean.fireFail(); + FlowableShareQuery flowableShareQuery = new FlowableShareQuery(); + BeanUtil.copyProperties(shareMessageQuery, flowableShareQuery); + ResultBean resultBean = flowableFeign.shareFlowable(flowableShareQuery); + return rb.success(); + } } From c95600dc097da7a9fab46eeff68ff99b55de18c9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 7 Mar 2023 13:57:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAccadjApplyService.java | 2 +- .../biz/basetrailer/BaseTrailerService.java | 21 +++++++++++-------- .../base/biz/basevehicle/BaseVehicleRest.java | 4 ++-- .../basevehinstall/BaseVehinstallRest.java | 16 +++++++------- .../ScmApplyInboundQueryService.java | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 2f630ae0e7..764fd28882 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -621,7 +621,7 @@ public class BaseAccadjApplyService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vehSid).getData(); for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid(); @@ -264,6 +266,8 @@ public class BaseTrailerService extends MybatisBaseService resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); - String orgCode = resultBean1.getData().getOrgCode(); + public String getGCRKApplyCode(BaseVehicle baseVehicle) { + String purchaseSystemSid = baseVehicle.getPurchaseSystemSid(); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData(); + String orgCode = basePurchaseSystemDetailsVo.getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); b.setBillType(BillTypeEnum.GCRK.getBillType()); @@ -418,8 +421,8 @@ public class BaseTrailerService extends MybatisBaseService scmApplyInboundVehQuerys = new ArrayList<>(); for (BaseVehicleDto baseVehicleDto1 : dto) { ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); - scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo()); + scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo().substring(baseVehicleDto1.getVinNo().length() - 8)); scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode()); scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName()); scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDto1.getManufSaleAccessKey()); @@ -534,7 +534,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { List scmApplyInboundVehQuerys = new ArrayList<>(); for (BaseVehicleDto baseVehicleDto1 : dto) { ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); - scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo()); + scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo().substring(baseVehicleDto1.getVinNo().length() - 8)); scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode()); scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName()); scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDto1.getManufSaleAccessKey()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java index 969543008a..fb7e00358c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java @@ -140,7 +140,8 @@ public class BaseVehinstallRest implements BaseVehinstallFeign { dto.setVehicleStateKey(VehicleState.StockEnum.STOCK.getCode()); dto.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks()); dto.setPriceDate(DateUtil.formatDate(new Date())); - String billNo = getGCRKApplyCode(dto.getUserSid()); + BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(dto.getVinNo(),dto.getCreateOrg()); + String billNo = getGCRKApplyCode(baseVehicle); dto.setBillNo(billNo); baseVehinstallService.saveOrUpdateDto(dto); if (StringUtils.isBlank(dto.getSid())) { @@ -246,19 +247,18 @@ public class BaseVehinstallRest implements BaseVehinstallFeign { scmApplyInboundVehQueryDto.setIunit("辆"); scmApplyInboundVehQueryDto.setNum("1"); scmApplyInboundVehQueryDto.setSettleMoney(dto.getCostPrice()); - scmApplyInboundVehQueryDto.setLocalName("在途仓库"); - scmApplyInboundVehQueryDto.setLocalCode("ARZTCK"); + scmApplyInboundVehQueryDto.setLocalName("正式仓库"); + scmApplyInboundVehQueryDto.setLocalCode("ARZSCK"); scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto); scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys); String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData(); return sid; } - public String getGCRKApplyCode(String userSid) { - //获取分公司sid - ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); - String orgCode = resultBean1.getData().getOrgCode(); + public String getGCRKApplyCode(BaseVehicle baseVehicle) { + String purchaseSystemSid = baseVehicle.getPurchaseSystemSid(); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData(); + String orgCode = basePurchaseSystemDetailsVo.getOrgCode(); BillNo b = new BillNo(); b.setOrgCode(orgCode); b.setBillType(BillTypeEnum.SZRK.getBillType()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java index 6f6e1dcb54..9d9856aa87 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java @@ -284,7 +284,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService Date: Tue, 7 Mar 2023 13:57:27 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=88=86?= =?UTF-8?q?=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java index 09311a7bae..f14407d585 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java @@ -45,7 +45,7 @@ public interface AppFeign { ResultBean addProgressComment(@RequestBody @Valid ProcessComment processComment); @ApiOperation("分享") - @PostMapping("/addProgressComment") + @PostMapping("/shareMessage") @ResponseBody ResultBean shareMessage(@Valid @RequestBody ShareMessageQuery shareMessageQuery); }