From f3224d926d8f0d1913cd1c5e38459cbd0ae3bd88 Mon Sep 17 00:00:00 2001 From: djz236 Date: Wed, 6 Apr 2022 17:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7springboot=E7=89=88=E6=9C=AC?= =?UTF-8?q?=20=202.5.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busmaindeposit/BusMainDepositMapper.java | 11 +++- .../busmaindeposit/BusMainDepositMapper.xml | 6 ++ .../busmaindeposit/BusMainDepositRest.java | 10 ++-- .../busmaindeposit/BusMainDepositService.java | 56 +++++++++++++++++-- 4 files changed, 73 insertions(+), 10 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java index 133e1a7647..8aea8174ba 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java @@ -69,5 +69,14 @@ public interface BusMainDepositMapper extends BaseMapper { int deleteVirtualOrder(@Param("staffSid") String staffSid, @Param("virtualOrderSid") String virtualOrderSid); BusMainDeposit selectBySid(@Param("virtualOrderSid") String virtualOrderSid); - + /** + * 更新虚拟订单审批（订金）业务表中的流程状态 + * @param businessSid 业务sid + * @param proDefId 流程定义sid + * @param nodeState 环节状态 + * @param procInsId 流程实例sid + * @param taskDefKey 环节sid + */ + void modifiBusDepositFlowState(@Param("businessSid") String businessSid,@Param("procDefId") String procDefId,@Param("nodeState") String nodeState, + @Param("procInstSid") String procInstSid,@Param("nodeSid") String nodeSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index 129888b67a..900364665f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -113,4 +113,10 @@ FROM bus_main_deposit bmd WHERE bmd.sid = #{virtualOrderSid} + + + + update bus_main_deposit set procDefId=#{procDefId},nodeState=#{nodeState},procInstSid=#{procInstSid},nodeSid=#{nodeSid} + where sid=#{businessSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java index 7c9b074794..2965c88a2f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java @@ -79,11 +79,11 @@ public class BusMainDepositRest implements BusMainDepositFeign { } @Override - public ResultBean saveDeposit(BusDepositDto dto) { + public ResultBean saveOrUpdateDeposit(BusDepositDto dto) { if (dto.getPaymentProofList() != null && dto.getPaymentProofList().size() > 1) { return new ResultBean().fail().setMsg("只可上传一张付款凭证"); } - return busMainDepositService.saveDeposit(dto); + return busMainDepositService.saveOrUpdateDeposit(dto); } @Override @@ -91,13 +91,13 @@ public class BusMainDepositRest implements BusMainDepositFeign { return busMainDepositService.saveDepositVehicle(dto); } - @Override + /*@Override public ResultBean updateDeposit(BusDepositDto dto, String sid) { if (dto.getPaymentProofList() != null && dto.getPaymentProofList().size() > 1) { return new ResultBean().fail().setMsg("只可上传一张付款凭证"); } - return busMainDepositService.updateDeposit(dto, sid); - } + return saveDeposit(dto);// busMainDepositService.updateDeposit(dto, sid); + }*/ @Override public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index fc1c21278f..c11773a85a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -195,7 +195,20 @@ public class BusMainDepositService extends MybatisBaseService map = generateBillNo(dto.getUserSid()); BusMainDeposit busMainDeposit = new BusMainDeposit(); @@ -305,7 +318,7 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); + variables.put("businessSid", businessSid); + variables.put("isLoan", true); + variables.put("orgSid", orgSid);//部门sid + ResultBean resultBean = flowableService.businessStart(procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); + if (resultBean.getSuccess() && resultBean.getData() != null) { + Map map = (Map) resultBean.getData(); + /*saveSysFormLink(map);*/ + //更新虚拟订单审批（订金）业务表中的流程状态 + modifiBusMainDepositFlowState(businessSid, + procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId + map.get("nodeState"),//state + map.get("procInsId"),//procInstSid + map.get("taskDefKey")//nodeSid + ); + } + return resultBean; + } + private void modifiBusMainDepositFlowState(String businessSid, + String proDefId,//procDefId + String nodeState,//state + String procInsId,//procInstSid + String taskDefKey//nodeSid + ){ + baseMapper.modifiBusDepositFlowState(businessSid, + proDefId,//procDefId + nodeState,//state + procInsId,//procInstSid + taskDefKey); + } + /*public ResultBean submitMainDespoitApprove(BusDepositDto dto) { + String orgSid = checkUserOrg(dto.getUserSid()); String businessSid = ""; if (StringUtils.isBlank(orgSid)) { return new ResultBean().fail().setMsg("用户组织机构不能为空"); @@ -724,7 +772,7 @@ public class BusMainDepositService extends MybatisBaseService