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-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -666,7 +666,7 @@ GROUP BY
     cb_data_dictionary
     WHERE
     CODE = b.peopleType
-    AND type = 'DWRYLX'
+    AND type = 'DLRYLX'
     ) AS peopleType,
     (
     SELECT

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3181,7 +3181,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	public void saveFirefightersPost(FirefightersDataDto firefightersDataDto, Long id){
 		QueryWrapper queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("org_usr_id", firefightersDataDto.getFirefightersPost().getOrgUsrId());
+		//queryWrapper.eq("org_usr_id", firefightersDataDto.getFirefightersPost().getOrgUsrId());
+		queryWrapper.eq("org_usr_id", id);
 		FirefightersPost firefightersPost = iFirefightersPostService.getOne(queryWrapper);
 
 		/*bug3071 消防人员，专家领域选择子分类时概要信息中专家领域未显示 2021-10-09 chenzhao */

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -377,6 +377,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
         pressurePumpInfo.getRecords().stream(
         ).map(item -> {
             item.put("startAndStopInterval", finalDiffMinute);
+            item.put("nameKey", pressurePumpStart);
             return item;
         }).collect(Collectors.toList());
         return CommonResponseUtil.success(pressurePumpInfo);

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

@@ -4835,6 +4835,7 @@
     <select id="getPipeNetworkBySuper" resultType="java.util.Map">
         SELECT
             a.`name`,
+            'FHS_PipePressureDetector_PipePressure' nameKey,
             (CASE WHEN
             LENGTH(trim(a.area)) = 0 THEN '--'
             ELSE
@@ -5288,6 +5289,7 @@
     <select id="getCenterWaterInfo" resultType="java.util.Map">
         SELECT
         a.`name`,
+        'FHS_FirePoolDevice_WaterLevel,FHS_WirelessliquidDetector_WaterLevel' nameKey,
         (
         CASE