27523 【户用光伏】发起合同允许两个人管理员盖章

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.qiyuesuo.sdk.v2.bean.User;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
@@ -157,12 +158,14 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         queryWrapper.eq("amos_company_seq", householdContract.getRegionalCompaniesSeq());
         List<SealDictionary> sealDictionaryList = sealDictionaryMapper.selectList(queryWrapper);
         List<Long> listSealId = new ArrayList<>();
+        List<User> operatorUsers = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(sealDictionaryList)) {
+            contractDataDto.setCategory( sealDictionaryList.get(0).getCategory());
+            contractDataDto.setCompanyTenantName( sealDictionaryList.get(0).getCompanyTenantName());
+            contractDataDto.setCompanyUsername( sealDictionaryList.get(0).getSealedUser());
+            contractDataDto.setCompanyContact( sealDictionaryList.get(0).getSealedPhone());
             for (SealDictionary sealDictionary : sealDictionaryList) {
-                contractDataDto.setCategory(sealDictionary.getCategory());
-                contractDataDto.setCompanyTenantName(sealDictionary.getCompanyTenantName());
-                contractDataDto.setCompanyUsername(sealDictionary.getSealedUser());
-                contractDataDto.setCompanyContact(sealDictionary.getSealedPhone());
+                operatorUsers.add(new User(sealDictionary.getSealedUser(), sealDictionary.getSealedPhone(), "MOBILE"));
                 listSealId.add(sealDictionary.getSealId());
             }
         }
@@ -216,7 +219,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
             }
         }
 
-        Long contractLockId = qiyuesuoServiceImpl.addContract(contractDataDto, templateParam);
+        Long contractLockId = qiyuesuoServiceImpl.addContract(contractDataDto, templateParam,operatorUsers);
         householdContract.setContractLockId(contractLockId);
         householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
         householdContractMapper.updateById(householdContract);
@@ -291,12 +294,14 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         queryWrapper.eq("amos_company_seq", householdContract.getRegionalCompaniesSeq());
         List<SealDictionary> sealDictionaryList = sealDictionaryMapper.selectList(queryWrapper);
         List<Long> listSealId = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(sealDictionaryList)){
+        List<User> operatorUsers = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(sealDictionaryList)) {
+            contractDataDto.setCategory( sealDictionaryList.get(0).getCategory());
+            contractDataDto.setCompanyTenantName( sealDictionaryList.get(0).getCompanyTenantName());
+            contractDataDto.setCompanyUsername( sealDictionaryList.get(0).getSealedUser());
+            contractDataDto.setCompanyContact( sealDictionaryList.get(0).getSealedPhone());
             for (SealDictionary sealDictionary : sealDictionaryList) {
-                contractDataDto.setCategory(sealDictionary.getCategory());
-                contractDataDto.setCompanyTenantName(sealDictionary.getCompanyTenantName());
-                contractDataDto.setCompanyUsername(sealDictionary.getSealedUser());
-                contractDataDto.setCompanyContact(sealDictionary.getSealedPhone());
+                operatorUsers.add(new User(sealDictionary.getSealedUser(), sealDictionary.getSealedPhone(), "MOBILE"));
                 listSealId.add(sealDictionary.getSealId());
             }
         }
@@ -353,7 +358,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         }
 
 
-        Long contractLockId = qiyuesuoServiceImpl.addContract(contractDataDto, templateParam);
+        Long contractLockId = qiyuesuoServiceImpl.addContract(contractDataDto, templateParam,operatorUsers);
         householdContract.setContractLockId(contractLockId);
         householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
         householdContractMapper.updateById(householdContract);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/QiyuesuoServiceImpl.java

@@ -106,7 +106,7 @@ public class QiyuesuoServiceImpl {
 	 *
 	 **/
 
-	public Long addContract(ContractDataDto contractDataDto, List<TemplateParamDto> templateParam) {
+	public Long addContract(ContractDataDto contractDataDto, List<TemplateParamDto> templateParam,List<User> corpOperators) {
 		SdkResponse<Contract> responseObj = null;
 		// 返回结果
 		Contract result = new Contract();
@@ -157,6 +157,8 @@ public class QiyuesuoServiceImpl {
 			Action action = new Action("COMPANY", 0);
 			// 指定印章
 			action.setCorpSealIds(corpSealIds);
+			//指定操作人
+			action.setCorpOperators(corpOperators);
 			signatory2.addAction(action);
 			// 设置签署方
 			contract.addSignatory(signatory1);