From 67ad61648fefa475bef5a5697802909399293b29 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 27 Oct 2023 16:16:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=B6=E8=AE=BF?= =?UTF-8?q?=E8=B5=84=E6=96=99=E5=AE=A1=E6=A0=B8--=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homevisitdatareviewAdd.vue | 22 +++++++++++++++++++ .../homevisitdatareviewReplenish.vue | 7 ++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewAdd.vue b/anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewAdd.vue index 6aa9e579b6..fd1233fa22 100644 --- a/anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewAdd.vue +++ b/anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewAdd.vue @@ -4,6 +4,7 @@
{{ viewTitle }}
推送问题反馈 + 保存 提交下一环节 关闭
@@ -200,6 +201,7 @@ export default { image_list16: [], image_list17: [], formobj: { + isSave: '', carProperty: [], doorway: [], groupPhoto: [], @@ -418,6 +420,25 @@ export default { this.$message({ showClose: true, type: 'error', message: '存在的问题反馈内容不能为空' }) } }, + save() { + this.$refs['form_obj'].validate((valid) => { + if (valid) { + this.getUrl() + this.submitdisabled = true + this.formobj.isSave = '1' + req.save(this.formobj).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.handleReturn('true') + } else { + this.submitdisabled = false + } + }).catch(() => { + this.submitdisabled = false + }) + } + }) + }, submit() { this.$refs['form_obj'].validate((valid) => { if (valid) { @@ -594,6 +615,7 @@ export default { handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') this.formobj = { + isSave: '', carProperty: [], doorway: [], groupPhoto: [], diff --git a/anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewReplenish.vue b/anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewReplenish.vue index c7df12ad00..b721c33680 100644 --- a/anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewReplenish.vue +++ b/anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewReplenish.vue @@ -3,7 +3,7 @@
{{ viewTitle }}
- 保存 + 保存 关闭
@@ -233,6 +233,7 @@ export default { image_list16: [], image_list17: [], formobj: { + isSave: '', carProperty: [], doorway: [], groupPhoto: [], @@ -474,11 +475,12 @@ export default { }) }) }, - submit() { + save() { this.$refs['form_obj'].validate((valid) => { if (valid) { this.getUrl() this.submitdisabled = true + this.formobj.isSave = '1' req.save(this.formobj).then((resp) => { if (resp.success) { this.$message({ showClose: true, type: 'success', message: '操作成功' }) @@ -650,6 +652,7 @@ export default { handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') this.formobj = { + isSave: '', carProperty: [], doorway: [], groupPhoto: [], 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 2/7] =?UTF-8?q?=E6=9D=83=E8=AF=81=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E7=89=8C=E5=8F=B7=EF=BC=8C=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=BD=AC=E5=8A=9E?= =?UTF-8?q?=E3=80=81=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("，"); From 7ac1f1e28251eec03f1dd59342cd56b7c8711a1b Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 27 Oct 2023 17:50:29 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=A0=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java | 1 + 1 file changed, 1 insertion(+) 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 c194355515..3d0b931500 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 @@ -153,6 +153,7 @@ public interface BusSalesOrderFeign { @ApiOperation(value = "加签") @PostMapping(value = "/delegate") + @ResponseBody public ResultBean delegate(@RequestBody BusSalesOrderDelegateQuery query); @ApiOperation(value = "转办") From 0dcaeb11896d2fc713d5f8d660861048d733a470 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 30 Oct 2023 08:35:05 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractMapper.xml | 2 +- .../BusSalesOrderLoancontractService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml index 7a0c1be50a..6516ea7001 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml @@ -21,7 +21,7 @@ bs.orgName as orgName, bs.staffName as staffName, bs.useOrgName as useOrgName, - co.loanCotractNo as loanContractNo, + co.loanContractNo as loanContractNo, co.borrowerName as borrowerName, co.bankName as bankName, co.bankContractNo as bankContractNo, diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index eb796328ca..8ec7ca50c1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -237,7 +237,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService Date: Mon, 30 Oct 2023 10:13:52 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 5 ++++- .../bussalesordervehicle/BusSalesOrderVehicleMapper.java | 1 + .../bussalesordervehicle/BusSalesOrderVehicleMapper.xml | 8 ++++++++ .../bussalesordervehicle/BusSalesOrderVehicleService.java | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) 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 d172607e47..4fa5acfeb4 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 @@ -7490,7 +7490,7 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid); + List busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid2(saleOrderSid); busSalesOrderVehicleList.removeAll(Collections.singleton(null)); List borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList()); List vinList = new ArrayList<>(); @@ -7511,6 +7511,9 @@ public class BusSalesOrderService extends MybatisBaseService selectListByOrdersSid(String saleOrderSid); + List selectListByOrdersSid2(String saleOrderSid); BusSalesOrderVehicle selectByBorrowSid(String sid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 0c8ad27ffe..d72503a8ee 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -272,6 +272,14 @@ where bv.salesOrderSid = #{saleOrderSid} and bbb.state = 1 group by bv.borrowerSid + + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 20151f4fca..7f90beae00 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -590,6 +590,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectListByOrdersSid2(String saleOrderSid) { + return baseMapper.selectListByOrdersSid2(saleOrderSid); + } + public BusSalesOrderVehicle selectByBorrowSid(String sid) { return baseMapper.selectByBorrowSid(sid); } From 4c0de922c21dea1e892cce2e3c5aca6fe4988465 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 30 Oct 2023 10:23:58 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index d72503a8ee..580b33088e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -290,6 +290,12 @@ from bus_sales_order_vehicle bv LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid where (bv.borrowerSid is null or bv.borrowerSid = '') and bv.salesOrderSid = #{sale0rderSid} + union all + select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,concat(if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)),':',if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1,'-',RIGHT(bv.linkNo, 8))) as dictValue,bv.sid dictKey + from bus_sales_order_vehicle bv + LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid + left join bus_sales_order_borrower bbb on bbb.sid = bv.borrowerSid + where length(bv.borrowerSid)>0 and bv.salesOrderSid = #{sale0rderSid} and bbb.state = 1 order by temporaryNo asc From 79b19faec5437eaa58f7d2bbedad277fb752953d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 30 Oct 2023 11:22:21 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 10 ++++++---- .../BusSalesOrderVehicleMapper.xml | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) 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 4fa5acfeb4..56825c5419 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 @@ -7512,16 +7512,18 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderVehicleLists = new ArrayList<>(); if (StringUtils.isNotBlank(borrowSid)) { busSalesOrderVehicleLists = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 580b33088e..c4d05c3289 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -92,6 +92,12 @@ from bus_sales_order_vehicle bv left join bus_sales_order bso on bso.sid = bv.salesOrderSid where bv.salesOrderSid = #{salesOrderSid} and (bv.borrowerSid IS NULL OR bv.borrowerSid = '') + union all + select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,bv.linkSid,bv.linkNo + from bus_sales_order_vehicle bv + left join bus_sales_order bso on bso.sid = bv.salesOrderSid + left join bus_sales_order_borrower bbb on bbb.sid = bv.borrowerSid + where bv.salesOrderSid = #{salesOrderSid} and length(bv.borrowerSid)>0 and bbb.state != 1