1、消防区域维护：可以批量修改负责部门；2、消防点位维护：可以批量修改负责人；3、消防器材管理：优化条件查询列表；4、消防点位检查表管理：新建检查表①检查人可以在多个部门选择②删除岗位条件，可以修改检查人，检查类型增加半月检查。企业端app：1、消防管理待排查：后台消防区域增加权限开关，可以控制手机app上传是照相还是可以从相册中获取；上传签字信息变为必选项；合格招牌你增加到12张；2、手机扫描可以扫码；扫码可以做检查，只有检查人可以扫码检查，其他人不变。动火模块：动火可以删除；修复动火区域管辖单位不可用

src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java

@@ -98,6 +98,8 @@ public class HotWorkApplicationController extends BaseController {
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		pd.put("OPERATOR", pd.get("loginUserId"));
+		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
 		hotworkapplicationService.delete(pd);
 		map.put("result", errInfo);				//返回结果
 		return map;

src/main/java/com/zcloud/controller/bus/SysDateController.java

@@ -21,7 +21,7 @@ import com.zcloud.util.Tools;
 import com.zcloud.entity.PageData;
 import com.zcloud.service.bus.SysDateService;
 
-/** 
+/**
  * 说明：系统日期
  * 作者：luoxiaobao
  * 时间：2021-05-07
@@ -30,10 +30,10 @@ import com.zcloud.service.bus.SysDateService;
 @Controller
 @RequestMapping("/sysdate")
 public class SysDateController extends BaseController {
-	
+
 	@Autowired
 	private SysDateService sysdateService;
-	
+
 	/**新增
 	 * @param
 	 * @throws Exception
@@ -75,7 +75,7 @@ public class SysDateController extends BaseController {
 		String HalfYearStartTime = DateUtil.getYear().toString();
 		String HalfYearEndTime = DateUtil.getYear().toString();
 		Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString());
-		
+
 		if(bmonth <= 6) {
 			HalfYearStartTime = HalfYearStartTime+"-01-01 00:00:00";
 			HalfYearEndTime = HalfYearEndTime+"-06-30 23:59:59";
@@ -87,11 +87,23 @@ public class SysDateController extends BaseController {
 		pd.put("HALFYEAR_END", HalfYearEndTime);
 		pd.put("YEAR_START", DateUtil.getCurrYearFirst()+" 00:00:00");
 		pd.put("YEAR_END", DateUtil.getCurrYearLast()+" 23:59:59");
+		String halfMonthStartTime = DateUtil.getMonthFirstDay().toString();
+		String halfMonthEndTime = DateUtil.getMonthEndDay().toString();
+		Integer onlyDay = Integer.parseInt(DateUtil.getOnlyDay().toString());
+		if (onlyDay <= 15) {
+			halfMonthStartTime = halfMonthStartTime + " 00:00:00";
+			halfMonthEndTime = DateUtil.getMonthAnyDay(15).toString() + " 23:59:59";
+		} else if (onlyDay > 15) {
+			halfMonthStartTime = DateUtil.getMonthAnyDay(16).toString() + " 00:00:00";
+			halfMonthEndTime = halfMonthEndTime + " 23:59:59";
+		}
+		pd.put("HALFMONTH_START", halfMonthStartTime);
+		pd.put("HALFMONTH_END", halfMonthEndTime);
 		sysdateService.save(pd);
 		map.put("result", errInfo);
 		return map;
 	}
-	
+
 	/**删除
 	 * @param out
 	 * @throws Exception
@@ -108,7 +120,7 @@ public class SysDateController extends BaseController {
 		map.put("result", errInfo);				//返回结果
 		return map;
 	}
-	
+
 	/**修改
 	 * @param
 	 * @throws Exception
@@ -125,7 +137,7 @@ public class SysDateController extends BaseController {
 		map.put("result", errInfo);
 		return map;
 	}
-	
+
 	/**列表
 	 * @param page
 	 * @throws Exception
@@ -147,7 +159,7 @@ public class SysDateController extends BaseController {
 		map.put("result", errInfo);
 		return map;
 	}
-	
+
 	 /**去修改页面获取数据
 	 * @param
 	 * @throws Exception
@@ -164,8 +176,8 @@ public class SysDateController extends BaseController {
 		map.put("pd", pd);
 		map.put("result", errInfo);
 		return map;
-	}	
+	}
-	
+
 	 /**批量删除
 	 * @param
 	 * @throws Exception
@@ -176,7 +188,7 @@ public class SysDateController extends BaseController {
 	public Object deleteAll() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
-		PageData pd = new PageData();		
+		PageData pd = new PageData();
 		pd = this.getPageData();
 		String DATA_IDS = pd.getString("DATA_IDS");
 		if(Tools.notEmpty(DATA_IDS)){
@@ -189,7 +201,7 @@ public class SysDateController extends BaseController {
 		map.put("result", errInfo);				//返回结果
 		return map;
 	}
-	
+
 	 /**导出到excel
 	 * @param
 	 * @throws Exception
@@ -217,6 +229,8 @@ public class SysDateController extends BaseController {
 		titles.add("半年-结束时间");	//13
 		titles.add("年-开始时间");	//14
 		titles.add("年-结束时间");	//15
+		titles.add("半月-开始时间");	//16
+		titles.add("半月-结束时间");  //17
 		dataMap.put("titles", titles);
 		List<PageData> varOList = sysdateService.listAll(pd);
 		List<PageData> varList = new ArrayList<PageData>();
@@ -237,6 +251,8 @@ public class SysDateController extends BaseController {
 			vpd.put("var13", varOList.get(i).getString("HALFYEAR_END"));	    //13
 			vpd.put("var14", varOList.get(i).getString("YEAR_START"));	    //14
 			vpd.put("var15", varOList.get(i).getString("YEAR_END"));	    //15
+			vpd.put("var16", varOList.get(i).getString("HALFMONTH_START"));	    //16
+			vpd.put("var17", varOList.get(i).getString("HALFMONTH_END"));		//17
 			varList.add(vpd);
 		}
 		dataMap.put("varList", varList);
@@ -244,5 +260,5 @@ public class SysDateController extends BaseController {
 		mv = new ModelAndView(erv,dataMap);
 		return mv;
 	}
-	
+
 }

src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java

@@ -256,6 +256,11 @@ public class FireCheckListController extends BaseController {
         pd.put("OPERATOR", Jurisdiction.getUsername());
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
+        String[] departmentIds = pd.getString("DEPARTMENT_ID").split(",");
+        if (departmentIds.length > 1) {
+            pd.put("departmentIds", departmentIds);
+            pd.remove("DEPARTMENT_ID");
+        }
         List<PageData> res = fireCheckListService.getCheckList(pd);
         map.put("result", errInfo);
         map.put("varList", res);

src/main/java/com/zcloud/controller/firemanager/FirePointController.java

@@ -288,4 +288,27 @@ public class FirePointController extends BaseController {
         return map;
     }
 
+    /**
+     * @Description: 批量修改消防点位负责人
+     * @Author: limingyu
+     * @Date: 2024/03/12 09:36
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/batchEditFirePointUser")
+    @ResponseBody
+    public Object batchEditFirePointUser() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String[] dataIds = pd.getString("DATA_IDS").split(",");
+        pd.put("dataIds", dataIds);
+        firePointService.batchEditFirePointUser(pd);
+
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
 }

src/main/java/com/zcloud/controller/firemanager/FireRegionController.java

@@ -222,4 +222,21 @@ public class FireRegionController extends BaseController {
         return map;
     }
 
+    /**
+     * @Description: 批量修改负责部门
+     * @Author: dearLin
+     * @Date: 2023/3/8/008 17:24
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping("/batchEditDeptByIds")
+    @ResponseBody
+    public Object batchEditDeptByIds() {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = getPageData();
+        pd.put("OPERATOR", Jurisdiction.getUsername());
+        pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
+        fireRegionService.editDeptByIds(map, pd);
+        return map;
+    }
 }

src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java

@@ -591,4 +591,39 @@ public class AppFireRecordController extends BaseController {
         map.put("varList", varList);
         return map;
     }
+
+    /**
+     * @Description: 获取检查照片上传方式
+     * @Author: dearLin
+     * @Date: 2023/3/8/008 13:45
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping("/getPhotoUploadMethod")
+    private Object getPhotoUploadMethod() throws Exception {
+        String errInfo = "success";
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pageData = getPageData();
+        PageData data = fireRecordService.getPhotoUploadMethod(pageData);
+        map.put("result", errInfo);
+        map.put("data", data);
+        return map;
+    }
+
+    /**
+     * 检查人id获取检查人所涉及的查询点位列表
+     * @Author: limingyu
+     * @Date: 2024/3/18/008 09:11
+     * @throws Exception
+     */
+    @RequestMapping("/getPointListByUserId")
+    private Object getPointListByUserId() throws Exception {
+        String errInfo = "success";
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pageData = getPageData();
+        List<PageData> varList = fireCheckStandardService.getPointListByUserId(pageData);
+        map.put("result", errInfo);
+        map.put("varList", varList);
+        return map;
+    }
 }

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -165,7 +165,13 @@ public class UsersController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
-        List<PageData> userList = usersService.getDepartmentId(pd.getString("DEPARTMENT_ID"));        //列出用户列表
+        String[] departmentIds = pd.getString("DEPARTMENT_ID").split(",");
+        List<PageData> userList = new ArrayList<>();
+        if (departmentIds.length > 1) {
+            userList = usersService.getDepartmentIds(departmentIds);        //列出用户列表
+        } else {
+            userList = usersService.getDepartmentId(pd.getString("DEPARTMENT_ID"));        //列出用户列表
+        }
         pd.put("ROLE_ID", "1");
         map.put("userList", userList);
         map.put("page", page);
@@ -1416,6 +1422,11 @@ public class UsersController extends BaseController {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
         PageData pd = this.getPageData();
+        String[] departmentIds = pd.getString("DEPARTMENT_ID").split(",");
+        if (departmentIds.length > 1) {
+            pd.put("departmentIds", departmentIds);
+            pd.remove("DEPARTMENT_ID");
+        }
         List<PageData> userList = usersService.listAllUser(pd);    //列出Post列表
         map.put("userList", userList);
         map.put("result", errInfo);

src/main/java/com/zcloud/mapper/datasource/firemanager/FireCheckStandardMapper.java

@@ -42,4 +42,6 @@ public interface FireCheckStandardMapper {
     List<PageData> getListAll(PageData pd) ;
 
     List<PageData> getStandardListByDeviceType(PageData pd);
+
+    List<PageData> getPointListByUserId(PageData pageData);
 }

src/main/java/com/zcloud/mapper/datasource/firemanager/FirePointMapper.java

@@ -3,6 +3,7 @@ package com.zcloud.mapper.datasource.firemanager;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -79,4 +80,8 @@ public interface FirePointMapper {
     void removeQualifiedByQIds(PageData pd);
 
     List<PageData> getFirePointCheckPhotos(PageData pd);
+
+    void batchEditFirePointUser(PageData pd);
+
+    List<PageData> findByIds(@Param("pointIds") List<String> pointIds);
 }

src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java

@@ -119,4 +119,6 @@ public interface FireRecordMapper {
     void doRemoveRecordDeviceHiddenByCidRidDid(PageData checkInfo);
 
     void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo);
+
+    PageData getPhotoUploadMethod(PageData pageData);
 }

src/main/java/com/zcloud/mapper/datasource/firemanager/FireRegionMapper.java

@@ -95,4 +95,6 @@ public interface FireRegionMapper {
     List<PageData> listAll (PageData pd);
 
     void deleteAll(PageData pd);
+
+    void editDeptByIds(PageData pd);
 }

src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationDelayedMapper.java

@@ -54,5 +54,6 @@ public interface HotWorkApplicationDelayedMapper{
 	 */
 	void deleteAll(String[] ArrayDATA_IDS);
 
+    void deleteByForeignKey(PageData pd);
 }
 

src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java

@@ -6,6 +6,7 @@ import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.entity.system.Role;
 import com.zcloud.entity.system.User;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 /**
@@ -310,4 +311,6 @@ public interface UsersMapper {
 	PageData findByCardNo(PageData pd);
 
 	List<PageData> listUserByDepId(PageData pd);
+
+	List<PageData> getDepartmentIds(@Param("departmentIds") String[] departmentIds);
 }

src/main/java/com/zcloud/service/firemanager/FireCheckStandardService.java

@@ -67,4 +67,12 @@ public interface FireCheckStandardService {
      * @Return: java.lang.Object
      */
     List<PageData> goRecordDeviceByPid(PageData pd);
+
+    /**
+     * 检查人id获取检查人所涉及的查询点位列表
+     * @Author: limingyu
+     * @Date: 2024/3/18/008 09:11
+     * @throws Exception
+     */
+    List<PageData> getPointListByUserId(PageData pageData);
 }

src/main/java/com/zcloud/service/firemanager/FirePointService.java

@@ -45,4 +45,8 @@ public interface FirePointService {
     void removeQualifiedByQIds(PageData pd);
 
     List<PageData> getFirePointCheckPhotos(PageData pd);
+
+    void batchEditFirePointUser(PageData pd);
+
+    List<PageData> findByIds(List<String> pointIds);
 }

src/main/java/com/zcloud/service/firemanager/FireRecordService.java

@@ -140,4 +140,6 @@ public interface FireRecordService {
     void doRemoveRecordDeviceHiddenByCidRidDid(PageData checkInfo);
 
     void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo);
+
+    PageData getPhotoUploadMethod(PageData pageData);
 }

src/main/java/com/zcloud/service/firemanager/FireRegionService.java

@@ -37,4 +37,5 @@ public interface FireRegionService {
     Map<String ,PageData> getAllByCorpIdForExcel (PageData pd);
     public PageData savaByExcel (String name,String bianma ,String departId) throws Exception;
 
+    void editDeptByIds(Map<String, Object> map, PageData pd);
 }

src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java

@@ -10,6 +10,7 @@ import com.zcloud.mapper.datasource.firemanager.FireCheckListMapper;
 import com.zcloud.service.bus.SysDateService;
 import com.zcloud.service.firemanager.*;
 import com.zcloud.service.system.FHlogService;
+import com.zcloud.service.system.UsersService;
 import com.zcloud.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +43,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
     @Resource
     private FirePointPreparedService firePointPreparedService;
     @Resource
+    private UsersService usersService;
+    @Resource
     private InitPageDataUtil initPageDataUtil;
 
     /**
@@ -108,7 +111,14 @@ public class FireCheckListServiceImpl implements FireCheckListService {
             List<PageData> preDataList = new ArrayList<>();
             String fire_check_id = UuidUtil.get32UUID();
             pd.put("FIRE_CHECK_TYPE", pageData.get("FIRE_CHECK_TYPE"));
-            pd.put("DEPARTMENT_ID", pageData.get("DEPARTMENT_ID"));
+            PageData user = new PageData();
+            user.put("USER_ID", USERID);
+            try {
+                PageData userById = usersService.findById(user);
+                pd.put("DEPARTMENT_ID", userById.get("DEPARTMENT_ID"));
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
             pd.put("USER_ID", USERID);
             pd.put("FIRE_CHECK_STANDARD_NAME", pageData.get("FIRE_CHECK_STANDARD_NAME"));
             //检查表
@@ -472,6 +482,13 @@ public class FireCheckListServiceImpl implements FireCheckListService {
         fireCheckData.put("FIRE_CHECK_ID", FIRE_CHECK_ID);
         fireCheckData.put("FIRE_CHECK_STANDARD_NAME", postData.getString("FIRE_CHECK_STANDARD_NAME"));
         fireCheckData.put("FIRE_CHECK_TYPE", postData.getString("FIRE_CHECK_TYPE"));
+        /**
+         * @date: 2024/03/12
+         * @author: limingyu
+         * @description: 修改点检表可以修改检查人，也可以修改部门
+         */
+        fireCheckData.put("DEPARTMENT_ID", postData.getString("UPDATE_DEPARTMENT_ID"));
+        fireCheckData.put("USER_ID", postData.getString("UPDATE_USER_ID"));
         fireCheckListMapper.upd4PcById(fireCheckData);
         /*
          * 修改需要检查的点位

src/main/java/com/zcloud/service/firemanager/impl/FireCheckStandardServiceImpl.java

@@ -5,6 +5,7 @@ import com.zcloud.entity.PageData;
 import com.zcloud.mapper.datasource.firemanager.FireCheckStandardMapper;
 import com.zcloud.service.bus.SysDateService;
 import com.zcloud.service.firemanager.FireCheckStandardService;
+import com.zcloud.service.firemanager.FirePointService;
 import com.zcloud.service.firemanager.FirePreparedCheckListService;
 import com.zcloud.service.firemanager.FireRecordService;
 import com.zcloud.util.DateUtil;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -38,6 +40,8 @@ public class FireCheckStandardServiceImpl implements FireCheckStandardService {
     private SysDateService sysDateService;
     @Resource
     private FireRecordService fireRecordService;
+    @Resource
+    private FirePointService firePointService;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveImportCheckStandard(List<PageData> listPd) {
@@ -232,4 +236,18 @@ public class FireCheckStandardServiceImpl implements FireCheckStandardService {
         });
         return list;
     }
+
+    @Override
+    public List<PageData> getPointListByUserId(PageData pageData) {
+        List<PageData> pointListByUserId = fireCheckStandardMapper.getPointListByUserId(pageData);
+        List<String> pointIds = new ArrayList<>();
+        List<PageData> dataList = new ArrayList<>();
+        if (pointListByUserId.size() > 0) {
+            for (PageData data : pointListByUserId) {
+                pointIds.add(data.getString("FIRE_POINT_ID"));
+            }
+            dataList = firePointService.findByIds(pointIds);
+        }
+        return dataList;
+    }
 }

src/main/java/com/zcloud/service/firemanager/impl/FirePointServiceImpl.java

@@ -156,4 +156,14 @@ public class FirePointServiceImpl implements FirePointService {
     public List<PageData> getFirePointCheckPhotos(PageData pd) {
         return firePointMapper.getFirePointCheckPhotos(pd);
     }
+
+    @Override
+    public void batchEditFirePointUser(PageData pd) {
+        firePointMapper.batchEditFirePointUser(pd);
+    }
+
+    @Override
+    public List<PageData> findByIds(List<String> pointIds) {
+        return firePointMapper.findByIds(pointIds);
+    }
 }

src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java

@@ -795,4 +795,9 @@ public class FireRecordServiceImpl implements FireRecordService {
     public void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo) {
         fireRecordMapper.doRemoveRecordPointHiddenByCidRidDid(checkInfo);
     }
+
+    @Override
+    public PageData getPhotoUploadMethod(PageData pageData) {
+        return fireRecordMapper.getPhotoUploadMethod(pageData);
+    }
 }

src/main/java/com/zcloud/service/firemanager/impl/FireRegionServiceImpl.java

@@ -180,4 +180,16 @@ public class FireRegionServiceImpl implements FireRegionService {
         this.saveInfo(pd);
         return pd;
     }
+
+    @Override
+    public void editDeptByIds(Map<String, Object> map, PageData pd) {
+        String DATA_IDS = pd.getString("DATA_IDS");
+        if (Tools.notEmpty(DATA_IDS)) {
+            String ArrayDATA_IDS[] = DATA_IDS.split(",");
+            pd.put("ArrayDATA_IDS", ArrayDATA_IDS);
+            initPageDataUtil.initEdit(pd);
+            fireRegionMapper.editDeptByIds(pd);
+            map.put("result", "success");
+        }
+    }
 }

src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationDelayedService.java

@@ -4,7 +4,7 @@ import java.util.List;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 
-/** 
+/**
  * 说明：延时监火
  * 作者：luoxiaobao
  * 时间：2022-05-05
@@ -17,42 +17,43 @@ public interface HotWorkApplicationDelayedService{
 	 * @throws Exception
 	 */
 	public void save(PageData pd)throws Exception;
-	
+
 	/**删除
 	 * @param pd
 	 * @throws Exception
 	 */
 	public void delete(PageData pd)throws Exception;
-	
+
 	/**修改
 	 * @param pd
 	 * @throws Exception
 	 */
 	public void edit(PageData pd)throws Exception;
-	
+
 	/**列表
 	 * @param page
 	 * @throws Exception
 	 */
 	public List<PageData> list(Page page)throws Exception;
-	
+
 	/**列表(全部)
 	 * @param pd
 	 * @throws Exception
 	 */
 	public List<PageData> listAll(PageData pd)throws Exception;
-	
+
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
 	 */
 	public PageData findById(PageData pd)throws Exception;
-	
+
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception
 	 */
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
-	
+
+    void deleteByForeignKey(PageData pd)throws Exception;
 }
 

src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationDelayedServiceImpl.java

@@ -79,5 +79,10 @@ public class HotWorkApplicationDelayedServiceImpl implements HotWorkApplicationD
 		hotworkapplicationdelayedMapper.deleteAll(ArrayDATA_IDS);
 	}
 
+    @Override
+    public void deleteByForeignKey(PageData pd) throws Exception {
+        hotworkapplicationdelayedMapper.deleteByForeignKey(pd);
+    }
+
 }
 

src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java

@@ -3,6 +3,8 @@ package com.zcloud.service.highriskwork.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.zcloud.service.highriskwork.HotWorkApplicationDelayedService;
+import com.zcloud.service.highriskwork.HotWorkApplicationUserService;
 import com.zcloud.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +26,10 @@ public class HotWorkApplicationServiceImpl implements HotWorkApplicationService{
 
 	@Autowired
 	private HotWorkApplicationMapper hotworkapplicationMapper;
+	@Autowired
+	private HotWorkApplicationUserService hotWorkApplicationUserService;
+	@Autowired
+	private HotWorkApplicationDelayedService hotWorkApplicationDelayedService;
 
 	/**新增
 	 * @param pd
@@ -39,6 +45,9 @@ public class HotWorkApplicationServiceImpl implements HotWorkApplicationService{
 	 */
 	public void delete(PageData pd)throws Exception{
 		hotworkapplicationMapper.delete(pd);
+		pd.put("FOREIGN_KEY", pd.getString("HOTWORKAPPLICATION_ID"));
+		hotWorkApplicationUserService.deleteByForeignKey(pd);	// 删除动火作业人员关联表
+		hotWorkApplicationDelayedService.deleteByForeignKey(pd);	// 删除延时监火表对应数据
 	}
 
 	/**修改

src/main/java/com/zcloud/service/system/UsersService.java

@@ -362,4 +362,6 @@ public interface UsersService {
 	PageData findByCardNo(PageData pd) throws Exception;
 
 	List<PageData> listUserByDepId(PageData pd) throws Exception;
+
+	List<PageData> getDepartmentIds(String[] departmentIds) throws Exception;
 }

src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java

@@ -496,4 +496,9 @@ public class UsersServiceImpl implements UsersService {
 	public List<PageData> listUserByDepId(PageData pd) throws Exception {
 		return usersMapper.listUserByDepId(pd);
 	}
+
+	@Override
+	public List<PageData> getDepartmentIds(String[] departmentIds) throws Exception {
+		return usersMapper.getDepartmentIds(departmentIds);
+	}
 }

src/main/java/com/zcloud/util/DateScheduled.java

@@ -16,11 +16,11 @@ import com.zcloud.service.bus.SysDateService;
 public class DateScheduled {
 	@Autowired
 	private SysDateService sysdateService;
-	
+
 
 	//@Scheduled(cron ="0 5 0 * * ?")//每天12点05
 	@Scheduled(cron ="0 30 0 * * ?")//每天12点30
-	
+
 	//@Scheduled(cron ="*/20 * * * * ?")//测试
     public void scheduled(){
 		try {
@@ -56,7 +56,7 @@ public class DateScheduled {
 			String HalfYearStartTime = DateUtil.getYear().toString();
 			String HalfYearEndTime = DateUtil.getYear().toString();
 			Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString());
-			
+
 			if(bmonth <= 6) {
 				HalfYearStartTime = HalfYearStartTime+"-01-01 00:00:00";
 				HalfYearEndTime = HalfYearEndTime+"-06-30 23:59:59";
@@ -68,12 +68,24 @@ public class DateScheduled {
 			pd.put("HALFYEAR_END", HalfYearEndTime);
 			pd.put("YEAR_START", DateUtil.getCurrYearFirst()+" 00:00:00");
 			pd.put("YEAR_END", DateUtil.getCurrYearLast()+" 23:59:59");
+			String halfMonthStartTime = DateUtil.getMonthFirstDay().toString();
+			String halfMonthEndTime = DateUtil.getMonthEndDay().toString();
+			Integer onlyDay = Integer.parseInt(DateUtil.getOnlyDay().toString());
+			if (onlyDay <= 15) {
+				halfMonthStartTime = halfMonthStartTime + " 00:00:00";
+				halfMonthEndTime = DateUtil.getMonthAnyDay(15).toString() + " 23:59:59";
+			} else if (onlyDay > 15) {
+				halfMonthStartTime = DateUtil.getMonthAnyDay(16).toString() + " 00:00:00";
+				halfMonthEndTime = halfMonthEndTime + " 23:59:59";
+			}
+			pd.put("HALFMONTH_START", halfMonthStartTime);
+			pd.put("HALFMONTH_END", halfMonthEndTime);
 			sysdateService.save(pd);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
     }
-	
+
 	/**
 	 * 数据初始化：bus_sysdate表时使用
 	 */
@@ -112,7 +124,7 @@ public class DateScheduled {
 				String HalfYearStartTime = DateSysUtil.getYear(i).toString();
 				String HalfYearEndTime = DateSysUtil.getYear(i).toString();
 				Integer bmonth = Integer.parseInt(DateSysUtil.getMonth(i).toString());
-				
+
 				if(bmonth <= 6) {
 					HalfYearStartTime = HalfYearStartTime+"-01-01 00:00:00";
 					HalfYearEndTime = HalfYearEndTime+"-06-30 23:59:59";
@@ -126,7 +138,7 @@ public class DateScheduled {
 				pd.put("YEAR_END", DateSysUtil.getCurrYearLast(i)+" 23:59:59");
 				sysdateService.save(pd);
 			}
-			
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/com/zcloud/util/DateUtil.java

@@ -813,6 +813,17 @@ public static boolean timeCompare(Date amBeginTime, Date amEndTime) {
 		}
 		return 1;
 	}
+
+	/**
+	 * 获取本月某一天的日期
+	 */
+	public static String getMonthAnyDay(int day) {
+		Calendar thisMonthAnyDateCal = Calendar.getInstance();
+		thisMonthAnyDateCal.set(Calendar.DAY_OF_MONTH, day);
+		String thisMonthAnyTime = sdfDay.format(thisMonthAnyDateCal.getTime());
+		return thisMonthAnyTime;
+	}
+
     public static void main(String[] args) {
 
 //		List<String> halfYearMonth = DateUtil.getHalfYearMonth(true);

src/main/java/com/zcloud/util/PeriodDateUtil.java

@@ -15,6 +15,7 @@ public class PeriodDateUtil {
     public static final String QUARTER = "checkPeriod0005";
     public static final String HALFYEAR = "checkPeriod0007";
     public static final String YEAR = "checkPeriod0006";
+    public static final String HALFMONTH = "checkPeriod0008";
 
     public static String[] getPeriodDate(PageData sysdate,String FIRE_CHECK_TYPE_NAME) {
         String[] strings = {"",""};
@@ -47,6 +48,10 @@ public class PeriodDateUtil {
                 strings[0] = sysdate.getString("HALFYEAR_START");
                 strings[1] = sysdate.getString("HALFYEAR_END");
                 break;
+            case PeriodDateUtil.HALFMONTH:
+                strings[0] = sysdate.getString("HALFMONTH_START");
+                strings[1] = sysdate.getString("HALFMONTH_END");
+                break;
             default:
                 break;
         }

src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java

@@ -0,0 +1,114 @@
+package com.zcloud.util;
+
+import com.zcloud.entity.PageData;
+import com.zcloud.service.bus.CheckRecordService;
+import com.zcloud.service.bus.ListManagerService;
+import com.zcloud.service.firemanager.FireCheckListService;
+import com.zcloud.service.firemanager.FireRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Component
+public class RecordHalfMonthScheduled {
+    @Autowired
+    private ListManagerService listManagerService;
+    @Autowired
+    private CheckRecordService checkRecordService;
+
+    @Resource
+    private FireCheckListService fireCheckListService;
+    @Resource
+    private FireRecordService fireRecordService;
+
+//    @Scheduled(cron ="0 0 0 1,16 1-12 ?")//每月1号、16号 00:00
+    //@Scheduled(cron ="*/20 * * * * ?")//测试
+    public void scheduled() {
+        try {
+            System.out.println("============定时增加每月超期未检查记录==========");
+            PageData pd = new PageData();
+            pd.put("STARTTIME",  DateUtil.getTimesLastMonthmorning());
+            pd.put("ENDTIME", DateUtil.getTimesLastMonthnight());
+            pd.put("PERIOD", "checkPeriod0008");
+            List<PageData> overTimeLists = listManagerService.overTimeRecord(pd);
+            if(overTimeLists != null && overTimeLists.size() > 0) {
+                for(PageData list : overTimeLists) {
+                    PageData record = new PageData();
+                    record.put("CHECKRECORD_ID", this.get32UUID());
+                    record.put("LISTMANAGER_ID", list.get("LISTMANAGER_ID"));
+                    record.put("LIST_NAME", list.get("NAME"));
+                    record.put("CORPINFO_ID", list.get("CORPINFO_ID"));
+                    record.put("ISDELETE", "0");
+                    record.put("FINISHED", "1");
+                    record.put("ISSTATISTICS", "0");
+                    record.put("TYPE", "2");
+                    record.put("CREATTIME", DateUtil.date2Str(new Date()));	//创建时间
+                    record.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
+                    record.put("PERIODSTART", pd.get("STARTTIME"));	//周期开始时间
+                    record.put("PERIODEND", pd.get("ENDTIME"));	//周期结束时间
+                    checkRecordService.save(record);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Scheduled(cron ="0 0 0 1,16 1-12 ?")//每月1号、16号 00:00
+//    @Scheduled(cron ="*/20 * * * * ?")//测试
+    public void equipmentNotChecked(){
+        System.out.println("============每半月定时增加超期未检查消防设备记录==========");
+        PageData pd = new PageData();
+        pd.put("FIRE_CHECK_TYPE", PeriodDateUtil.HALFMONTH);
+        int day = Integer.parseInt(DateUtil.getOnlyDay().toString());
+        String startTime = "";
+        String endTime = "";
+        if (day <= 15) {
+            startTime = DateUtil.getMonthFirstDay().toString() + " 00:00:00";
+            endTime = DateUtil.getMonthAnyDay(15).toString() + " 23:59:59";
+        } else {
+            startTime = DateUtil.getMonthAnyDay(16).toString() + " 00:00:00";
+            endTime = DateUtil.getMonthEndDay().toString() + " 23:59:59";
+        }
+        pd.put("STARTTIME",startTime);
+        pd.put("ENDTIME",endTime);
+        List<PageData> preData = fireCheckListService.getNotCheckedByWEEK(pd);
+        // 前一日没有查询的id
+        List<PageData> insertData = new LinkedList<>();
+        if (preData != null && !preData.isEmpty()) {
+            // 添加
+            String finalStartTime = startTime;
+            String finalEndTime = endTime;
+            preData.forEach(item -> {
+                PageData pageData = new PageData();
+                String FIRE_RECORD_ID = UuidUtil.get32UUID();
+                String corpinfoId = (String) item.get("CORPINFO_ID");
+                pageData.put("FIRE_CHECK_ID", item.get("FIRE_CHECK_ID"));
+                pageData.put("FIRE_RECORD_ID", FIRE_RECORD_ID);
+                pageData.put("CORPINFO_ID", corpinfoId);
+                pageData.put("PERIODSTART", finalStartTime);
+                pageData.put("PERIODEND", finalEndTime);
+                //'添加人''添加时间''修改人''修改时间'
+                pageData.put("CREATOR", "adminTask");
+                pageData.put("CREATTIME", DateUtil.date2Str(new Date()));
+                pageData.put("OPERATOR", "adminTask");
+                pageData.put("OPERATTIME", DateUtil.date2Str(new Date()));
+                insertData.add(pageData);
+            });
+            // 未检查记录添加
+            fireRecordService.additionRecord(insertData);
+        }
+        System.out.println("============每半月超期未检查消防设备记录任务结束==========");
+        System.out.println("定时任务添加了" + Arrays.toString(insertData.toArray()));
+    }
+
+    /**得到32位的uuid
+     * @return
+     */
+    public String get32UUID(){
+        return UuidUtil.get32UUID();
+    }
+}

src/main/resources/mybatis/datasource/bus/SysDateMapper.xml

@@ -29,6 +29,8 @@
 		f.HALFYEAR_END,
 		f.YEAR_START,
 		f.YEAR_END,
+		f.HALFMONTH_START,
+		f.HALFMONTH_END,
 		f.SYSDATE_ID
 	</sql>
 
@@ -49,6 +51,8 @@
 		HALFYEAR_END,
 		YEAR_START,
 		YEAR_END,
+		HALFMONTH_START,
+		HALFMONTH_END,
 		SYSDATE_ID
 	</sql>
 
@@ -69,6 +73,8 @@
 		#{HALFYEAR_END},
 		#{YEAR_START},
 		#{YEAR_END},
+		#{HALFMONTH_START},
+		#{HALFMONTH_END},
 		#{SYSDATE_ID}
 	</sql>
 
@@ -113,6 +119,8 @@
 			HALFYEAR_END = #{HALFYEAR_END},
 			YEAR_START = #{YEAR_START},
 			YEAR_END = #{YEAR_END},
+		    HALFMONTH_START = #{HALFMONTH_START},
+			HALFMONTH_END = #{HALFMONTH_END},
 			SYSDATE_ID = SYSDATE_ID
 		where
 			SYSDATE_ID = #{SYSDATE_ID}

src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml

@@ -28,6 +28,12 @@
             FIRE_CHECK_TYPE          = #{FIRE_CHECK_TYPE},
             OPERATOR                 = #{OPERATOR},
             OPERATTIME               = #{OPERATTIME}
+            <if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
+                ,DEPARTMENT_ID = #{DEPARTMENT_ID}
+            </if>
+            <if test="USER_ID != null and USER_ID != ''">
+                ,USER_ID = #{USER_ID}
+            </if>
         WHERE FIRE_CHECK_ID = #{FIRE_CHECK_ID}
     </update>
     <update id="delByIds" parameterType="pd">
@@ -166,7 +172,7 @@
              oa_department AS oa
              ON
                  su.DEPARTMENT_ID = oa.DEPARTMENT_ID
-                 INNER JOIN
+                 LEFT JOIN
              sys_post AS sp
              ON
                  su.POST_ID = sp.POST_ID
@@ -229,6 +235,12 @@
         <if test="USERNAME != null and USERNAME != ''">
             and su.NAME like concat(#{USERNAME},'%')
         </if>
+        <if test="departmentIds != null and departmentIds != ''">
+            and fp.DEPARTMENT_ID in
+            <foreach item="item" index="index" collection="departmentIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
             and fp.DEPARTMENT_ID = #{DEPARTMENT_ID}
         </if>
@@ -339,6 +351,9 @@
                  LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA
         WHERE cl.ISDELETE = 0
           AND cl.STATE = 0
+          <if test="pd.pointId != null and pd.pointId != ''">
+              AND fpp.FIRE_POINT_ID = #{pd.pointId}
+          </if>
         and fpp.ISDELETE = 0
         AND fpc.ISDELETE = 0
         <if test="pd.roleLevel != null and pd.roleLevel != ''"><!-- 权限显示 -->

src/main/resources/mybatis/datasource/firemanager/FireCheckStandardMapper.xml

@@ -338,4 +338,21 @@
            and FIRE_DEVICE_TYPE = #{FIRE_DEVICE_TYPE}
         </if>
     </select>
+
+    <select id="getPointListByUserId" resultType="com.zcloud.entity.PageData">
+        SELECT DISTINCT
+            fpp.FIRE_POINT_ID
+        FROM
+            bus_fire_point_prepared fpp
+        WHERE
+                fpp.FIRE_CHECK_ID IN (
+                SELECT
+                    fc.FIRE_CHECK_ID
+                FROM
+                    bus_fire_checklist fc
+                WHERE
+                    fc.USER_ID = #{USER_ID}
+                  AND fc.ISDELETE = 0
+            )
+    </select>
 </mapper>

src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml

@@ -111,6 +111,12 @@
         WHERE
         fp.ISDELETE = 0 and fd.ISDELETE = 0
         and fd.CORPINFO_ID = #{pd.CORPINFO_ID}
+        <if test="pd.DEPARTMENT_NAME != null and pd.DEPARTMENT_NAME != ''">
+            and d.`NAME` like concat('%',#{pd.DEPARTMENT_NAME},'%')
+        </if>
+        <if test="pd.USER_NAME != null and pd.USER_NAME != ''">
+            and su.`NAME` like concat('%',#{pd.USER_NAME},'%')
+        </if>
         <if test="pd.FIRE_POINT_ID != null and pd.FIRE_POINT_ID !='' ">
             and fp.FIRE_POINT_ID = #{pd.FIRE_POINT_ID}
         </if>

src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml

@@ -103,11 +103,22 @@
         </foreach>
     </update>
 
+    <update id="batchEditFirePointUser">
+        update bus_fire_point set
+        USER_ID = #{USER_ID}
+        where
+        FIRE_POINT_ID in
+        <foreach collection="dataIds" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
     <select id="datalistPage" parameterType="page" resultType="pd">
         SELECT
         p.FIRE_POINT_ID,
         p.FIRE_POINT_NAME,
         p.FIRE_POINT_CODE,
+        p.DEPARTMENT_ID,
         r.FIRE_REGION_ID,
         CONCAT_WS( '--', p.LATITUDE, p.LONGITUDE ) LONGTITUDEANDLATITUDE,
         p.QUALIFIED_PHOTOS_ID,
@@ -133,6 +144,9 @@
         <if test="pd.FIRE_POINT_CODE != null and pd.FIRE_POINT_CODE !='' ">
             AND p.FIRE_POINT_CODE like concat('%',#{pd.FIRE_POINT_CODE,jdbcType=VARCHAR},'%')
         </if>
+        <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+            AND p.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+        </if>
         group by p.FIRE_POINT_ID
         ORDER BY
         p.OPERATTIME desc
@@ -231,4 +245,14 @@
             frp.CREATTIME DESC
             limit 1
     </select>
+
+    <select id="findByIds" resultType="com.zcloud.entity.PageData">
+        SELECT p.*
+        FROM bus_fire_point AS p
+        WHERE p.ISDELETE = 0
+        AND p.FIRE_POINT_ID IN
+        <foreach collection="pointIds" item="item" open="(" separator="," close=")" index="index">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml

@@ -379,7 +379,7 @@
                  INNER JOIN bus_fire_point AS bfp ON bfd.FIRE_POINT_ID = bfp.FIRE_POINT_ID
                  INNER JOIN sys_user AS su ON cl.USER_ID = su.USER_ID
                  INNER JOIN oa_department AS oa ON su.DEPARTMENT_ID = oa.DEPARTMENT_ID
-                 INNER JOIN sys_post AS sp ON su.POST_ID = sp.POST_ID
+                 LEFT JOIN sys_post AS sp ON su.POST_ID = sp.POST_ID
                  INNER JOIN bus_fire_region AS bfr ON bfp.FIRE_REGION_ID = bfr.FIRE_REGION_ID
                  INNER JOIN bus_fire_record AS fr ON cl.FIRE_CHECK_ID = fr.FIRE_CHECK_ID
         WHERE cl.ISDELETE = 0
@@ -1016,4 +1016,18 @@
             bus_fire_device_prepared  where HIDDEN_ID = #{HIDDEN_ID} and ISDELETE = 0 order by OPERATTIME desc limit 1
     </select>
 
+    <select id="getPhotoUploadMethod" resultType="com.zcloud.entity.PageData">
+        SELECT
+            fr.PHOTO_UPLOAD_METHOD
+        FROM
+            bus_fire_record_point frp
+                LEFT JOIN bus_fire_point fp ON frp.FIRE_POINT_ID = fp.FIRE_POINT_ID
+                AND fp.ISDELETE = '0'
+                LEFT JOIN bus_fire_region fr ON fr.FIRE_REGION_ID = fp.FIRE_REGION_ID
+                AND fr.ISDELETE = '0'
+        WHERE
+            frp.EQUIPMENT_POINT_ID = #{EQUIPMENT_POINT_ID}
+          AND frp.ISDELETE = '0'
+    </select>
+
 </mapper>

src/main/resources/mybatis/datasource/firemanager/FireRegionMapper.xml

@@ -13,7 +13,8 @@
 		DEPARTMENT_ID,
 		CORPINFO_ID,
 		REMAKE,
-		STATE
+		STATE,
+        PHOTO_UPLOAD_METHOD
     </sql>
     <sql id="baseFields">
         ,CREATOR
@@ -65,7 +66,8 @@
             bus_fire_region.FIRE_REGION_CODE,
             bus_fire_region.STATE,
             bus_fire_region.REMAKE,
-            bus_fire_region.DEPARTMENT_ID
+            bus_fire_region.DEPARTMENT_ID,
+            bus_fire_region.PHOTO_UPLOAD_METHOD
         FROM
             bus_fire_region
                 INNER JOIN
@@ -83,6 +85,7 @@
           , OPERATOR         = #{OPERATOR}
           , OPERATTIME       = #{OPERATTIME}
           , REMAKE           = #{REMAKE}
+          , PHOTO_UPLOAD_METHOD = #{PHOTO_UPLOAD_METHOD}
         WHERE FIRE_REGION_ID = #{FIRE_REGION_ID,jdbcType = VARCHAR}
     </update>
 
@@ -100,15 +103,24 @@
         where FIRE_REGION_ID =#{FIRE_REGION_ID}
     </update>
 
+    <update id="editDeptByIds">
+        update <include refid="tableName"></include> set
+        DEPARTMENT_ID = #{DEPARTMENT_ID}
+        where FIRE_REGION_ID in
+        <foreach collection="ArrayDATA_IDS" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
     <insert id="insInfo" parameterType="page">
         INSERT INTO
         <include refid="tableName"></include>
         (`FIRE_REGION_ID`, `FIRE_REGION_NAME`, `FIRE_REGION_CODE`,DEPARTMENT_ID,
         `CREATOR`, `CREATTIME`, `OPERATOR`, `OPERATTIME`,
-        `CORPINFO_ID`, `REMAKE`, `ISDELETE`)
+        `CORPINFO_ID`, `REMAKE`, `ISDELETE`, `PHOTO_UPLOAD_METHOD`)
         VALUES (#{FIRE_REGION_ID}, #{FIRE_REGION_NAME}, #{FIRE_REGION_CODE},#{DEPARTMENT_ID},
         #{CREATOR}, #{CREATTIME}, #{OPERATOR}, #{OPERATTIME}, #{CORPINFO_ID},
-        #{REMAKE}, 0)
+        #{REMAKE}, 0, #{PHOTO_UPLOAD_METHOD})
     </insert>
 
     <select id="getAllRegionName" parameterType="page" resultType="pd">

src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationDelayedMapper.xml

@@ -147,4 +147,13 @@
 		</foreach>
 	</delete>
 
+    <delete id="deleteByForeignKey">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			HOTWORKAPPLICATION_ID = #{HOTWORKAPPLICATION_ID}
+	</delete>
+
 </mapper>

src/main/resources/mybatis/datasource/system/UsersMapper.xml

@@ -731,6 +731,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND
 				u.CORPINFO_ID = #{CORPINFO_ID}
 		</if>
+		<if test="departmentIds != null and departmentIds != ''">
+			and u.DEPARTMENT_ID in
+			<foreach collection="departmentIds" item="item" index="index" separator="," close=")" open="(">
+				#{item}
+			</foreach>
+		</if>
 		<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''"><!-- 关键词检索 -->
 			AND
 				u.DEPARTMENT_ID = #{DEPARTMENT_ID}
@@ -1444,4 +1450,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from <include refid="tableName"></include> f
 		where DEPARTMENT_ID = #{RECEIVER_ID} and ISDELETE = '0'
 	</select>
+
+	<select id="getDepartmentIds" parameterType="String" resultType="com.zcloud.entity.PageData">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		ISDELETE = '0'
+		<if test="departmentIds != null and departmentIds != ''">
+			and DEPARTMENT_ID in
+			<foreach item="item" index="index" collection="departmentIds" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+	</select>
 </mapper>