From c083b87a2635d9b48dd95cb441d7a7c5c9258abe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 21 四月 2021 18:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java
index 55b293c..6615ab0 100644
--- a/service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/contract/impl/SaveContractBMOImpl.java
@@ -9,15 +9,19 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.rentingPool.RentingPoolDto;
import com.java110.dto.store.StoreDto;
+import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
import com.java110.intf.store.IContractAttrInnerServiceSMO;
+import com.java110.intf.store.IContractFileInnerServiceSMO;
import com.java110.intf.store.IContractInnerServiceSMO;
import com.java110.intf.store.IContractTypeInnerServiceSMO;
import com.java110.intf.user.IRentingPoolInnerServiceSMO;
import com.java110.po.contract.ContractPo;
import com.java110.po.contractAttr.ContractAttrPo;
+import com.java110.po.contractFile.ContractFilePo;
import com.java110.po.rentingPool.RentingPoolPo;
import com.java110.store.bmo.contract.ISaveContractBMO;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +44,12 @@
@Autowired
private IRentingPoolInnerServiceSMO rentingPoolInnerServiceSMOImpl; // 鎴垮眿绉熻祦
+
+ @Autowired
+ private IContractApplyUserInnerServiceSMO contractApplyUserInnerServiceSMOImpl;
+
+ @Autowired
+ private IContractFileInnerServiceSMO contractFileInnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
@@ -76,13 +86,26 @@
}
contractPo.setContractId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_contractId));
+ //闄勪欢淇濆瓨
+ List<ContractFilePo> filePos = contractPo.getContractFilePo();
int flag = contractInnerServiceSMOImpl.saveContract(contractPo);
+ for (ContractFilePo file: filePos) {
+ if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0){
+ file.setContractId(contractPo.getContractId());
+ contractFileInnerServiceSMOImpl.saveContractFile(file);
+ }
+ }
+ contractPo.setContractId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_contractId));
if (flag < 0) {
return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
-
}
+ //鎻愪氦娴佺▼
+ ContractDto tmpContractDto = BeanConvertUtil.covertBean(contractPo, ContractDto.class);
+ tmpContractDto.setCurrentUserId(reqJson.getString("userId"));
+ contractApplyUserInnerServiceSMOImpl.startProcess(tmpContractDto);
+
if (StoreDto.STORE_ADMIN.equals(contractPo.getStoreId())) {
noticeRentUpdateState(contractPo, audit);
}
--
Gitblit v1.8.0