修改同步企业接口

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

@@ -82,9 +82,12 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         Date syncDate = sdf.parse(object.getString("sync_date"));
         Date recDate = sdf.parse(object.getString("issue_date"));
 
+        String unitType = object.getString("cert_type");
+
+
         tzBaseEnterpriseInfo.setSequenceNbr(object.getLong("sequence_nbr"));
         tzBaseEnterpriseInfo.setAddress(object.getString("reg_address"));
-        tzBaseEnterpriseInfo.setUnitType(object.getString("cert_type"));
+        tzBaseEnterpriseInfo.setUnitType(unitType);
         tzBaseEnterpriseInfo.setUseCode(object.getString("unit_code"));
         tzBaseEnterpriseInfo.setUseUnit(object.getString("unit_name"));
         tzBaseEnterpriseInfo.setProvince(object.getString("province"));
@@ -99,7 +102,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         companyModel.setCompanyCode(object.getString("unit_code"));
         companyModel.setLevel("company");
         companyModel.setAgencyCode("tzs");
-        companyModel.setCompanyType(object.getString("cert_type"));
+        companyModel.setCompanyType(unitType);
         companyModel.setAddress(object.getString("reg_address"));
 
         //业务表更新条件构造器
@@ -131,21 +134,26 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
             } else if(tzBaseEnterprisePrivilegeInfo == null){
                 //企业表没有，平台表有
+                if(!ValidationUtil.isEmpty(companyPrivilegeModel.getCompanyType())){
                     if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
                         companyModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
                     }else {
                         companyModel.setCompanyType(companyPrivilegeModel.getCompanyType());
                     }
+                }
                 tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
                 Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
             } else if(companyPrivilegeModel == null){
                 //平台表没有，企业表有
+                if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getUnitType())){
                     if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
                         tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());
                     }else {
                         tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType());
                     }
+                }
+
                 Privilege.companyClient.create(companyModel);
                 tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
                 accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
@@ -158,28 +166,36 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
                     tzBaseEnterprisePrivilegeInfo.setRecDate(sdft.parse("1990-01-01"));
                 }
                 if (tzBaseEnterprisePrivilegeInfo.getRecDate().compareTo(object.getDate("issue_date")) < 1) {
+                    if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getUnitType())){
                         if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
                             tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());
                         }else {
                             tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType());
                         }
+                    }
+                    if(!ValidationUtil.isEmpty(companyPrivilegeModel.getCompanyType())){
                         if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
                             companyModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
                         }else {
                             companyModel.setCompanyType(companyPrivilegeModel.getCompanyType());
                         }
+                    }
                     tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
                     Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
                     accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
                 } else {
+                    if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getUnitType())){
                         if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
                             tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());
                             tzBaseEnterpriseInfoService.update(tzBaseEnterprisePrivilegeInfo,updateWrapper);
                         }
+                    }
+                    if(!ValidationUtil.isEmpty(companyPrivilegeModel.getCompanyType())){
                         if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
                             companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
                             Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
                         }
+                    }
                     System.out.println("该数据不是最新的数据 不用更新");
                     accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
                 }