重点单位信息采集修改字段

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/BaseCompanyChange.java

@@ -142,5 +142,9 @@ public class BaseCompanyChange implements Serializable {
      */
     private LocalDateTime createTime;
 
+    /**
+     * 街镇
+     */
+    private String streetTown;
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyServiceImpl.java

@@ -821,7 +821,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
         if (StringUtils.isNotBlank(baseCompany.getCompanyId())) {
             LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.select(BaseCompany::getCompanyId,BaseCompany::getOrganization,BaseCompany::getCompanyName,
-                    BaseCompany::getAddress,BaseCompany::getFoundTime)
+                    BaseCompany::getAddress,BaseCompany::getFoundTime,BaseCompany::getCompanyNature, BaseCompany::getStreetTown)
                     .eq(BaseCompany::getCompanyId, baseCompany.getCompanyId())
                     .eq(BaseCompany::getEnable, 0)
                     .orderByDesc(BaseCompany::getId);
@@ -850,10 +850,12 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 for (int i = 0; i < list1.size(); i++) {
                     BaseCompanyChange baseCompanyChange = new BaseCompanyChange();
                     baseCompanyChange.setCompanyId(list1.get(i).getCompanyId());
+                    baseCompanyChange.setCompanyNature(list1.get(i).getCompanyNature());
                     baseCompanyChange.setCompanyName(list1.get(i).getCompanyName());
                     baseCompanyChange.setOrganization(list1.get(i).getOrganization());
                     baseCompanyChange.setAddress(list1.get(i).getAddress());
                     baseCompanyChange.setFoundTime(list1.get(i).getFoundTime());
+                    baseCompanyChange.setStreetTown(list1.get(i).getStreetTown());
                     for (int j = 0; j < list2.size(); j++) {
                         if (list1.get(i).getCompanyId().equals(list2.get(j).getCompanyId())) {
                             baseCompanyChange.setEmployeeNum(list2.get(j).getEmployeeNum());