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

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -510,32 +510,26 @@ public class FirefightersController extends BaseController {
         if(null != reginParam) {
             String bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
             // String bizOrgName = reginParam.getPersonIdentity().getCompanyName();
-            QueryWrapper<Firefighters> firefightersQueryWrapper2 = new QueryWrapper<>();
-            firefightersQueryWrapper2.eq("amos_user_id",reginParam.getUserModel().getUserId());
-            Firefighters one = iFirefightersService.getOne(firefightersQueryWrapper2);
-            QueryWrapper<FireTeam> fireTeamQuery = new QueryWrapper<>();
-            fireTeamQuery.eq("company",one.getCompany());
-            fireTeamQuery.eq("type_code","116");
-            fireTeamQuery.eq("is_delete","0");
-            List<FireTeam> fireTeamList = iFireTeamService.list(fireTeamQuery);
-
+//            QueryWrapper<Firefighters> firefightersQueryWrapper2 = new QueryWrapper<>();
+//            firefightersQueryWrapper2.eq("amos_user_id",reginParam.getUserModel().getUserId());
+//            Firefighters one = iFirefightersService.getOne(firefightersQueryWrapper2);
             List<Map<String,Object>> list = new ArrayList<>();
-            for (FireTeam fireTeam :fireTeamList
-                 ) {
-                QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
-                firefightersQueryWrapper1.eq("fire_team_id", fireTeam.getSequenceNbr());
-                List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
-                firefighters.stream().forEach(e -> {
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("name", e.getName());
-                    map.put("jobTitle", e.getJobTitle());
-                    map.put("bizOrgName", e.getBizOrgName());
-                    map.put("bizOrgCode", bizOrgCode);
-                    map.put("amosUserId", e.getOrgUsrId());
-                    map.put("personnelPhotos", e.getPersonnelPhotos());
-                    list.add(map);
-                });
-            }
+
+            QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
+            firefightersQueryWrapper1.like("biz_org_code", bizOrgCode);
+            firefightersQueryWrapper1.eq("people_type", "1601");
+            firefightersQueryWrapper1.eq("is_delete", "0");
+            List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
+            firefighters.stream().forEach(e -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("name", e.getName());
+                map.put("jobTitle", e.getJobTitle());
+                map.put("bizOrgName", e.getBizOrgName());
+                map.put("bizOrgCode", bizOrgCode);
+                map.put("amosUserId", e.getOrgUsrId());
+                map.put("personnelPhotos", e.getPersonnelPhotos());
+                list.add(map);
+            });
 
             JSONObject object = new JSONObject();
             object.put("persons",list);

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

@@ -2494,7 +2494,7 @@
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
         (select
-        avg(IFNULL(ei.`value`,0))
+        FORMAT(avg(IFNULL(ei.`value`,0)), 2)
         from
         wl_equipment_specific_index ei
         where
@@ -2976,7 +2976,7 @@
         ifnull( `rp`.`min_water_level`, 0 ) AS `minLevel`,
         ifnull( `rp`.`max_water_level`, 0 ) AS `maxLevel`,
         (select
-        avg(IFNULL(ei.`value`,0))
+        FORMAT(avg(IFNULL(ei.`value`,0)), 2)
         from
         wl_equipment_specific_index ei
         where
@@ -4666,7 +4666,7 @@
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
         (select
-        avg(IFNULL(ei.`value`,0))
+        FORMAT(avg(IFNULL(ei.`value`,0)), 2)
         from
         wl_equipment_specific_index ei
         where
@@ -4824,7 +4824,7 @@
                     IFNULL( rp.min_water_level, 0 ) AS minLevel,
                     IFNULL( rp.max_water_level, 0 ) AS maxLevel,
                     (select
-                         avg(IFNULL(ei.`value`,0))
+                         FORMAT(avg(IFNULL(ei.`value`,0)), 2)
                      from
                          wl_equipment_specific_index ei
                      where