Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -51,4 +51,7 @@ public class ContractTemplateDto  extends BaseDto {
     @ApiModelProperty(value = "个人签字位置y偏移量")
     private Double personalOffsety;
 
+    @ApiModelProperty(value = "序号")
+    private Integer num;
+
 }

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

@@ -98,7 +98,7 @@ public class HouseholdContractDto  extends BaseDto {
     private String projectAddressName;
 
     @ApiModelProperty(value = "免租期免租期")
-    private String rentFree;
+    private Date rentFree;
 
     @ApiModelProperty(value = "租金计算日期")
     private Date rentCalculationDate;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ContractTemplate.java

@@ -81,5 +81,6 @@ public class ContractTemplate extends BaseEntity {
      */
 	@TableField("personal_offsety")
     private Double personalOffsety;
-
+    @TableField("num")
+    private Integer num;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HouseholdContract.java

@@ -178,7 +178,7 @@ public class HouseholdContract extends BaseEntity {
 免租期
      */
 	@TableField("rent_free")
-    private String rentFree;
+    private Date rentFree;
 
     /**
      * 租金计算日期

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java

@@ -193,7 +193,7 @@ public class HouseholdContractController extends BaseController {
     public ResponseModel<List<CompanyModel>> sealId() {
         FeignClientResult<Collection<CompanyModel>> feignClientResult=  Privilege.companyClient.querySubAgencyTree(regionalCompanies);
         List<CompanyModel>  companyModel = (List<CompanyModel>)feignClientResult.getResult();
-        companyModel=companyModel.stream().filter(compan->compan.getLevel()!=null).collect(Collectors.toList());
+        companyModel=companyModel.stream().filter(compan->compan.getCompanyCode()!=null&&!"".equals(compan.getCompanyCode())).collect(Collectors.toList());
         return ResponseHelper.buildResponse(companyModel);
     }
 

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

@@ -28,6 +28,6 @@ public class ContractTemplateServiceImpl extends BaseService<ContractTemplateDto
      * 列表查询 示例
      */
     public List<ContractTemplateDto> queryForContractTemplateList()   {
-        return this.queryForList("" , false);
+        return this.queryForList("num" , true);
     }
 }
\ No newline at end of file

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

@@ -40,14 +40,19 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
     @Autowired
     QiyuesuoServiceImpl qiyuesuoServiceImpl;
 
-    @Value("${qiyuesuo.category}")
-    String category;
-    @Value("${qiyuesuo.category}")
-    String companyTenantName;
-    @Value("${qiyuesuo.category}")
-    String companyUsername;
-    @Value("${qiyuesuo.category}")
-    String companyContact;
+   // @Value("${qiyuesuo.category}")
+    String category="智信能源合同";
+    //@Value("${qiyuesuo.companyTenantName}")
+    String companyTenantName="智信能源科技有限公司-测试";
+   // @Value("${qiyuesuo.companyUsername}")
+    String companyUsername="唐伟";
+   // @Value("${qiyuesuo.companyContact}")
+    String companyContact="18291879708";
+
+
+
+
+
     @Autowired
     ContractTemplateMapper contractTemplateMapper;
 
@@ -142,31 +147,37 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         contractDataDto.setCompanyUsername(companyUsername);
         contractDataDto.setCompanyContact(companyContact);
         contractDataDto.setEmplateId(model.getContractTemplateId());
-        ContractTemplate contractTemplate=contractTemplateMapper.selectById(model.getContractTemplateId());
+
+
+        QueryWrapper<ContractTemplate> qu=new QueryWrapper();
+        qu.eq("template_id",model.getContractTemplateId());
+        ContractTemplate contractTemplate=contractTemplateMapper.selectOne(qu);
+
+
         contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
         contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
         contractDataDto.setCompanyOffsetX(contractTemplate.getCompanyOffsetx());
         contractDataDto.setCompanyOffsetY(contractTemplate.getCompanyOffsety());
-        contractDataDto.setPersonalkeyword(contractTemplate.getCompanyKeyword());
+        contractDataDto.setPersonalkeyword(contractTemplate.getPersonalKeyword());
         contractDataDto.setPersonalPage(contractTemplate.getPersonalPage());
         contractDataDto.setPersonalOffsetX(contractTemplate.getPersonalOffsetx());
         contractDataDto.setPersonalOffsetY(contractTemplate.getPersonalOffsety());
 
         List<TemplateParamDto> templateParam=new ArrayList<>();
         SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
-        templateParam.add(new TemplateParamDto("partyA",householdContract.getPartyA()));
-        templateParam.add(new TemplateParamDto("peasantHouseholdPhone",householdContract.getPeasantHouseholdPhone()));
-        templateParam.add(new TemplateParamDto("rentFree",householdContract.getRentFree()));
-        templateParam.add(new TemplateParamDto("rentCalculationDate",householdContract.getRentCalculationDate()!=null?sdfdate.format(householdContract.getRentCalculationDate()):""));
-        templateParam.add(new TemplateParamDto("leaseEndDate",householdContract.getLeaseEndDate()!=null?sdfdate.format(householdContract.getLeaseEndDate()):""));
-        templateParam.add(new TemplateParamDto("constructionScale",householdContract.getConstructionScale()!=null?String.valueOf(householdContract.getConstructionScale()):""));
-        templateParam.add(new TemplateParamDto("componentQuantityBlock",householdContract.getComponentQuantityBlock()!=null?String.valueOf(householdContract.getComponentQuantityBlock()):""));
-        templateParam.add(new TemplateParamDto("totalInvestment",householdContract.getTotalInvestment()!=null?String.valueOf(householdContract.getTotalInvestment()):""));
-        templateParam.add(new TemplateParamDto("peasantHouseholdCard",householdContract.getPeasantHouseholdCard()));
-        templateParam.add(new TemplateParamDto("permanentAddressDetail",householdContract.getPermanentAddressName()+householdContract.getPermanentAddressDetail()));
-        templateParam.add(new TemplateParamDto("projectAddressDetail",householdContract.getProjectAddressName()+householdContract.getProjectAddressDetail()));
-        templateParam.add(new TemplateParamDto("componentPower",householdContract.getComponentPower()!=null?String.valueOf(householdContract.getComponentPower()):""));
-        templateParam.add(new TemplateParamDto("stationPower",householdContract.getStationPower()!=null?String.valueOf(householdContract.getStationPower()):""));
+        templateParam.add(new TemplateParamDto("partyA",householdContract.getPartyA()!=null?householdContract.getPartyA():null));
+        templateParam.add(new TemplateParamDto("peasantHouseholdPhone",householdContract.getPeasantHouseholdPhone()!=null?householdContract.getPeasantHouseholdPhone():null));
+        templateParam.add(new TemplateParamDto("rentFree",householdContract.getRentFree()!=null?sdfdate.format(householdContract.getRentFree()):null));
+        templateParam.add(new TemplateParamDto("rentCalculationDate",householdContract.getRentCalculationDate()!=null?sdfdate.format(householdContract.getRentCalculationDate()):null));
+        templateParam.add(new TemplateParamDto("leaseEndDate",householdContract.getLeaseEndDate()!=null?sdfdate.format(householdContract.getLeaseEndDate()):null));
+        templateParam.add(new TemplateParamDto("constructionScale",householdContract.getConstructionScale()!=null?String.valueOf(householdContract.getConstructionScale()):null));
+        templateParam.add(new TemplateParamDto("componentQuantityBlock",householdContract.getComponentQuantityBlock()!=null?String.valueOf(householdContract.getComponentQuantityBlock()):null));
+        templateParam.add(new TemplateParamDto("totalInvestment",householdContract.getTotalInvestment()!=null?String.valueOf(householdContract.getTotalInvestment()):null));
+        templateParam.add(new TemplateParamDto("peasantHouseholdCard",householdContract.getPeasantHouseholdCard()!=null?householdContract.getPeasantHouseholdCard():null));
+        templateParam.add(new TemplateParamDto("permanentAddressDetail",householdContract.getPermanentAddressName()!=null?householdContract.getPermanentAddressName()+householdContract.getPermanentAddressDetail():null));
+        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));
         Long  contractLockId=qiyuesuoServiceImpl.addContract(contractDataDto , templateParam);
         householdContract.setContractLockId(contractLockId);
         householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());

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

@@ -120,8 +120,8 @@ public class QiyuesuoServiceImpl {
       Contract contract = new Contract();
       contract.setSubject(subject);
       contract.setDescription(subject);
-      contract.setExpireTime(expireTime);
-      contract.setEndTime(endTime);
+//      contract.setExpireTime(expireTime);
+//      contract.setEndTime(endTime);
       contract.setCategory(new Category(category));
       contract.setSend(false);
       // 个人
@@ -179,7 +179,7 @@ public class QiyuesuoServiceImpl {
       Stamper stamper2 = new Stamper();
       stamper2.setSignatoryId(SignatoryId);
       stamper2.setDocumentId(documentAddResult.getDocumentId());
-      stamper.setKeyword(personalkeyword);
+      stamper2.setKeyword(personalkeyword);
       stamper2.setType("PERSONAL");
       stamper2.setPage(personalPage);
       stamper2.setOffsetX(personalOffsetX);
@@ -198,8 +198,11 @@ public class QiyuesuoServiceImpl {
         // 添加合同文档
         List<TemplateParam> params = new ArrayList<>();
         for (TemplateParamDto templateParamDto : templateParam) {
-            params.add(new TemplateParam(templateParamDto.getKey(), templateParamDto.getValue()));
+              if(templateParamDto.getValue()!=null){
+                  params.add(new TemplateParam(templateParamDto.getKey(), templateParamDto.getValue()));
+              }
         }
+        logger.info("合同参数"+JSON.toJSONString(params));
         DocumentAddByTemplateRequest request = new DocumentAddByTemplateRequest(contractId,
                 emplateId , params, subject);
         String response = sdkClient.service(request);