修改bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -99,6 +99,9 @@ public class ControllerAop {
 		urls.add("/tzs/reg-unit-info/save");
         urls.add("/hygf/unit-info/region/tree");
         urls.add("/hygf/unit-info/management-unit/tree");
+        urls.add("/hygf/unit-info/hasExistPhone/*");
+
+
 
 		// 获取请求路径
 		for (String uri : urls) {

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 /**
@@ -20,6 +21,7 @@ public class ContractDataDto {
     String companyTenantName;
     String companyUsername;
     String companyContact;
+    Integer companyKeywordIndex;
     Long emplateId;
     String  companykeyword;
     Integer  companyPage;
@@ -29,4 +31,5 @@ public class ContractDataDto {
     Integer personalPage;
     Double  personalOffsetX;
     Double  personalOffsetY;
+    Integer personalKeywordIndex;
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -53,5 +54,7 @@ public class ContractTemplateDto  extends BaseDto {
 
     @ApiModelProperty(value = "序号")
     private Integer num;
+    private Integer personalKeywordIndex;
 
+    private Integer companyKeywordIndex;
 }

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

@@ -83,4 +83,9 @@ public class ContractTemplate extends BaseEntity {
     private Double personalOffsety;
     @TableField("num")
     private Integer num;
+    @TableField("personal_keyword_index")
+    private Integer personalKeywordIndex;
+
+    @TableField("company_keyword_index")
+    private Integer companyKeywordIndex;
 }

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,14 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
     @Autowired
     QiyuesuoServiceImpl qiyuesuoServiceImpl;
 
-   // @Value("${qiyuesuo.category}")
-    String category="智信能源合同";
-    //@Value("${qiyuesuo.companyTenantName}")
-    String companyTenantName="智信能源科技有限公司-测试";
-   // @Value("${qiyuesuo.companyUsername}")
-    String companyUsername="唐伟";
-   // @Value("${qiyuesuo.companyContact}")
-    String companyContact="18291879708";
+    @Value("${qiyuesuo.category}")
+    String category;
+    @Value("${qiyuesuo.companyTenantName}")
+    String companyTenantName;
+    @Value("${qiyuesuo.companyUsername}")
+    String companyUsername;
+   @Value("${qiyuesuo.companyContact}")
+    String companyContact;
 
 
 
@@ -142,9 +142,20 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         contractDataDto.setSubject(model.getName());
 //      contractDataDto.setEndTime(sdf.format(afterOneMonth));
 ////    contractDataDto.setExpireTime(sdf.format(model.getLeaseEndDate()));
-        contractDataDto.setCategory(category);
-        contractDataDto.setCompanyTenantName(companyTenantName);
-        contractDataDto.setCompanyUsername(companyUsername);
+
+
+       try {
+           contractDataDto.setCategory(new String(category.getBytes("ISO8859-1"),"UTF-8"));
+           contractDataDto.setCompanyTenantName(new String(companyTenantName.getBytes("ISO8859-1"),"UTF-8"));
+           contractDataDto.setCompanyUsername(new String(companyUsername.getBytes("ISO8859-1"),"UTF-8"));
+
+       }catch (Exception e){
+
+           e.printStackTrace();
+       }
+
+
+
         contractDataDto.setCompanyContact(companyContact);
         contractDataDto.setEmplateId(model.getContractTemplateId());
 
@@ -158,10 +169,14 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
         contractDataDto.setCompanyOffsetX(contractTemplate.getCompanyOffsetx());
         contractDataDto.setCompanyOffsetY(contractTemplate.getCompanyOffsety());
+        contractDataDto.setCompanyKeywordIndex(contractTemplate.getCompanyKeywordIndex());
         contractDataDto.setPersonalkeyword(contractTemplate.getPersonalKeyword());
         contractDataDto.setPersonalPage(contractTemplate.getPersonalPage());
         contractDataDto.setPersonalOffsetX(contractTemplate.getPersonalOffsetx());
         contractDataDto.setPersonalOffsetY(contractTemplate.getPersonalOffsety());
+        contractDataDto.setPersonalKeywordIndex(contractTemplate.getPersonalKeywordIndex());
+
+
 
         List<TemplateParamDto> templateParam=new ArrayList<>();
         SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");