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

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -166,7 +166,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         }
 
         dataList.forEach(x -> {
-            x.setChargePerson(userMap.get(x.getChargePerson()));
+//            x.setChargePerson(userMap.get(x.getChargePerson()));
             x.setSystemimg(equipmentManageMapper.getFiles(String.valueOf(x.getId()), "face"));
         });
         map.put("dataList", dataList);
@@ -194,7 +194,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         String userId = remoteSecurityService.getAgencyUser().getUserId();
         vo.setRecUserId(userId);
         // 冗余名称，数据同步使用
-        this.setChargePersonName(vo);
+//        this.setChargePersonName(vo);
         String s = String.valueOf(System.currentTimeMillis());
         vo.setId(s);
         vo.setSort(s);
@@ -245,7 +245,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         String userId = remoteSecurityService.getAgencyUser().getUserId();
         vo.setRecUserId(userId);
         // 冗余名称，数据同步使用
-        this.setChargePersonName(vo);
+//        this.setChargePersonName(vo);
         if ("".equals(vo.getInstallDate())) {
             vo.setInstallDate(null);
         }

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -10,7 +10,7 @@
             instance_id,
             date_format(install_date,'%Y-%m-%d') AS installDate,
             date_format(first_maintenance_date,'%Y-%m-%d') AS firstMaintenanceDate,
-            charge_person as chargePerson,
+        charge_person_name as chargePerson,
             (select name from wl_manufacturer_info where id = construction_unit) as constructionUnit,
             (select name from wl_manufacturer_info where id = maintenance_unit) as maintenanceUnit,
             (select name from wl_equipment_category where id = system_type) as systemType,