新增户用合同

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MonitorViewService.java

@@ -89,7 +89,7 @@ public class MonitorViewService
 
 		if (ValidationUtil.isEmpty(oldModel))
 		{
-			throw new DataNotFound("找不到视频视图信息");
+			throw new DataNotFound("视频视图信息");
 		}
 		Bean.copyExistPropertis(model, oldModel);
 		this.updateWithModel(oldModel);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ReviewDto.java

@@ -31,7 +31,7 @@ public class ReviewDto {
     private String flowTaskId;
     private String planInstanceId;
     private String adminUserId;
-
+    private String regionalCompaniesName;
 
 
 

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

@@ -168,7 +168,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         contractDataDto.setPersonalOffsetX(contractTemplate.getPersonalOffsetx());
         contractDataDto.setPersonalOffsetY(contractTemplate.getPersonalOffsety());
         contractDataDto.setPersonalKeywordIndex(contractTemplate.getPersonalKeywordIndex());
-
+        SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd");
+        Date now=new Date();
+        String daty= myFmt2.format(now);
         List<TemplateParamDto> templateParam=new ArrayList<>();
         SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
         templateParam.add(new TemplateParamDto("partyA",householdContract.getPartyA()!=null?householdContract.getPartyA():null));
@@ -184,6 +186,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         templateParam.add(new TemplateParamDto("projectAddressDetail",householdContract.getProjectAddressName()!=null?householdContract.getProjectAddressName()+householdContract.getProjectAddressDetail():null));
         templateParam.add(new TemplateParamDto("componentPower",householdContract.getComponentPower()!=null?String.valueOf(householdContract.getComponentPower()):null));
         templateParam.add(new TemplateParamDto("stationPower",householdContract.getStationPower()!=null?String.valueOf(householdContract.getStationPower()):null));
+        templateParam.add(new TemplateParamDto("signingTime",daty));
         Long  contractLockId=qiyuesuoServiceImpl.addContract(contractDataDto , templateParam);
         householdContract.setContractLockId(contractLockId);
         householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());