From 10ea7631cce9910876aef419949ef504d754abe8 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 5 Sep 2022 18:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/commoncontract/CommonContract.java | 2 ++ .../commoncontract/CommonContractMapper.java | 2 +- .../commoncontract/CommonContractMapper.xml | 6 +++-- .../commoncontract/CommonContractService.java | 24 +++++++++++++------ .../BusSalesOrderDepositService.java | 1 + .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java index 8ce0e35431..372dccf60d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java @@ -109,4 +109,6 @@ public class CommonContract extends BaseEntity { private String procInstId; @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty("生成的合同的url") + private String commonContractUrl; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java index b072d09afa..4f19b9e6aa 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java @@ -77,7 +77,7 @@ public interface CommonContractMapper extends BaseMapper { * @param staffSid * @return */ - AppCommonContractInitVo getContractInfo(@Param("contractSid") String contractSid, @Param("staffSid") String staffSid); + AppCommonContractInitVo getContractInfo(@Param("contractSid") String contractSid); int selectNum(String bill); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index d502005615..2b603f43fd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -94,10 +94,12 @@ contractAmount AS contractPrice, customerSid, appdixUrl, - sceneSignUrl + sceneSignUrl, + taskId, + procInstId as procInsId, + staffSid as userSid FROM common_contract WHERE sid = #{contractSid} - AND staffSid = #{staffSid} 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 bb885c0591..0a543ccc53 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 @@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice; -import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto; @@ -1028,9 +1026,8 @@ public class CommonContractService extends MybatisBaseService contract = new ArrayList<>(); @@ -1176,7 +1173,7 @@ public class CommonContractService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 - appMap.put("sid", businessSid); + appMap.put("contractSid", businessSid); variables.put("app", appMap); //流程定义id bv.setModelId(ProcDefEnum.CONTRACTAPPLY.getProDefId()); @@ -1330,6 +1327,7 @@ public class CommonContractService extends MybatisBaseService future2 = pool.submit(() -> { return genCarSaleContractBlank(dto, map, appOrderDetailsVo); @@ -1362,8 +1365,14 @@ public class CommonContractService extends MybatisBaseService future3 = pool.submit(() -> { //新增合同信息 CommonContract commonContract = new CommonContract(); @@ -1400,6 +1409,7 @@ public class CommonContractService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); + appMap.put("contractSid", businessSid); variables.put("app", appMap); bv.setFormVariables(variables); if (bv.getTaskId().equals(commonContract.getTaskId())) { @@ -1514,7 +1524,7 @@ public class CommonContractService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); + appMap.put("contractSid", businessSid); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index 9ca6e43700..9a018e3c41 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -273,6 +273,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService