代码提交

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -129,6 +129,7 @@
             max(case v.field_code when 'administrativePositionCode' then IFNULL(v.field_value_label,v.field_value) end) administrativePositionCode,
             max(case v.field_code when 'internalPositionCode' then IFNULL(v.field_value_label,v.field_value) end) internalPositionCode,
             max(case v.field_code when 'fireManagementPostCode' then IFNULL(v.field_value_label,v.field_value) end) fireManagementPostCode,
+            max(case v.field_code when 'fireManagementPostCode' then v.field_value end) fireManagementPost,
             max(case v.field_code when 'positionType' then IFNULL(v.field_value,v.field_value_label) end) positionType,
             max(case v.field_code when 'certificateType' then IFNULL(v.field_value_label,v.field_value) end) certificateType,
             max(case v.field_code when 'holdingTime' then IFNULL(v.field_value_label,v.field_value) end) holdingTime,
@@ -171,6 +172,9 @@
             <if test="map.peopleType != null and map.peopleType != ''">
                 AND g.peopleType = #{map.peopleType}
             </if>
+            <if test="map.fireManagementPost != null and map.fireManagementPost != ''">
+                AND g.fireManagementPost = #{map.fireManagementPost}
+            </if>
             GROUP BY
             u.sequence_nbr ,
             u.biz_org_name ,

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

@@ -600,6 +600,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			map.put("positionType", positionType);
 		}
 
+		String fireManagementPost = "";
+		if(req.containsKey("fireManagementPost")) {
+			fireManagementPost = req.get("fireManagementPost").toString();
+			map.put("fireManagementPost", fireManagementPost);
+		}
+
 		String peopleType = "";
 		if(req.containsKey("peopleType")) {
 			peopleType = req.get("peopleType").toString();
@@ -614,6 +620,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		req.remove("positionType");
 		req.remove("peopleType");
 		req.remove("bizOrgName");
+		req.remove("fireManagementPost");
 		map.put("fieldsValue", req);
 		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
 		pageBean.setTotal(this.baseMapper.selectPersonListCount(map));

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

@@ -110,6 +110,13 @@ public class FireFightingSystemController extends AbstractBaseController {
         return fireFightingSystemService.getEquiplistBySystemId(systemId);
     }
 
+    @RequestMapping(value = "/getEquiplistBySystemIdPage", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("根据系统id查询设备列表")
+    public IPage<EquiplistSpecificBySystemVO> getEquiplistBySystemIdPage(Long systemId, int size, int current) {
+        return fireFightingSystemService.getEquiplistBySystemIdPage(systemId, size, current);
+    }
+
     @RequestMapping(value = "/getEquipcountBySystemId", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("根据系统id查询分组设备数量")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -25,6 +25,15 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      */
     List<EquiplistSpecificBySystemVO> getEquiplistBySystemId(Long systemId);
 
+    /**
+     * 根据系统id查询设备列表
+     *
+     * @param systemId page
+     * @return
+     */
+    IPage<EquiplistSpecificBySystemVO> getEquiplistBySystemIdPage(@Param("page") IPage<EquiplistSpecificBySystemVO> page,
+                                                                  @Param("systemId") Long systemId);
+
 
     /**
      * 根据系统id查询设备列表

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

@@ -27,6 +27,14 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
     List<EquiplistSpecificBySystemVO> getEquiplistBySystemId(Long systemId);
 
     /**
+     * 根据系统id查询设备列表
+     *
+     * @param systemId
+     * @return
+     */
+    IPage<EquiplistSpecificBySystemVO> getEquiplistBySystemIdPage(Long systemId, int size, int current);
+
+    /**
      * 获取系列列表
      *
      * @param equimentName

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

@@ -181,6 +181,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     getEquiplistBySystemId(Long systemId) {
         return this.baseMapper.getEquiplistBySystemId(systemId);
     }
+    @Override
+    public IPage<EquiplistSpecificBySystemVO> getEquiplistBySystemIdPage(Long systemId, int size, int current) {
+        IPage<EquiplistSpecificBySystemVO> page = new Page();
+        page.setSize(size);
+        page.setCurrent(current);
+        return this.baseMapper.getEquiplistBySystemIdPage(page, systemId);
+    }
 
     @Override
     public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction,

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

@@ -6072,4 +6072,23 @@
             </if>
         </where>
     </select>
+    <select id="getEquiplistBySystemIdPage"
+            resultType="com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO">
+        SELECT
+            spe.id,
+            det.`name` equipment_name,
+            spe.`code`,
+            spe.`iot_code` iotCode,
+            cate.`name` AS category_name,
+            find_in_set(spe.id,(select  point_in_scene from  wl_source_scene  where source_id=#{systemId}))	 is_bound
+
+        FROM
+            wl_equipment_specific AS spe
+                LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
+                LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
+                LEFT JOIN wl_equipment_category cate ON cate.id = wle.category_id
+                LEFT JOIN wl_stock_detail AS wlsd on  wlsd.equipment_detail_id = det.id
+        WHERE
+            find_in_set(#{systemId},spe.system_id) and spe.single = true  and 	wlsd.`status` = 1
+    </select>
 </mapper>