企业同步一次性接口修改

amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TaBusinessServiceImpl.java

@@ -68,7 +68,14 @@ public class TaBusinessServiceImpl extends BaseService<TaAccessConfigModel, TaAc
 			String street = address.substring(area.length()).substring(0,address.substring(area.length()).indexOf("号")+1);
 			String community = address.substring(area.length()+street.length());
 
-			String industry = getIndustry(data.getString("hydm"));
+			String industry = "";
+			if(!ValidationUtil.isEmpty(data.get("hydm"))){
+				if(data.getString("hydm").length() > 2){
+					industry = getIndustry(data.getString("hydm"));
+				}
+
+			}
+
 
 			//所属行业
 			result.put("industry", industry);

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/SpeUseUnit.java

@@ -27,6 +27,8 @@ public class SpeUseUnit implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id")
+    private String id;
 
     @ApiModelProperty(value = "单位名称")
     private String name;
@@ -145,5 +147,8 @@ public class SpeUseUnit implements Serializable {
     @ApiModelProperty(value = "同步id")
     private String syncId;
 
+    @ApiModelProperty(value = "同步状态")
+    private Integer syncState;
+
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PrivilegeCompanyUpdateAddListener.java

@@ -70,10 +70,10 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
 
         //判断库中company是否重复
-        CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyName(object.getString("unit_name")).getResult();
+        CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(object.getString("unit_code")).getResult();
 
         QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
-        queryWrapper.eq("use_unit",object.getString("unit_name"));
+        queryWrapper.eq("use_code",object.getString("unit_code"));
         TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getOne(queryWrapper);
 
         CompanyModel companyModel = new CompanyModel();
@@ -104,15 +104,15 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
 
         //业务表更新条件构造器
         UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("Use_unit",object.getString("unit_name"));
+        updateWrapper.eq("Use_code",object.getString("unit_code"));
 
 
 
-        String regCode = object.getString("reg_code")+"000";
+        String regCode = object.getString("reg_code");
         CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
 
         if(ValidationUtil.isEmpty(privilegeCompanyModel)){
-            privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000000").getResult();
+            privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
         }
 
         try {
@@ -152,6 +152,11 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
             }
             else {
                 //当企业表、平台表 中有时
+                if(ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getRecDate())){
+                    //如果库中没有存时间，则默认为1990-01-01
+                    SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd");
+                    tzBaseEnterprisePrivilegeInfo.setRecDate(sdft.parse("1990-01-01"));
+                }
                 if (tzBaseEnterprisePrivilegeInfo.getRecDate().compareTo(object.getDate("issue_date")) < 1) {
                     if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
                         tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());