From f923d1ad619710cf53d1bdc5fb666bf7255ed49d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 27 Oct 2023 17:03:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E8=AF=81=E8=B5=84=E6=96=99=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BD=A6=E7=89=8C=E5=8F=B7=EF=BC=8C=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=BD=AC=E5=8A=9E=E3=80=81?= =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderFeign.java | 3 +- .../bussalesorder/BusSalesOrderService.java | 33 ++++--- .../anrui/flowable/api/flow2/FlowFeign.java | 5 ++ .../anrui/flowable/biz/flow2/FlowRest.java | 5 ++ .../anrui/flowable/biz/flow2/FlowService.java | 87 +++++++++++++++++++ .../LoanAuditInfoDto.java | 2 + .../LoanAuditInfoVo.java | 2 + .../LoanTransferInfoDto.java | 2 + .../LoanTransferInfoVo.java | 2 + .../LoanWarrantInformation.java | 3 + .../LoanWarrantInformationDetailsVo.java | 2 + .../LoanWarrantInformationVo.java | 2 + .../LoanWarrantInformationMapper.xml | 3 +- .../LoanWarrantInformationService.java | 11 +++ 14 files changed, 146 insertions(+), 16 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 613e15ac6a..c194355515 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -156,7 +156,8 @@ public interface BusSalesOrderFeign { public ResultBean delegate(@RequestBody BusSalesOrderDelegateQuery query); @ApiOperation(value = "转办") - @PostMapping(value = "/assignTask") + @PutMapping(value = "/assignTask") + @ResponseBody public ResultBean assignTask(@RequestBody BusSalesOrderDelegateQuery query); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 0a03cb8849..d172607e47 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1996,25 +1996,29 @@ public class BusSalesOrderService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid()); if (commonContractVoResultBean.getData() != null) { record.setContractId(commonContractVoResultBean.getData().getContractNo()); @@ -5522,7 +5526,7 @@ public class BusSalesOrderService extends MybatisBaseService getApplicantInfoForUrgeCount(String taskId, String procInstId) { return flowService.getApplicantInfoForUrgeCount(taskId,procInstId); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java index 446d823f49..8a63a17ae2 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java @@ -852,6 +852,91 @@ public class FlowService extends MybatisBaseService { } + public ResultBean assignTask(FlowDelegateQuery flowDelegateQuery) { + ResultBean rb = ResultBean.fireFail(); + DelegateQuery delegateQuery = new DelegateQuery(); + BeanUtil.copyProperties(flowDelegateQuery, delegateQuery); + ResultBean assignTask = flowTaskService.assignTask(delegateQuery); + String userSid = flowDelegateQuery.getUserSid(); + String assigneeSid = flowDelegateQuery.getAssignee(); + String instanceId = flowDelegateQuery.getInstanceId(); + String views = ""; + if (StringUtils.isNotBlank(flowDelegateQuery.getViews())) { + views = flowDelegateQuery.getViews(); + } + ResultBean userVoResultBean1 = sysUserFeign.fetchBySid(userSid); + String userName = ""; + if (userVoResultBean1.getData() != null) { + userName = userVoResultBean1.getData().getName(); + } + ResultBean userVoResultBean2 = sysUserFeign.fetchBySid(assigneeSid); + ProcessCommentDto processCommentDto = new ProcessCommentDto(); + processCommentDto.setReviewerSid(userSid); + if (userVoResultBean2.getData() != null) { + String changeName = userVoResultBean2.getData().getName(); + processCommentDto.setReviewer(userName); + processCommentDto.setContent(userName + "转办给" + changeName + "：" + views); + } + processCommentDto.setTime(new Date()); + processCommentDto.setProcessId(instanceId); + processCommentService.saveOrUpdateDto(processCommentDto); + //转办内容推送至待阅 + HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery() + .includeProcessVariables().taskId(delegateQuery.getTaskId()).singleResult(); + if (historicTaskInstance == null) { + return rb.setMsg("分享失败！"); + } + MessageFlowVo messageFlowVo = new MessageFlowVo(); + String procDefId = historicTaskInstance.getProcessDefinitionId(); + String procInsId = historicTaskInstance.getProcessInstanceId(); + String nodeState = historicTaskInstance.getName(); + String taskDefKey = historicTaskInstance.getTaskDefinitionKey(); + messageFlowVo.setProcDefId(procDefId); + messageFlowVo.setTaskId(delegateQuery.getTaskId()); + messageFlowVo.setNodeState(nodeState); + messageFlowVo.setProcInsId(procInsId); + messageFlowVo.setTaskDefKey(taskDefKey); + Map processVariables = historicTaskInstance.getProcessVariables(); + MessageFlowableQuery mfq = new MessageFlowableQuery(); + mfq.setUfVo(messageFlowVo); + String createrOrgPath = (String) processVariables.get("createrOrgPath"); + if (historicTaskInstance == null) { + return rb.setMsg("分享失败！"); + } + // + String assignee = (String) processVariables.get("assignee"); + ResultBean stringResultBean = sysUserFeign.fetchBySid(assignee); + String assigneeName = ""; + if (stringResultBean.getData() != null) { + assigneeName = stringResultBean.getData().getName(); + } + + Map app = new HashMap<>(); + if (processVariables.get("app") != null) { + app = (Map) processVariables.get("app"); + } + mfq.setAppMap(app); + String businessSid = (String) processVariables.get("businessSid"); + mfq.setBusinessSid(businessSid); + mfq.setMsgContent(userName + "分享的流程审批,请查看"); +// act_re_procdef + Map process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId()); + + mfq.setModuleName(process.get("NAME_")); + if (processVariables.containsKey("orderNames")) { + mfq.setMsgTitle(processVariables.get("orderNames").toString()); + } else { + mfq.setMsgTitle(process.get("NAME_")); + } + mfq.setUserSids(userSid); + mfq.setOrgPath(createrOrgPath); + mfq.setUserSid(assignee); + mfq.setApplicationName(assigneeName); + ResultBean resultBean = messageFeign.pushMessageShare(mfq); + return rb.success(); + } + + public ResultBean getApplicantInfoForUrgeCount(String taskId, String procInstId) { ResultBean rb = ResultBean.fireFail(); FlowableMessageVo flowableMessageVo = baseMapper.getApplicantInfoForUrgeCount(taskId, procInstId); @@ -915,4 +1000,6 @@ public class FlowService extends MybatisBaseService { } return rb.success().setData(vo); } + + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoDto.java index b48b480e32..13d9cfb91d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoDto.java @@ -26,6 +26,8 @@ public class LoanAuditInfoDto implements Dto { private String bankName; @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("车牌号") + private String vehicleMark; @ApiModelProperty("登记证 1-2页") private List registrationFiles1 = new ArrayList<>(); @ApiModelProperty("登记证 3-4页") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoVo.java index bb59679b9a..b9b1cf30c7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanAuditInfoVo.java @@ -26,6 +26,8 @@ public class LoanAuditInfoVo implements Vo { private String bankName; @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("车牌号") + private String vehicleMark; @ApiModelProperty("登记证 1-2页") private List registrationFiles1 = new ArrayList<>(); @ApiModelProperty("登记证 3-4页") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoDto.java index cfd38916a0..a864701d29 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoDto.java @@ -32,4 +32,6 @@ public class LoanTransferInfoDto implements Dto { private String recipient; @ApiModelProperty("移交备注") private String transferRemarks; + @ApiModelProperty("车牌号") + private String vehicleMark; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoVo.java index 7d0cd4378a..c428a80751 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanTransferInfoVo.java @@ -36,4 +36,6 @@ public class LoanTransferInfoVo implements Vo { private String recipient; @ApiModelProperty("移交备注") private String transferRemarks; + @ApiModelProperty("车牌号") + private String vehicleMark; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformation.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformation.java index 5c6eabd563..d5cf5e3d91 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformation.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformation.java @@ -63,4 +63,7 @@ public class LoanWarrantInformation extends BaseEntity { private String useOrgName; @ApiModelProperty("使用组织全路径") private String orgSidPath; + @ApiModelProperty("车牌号") + private String vehicleMark; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationDetailsVo.java index d3c1ac818f..30d5827239 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationDetailsVo.java @@ -50,4 +50,6 @@ public class LoanWarrantInformationDetailsVo implements Vo { private String recipient; @ApiModelProperty("移交备注") private String transferRemarks; + @ApiModelProperty("车牌号") + private String vehicleMark; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationVo.java index efb066feae..44e3c3471a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationVo.java @@ -36,4 +36,6 @@ public class LoanWarrantInformationVo implements Vo { private String bankName; @ApiModelProperty("备注") private String transferRemarks; + @ApiModelProperty("车牌号") + private String vehicleMark; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.xml index b2d5c266d1..cc7ccc09b1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.xml @@ -29,7 +29,8 @@ auditStateValue, date_format(transferDate, '%Y-%m-%d') as transferDate, bankName, - transferRemarks + transferRemarks, + vehicleMark from loan_warrant_information ${ew.sqlSegment} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java index 2d53e751f4..f586597e83 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java @@ -267,12 +267,19 @@ public class LoanWarrantInformationService extends MybatisBaseService hashSet = new HashSet<>(); for (String sid : sids) { LoanWarrantInformation entity = fetchBySid(sid); if (StringUtils.isNotBlank(entity.getVinNo())) { sbVinNo.append(entity.getVinNo()).append("，"); } + if (StringUtils.isNotBlank(entity.getVehicleMark())) { + sbVinMark.append(entity.getVehicleMark()).append("，"); + } + if (StringUtils.isNotBlank(entity.getVinNo())) { + sbVinNo.append(entity.getVinNo()).append("，"); + } if (StringUtils.isNotBlank(entity.getContractNo())) { hashSet.add(entity.getContractNo()); } @@ -308,6 +315,10 @@ public class LoanWarrantInformationService extends MybatisBaseService 0) { + sbVinMark.delete(sbVinMark.length() - 1, sbVinMark.length()); + vo.setVehicleMark(sbVinMark.toString()); + } if (!hashSet.isEmpty()) { for (String s : hashSet) { sbConNo.append(s).append("，");