diff --git a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java
new file mode 100644
index 0000000..45c02ef
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java
@@ -0,0 +1,270 @@
+package com.zcloud.controller.keyProjects;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.keyProjects.KeyprojectCheckInfoService;
+import com.zcloud.service.keyProjects.KeyprojectCheckService;
+import com.zcloud.service.keyProjects.KeyprojectHiddenService;
+import com.zcloud.service.system.ImgFilesService;
+import com.zcloud.util.DateUtil;
+import com.zcloud.util.Tools;
+import com.zcloud.util.UuidUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.*;
+
+/**
+ * 说明：重点工程检查
+ * 作者：luoxiaobao
+ * 时间：2022-09-19
+ * 官网：www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/keyprojectcheck")
+public class KeyprojectCheckController extends BaseController {
+
+    @Autowired
+    private KeyprojectCheckService keyprojectcheckService;
+    @Autowired
+    private KeyprojectCheckInfoService keyprojectcheckInfoService;
+    @Autowired
+    private KeyprojectHiddenService keyprojectHiddenService;
+    @Autowired
+    private ImgFilesService imgFilesService;
+    /**新增
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/add")
+    @ResponseBody
+    public Object add() throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd.put("KEYPROJECTCHECK_ID", this.get32UUID());	//主键
+        pd.put("CREATTIME", DateUtil.date2Str(new Date()));	//添加时间
+        pd.put("OPERATTIME", DateUtil.date2Str(new Date()));	//修改时间
+        pd.put("ISDELETE", 0);	//是否删除
+        pd.put("SOURCE", 1);	//企业ID
+        keyprojectcheckService.save(pd);
+
+        String currentTime = DateUtil.date2Str(new Date());
+        if (Tools.notEmpty(pd.getString("SITUATIONJSON"))) {
+            List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("SITUATIONJSON"));
+            String time = currentTime;
+            for (JSONObject json : list) {
+                PageData situationPd = new PageData();
+                situationPd.put("KEYPROJECTCHECKINFO_ID", UuidUtil.get32UUID());    //主键
+                situationPd.put("KEYPROJECTCHECK_ID", pd.getString("KEYPROJECTCHECK_ID"));    //检查ID
+                situationPd.put("SITUATION", json.get("SITUATION"));    //检查情况
+                situationPd.put("ISDELETE", "0");    //是否删除(0:有效 1：删除)
+                situationPd.put("CREATOR", pd.getString("CREATOR"));    //添加人
+                situationPd.put("CREATTIME", time);    //添加时间
+                situationPd.put("OPERATOR", pd.getString("OPERATOR"));    //修改人
+                situationPd.put("OPERATTIME", time);    //修改时间
+                keyprojectcheckInfoService.save(situationPd);
+                time = DateUtil.calculateDateSecond(time, 1);
+            }
+        }
+
+        if (Tools.notEmpty(pd.getString("HIDDENJSON"))) {
+            List<PageData> hiddenList = new ArrayList<PageData>();
+            List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("HIDDENJSON"));
+            String time = currentTime;
+            for (JSONObject json : list) {
+                PageData hidden = new PageData();
+                hidden.put("HIDDEN_ID", UuidUtil.get32UUID());    //主键
+                hidden.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID"));    //外键ID
+                hidden.put("HIDDENDESCR", json.getString("HIDDENDESCR"));    //隐患描述
+                hidden.put("HIDDENPART", json.getString("HIDDENPART"));    //隐患部位
+                hidden.put("HIDDENLEVEL", json.getString("HIDDENLEVEL"));    //隐患级别
+                hidden.put("HIDDENTYPE", json.getString("HIDDENTYPE"));    //隐患类型1
+                hidden.put("HIDDENTYPE2", json.getString("HIDDENTYPE2"));    //隐患类型2
+                hidden.put("LONGITUDE", json.getString("LONGITUDE"));    //隐患位置经度
+                hidden.put("LATITUDE", json.getString("LATITUDE"));    //隐患位置纬度
+                hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME"));    //隐患发现时间
+                hidden.put("HIDDENFINDDEPT", json.getString("HIDDENFINDDEPT"));    //隐患发现部门（隐患责任人部门）
+                hidden.put("RECTIFICATIONTYPE", json.getString("RECTIFICATIONTYPE"));    //隐患处置
+                hidden.put("RECTIFICATIONDEADLINE", json.getString("RECTIFICATIONDEADLINE"));    //整改期限
+                hidden.put("RECTIFYDESCR", json.getString("RECTIFYDESCR"));    //整改描述
+                hidden.put("RECTIFICATIONDEPT", json.getString("RECTIFICATIONDEPT"));    //整改部门
+                hidden.put("RECTIFICATIONOR", json.getString("RECTIFICATIONOR"));    //整改人
+                hidden.put("CREATOR", json.getString("CREATOR"));    //发现人（隐患责任人）
+                hidden.put("SOURCE", json.getString("SOURCE"));    //隐患来源
+                hidden.put("STATE", "100");    //隐患状态 100-安全环保检查暂存的隐患（流程完转0）
+                hidden.put("CREATTIME", time);    //发现时间
+                hidden.put("CORPINFO_ID", pd.getString("CORPINFO_ID"));    //企业ID
+                hidden.put("ISDELETE", "0");    //是否删除(0:有效 1：删除)
+                hidden.put("POSITIONDESC",json.getString("POSITIONDESC"));// 隐患位置描述
+
+                keyprojectHiddenService.save(hidden);
+                hiddenList.add(hidden);
+                time = DateUtil.calculateDateSecond(time, 1);
+            }
+            pd.put("hiddenList", hiddenList);
+        }
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**删除
+     * @param out
+     * @throws Exception
+     */
+    @RequestMapping(value="/delete")
+    @ResponseBody
+    public Object delete() throws Exception{
+        Map<String,String> map = new HashMap<String,String>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        keyprojectcheckService.delete(pd);
+        map.put("result", errInfo);				//返回结果
+        return map;
+    }
+
+    /**修改
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/edit")
+    @ResponseBody
+    public Object edit() throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        keyprojectcheckService.edit(pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**列表
+     * @param page
+     * @throws Exception
+     */
+    @RequestMapping(value="/list")
+    @ResponseBody
+    public Object list(Page page) throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String KEYWORDS = pd.getString("KEYWORDS");						//关键词检索条件
+        if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
+        page.setPd(pd);
+        List<PageData>	varList = keyprojectcheckService.list(page);	//列出KeyprojectCheck列表
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**去修改页面获取数据
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/goEdit")
+    @ResponseBody
+    public Object goEdit() throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd = keyprojectcheckService.findById(pd);	//根据ID读取
+
+        List<PageData> situationList = keyprojectcheckInfoService.listAll(pd);
+        pd.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID"));
+        pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd));
+        pd.put("situationList", situationList);
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**去隐患页面获取数据
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/listHidden")
+    @ResponseBody
+    public Object listHidden(Page page) throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String KEYWORDS = pd.getString("KEYWORDS");						//关键词检索条件
+        if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
+        page.setPd(pd);
+        List<PageData>	varList = keyprojectHiddenService.list(page);	//列出KeyprojectCheck列表
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**去隐患页面获取数据
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/findHidden")
+    @ResponseBody
+    public Object findHidden() throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd = keyprojectHiddenService.findById(pd);	//根据ID读取
+
+        PageData pd2 = new PageData();
+        pd2.put("FOREIGN_KEY",pd.getString("HIDDEN_ID"));
+        pd2.put("TYPE",3);	//隐患图片
+        pd.put("hiddenImgs", imgFilesService.listAll(pd2));
+        if(imgFilesService.listAll(pd2).size()==0){
+            pd2.put("TYPE",114);	//AI隐患图片
+            pd.put("hiddenImgs", imgFilesService.listAll(pd2));
+        }
+        pd2.put("TYPE",102);	//隐患视频
+        pd.put("hiddenVideos", imgFilesService.listAll(pd2));
+        pd2.put("TYPE",4);
+        pd.put("zgImgs", imgFilesService.listAll(pd2));//整改图片
+        pd2.put("TYPE",5);
+        pd.put("ysImgs", imgFilesService.listAll(pd2));//整改图片
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**批量删除
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/deleteAll")
+    @ResponseBody
+    public Object deleteAll() throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DATA_IDS = pd.getString("DATA_IDS");
+        if(Tools.notEmpty(DATA_IDS)){
+            String ArrayDATA_IDS[] = DATA_IDS.split(",");
+            keyprojectcheckService.deleteAll(ArrayDATA_IDS);
+            errInfo = "success";
+        }else{
+            errInfo = "fail";
+        }
+        map.put("result", errInfo);				//返回结果
+        return map;
+    }
+
+}
+
diff --git a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectPunishController.java b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectPunishController.java
new file mode 100644
index 0000000..e9de8b4
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectPunishController.java
@@ -0,0 +1,219 @@
+package com.zcloud.controller.keyProjects;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.keyProjects.KeyprojectPunishService;
+import com.zcloud.util.ObjectExcelView;
+import com.zcloud.util.Tools;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 说明：重点工程处罚
+ * 作者：luoxiaobao
+ * 时间：2022-09-21
+ * 官网：www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/keyprojectpunish")
+public class KeyprojectPunishController extends BaseController {
+
+	@Autowired
+	private KeyprojectPunishService keyprojectpunishService;
+
+	/**新增
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/add")
+	@RequiresPermissions("keyprojectpunish:add")
+	@ResponseBody
+	public Object add() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("KEYPROJECTPUNISH_ID", this.get32UUID());	//主键
+		keyprojectpunishService.save(pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**删除
+	 * @param out
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/delete")
+	@RequiresPermissions("keyprojectpunish:del")
+	@ResponseBody
+	public Object delete() throws Exception{
+		Map<String,String> map = new HashMap<String,String>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		keyprojectpunishService.delete(pd);
+		map.put("result", errInfo);				//返回结果
+		return map;
+	}
+
+	/**修改
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/edit")
+	@RequiresPermissions("keyprojectpunish:edit")
+	@ResponseBody
+	public Object edit() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		keyprojectpunishService.edit(pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/list")
+	@ResponseBody
+	public Object list(Page page) throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String KEYWORDS = pd.getString("KEYWORDS");						//关键词检索条件
+		if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
+		page.setPd(pd);
+		List<PageData>	varList = keyprojectpunishService.list(page);	//列出KeyprojectPunish列表
+		map.put("varList", varList);
+		map.put("page", page);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	 /**去修改页面获取数据
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goEdit")
+	@ResponseBody
+	public Object goEdit() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = keyprojectpunishService.findById(pd);	//根据ID读取
+		map.put("pd", pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	 /**批量删除
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/deleteAll")
+	@RequiresPermissions("keyprojectpunish:del")
+	@ResponseBody
+	public Object deleteAll() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String DATA_IDS = pd.getString("DATA_IDS");
+		if(Tools.notEmpty(DATA_IDS)){
+			String ArrayDATA_IDS[] = DATA_IDS.split(",");
+			keyprojectpunishService.deleteAll(ArrayDATA_IDS);
+			errInfo = "success";
+		}else{
+			errInfo = "fail";
+		}
+		map.put("result", errInfo);				//返回结果
+		return map;
+	}
+
+	 /**导出到excel
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/excel")
+	@RequiresPermissions("toExcel")
+	public ModelAndView exportExcel() throws Exception{
+		ModelAndView mv = new ModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		Map<String,Object> dataMap = new HashMap<String,Object>();
+		List<String> titles = new ArrayList<String>();
+		titles.add("添加人");	//1
+		titles.add("添加时间");	//2
+		titles.add("修改人");	//3
+		titles.add("修改时间");	//4
+		titles.add("是否删除(0:有效 1：删除)");	//5
+		titles.add("检查ID");	//6
+		titles.add("隐患ID");	//7
+		titles.add("处罚单位");	//8
+		titles.add("处罚人");	//9
+		titles.add("处罚原因");	//10
+		titles.add("处罚金额");	//11
+		titles.add("处罚时间");	//12
+		titles.add("是否处理 0否1是");	//13
+		titles.add("处理图片");	//14
+		titles.add("处理时间");	//15
+		dataMap.put("titles", titles);
+		List<PageData> varOList = keyprojectpunishService.listAll(pd);
+		List<PageData> varList = new ArrayList<PageData>();
+		for(int i=0;i<varOList.size();i++){
+			PageData vpd = new PageData();
+			vpd.put("var1", varOList.get(i).getString("CREATOR"));	    //1
+			vpd.put("var2", varOList.get(i).getString("CREATTIME"));	    //2
+			vpd.put("var3", varOList.get(i).getString("OPERATOR"));	    //3
+			vpd.put("var4", varOList.get(i).getString("OPERATTIME"));	    //4
+			vpd.put("var5", varOList.get(i).get("ISDELETE").toString());	//5
+			vpd.put("var6", varOList.get(i).getString("KEYPROJECTCHECK_ID"));	    //6
+			vpd.put("var7", varOList.get(i).getString("HIDDEN_ID"));	    //7
+			vpd.put("var8", varOList.get(i).getString("UNITS_ID"));	    //8
+			vpd.put("var9", varOList.get(i).getString("PERSONNELMANAGEMENT_ID"));	    //9
+			vpd.put("var10", varOList.get(i).getString("REASON"));	    //10
+			vpd.put("var11", varOList.get(i).getString("AMOUT"));	    //11
+			vpd.put("var12", varOList.get(i).getString("DATE"));	    //12
+			vpd.put("var13", varOList.get(i).getString("HANDLED"));	    //13
+			vpd.put("var14", varOList.get(i).getString("HANDLE_IMG"));	    //14
+			vpd.put("var15", varOList.get(i).getString("HANLDE_TIME"));	    //15
+			varList.add(vpd);
+		}
+		dataMap.put("varList", varList);
+		ObjectExcelView erv = new ObjectExcelView();
+		mv = new ModelAndView(erv,dataMap);
+		return mv;
+	}
+	/**
+	 * 根据添加人查询罚单
+	 * @param
+	 * @return
+	 */
+	@RequestMapping(value="/findByOperator")
+	@ResponseBody
+	public Object findByOperator() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		List<PageData> byOperator = keyprojectpunishService.findByOperator(pd);
+		map.put("data", byOperator);
+		map.put("result", errInfo);				//返回结果
+		return map;
+	}
+}
diff --git a/src/main/java/com/zcloud/controller/relatedparty/UnitsController.java b/src/main/java/com/zcloud/controller/relatedparty/UnitsController.java
index e4306fc..0cb4546 100644
--- a/src/main/java/com/zcloud/controller/relatedparty/UnitsController.java
+++ b/src/main/java/com/zcloud/controller/relatedparty/UnitsController.java
@@ -139,6 +139,19 @@ public class UnitsController extends BaseController {
 		return map;
 	}
 
+	@RequestMapping(value = "/listAll")
+//	@RequiresPermissions("units:list")
+	@ResponseBody
+	public Object listAll() throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+		String errInfo = "success";
+		PageData pd = this.getPageData();
+		List<PageData> varList = unitsService.listAll(pd);    //列出Units列表
+		map.put("varList", varList);
+		map.put("result", errInfo);
+		return map;
+	}
+
 	/**判断相关方单位名是否存在
 	 * @return
 	 */
diff --git a/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementController.java b/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementController.java
index 6e71ec2..25e7255 100644
--- a/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementController.java
+++ b/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementController.java
@@ -5,11 +5,9 @@ import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.logs.LogAnno;
 import com.zcloud.service.specialoperation.PersonnelManagementService;
-import com.zcloud.util.DateUtil;
-import com.zcloud.util.Jurisdiction;
-import com.zcloud.util.ObjectExcelView;
-import com.zcloud.util.Tools;
+import com.zcloud.util.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.crypto.hash.SimpleHash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -74,6 +72,24 @@ public class PersonnelManagementController extends BaseController {
 		return map;
 	}
 
+	@RequestMapping(value = "/resetPwd")
+	@ResponseBody
+	public Object resetPwd(Page page) throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		PageData pageData = personnelmanagementService.findById(pd);
+		String pwd = new SimpleHash("SHA-1", pageData.getString("PHONENUM"), Const.DEFAULT_PASSWORD).toString();
+		PageData updateUser = new PageData();
+		updateUser.put("PASSWORD", pwd);
+		updateUser.put("PERSONNELMANAGEMENT_ID", pageData.getString("PERSONNELMANAGEMENT_ID"));
+		personnelmanagementService.editPassword(updateUser);
+
+		map.put("result", errInfo);
+		return map;
+	}
+
 	/**修改
 	 * @param
 	 * @throws Exception
@@ -160,6 +176,80 @@ public class PersonnelManagementController extends BaseController {
 		return map;
 	}
 
+	/**
+	 * 判断相关方下面是有相关方人员
+	 *
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/isTrueDelete")
+	@ResponseBody
+	public Object isTrueDelete() throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		List<PageData> pageData = personnelmanagementService.listAll(pd);
+		if (pageData.size() > 0) {
+			int number = 1;
+			map.put("number", number);
+		} else {
+			int number = 0;
+			map.put("number", number);
+		}
+
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/isTrueDeleteAll")
+	@ResponseBody
+	public Object isTrueDeleteAll() throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String[] UNITS_ID = pd.getString("UNITS_ID").split(",");
+		List<String> list = new ArrayList<>();
+		for (String IDS : UNITS_ID) {
+			list.add(IDS);
+		}
+		pd.put("IDS", list);
+		pd.put("UNITS_ID", "");
+		List<PageData> pageData = personnelmanagementService.listAll(pd);
+		if (pageData.size() > 0) {
+			int number = 1;
+			map.put("number", number);
+		} else {
+			int number = 0;
+			map.put("number", number);
+		}
+
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**
+	 * 列表
+	 *
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/listAll")
+	@ResponseBody
+	public Object listAll() throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		List<PageData> varList = personnelmanagementService.listAll(pd);    //列出PersonnelManagement列表
+		map.put("varList", varList);
+		map.put("result", errInfo);
+		return map;
+	}
+
 	/**判断特种作业证书编号是否存在
 	 * @return
 	 */
diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckInfoMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckInfoMapper.java
new file mode 100644
index 0000000..8d5aec7
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckInfoMapper.java
@@ -0,0 +1,59 @@
+package com.zcloud.mapper.datasource.keyProjects;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程检查内容
+ * 作者：luoxiaobao
+ * 时间：2022-09-19
+ * 官网：www.zcloudchina.com
+ */
+public interface KeyprojectCheckInfoMapper {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	void save(PageData pd);
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	void delete(PageData pd);
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	void edit(PageData pd);
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> datalistPage(Page page);
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAll(PageData pd);
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	PageData findById(PageData pd);
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	void deleteAll(String[] ArrayDATA_IDS);
+
+}
+
diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckMapper.java
new file mode 100644
index 0000000..0b2f8e9
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckMapper.java
@@ -0,0 +1,59 @@
+package com.zcloud.mapper.datasource.keyProjects;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程检查
+ * 作者：luoxiaobao
+ * 时间：2022-09-19
+ * 官网：www.zcloudchina.com
+ */
+public interface KeyprojectCheckMapper {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	void save(PageData pd);
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	void delete(PageData pd);
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	void edit(PageData pd);
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> datalistPage(Page page);
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAll(PageData pd);
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	PageData findById(PageData pd);
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	void deleteAll(String[] ArrayDATA_IDS);
+
+}
+
diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java
new file mode 100644
index 0000000..9fa7b3b
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java
@@ -0,0 +1,162 @@
+package com.zcloud.mapper.datasource.keyProjects;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：隐患表
+ * 作者：shaojie
+ * 时间：2021-03-15
+ * 官网：www.qdkjchina.com
+ */
+public interface KeyprojectHiddenMapper {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	void save(PageData pd);
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	void delete(PageData pd);
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	void edit(PageData pd);
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> datalistPage(Page page);
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAll(PageData pd);
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	PageData findById(PageData pd);
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	void deleteAll(String[] ArrayDATA_IDS);
+
+	/**上报隐患统计
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> reportedChart(PageData pd);
+
+	/**隐患统计（折线图）
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> lineChart(PageData pd);
+
+	List<PageData> majorlistPage(Page page);
+
+	List<PageData> mainStatistics(PageData pd);
+
+
+	PageData yhpcCountForApp (PageData pd);
+
+    /**清单其他隐患
+     * @param pd
+     * @throws Exception
+     */
+    List<PageData> getOtherHidden(PageData pd);
+
+    List<PageData> getListForApplistPage (Page page);
+
+
+	/**隐患导出EXCEL（企业隐患管理使用）
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listExcelHidden(PageData pd);
+
+	/**一般隐患
+	 * @param page
+	 * @throws Exception
+	 */
+    List<PageData> generalHiddenlistPage(Page page);
+
+	/**忽略隐患
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> ignoreHiddenlistPage(Page page);
+
+	/**重大隐患
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> majorhiddenlistPage(Page page);
+
+	/**通过部门ID查询特殊隐患列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> specialByIdlistPage(Page page);
+
+	void editstate(PageData pd);
+
+    List<PageData> verifydatalistPage(Page page);
+
+	/**
+	 * 港股分公司安委会办公室验收列表 -- 港务局
+	 * @param page
+	 * @return
+	 * @throws Exception
+	 */
+    List<PageData> checkandacceptdatalistPage(Page page);
+
+	/**
+	 * 获取安全环保检查下的隐患列表
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+    List<PageData> listAllInspection(PageData pd);
+
+	/**
+	 * 安全环保检查流程归档更新隐患状态为暂存
+	 * @param pd
+	 */
+	void editStateInspection(PageData pd);
+
+    List<PageData> hiddenInspectionlistPage(Page page);
+
+    void finalcheck(PageData pd);
+
+	List<PageData> listOtherNotAccept(PageData pd);
+
+	void changeState(PageData pd);
+
+    void deleteByKey(PageData key);
+
+    PageData keyprojectcount(PageData pd);
+
+
+	/**重点工程处罚列表 包含 未选择处罚结果的隐患  已下发处罚但为反馈的隐患 不处罚的隐患
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> getpunishlistPage(Page page);
+
+}
+
diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectPunishMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectPunishMapper.java
new file mode 100644
index 0000000..8c8d4ba
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectPunishMapper.java
@@ -0,0 +1,66 @@
+package com.zcloud.mapper.datasource.keyProjects;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程处罚
+ * 作者：luoxiaobao
+ * 时间：2022-09-21
+ * 官网：www.zcloudchina.com
+ */
+public interface KeyprojectPunishMapper {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	void save(PageData pd);
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	void delete(PageData pd);
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	void edit(PageData pd);
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> datalistPage(Page page);
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAll(PageData pd);
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	PageData findById(PageData pd);
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	void deleteAll(String[] ArrayDATA_IDS);
+
+    void editstate(PageData pd);
+	/**
+	 * 根据添加人查询罚单
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> findByOperator(PageData pd);
+}
+
diff --git a/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java
index beab38d..5d1d664 100644
--- a/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java
@@ -63,5 +63,6 @@ public interface PersonnelManagementMapper{
 	 */
 	PageData findByCertificate(PageData pd);
 
+	void editPassword(PageData pd);
 }
 
diff --git a/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckInfoService.java b/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckInfoService.java
new file mode 100644
index 0000000..e222144
--- /dev/null
+++ b/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckInfoService.java
@@ -0,0 +1,59 @@
+package com.zcloud.service.keyProjects;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程检查内容
+ * 作者：luoxiaobao
+ * 时间：2022-09-19
+ * 官网：www.zcloudchina.com
+ */
+public interface KeyprojectCheckInfoService{
+
+	/**新增
+	 * @param pd
+	 * @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;
+
+}
+
diff --git a/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckService.java b/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckService.java
new file mode 100644
index 0000000..f27baa8
--- /dev/null
+++ b/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckService.java
@@ -0,0 +1,59 @@
+package com.zcloud.service.keyProjects;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程检查
+ * 作者：luoxiaobao
+ * 时间：2022-09-19
+ * 官网：www.zcloudchina.com
+ */
+public interface KeyprojectCheckService{
+
+	/**新增
+	 * @param pd
+	 * @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;
+
+}
+
diff --git a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java
new file mode 100644
index 0000000..954c4e8
--- /dev/null
+++ b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java
@@ -0,0 +1,184 @@
+package com.zcloud.service.keyProjects;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：隐患表
+ * 作者：shaojie
+ * 时间：2021-03-15
+ * 官网：www.qdkjchina.com
+ */
+public interface KeyprojectHiddenService {
+
+	/**新增
+	 * @param pd
+	 * @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 pd
+	 * @throws Exception
+	 */
+	public void editstate(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;
+
+	/**上报隐患统计
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> reportedChart(PageData pd)throws Exception;
+
+	/**隐患统计（折线图）
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> lineChart(PageData pd)throws Exception;
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception;
+
+	/**通过部门id获取特殊隐患数据
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> specialByCorpInfoId(Page page)throws Exception;
+
+
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
+
+	public List<PageData> majorList(Page page)throws Exception;
+
+/*
+	public List<PageData> majorlHiddenlistPage(Page page)throws Exception;
+*/
+
+	public PageData yhpcCountForApp(PageData pd) throws Exception;
+    /**
+     * 清单其他隐患
+     * @param pd
+     * @return
+     * @throws Exception
+     */
+    public 	List<PageData> getOtherHidden(PageData pd) throws Exception;
+
+    public List<PageData> getListForApp(Page page) throws Exception;
+
+
+	public List<PageData> mainStatistics(PageData pd) throws Exception;
+
+    public List<PageData> mainStatisticsForApp(PageData pd) throws Exception;
+
+	/**隐患导出EXCEL（企业隐患管理使用）
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listExcelHidden(PageData pd)throws Exception;
+
+	/**一般隐患查询列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> generalHiddenlistPage(Page page)throws Exception;
+
+	/**忽略隐患查询列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> ignoreHiddenlistPage(Page page)throws Exception;
+
+	/**
+	 * 重大隐患核实列表 -- 港务局
+	 * @param page
+	 * @return
+	 * @throws Exception
+	 */
+    List<PageData> verifylist(Page page) throws  Exception;
+
+	/**
+	 * 获取安全环保检查下的隐患列表
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> listAllInspection(PageData pd)throws Exception;
+
+	/**
+	 * 安全环保检查流程归档更新隐患状态为暂存
+	 * @param pd
+	 */
+	void editStateInspection(PageData pd)throws Exception;
+
+	/**
+	 * 港股分公司安委会办公室验收列表 -- 港务局
+	 * @param page
+	 * @return
+	 * @throws Exception
+	 */
+    List<PageData> checkandaccept(Page page) throws Exception;
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> listForSafetyEnvironmental(Page page)throws Exception;
+
+	public void finalcheck(PageData pd)throws Exception;
+
+	/**
+	 * 获取其他没有验收的隐患
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	List<PageData> listOtherNotAccept(PageData pd)throws Exception;
+
+	void changeState(PageData hidden) throws Exception;
+
+    void deleteByKey(PageData key) throws Exception;
+
+	/**
+	 * 手机端统计重点工程待处理信息
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public PageData keyprojectcount(PageData pd)throws Exception;
+
+	List<PageData> getpunishlist(Page page);
+}
+
diff --git a/src/main/java/com/zcloud/service/keyProjects/KeyprojectPunishService.java b/src/main/java/com/zcloud/service/keyProjects/KeyprojectPunishService.java
new file mode 100644
index 0000000..df99caa
--- /dev/null
+++ b/src/main/java/com/zcloud/service/keyProjects/KeyprojectPunishService.java
@@ -0,0 +1,66 @@
+package com.zcloud.service.keyProjects;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程处罚
+ * 作者：luoxiaobao
+ * 时间：2022-09-21
+ * 官网：www.zcloudchina.com
+ */
+public interface KeyprojectPunishService {
+
+	/**新增
+	 * @param pd
+	 * @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;
+
+	public  void editstate(PageData pd)throws Exception;
+	/**
+	 * 根据添加人查询罚单
+	 * @param pd
+	 * @return
+	 */
+	public  List<PageData> findByOperator(PageData pd)throws Exception;
+}
+
diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckInfoServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckInfoServiceImpl.java
new file mode 100644
index 0000000..3c77661
--- /dev/null
+++ b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckInfoServiceImpl.java
@@ -0,0 +1,83 @@
+package com.zcloud.service.keyProjects.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.keyProjects.KeyprojectCheckInfoMapper;
+import com.zcloud.service.keyProjects.KeyprojectCheckInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程检查内容
+ * 作者：luoxiaobao
+ * 时间：2022-09-19
+ * 官网：www.zcloudchina.com
+ */
+@Service
+@Transactional //开启事物
+public class KeyprojectCheckInfoServiceImpl implements KeyprojectCheckInfoService {
+
+	@Autowired
+	private KeyprojectCheckInfoMapper keyprojectcheckinfoMapper;
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		keyprojectcheckinfoMapper.save(pd);
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		keyprojectcheckinfoMapper.delete(pd);
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		keyprojectcheckinfoMapper.edit(pd);
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception{
+		return keyprojectcheckinfoMapper.datalistPage(page);
+	}
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return keyprojectcheckinfoMapper.listAll(pd);
+	}
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return keyprojectcheckinfoMapper.findById(pd);
+	}
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		keyprojectcheckinfoMapper.deleteAll(ArrayDATA_IDS);
+	}
+
+}
+
diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckServiceImpl.java
new file mode 100644
index 0000000..223eee6
--- /dev/null
+++ b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckServiceImpl.java
@@ -0,0 +1,83 @@
+package com.zcloud.service.keyProjects.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.keyProjects.KeyprojectCheckMapper;
+import com.zcloud.service.keyProjects.KeyprojectCheckService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程检查
+ * 作者：luoxiaobao
+ * 时间：2022-09-19
+ * 官网：www.zcloudchina.com
+ */
+@Service
+@Transactional //开启事物
+public class KeyprojectCheckServiceImpl implements KeyprojectCheckService {
+
+	@Autowired
+	private KeyprojectCheckMapper keyprojectcheckMapper;
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		keyprojectcheckMapper.save(pd);
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		keyprojectcheckMapper.delete(pd);
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		keyprojectcheckMapper.edit(pd);
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception{
+		return keyprojectcheckMapper.datalistPage(page);
+	}
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return keyprojectcheckMapper.listAll(pd);
+	}
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return keyprojectcheckMapper.findById(pd);
+	}
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		keyprojectcheckMapper.deleteAll(ArrayDATA_IDS);
+	}
+
+}
+
diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java
new file mode 100644
index 0000000..6d10025
--- /dev/null
+++ b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java
@@ -0,0 +1,253 @@
+package com.zcloud.service.keyProjects.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.keyProjects.KeyprojectHiddenMapper;
+import com.zcloud.mapper.datasource.keyProjects.KeyprojectPunishMapper;
+import com.zcloud.service.keyProjects.KeyprojectHiddenService;
+import com.zcloud.service.system.ImgFilesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 说明：隐患表
+ */
+@Service
+@Transactional //开启事物
+public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService {
+
+	@Autowired
+	private KeyprojectHiddenMapper hiddenMapper;
+	@Autowired
+	private ImgFilesService imgFilesService;
+	@Autowired
+	private KeyprojectPunishMapper keyprojectpunishMapper;
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		hiddenMapper.save(pd);
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		hiddenMapper.delete(pd);
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		hiddenMapper.edit(pd);
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void editstate(PageData pd)throws Exception{
+		hiddenMapper.editstate(pd);
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception{
+		return hiddenMapper.datalistPage(page);
+	}
+
+	public List<PageData> majorList(Page page)throws Exception{
+		return hiddenMapper.majorlistPage(page);
+	}
+
+	/*@Override
+	public List<PageData> majorlHiddenlistPage(Page page) throws Exception {
+		return null;
+	}*/
+
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return hiddenMapper.listAll(pd);
+	}
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return hiddenMapper.findById(pd);
+	}
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		hiddenMapper.deleteAll(ArrayDATA_IDS);
+	}
+
+	/**通过id获取数据
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> specialByCorpInfoId(Page page)throws Exception{
+		return hiddenMapper.specialByIdlistPage(page);
+	}
+
+	/**上报隐患统计
+	 * @throws Exception
+	 */
+	@Override
+	public List<PageData> reportedChart(PageData pd) throws Exception {
+		return hiddenMapper.reportedChart(pd);
+	}
+
+	/**隐患统计（折线图）
+	 * @throws Exception
+	 */
+	@Override
+	public List<PageData> lineChart(PageData pd) throws Exception {
+		return hiddenMapper.lineChart(pd);
+	}
+    @Override
+    public PageData yhpcCountForApp(PageData pd) throws Exception{
+        return hiddenMapper.yhpcCountForApp(pd);
+    }
+    /**
+     * 清单其他隐患
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<PageData> getOtherHidden(PageData pd) throws Exception {
+        return hiddenMapper.getOtherHidden(pd);
+    }
+    public List<PageData> getListForApp (Page page) throws Exception{
+        return hiddenMapper.getListForApplistPage(page);
+    }
+  public List<PageData> mainStatistics(PageData pd) throws Exception{
+		return hiddenMapper.mainStatistics(pd);
+    }
+    public List<PageData> mainStatisticsForApp(PageData pd) throws Exception{
+        return hiddenMapper.mainStatistics(pd);
+    }
+
+
+	/**隐患导出EXCEL（企业隐患管理使用）
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listExcelHidden(PageData pd)throws Exception{
+		return hiddenMapper.listExcelHidden(pd);
+	}
+
+	@Override
+	public List<PageData> generalHiddenlistPage(Page page) throws Exception {
+		return hiddenMapper.generalHiddenlistPage(page);
+	}
+
+	@Override
+	public List<PageData> ignoreHiddenlistPage(Page page) throws Exception {
+		return hiddenMapper.ignoreHiddenlistPage(page);
+	}
+
+	@Override
+	public List<PageData> verifylist(Page page) throws Exception {
+		return hiddenMapper.verifydatalistPage(page);
+	}
+
+	@Override
+	public List<PageData> checkandaccept(Page page) throws Exception {
+		return hiddenMapper.checkandacceptdatalistPage(page);
+	}
+
+
+
+	@Override
+	public List<PageData> listAllInspection(PageData pd) throws Exception {
+		List<PageData> hiddenList = hiddenMapper.listAllInspection(pd);
+		for (PageData hd : hiddenList) {
+			PageData pd2 = new PageData();
+			pd2.put("FOREIGN_KEY",hd.getString("HIDDEN_ID"));
+			pd2.put("TYPE",3);	//隐患图片
+			hd.put("hiddenImgs", imgFilesService.listAll(pd2));
+			if(imgFilesService.listAll(pd2).size()==0){
+				pd2.put("TYPE",114);	//AI隐患图片
+				hd.put("hiddenImgs", imgFilesService.listAll(pd2));
+			}
+			pd2.put("TYPE",102);	//隐患视频
+			hd.put("hiddenVideos", imgFilesService.listAll(pd2));
+			pd2.put("TYPE",4);
+			hd.put("zgImgs", imgFilesService.listAll(pd2));//整改图片
+			pd2.put("TYPE",5);
+			hd.put("ysImgs", imgFilesService.listAll(pd2));//整改图片
+
+			PageData findTicketData = new PageData();
+			findTicketData.put("HIDDEN_ID",hd.getString("HIDDEN_ID"));
+			hd.put("punishForm",keyprojectpunishMapper.findById(findTicketData));
+		}
+		return hiddenList;
+	}
+
+	@Override
+	public void editStateInspection(PageData pd) throws Exception {
+		hiddenMapper.editStateInspection(pd);
+	}
+
+	@Override
+	public List<PageData> listForSafetyEnvironmental(Page page) throws Exception {
+		return hiddenMapper.hiddenInspectionlistPage(page);
+	}
+
+	/**安全环保检查验收
+	 * @param pd
+	 * @throws Exception
+	 */
+	@Override
+	public void finalcheck(PageData pd)throws Exception{
+		hiddenMapper.finalcheck(pd);
+	}
+
+	@Override
+	public List<PageData> listOtherNotAccept(PageData pd) throws Exception {
+		return hiddenMapper.listOtherNotAccept(pd);
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void changeState(PageData pd)throws Exception{
+		hiddenMapper.changeState(pd);
+	}
+
+	@Override
+	public void deleteByKey(PageData key) throws Exception {
+		hiddenMapper.deleteByKey(key);
+	}
+
+	@Override
+	public PageData keyprojectcount(PageData pd) throws Exception {
+	  return hiddenMapper.keyprojectcount(pd);
+	}
+
+	@Override
+	public List<PageData> getpunishlist(Page page) {
+		return hiddenMapper.getpunishlistPage(page);
+	}
+}
+
diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectPunishServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectPunishServiceImpl.java
new file mode 100644
index 0000000..4f075e8
--- /dev/null
+++ b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectPunishServiceImpl.java
@@ -0,0 +1,95 @@
+package com.zcloud.service.keyProjects.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.keyProjects.KeyprojectPunishMapper;
+import com.zcloud.service.keyProjects.KeyprojectPunishService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程处罚
+ * 作者：luoxiaobao
+ * 时间：2022-09-21
+ * 官网：www.zcloudchina.com
+ */
+@Service
+@Transactional //开启事物
+public class KeyprojectPunishServiceImpl implements KeyprojectPunishService {
+
+	@Autowired
+	private KeyprojectPunishMapper keyprojectpunishMapper;
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		keyprojectpunishMapper.save(pd);
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		keyprojectpunishMapper.delete(pd);
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		keyprojectpunishMapper.edit(pd);
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception{
+		return keyprojectpunishMapper.datalistPage(page);
+	}
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return keyprojectpunishMapper.listAll(pd);
+	}
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return keyprojectpunishMapper.findById(pd);
+	}
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		keyprojectpunishMapper.deleteAll(ArrayDATA_IDS);
+	}
+
+
+	public  void editstate(PageData pd)throws Exception{
+		keyprojectpunishMapper.editstate(pd);
+	}
+	/**
+	 * 根据添加人查询罚单
+	 * @param pd
+	 * @return
+	 */
+	public List<PageData> findByOperator(PageData pd)throws Exception{
+		return keyprojectpunishMapper.findByOperator(pd);
+	}
+}
+
diff --git a/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java b/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java
index deacbfc..e425a1c 100644
--- a/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java
+++ b/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java
@@ -63,5 +63,7 @@ public interface PersonnelManagementService{
 	 */
 	public PageData findByCertificate(PageData pd)throws Exception;
 
+    void editPassword(PageData updateUser) throws Exception;
+
 }
 
diff --git a/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java b/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java
index 2fb212f..10eae8e 100644
--- a/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java
+++ b/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java
@@ -4,6 +4,8 @@ import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.mapper.datasource.specialoperation.PersonnelManagementMapper;
 import com.zcloud.service.specialoperation.PersonnelManagementService;
+import com.zcloud.util.Jurisdiction;
+import com.zcloud.util.Tools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -91,5 +93,13 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic
 		return personnelmanagementMapper.findByCertificate(pd);
 	}
 
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void editPassword(PageData pd) throws Exception {
+		personnelmanagementMapper.editPassword(pd);
+	}
+
 }
 
diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java
index 6ac3c54..c2472db 100644
--- a/src/main/java/com/zcloud/util/Const.java
+++ b/src/main/java/com/zcloud/util/Const.java
@@ -47,6 +47,7 @@ public class Const {
 	public static final String IS_MAIN = "IS_MAIN";						//是否主账号
 	public static final String ISSUPERVISE = "ISSUPERVISE";						//是否监管部门
 	public static final String VIPLEVEL = "VIPLEVEL";						//企业会员等级
+	public static final String DEFAULT_PASSWORD = "Aa@123456789";						//系统默认密码
 
 	public static final String FILEURL = "/mnt/qyag/file/";				//文件服务器地址
 	public static final String HTTPFILEURL = "https://file.zcloudchina.com/YTHFile";						//文件服务器地址
diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckInfoMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckInfoMapper.xml
new file mode 100644
index 0000000..6a2f3f6
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckInfoMapper.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.keyProjects.KeyprojectCheckInfoMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		BUS_KEYPROJECTCHECKINFO
+	</sql>
+
+	<!--数据字典表名 -->
+	<sql id="dicTableName">
+		SYS_DICTIONARIES
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.ISDELETE,
+		f.KEYPROJECTCHECK_ID,
+		f.SITUATION,
+		f.KEYPROJECTCHECKINFO_ID
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		CREATOR,
+		CREATTIME,
+		OPERATOR,
+		OPERATTIME,
+		ISDELETE,
+		KEYPROJECTCHECK_ID,
+		SITUATION,
+		KEYPROJECTCHECKINFO_ID
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{CREATOR},
+		#{CREATTIME},
+		#{OPERATOR},
+		#{OPERATTIME},
+		#{ISDELETE},
+		#{KEYPROJECTCHECK_ID},
+		#{SITUATION},
+		#{KEYPROJECTCHECKINFO_ID}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			KEYPROJECTCHECKINFO_ID = #{KEYPROJECTCHECKINFO_ID}
+	</delete>
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			CREATOR = #{CREATOR},
+			CREATTIME = #{CREATTIME},
+			OPERATOR = #{OPERATOR},
+			OPERATTIME = #{OPERATTIME},
+			ISDELETE = #{ISDELETE},
+			KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID},
+			SITUATION = #{SITUATION},
+			KEYPROJECTCHECKINFO_ID = KEYPROJECTCHECKINFO_ID
+		where
+			KEYPROJECTCHECKINFO_ID = #{KEYPROJECTCHECKINFO_ID}
+	</update>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+			f.KEYPROJECTCHECKINFO_ID = #{KEYPROJECTCHECKINFO_ID}
+	</select>
+
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+				(
+				<!--	根据需求自己加检索条件
+					字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+					 or
+					字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+				-->
+				)
+		</if>
+	</select>
+
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where 1=1
+		<if test="KEYPROJECTCHECK_ID != null and KEYPROJECTCHECK_ID != ''">
+			and f.KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID}
+		</if>
+	</select>
+
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			KEYPROJECTCHECKINFO_ID in
+		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml
new file mode 100644
index 0000000..a4295d2
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.keyProjects.KeyprojectCheckMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		BUS_KEYPROJECTCHECK
+	</sql>
+
+	<!--数据字典表名 -->
+	<sql id="dicTableName">
+		SYS_DICTIONARIES
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.CORPINFO_ID,
+		f.ISDELETE,
+		f.SOURCE,
+		f.OUTSOURCED_ID,
+		f.UNITS_ID,
+		f.PERSONNELMANAGEMENT_ID,
+		f.PERSON_SIGN_IMG,
+		f.PERSON_SIGN_TIME,
+		f.INSPECTION_TYPE,
+		f.INSPECTION_PLACE,
+		f.INSPECTION_TIME_START,
+		f.INSPECTION_TIME_END,
+		f.INSPECTION_USERS,
+		f.INSPECTION_STATUS,
+		f.INSPECTION_CATEGORY,
+		f.KEYPROJECTCHECK_ID
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		CREATOR,
+		CREATTIME,
+		OPERATOR,
+		OPERATTIME,
+		CORPINFO_ID,
+		ISDELETE,
+		SOURCE,
+		OUTSOURCED_ID,
+		UNITS_ID,
+		PERSONNELMANAGEMENT_ID,
+		PERSON_SIGN_IMG,
+		PERSON_SIGN_TIME,
+		INSPECTION_TYPE,
+		INSPECTION_PLACE,
+		INSPECTION_TIME_START,
+		INSPECTION_TIME_END,
+		INSPECTION_USERS,
+		INSPECTION_STATUS,
+		INSPECTION_CATEGORY,
+		KEYPROJECTCHECK_ID
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{CREATOR},
+		#{CREATTIME},
+		#{OPERATOR},
+		#{OPERATTIME},
+		#{CORPINFO_ID},
+		#{ISDELETE},
+		#{SOURCE},
+		#{OUTSOURCED_ID},
+		#{UNITS_ID},
+		#{PERSONNELMANAGEMENT_ID},
+		#{PERSON_SIGN_IMG},
+		#{PERSON_SIGN_TIME},
+		#{INSPECTION_TYPE},
+		#{INSPECTION_PLACE},
+		#{INSPECTION_TIME_START},
+		#{INSPECTION_TIME_END},
+		#{INSPECTION_USERS},
+		#{INSPECTION_STATUS},
+		#{INSPECTION_CATEGORY},
+		#{KEYPROJECTCHECK_ID}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID}
+	</delete>
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			CREATOR = #{CREATOR},
+			CREATTIME = #{CREATTIME},
+			OPERATOR = #{OPERATOR},
+			OPERATTIME = #{OPERATTIME},
+			CORPINFO_ID = #{CORPINFO_ID},
+			ISDELETE = #{ISDELETE},
+			SOURCE = #{SOURCE},
+			OUTSOURCED_ID = #{OUTSOURCED_ID},
+			UNITS_ID = #{UNITS_ID},
+			PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID},
+			PERSON_SIGN_IMG = #{PERSON_SIGN_IMG},
+			PERSON_SIGN_TIME = #{PERSON_SIGN_TIME},
+			INSPECTION_TYPE = #{INSPECTION_TYPE},
+			INSPECTION_PLACE = #{INSPECTION_PLACE},
+			INSPECTION_TIME_START = #{INSPECTION_TIME_START},
+			INSPECTION_TIME_END = #{INSPECTION_TIME_END},
+			INSPECTION_USERS = #{INSPECTION_USERS},
+			INSPECTION_STATUS = #{INSPECTION_STATUS},
+			INSPECTION_CATEGORY = #{INSPECTION_CATEGORY},
+			KEYPROJECTCHECK_ID = KEYPROJECTCHECK_ID
+		where
+			KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID}
+	</update>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>,
+		o.OUTSOURCED_NAME,
+		u.UNITS_NAME,
+		p.NAME as PERSON_NAME,
+		d.NAME as INSPECTION_TYPE_NAME
+		from
+		<include refid="tableName"></include> f
+		left join BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
+		left join BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
+		left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
+		LEFT JOIN SYS_DICTIONARIES d on d.BIANMA = f.INSPECTION_TYPE
+		where
+			f.KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID}
+	</select>
+
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>,
+		o.OUTSOURCED_NAME,
+		u.UNITS_NAME,
+		p.NAME as PERSON_NAME,
+		d.NAME as INSPECTION_TYPE_NAME,
+		(select count(1) from BUS_KEYPROJECT_HIDDEN h where h.FOREIGN_ID = f.KEYPROJECTCHECK_ID) as HIDDEN_COUNT
+		from
+		<include refid="tableName"></include> f
+		left join BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
+		left join BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
+		left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
+		left join SYS_DICTIONARIES d on d.BIANMA = f.INSPECTION_TYPE
+		where f.ISDELETE = '0'
+		<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''">
+			and f.OUTSOURCED_ID = #{pd.OUTSOURCED_ID}
+		</if>
+		<if test="pd.PERSONNELMANAGEMENT_ID != null and pd.PERSONNELMANAGEMENT_ID != ''">
+			and f.PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}
+		</if>
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+			(
+			<!--	根据需求自己加检索条件-->
+			f.INSPECTION_PLACE LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			)
+		</if>
+		order by f.CREATTIME desc
+	</select>
+
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+	</select>
+
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			KEYPROJECTCHECK_ID in
+		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
new file mode 100644
index 0000000..8e9f26d
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
@@ -0,0 +1,1600 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.keyProjects.KeyprojectHiddenMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		BUS_KEYPROJECT_HIDDEN
+	</sql>
+
+	<!--数据字典表名 -->
+	<sql id="dicTableName">
+		sys_dictionaries
+	</sql>
+	<!-- 字段 -->
+	<sql id="Field">
+		f.SOURCE,
+		f.RISK_UNIT,
+		f.IDENTIFICATION,
+		f.RISK_DESCR,
+		f.RISK_POSITION,
+		f.LEVEL,
+		f.CHECK_CONTENT,
+		f.HIDDENDESCR,
+		f.HIDDENPART,
+		f.CREATOR,
+		f.CREATTIME,
+		f.RECTIFYDESCR,
+		f.RECTIFICATIONTYPE,
+		f.RECTIFICATIONOR,
+		f.RECTIFICATIONTIME,
+		f.HIDDENLEVEL,
+		f.STATE,
+		f.CHECKDEPT,
+		f.CHECKOR,
+		f.CHECKTIME,
+		f.CHECKDESCR,
+		f.ISQUALIFIED,
+		f.ISDELETE,
+		f.CORPINFO_ID,
+		f.HIDDENFINDDEPT,
+		f.RECTIFICATIONDEADLINE,
+		f.RECTIFICATIONDEPT,
+		f.HIDDEN_ID,
+		f.CHECKRECORD_ID,
+		f.RECORDITEM_ID,
+		f.RISKITEM_ID,
+		f.REVIEWOR,
+		f.REVIEWTIME,
+		f.REVIEWDEPT,
+		f.LONGITUDE,
+		f.LATITUDE,
+		f.HAVESCHEME,
+		f.HIDDENTYPE,
+		f.ISCONFIRM,
+		f.CONFIRM_USER,
+		f.DISCOVERYTIME,
+		f.CONFIRM_TIME,
+		f.HIDDENTYPE2,
+		f.INVESTMENT_FUNDS,
+		f.LISTMANAGER_ID,
+		f.FOREIGN_ID,
+		f.FINAL_CHECK,
+		f.FINAL_CHECKOR,
+		f.FINAL_CHECKTIME,
+		f.FINAL_CHECKDESCR,
+		f.ISRELEVANT,
+		f.ISPUNISH,
+		f.POSITIONDESC
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		ISPUNISH,
+        ISRELEVANT,
+		SOURCE,
+		RISK_UNIT,
+		IDENTIFICATION,
+		RISK_DESCR,
+		RISK_POSITION,
+		LEVEL,
+		CHECK_CONTENT,
+		HIDDENDESCR,
+		HIDDENPART,
+		CREATOR,
+		CREATTIME,
+		RECTIFYDESCR,
+		RECTIFICATIONTYPE,
+		RECTIFICATIONOR,
+		RECTIFICATIONTIME,
+		HIDDENLEVEL,
+		STATE,
+		CHECKDEPT,
+		CHECKOR,
+		CHECKTIME,
+		CHECKDESCR,
+		ISQUALIFIED,
+		ISDELETE,
+		CORPINFO_ID,
+		HIDDENFINDDEPT,
+		RECTIFICATIONDEADLINE,
+		RECTIFICATIONDEPT,
+		HIDDEN_ID,
+		CHECKRECORD_ID,
+		RECORDITEM_ID,
+		RISKITEM_ID,
+		REVIEWOR,
+		REVIEWTIME,
+		REVIEWDEPT,
+		LONGITUDE,
+		LATITUDE,
+		HAVESCHEME,
+		HIDDENTYPE,
+		ISCONFIRM,
+		CONFIRM_USER,
+		DISCOVERYTIME,
+		HIDDENTYPE2,
+		INVESTMENT_FUNDS,
+		LISTMANAGER_ID,
+		FOREIGN_ID,
+		FINAL_CHECK,
+		FINAL_CHECKOR,
+		FINAL_CHECKTIME,
+		FINAL_CHECKDESCR,
+		POSITIONDESC
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{ISPUNISH},
+		#{ISRELEVANT},
+		#{SOURCE},
+		#{RISK_UNIT},
+		#{IDENTIFICATION},
+		#{RISK_DESCR},
+		#{RISK_POSITION},
+		#{LEVEL},
+		#{CHECK_CONTENT},
+		#{HIDDENDESCR},
+		#{HIDDENPART},
+		#{CREATOR},
+		#{CREATTIME},
+		#{RECTIFYDESCR},
+		#{RECTIFICATIONTYPE},
+		#{RECTIFICATIONOR},
+		#{RECTIFICATIONTIME},
+		#{HIDDENLEVEL},
+		#{STATE},
+		#{CHECKDEPT},
+		#{CHECKOR},
+		#{CHECKTIME},
+		#{CHECKDESCR},
+		#{ISQUALIFIED},
+		#{ISDELETE},
+		#{CORPINFO_ID},
+		#{HIDDENFINDDEPT},
+		#{RECTIFICATIONDEADLINE},
+		#{RECTIFICATIONDEPT},
+		#{HIDDEN_ID},
+		#{CHECKRECORD_ID},
+		#{RECORDITEM_ID},
+		#{RISKITEM_ID},
+		#{REVIEWOR},
+		#{REVIEWTIME},
+		#{REVIEWDEPT},
+		#{LONGITUDE},
+		#{LATITUDE},
+		#{HAVESCHEME},
+		#{HIDDENTYPE},
+		#{ISCONFIRM},
+		#{CONFIRM_USER},
+		#{DISCOVERYTIME},
+		#{HIDDENTYPE2},
+		#{INVESTMENT_FUNDS},
+		#{LISTMANAGER_ID},
+		#{FOREIGN_ID},
+		#{FINAL_CHECK},
+		#{FINAL_CHECKOR},
+		#{FINAL_CHECKTIME},
+		#{FINAL_CHECKDESCR},
+		#{POSITIONDESC}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		delete from
+		<include refid="tableName"></include>
+		where
+			HIDDEN_ID = #{HIDDEN_ID}
+	</delete>
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ISPUNISH = #{ISPUNISH},
+		    ISRELEVANT = #{ISRELEVANT},
+			SOURCE = #{SOURCE},
+			RISK_UNIT = #{RISK_UNIT},
+			IDENTIFICATION = #{IDENTIFICATION},
+			RISK_DESCR = #{RISK_DESCR},
+			RISK_POSITION = #{RISK_POSITION},
+			LEVEL = #{LEVEL},
+			CHECK_CONTENT = #{CHECK_CONTENT},
+			HIDDENDESCR = #{HIDDENDESCR},
+			HIDDENPART = #{HIDDENPART},
+			RECTIFYDESCR = #{RECTIFYDESCR},
+			RECTIFICATIONTYPE = #{RECTIFICATIONTYPE},
+			RECTIFICATIONDEPT = #{RECTIFICATIONDEPT},
+			RECTIFICATIONOR = #{RECTIFICATIONOR},
+			RECTIFICATIONTIME = #{RECTIFICATIONTIME},
+			HIDDENLEVEL = #{HIDDENLEVEL},
+			STATE = #{STATE},
+			CHECKDEPT = #{CHECKDEPT},
+			CHECKOR = #{CHECKOR},
+			CHECKDESCR = #{CHECKDESCR},
+			ISQUALIFIED = #{ISQUALIFIED},
+			ISDELETE = #{ISDELETE},
+			CORPINFO_ID = #{CORPINFO_ID},
+			HIDDENFINDDEPT = #{HIDDENFINDDEPT},
+			CHECKRECORD_ID = #{CHECKRECORD_ID},
+			RECORDITEM_ID = #{RECORDITEM_ID},
+			RISKITEM_ID = #{RISKITEM_ID},
+			REJECTREASON = #{REJECTREASON},
+			REVIEWOR = #{REVIEWOR},
+			REVIEWTIME = #{REVIEWTIME},
+			REVIEWDEPT = #{REVIEWDEPT},
+			HAVESCHEME = #{HAVESCHEME},
+			LONGITUDE = #{LONGITUDE},
+			LATITUDE = #{LATITUDE},
+			HIDDEN_ID = HIDDEN_ID
+		where
+			HIDDEN_ID = #{HIDDEN_ID}
+	</update>
+
+	<!-- 只用与修改隐患状态 -->
+	<update id="editstate" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="STATE != null and STATE != ''">
+				STATE = #{STATE},
+			</if>
+			<if test="RECTIFICATIONTIME != null and RECTIFICATIONTIME != ''">
+				RECTIFICATIONTIME = #{RECTIFICATIONTIME},
+			</if>
+			<if test="RECTIFICATIONOR != null and RECTIFICATIONOR != ''">
+				RECTIFICATIONOR = #{RECTIFICATIONOR},
+			</if>
+			<if test="RECTIFICATIONDEPT != null and RECTIFICATIONDEPT != ''">
+				RECTIFICATIONDEPT = #{RECTIFICATIONDEPT},
+			</if>
+			<if test="CHECKOR != null and CHECKOR != ''">
+				CHECKOR = #{CHECKOR},
+			</if>
+			<if test="ISPUNISH != null and ISPUNISH != ''">
+				ISPUNISH = #{ISPUNISH},
+			</if>
+			<if test="PUNISH_PERSON != null and PUNISH_PERSON != ''">
+				PUNISH_PERSON = #{PUNISH_PERSON},
+			</if>
+			<if test="HIDDENLEVEL != null and HIDDENLEVEL != ''">
+				HIDDENLEVEL = #{HIDDENLEVEL},
+			</if>
+			<if test="CHECKTIME != null and CHECKTIME != ''">
+				CHECKTIME = #{CHECKTIME},
+			</if>
+		</trim>
+		where
+		HIDDEN_ID = #{HIDDEN_ID}
+	</update>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		f.*,
+		hr.HIDDENREGION HIDDENPART_NAME,
+		lv.NAME HIDDENLEVEL_NAME,
+		ht.NAME HIDDENTYPE_NAME,
+		ht2.NAME HIDDENTYPE2_NAME,
+		crd.NAME HIDDENFINDDEPT_NAME,
+		cr.NAME CREATOR_NAME,
+		u.UNITS_NAME as RECTIFICATIONDEPT_NAME,
+		p.NAME as RECTIFICATIONOR_NAME
+		from
+		<include refid="tableName"></include> f
+		left join bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
+		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+		left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
+		left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
+		left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		left join vi_user_all cr on cr.USER_ID = f.CREATOR
+		left join BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
+		left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
+		where
+		f.HIDDEN_ID = #{HIDDEN_ID}
+	</select>
+
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		f.*,
+		hr.HIDDENREGION HIDDENPART_NAME,
+		lv.NAME HIDDENLEVEL_NAME,
+		ht.NAME HIDDENTYPE_NAME,
+		ht2.NAME HIDDENTYPE2_NAME,
+		crd.NAME HIDDENFINDDEPT_NAME,
+		u.UNITS_NAME as RECTIFICATIONDEPT_NAME,
+		p.NAME as RECTIFICATIONOR_NAME,
+		bo.OUTSOURCED_NAME,
+		bod.OUTSOURCED_NAME AIOUTSOURCED_NAME,
+		pu.KEYPROJECTPUNISH_ID
+		from
+		<include refid="tableName"></include> f
+		LEFT JOIN BUS_KEYPROJECTCHECK ch ON ch.OUTSOURCED_ID = f.FOREIGN_ID or  f.FOREIGN_ID = ch.KEYPROJECTCHECK_ID
+		LEFT JOIN BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID <!-- 用于安全环保检查隐患的重点工程名称 -->
+		left join bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
+		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+		left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
+		left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
+		left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		left join BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
+		left join BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
+		LEFT JOIN BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID <!-- 用于AI隐患的重点工程名称 -->
+		left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
+		left join BUS_KEYPROJECTPUNISH pu on pu.HIDDEN_ID = f.HIDDEN_ID
+		<if test="pd.CREATOR != null and pd.CREATOR !=''" >
+		left join (
+		SELECT
+		f.HIDDEN_ID
+		FROM
+		BUS_KEYPROJECT_HIDDEN f
+		LEFT JOIN bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
+		LEFT JOIN BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
+		LEFT JOIN BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
+		WHERE
+		f.ISDELETE = '0'
+		AND f.SOURCE IN ( '4', '5', '1' )
+		AND f.STATE = '2'
+		AND f.CREATOR = #{pd.CREATOR}
+		AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
+		) t on t.HIDDEN_ID = f.HIDDEN_ID
+		</if>
+		where f.ISDELETE = '0'
+		<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''">
+			and bo.OUTSOURCED_ID = #{pd.OUTSOURCED_ID}
+           </if>
+           <if test="pd.ISRECTIFY != null and pd.ISRECTIFY !='' and pd.ISRECTIFY == 1" >
+               and f.STATE = 1
+           </if>
+           <if test="pd.ISRECTIFY != null and pd.ISRECTIFY !='' and pd.ISRECTIFY == 2" >
+               and f.STATE &gt; 1
+           </if>
+           <if test="pd.ISCHECK != null and pd.ISCHECK !='' and pd.ISCHECK == 2" >
+               and f.STATE = 4
+           </if>
+           <if test="pd.HIDDENLEVEL != null and pd.HIDDENLEVEL !=''" >
+               and f.HIDDENLEVEL = #{pd.HIDDENLEVEL}
+           </if>
+           <if test="pd.RECTIFICATIONOR != null and pd.RECTIFICATIONOR !=''" >
+               and f.RECTIFICATIONOR = #{pd.RECTIFICATIONOR}
+           </if>
+           <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+			(
+			<!--	根据需求自己加检索条件-->
+			f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			)
+		</if>
+		GROUP BY f.HIDDEN_ID
+		order by
+		<if test="pd.CREATOR != null and pd.CREATOR !=''" >
+		t.HIDDEN_ID desc,
+		</if>
+		f.CREATTIME  desc, f.STATE desc
+	</select>
+
+	<!-- 隐患导出EXCEL（企业隐患管理使用） -->
+	<select id="listExcelHidden" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>,
+		c.CORP_NAME,
+		type.NAME as TYPE_NAME,
+		city.NAME as CITY_NAME,
+		country.NAME as COUNTRY_NAME,
+		village.NAME as VILLAGE_NAME,
+		cr.NAME CREATORNAME,
+		re.NAME RECTIFICATIONORNAME,
+		ch.NAME CHECKORNAME,
+		rev.NAME REVIEWORNAME,
+		crd.NAME HIDDENFINDDEPTNAME,
+		red.NAME RECTIFICATIONDEPTNAME,
+		chd.NAME CHECKDEPTNAME,
+		lv.NAME HIDDENLEVELNAME,
+		(select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
+		from
+		<include refid="tableName"></include> f
+		left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
+		left join BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
+		left join sys_dictionaries city on city.BIANMA = c.CITY
+		left join sys_dictionaries country on country.BIANMA = c.COUNTRY
+		left join sys_dictionaries village on village.BIANMA = c.VILLAGE
+
+		left join sys_user cr on cr.USER_ID = f.CREATOR
+		left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
+		left join sys_user ch on ch.USER_ID = f.CHECKOR
+		left join sys_user rev on rev.USER_ID = f.REVIEWOR
+
+		left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
+		left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
+
+		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+		where f.ISDELETE = '0' and f.STATE != '0'
+		<if test="IDS != null and IDS != ''">
+			and f.HIDDEN_ID in
+	        <foreach item="item" index="index" collection="IDS" open="(" separator="," close=")">
+	            #{item}
+	        </foreach>
+		</if>
+		order by f.CREATTIME  desc, f.STATE desc
+	</select>
+
+	<!-- 列表 -->
+	<select id="majorlistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>,
+		c.CORP_NAME,
+		type.NAME as TYPE_NAME,
+		city.NAME as CITY_NAME,
+		country.NAME as COUNTRY_NAME,
+		village.NAME as VILLAGE_NAME,
+		cr.NAME CREATORNAME,
+		re.NAME RECTIFICATIONORNAME,
+		ch.NAME CHECKORNAME,
+		rev.NAME REVIEWORNAME,
+		crd.NAME HIDDENFINDDEPTNAME,
+		red.NAME RECTIFICATIONDEPTNAME,
+		chd.NAME CHECKDEPTNAME,
+		lv.NAME HIDDENLEVELNAME,
+		(select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME,
+		ma.IS_LISTING,
+		ma.STATE as MA_STATE,
+		ma.MAJORHIDDEN_ID
+		from
+		<include refid="tableName"></include> f
+		left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
+		left join BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
+		left join sys_dictionaries city on city.BIANMA = c.CITY
+		left join sys_dictionaries country on country.BIANMA = c.COUNTRY
+		left join sys_dictionaries village on village.BIANMA = c.VILLAGE
+
+		left join sys_user cr on cr.USER_ID = f.CREATOR
+		left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
+		left join sys_user ch on ch.USER_ID = f.CHECKOR
+		left join sys_user rev on rev.USER_ID = f.REVIEWOR
+
+		left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
+		left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
+
+		left join 	<include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+
+		left join BUS_MAJORHIDDEN ma on ma.HIDDEN_ID = f.HIDDEN_ID
+		where f.ISDELETE = '0' and f.STATE != '0'
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+				(
+					f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+					or
+					f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+					or
+					f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+					or
+					f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+					or
+					c.CORP_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+				)
+		</if>
+		<if test="pd.IS_COUNTYR != null and pd.IS_COUNTYR != ''">
+			and ma.STATE = 2 or (ma.STATE&gt;2 and ma.DEPARTMENT_ID = pd.MA_DEPARTMENT_ID)
+		</if>
+
+		<if test="pd.IS_STREET != null and pd.IS_STREET != ''">
+			and ma.STATE = 1 or (ma.STATE&gt;2 and ma.DEPARTMENT_ID = pd.MA_DEPARTMENT_ID)
+		</if>
+
+
+
+		<if test="pd.DEPT_PROVINCE != null and pd.DEPT_PROVINCE != ''">
+			and c.PROVINCE = #{pd.DEPT_PROVINCE}
+		</if>
+		<if test="pd.DEPT_CITY != null and pd.DEPT_CITY != ''">
+			and c.CITY = #{pd.DEPT_CITY}
+		</if>
+		<if test="pd.DEPT_COUNTRY != null and pd.DEPT_COUNTRY != ''">
+			and c.COUNTRY = #{pd.DEPT_COUNTRY}
+		</if>
+		<if test="pd.DEPT_VILLAGE != null and pd.DEPT_VILLAGE != ''">
+			and c.VILLAGE = #{pd.DEPT_VILLAGE}
+		</if>
+		<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+			and c.CORP_OF_TYPE in (select CORPTYPE_ID from BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{pd.DEPARTMENT_ID})
+		</if>
+
+		<if test="pd.COUNTRY != null and pd.COUNTRY != ''">
+			and c.COUNTRY = #{pd.COUNTRY}
+		</if>
+		<if test="pd.VILLAGE != null and pd.VILLAGE != ''">
+			and c.VILLAGE = #{pd.VILLAGE}
+		</if>
+		<if test="pd.CORP_OF_TYPE != null and pd.CORP_OF_TYPE != ''">
+			and c.CORP_OF_TYPE = #{pd.CORP_OF_TYPE}
+		</if>
+
+		<if test="pd.STARTTIME != null and pd.STARTTIME != ''"><!-- 关键词检索 -->
+			and f.RECTIFICATIONDEADLINE &gt;= #{pd.STARTTIME}
+		</if>
+		<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
+			and f.RECTIFICATIONDEADLINE &lt;= #{pd.ENDTIME}
+		</if>
+		<if test="pd.STATE != null and pd.STATE !='' and pd.STATE != 0" >
+			and f.STATE = #{pd.STATE}
+		</if>
+		<if test="pd.MAJOR_STATE != null and pd.MAJOR_STATE !='' and pd.MAJOR_STATE != 0" >
+			and ma.STATE = #{pd.MAJOR_STATE}
+		</if>
+		<if test="pd.HIDDENLEVEL != null and pd.HIDDENLEVEL !=''" >
+			and f.HIDDENLEVEL = #{pd.HIDDENLEVEL}
+		</if>
+		order by f.CREATTIME  desc
+	</select>
+
+	<!-- 隐患统计 -->
+	<select id="reportedChart" parameterType="pd" resultType="pd">
+		select
+		count(c.PROVINCE) value,
+		<if test="CHARTTYPE != null and CHARTTYPE != ''"><!-- 关键词检索 -->
+			<choose>
+				<when test="CHARTTYPE==1"><!-- 按省统计 -->
+					c.PROVINCE as name
+				</when>
+				<when test="CHARTTYPE=='2'"><!-- 按市统计 -->
+					c.CITY as name
+				</when>
+				<when test="CHARTTYPE=='3'"><!-- 按区县统计 -->
+					c.COUNTY as name
+				</when>
+			</choose>
+		</if>
+
+		from
+		<include refid="tableName"></include> f
+		left join bus_corp_info c on c.CORPINFO_ID = f.CORPINFO_ID
+		where f.ISDELETE  = '0' and  c.ISDELETE = '0'
+		<if test = "STATE != null and STATE != ''">
+			and f.STATE = #{STATE}
+		</if>
+		<if test="CHARTTYPE != null and CHARTTYPE != ''"><!-- 关键词检索 -->
+			<choose>
+				<when test="CHARTTYPE==1"><!-- 按省统计 -->
+					GROUP BY c.PROVINCE
+					ORDER BY c.PROVINCE
+				</when>
+				<when test="CHARTTYPE=='2'"><!-- 按市统计 -->
+					GROUP BY c.CITY
+					ORDER BY c.CITY
+				</when>
+				<when test="CHARTTYPE=='3'"><!-- 按区县统计 -->
+					GROUP BY c.COUNTY
+					ORDER BY c.COUNTY
+				</when>
+			</choose>
+		</if>
+	</select>
+
+		<!-- 隐患统计（折线图） -->
+	<select id="lineChart" parameterType="pd" resultType="pd">
+		SELECT
+			d.NAME,
+			IFNULL( h.NUM1, 0 ) NUM1,
+			IFNULL( h.NUM2, 0 ) NUM2
+		FROM
+			sys_dictionaries d
+			LEFT JOIN (
+				SELECT
+					COUNT( f.STATE = 4 OR NULL ) AS NUM1,
+					COUNT( f.STATE = 1 OR NULL ) AS NUM2,
+					c.CORP_OF_TYPE
+				FROM
+					BUS_HIDDEN f
+					LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = f.CORPINFO_ID
+				WHERE
+					f.ISDELETE = '0'
+					AND c.ISDELETE = '0'
+				GROUP BY
+					c.CORP_OF_TYPE
+				ORDER BY
+					c.CORP_OF_TYPE
+			) h ON h.CORP_OF_TYPE = d.DICTIONARIES_ID
+		WHERE
+			d.PARENT_ID = #{DICTIONARIES_ID}
+			and d.YNDEL = 'no'
+	</select>
+
+
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>,
+		c.CORP_NAME,
+		type.NAME as TYPE_NAME,
+		city.NAME as CITY_NAME,
+		country.NAME as COUNTRY_NAME,
+		village.NAME as VILLAGE_NAME,
+		cr.NAME CREATORNAME,
+		re.NAME RECTIFICATIONORNAME,
+		ch.NAME CHECKORNAME,
+		rev.NAME REVIEWORNAME,
+		crd.NAME HIDDENFINDDEPTNAME,
+		red.NAME RECTIFICATIONDEPTNAME,
+		chd.NAME CHECKDEPTNAME,
+		lv.NAME HIDDENLEVELNAME,
+		(select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
+		from
+		<include refid="tableName"></include> f
+		left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
+		left join BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
+		left join sys_dictionaries city on city.BIANMA = c.CITY
+		left join sys_dictionaries country on country.BIANMA = c.COUNTRY
+		left join sys_dictionaries village on village.BIANMA = c.VILLAGE
+
+		left join sys_user cr on cr.USER_ID = f.CREATOR
+		left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
+		left join sys_user ch on ch.USER_ID = f.CHECKOR
+		left join sys_user rev on rev.USER_ID = f.REVIEWOR
+
+		left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
+		left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
+
+		left join 	<include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+		where f.ISDELETE = '0' and f.STATE != '0'
+		<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+				(
+					f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+					or
+					f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+					or
+					f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+					or
+					f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+					or
+					c.CORP_NAME LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+				)
+		</if>
+
+		<if test="DEPT_PROVINCE != null and DEPT_PROVINCE != ''">
+			and c.PROVINCE = #{DEPT_PROVINCE}
+		</if>
+		<if test="DEPT_CITY != null and DEPT_CITY != ''">
+			and c.CITY = #{DEPT_CITY}
+		</if>
+		<if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
+			and c.COUNTRY = #{DEPT_COUNTRY}
+		</if>
+		<if test="DEPT_VILLAGE != null and DEPT_VILLAGE != ''">
+			and c.VILLAGE = #{DEPT_VILLAGE}
+		</if>
+		<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
+			and c.CORP_OF_TYPE in (select CORPTYPE_ID from BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID})
+		</if>
+
+		<if test="COUNTRY != null and COUNTRY != ''">
+			and c.COUNTRY = #{COUNTRY}
+		</if>
+		<if test="VILLAGE != null and VILLAGE != ''">
+			and c.VILLAGE = #{VILLAGE}
+		</if>
+		<if test="CORP_OF_TYPE != null and CORP_OF_TYPE != ''">
+			and c.CORP_OF_TYPE = #{CORP_OF_TYPE}
+		</if>
+
+		<if test="STARTTIME != null and STARTTIME != ''"><!-- 关键词检索 -->
+			and f.RECTIFICATIONDEADLINE &gt;= #{STARTTIME}
+		</if>
+		<if test="ENDTIME != null and ENDTIME != ''">
+			and f.RECTIFICATIONDEADLINE &lt;= #{ENDTIME}
+		</if>
+		<if test="STATE != null and STATE !='' and STATE != 0" >
+			and f.STATE = #{STATE}
+		</if>
+
+		<if test="HIDDENLEVEL != null and HIDDENLEVEL !=''" >
+			and f.HIDDENLEVEL = #{HIDDENLEVEL}
+		</if>
+		order by f.CREATTIME  desc
+	</select>
+
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		delete from
+		<include refid="tableName"></include>
+		where
+			HIDDEN_ID in
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+    <!-- 隐患统计 手机端 -->
+    <select id="yhpcCountForApp" parameterType="pd" resultType="pd">
+        select
+        count(1) as count ,
+         SUM(case when  h.HIDDENLEVEL ='hiddenLevel0001' THEN 1 ELSE 0 end )  as ybCount ,
+         SUM(case when h.STATE !='4' THEN 1 ELSE 0 end )  as wzgCount
+        from BUS_HIDDEN h
+        LEFT JOIN bus_corp_info c on c.CORPINFO_ID = h.CORPINFO_ID
+        where h.ISDELETE ='0'
+        <if test="DEPT_PROVINCE != null and DEPT_PROVINCE != ''">
+            and c.PROVINCE = #{DEPT_PROVINCE}
+        </if>
+        <if test="DEPT_CITY != null and DEPT_CITY != ''">
+            and c.CITY = #{DEPT_CITY}
+        </if>
+        <if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
+            and c.COUNTRY = #{DEPT_COUNTRY}
+        </if>
+        <if test="DEPT_VILLAGE != null and DEPT_VILLAGE != ''">
+            and c.VILLAGE = #{DEPT_VILLAGE}
+        </if>
+        <if test="toTime != null and toTime != ''">
+            and h.CREATTIME >= #{toTime}
+            and h.CREATTIME &lt;= #{fromTime}
+        </if>
+	</select>
+    <!-- 清单其他隐患 -->
+    <select id="getOtherHidden" parameterType="pd" resultType="pd">
+        SELECT
+        <include refid="Field"></include>
+        FROM
+        BUS_HIDDEN f
+        WHERE f.ISDELETE = '0'
+			and f.SOURCE = '3'
+        <if test="STATE != null and STATE != ''"><!-- 关键词检索 -->
+            and
+            f.STATE = #{STATE}
+        </if>
+        <if test="USER_ID != null and USER_ID != ''"><!-- 关键词检索 -->
+            and
+            f.CREATOR = #{USER_ID}
+        </if>
+        <if test="LISTMANAGER_ID != null and LISTMANAGER_ID != ''"><!-- 关键词检索 -->
+            and
+            f.LISTMANAGER_ID = #{LISTMANAGER_ID}
+        </if>
+        <if test="CHECKRECORD_ID != null and CHECKRECORD_ID != ''"><!-- 关键词检索 -->
+            and
+            f.CHECKRECORD_ID = #{CHECKRECORD_ID}
+        </if>
+        <if test="IS_DAY != null and IS_DAY != ''"><!-- 关键词检索 -->
+            and
+            TO_DAYS(f.CREATTIME) = TO_DAYS(NOW())
+        </if>
+        <if test="IS_WEEK != null and IS_WEEK != ''"><!-- 关键词检索 -->
+            and
+            YEARWEEK(DATE_FORMAT(f.CREATTIME,'%Y-%m-%d')) = YEARWEEK(NOW())
+        </if>
+        <if test="IS_XUN != null and IS_XUN != ''"><!-- 关键词检索 -->
+            <if test="BEGINTIME != null and BEGINTIME != ''"><!-- 关键词检索 -->
+                and f.CREATTIME &gt;= #{BEGINTIME}
+            </if>
+            <if test="ENDTIME != null and ENDTIME != ''">
+                and f.CREATTIME &lt;= #{ENDTIME}
+            </if>
+        </if>
+
+        <if test="IS_MONTH != null and IS_MONTH != ''"><!-- 关键词检索 -->
+            and
+            DATE_FORMAT(f.CREATTIME,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m')
+        </if>
+        <if test="IS_QUARTER != null and IS_QUARTER != ''"><!-- 关键词检索 -->
+            and
+            QUARTER(f.CREATTIME) = QUARTER(NOW())
+        </if>
+        <if test="IS_HALFYEAR != null and IS_HALFYEAR != ''">
+            AND
+            CONVERT(concat(DATE_FORMAT(f.CREATTIME, '%Y'), INTERVAL(CONVERT(MONTH(f.CREATTIME),SIGNED),7,13) ),SIGNED) =
+            CONVERT(concat(DATE_FORMAT(NOW(), '%Y'), INTERVAL(CONVERT(MONTH(NOW()),SIGNED),7,13) ),SIGNED)
+        </if>
+        <if test="IS_YEAR != null and IS_YEAR != ''"><!-- 关键词检索 -->
+            and
+            YEAR(f.CREATTIME)=YEAR(NOW())
+        </if>
+        ORDER BY f.CREATTIME
+    </select>
+    <!-- 列表 -->
+    <select id="getListForApplistPage" parameterType="page" resultType="pd">
+        select
+        <include refid="Field"></include>,
+        cr.NAME CREATORNAME,
+        re.NAME RECTIFICATIONORNAME,
+        ch.NAME CHECKORNAME,
+        rev.NAME REVIEWORNAME,
+        crd.NAME HIDDENFINDDEPTNAME,
+        red.NAME RECTIFICATIONDEPTNAME,
+        chd.NAME CHECKDEPTNAME,
+        lv.NAME HIDDENLEVELNAME,
+        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME,
+        ma.STATE as MA_STATE,
+        ma.MAJORHIDDEN_ID
+        from
+        <include refid="tableName"></include> f
+        left join sys_user cr on cr.USER_ID = f.CREATOR
+        left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
+        left join sys_user ch on ch.USER_ID = f.CHECKOR
+        left join sys_user rev on rev.USER_ID = f.REVIEWOR
+        left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+        left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
+        left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
+        left join  <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+        left join BUS_MAJORHIDDEN ma on ma.HIDDEN_ID = f.HIDDEN_ID
+        where f.ISDELETE = '0' and f.STATE != '0'
+        <if test="pd.HIDDENLEVEL != null and pd.HIDDENLEVEL !=''" >
+            and f.HIDDENLEVEL = #{pd.HIDDENLEVEL}
+        </if>
+        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+            and
+            (
+            f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+            or
+            f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+            or
+            f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+            or
+            f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+            )
+        </if>
+
+        <if test="pd.HIDDENDESCR != null and pd.HIDDENDESCR != ''"><!-- 关键词检索 -->
+            and f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%')
+        </if>
+        <if test="pd.ISQUALIFIED != null and pd.ISQUALIFIED != ''"><!-- 关键词检索 -->
+            and f.ISQUALIFIED = #{pd.ISQUALIFIED}
+        </if>
+        <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''"><!-- 关键词检索 -->
+            and f.HIDDENFINDDEPT = #{pd.DEPARTMENT_ID}
+        </if>
+        <if test="pd.HIDDENLEVEL != null and pd.HIDDENLEVEL != ''"><!-- 关键词检索 -->
+            and f.HIDDENLEVEL = #{pd.HIDDENLEVEL}
+        </if>
+        <if test="pd.STARTTIME != null and pd.STARTTIME != ''"><!-- 关键词检索 -->
+            and f.CREATTIME &gt;= #{pd.STARTTIME}
+        </if>
+        <if test="pd.ENDTIME != null and pd.ENDTIME != ''">
+            and f.CREATTIME &lt;= #{pd.ENDTIME}
+        </if>
+        <if test="pd.STATE != null and pd.STATE !='' and pd.STATE != 0" >
+            and f.STATE = #{pd.STATE}
+        </if>
+        <if test="pd.SELF_USER_ID != null and pd.SELF_USER_ID != ''">
+            and f.CREATOR = #{pd.SELF_USER_ID}
+        </if>
+        <if test="pd.DISPOSESTATE != null and pd.DISPOSESTATE != ''"><!-- 关键词检索 -->
+            <if test="pd.DISPOSESTATE==2"><!-- 整改 -->
+                <if test="pd.ISMAIN != null and pd.ISMAIN != ''">
+                    <choose>
+                        <when test="pd.ISMAIN == 1">
+                            AND f.CORPINFO_ID = #{pd.CORPINFO_ID}
+                        </when>
+                        <otherwise>
+                            and f.RECTIFICATIONOR = #{pd.SELFUSERID}
+                        </otherwise>
+                    </choose>
+                </if>
+
+                and f.STATE in('1','-1')
+            </if>
+            <if test="pd.DISPOSESTATE==3"><!-- 验收 -->
+                and f.STATE = '3'
+                <if test="pd.ISMAIN != null and pd.ISMAIN != ''">
+                    <choose>
+                        <when test="pd.ISMAIN == 1">
+                            AND f.CORPINFO_ID = #{pd.CORPINFO_ID}
+                        </when>
+                        <otherwise>
+                            and
+                            (
+                            select count(1)
+                            from BUS_HIDDENCHECK bh
+                            where
+                            bh.HIDDEN_ID=f.HIDDEN_ID
+                            and bh.USER_ID=#{pd.SELFUSERID}
+                            and bh.STATUS=0
+                            )>0
+                        </otherwise>
+                    </choose>
+                </if>
+
+            </if>
+            <if test="pd.DISPOSESTATE==4"><!-- 已验收 -->
+                and f.STATE = '4'
+
+                <choose>
+                    <when test="pd.ISMAIN == 1">
+                        AND f.CORPINFO_ID = #{pd.CORPINFO_ID}
+                    </when>
+                    <otherwise>
+                        and (
+                        f.RECTIFICATIONOR = #{pd.SELFUSERID}
+                        or f.CREATOR = #{pd.SELFUSERID}
+                        or (
+                        select count(1)
+                        from BUS_HIDDENCHECK bh
+                        where
+                        bh.HIDDEN_ID=f.HIDDEN_ID
+                        and bh.USER_ID=#{pd.SELFUSERID}
+                        )>0
+                        )
+                    </otherwise>
+                </choose>
+
+            </if>
+            <if test="pd.DISPOSESTATE==-1"><!-- 所有 -->
+                <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
+                    and
+                    f.CORPINFO_ID = #{pd.CORPINFO_ID}
+                </if>
+                <if test="pd.STATE != null and pd.STATE != ''"><!-- 关键词检索 -->
+                    and
+                    f.STATE = #{pd.STATE}
+                </if>
+            </if>
+        </if>
+        order by f.CREATTIME  desc
+    </select>
+    <!-- 首页统计 -->
+    <select id="mainStatistics" parameterType="pd" resultType="pd">
+        SELECT
+        <if test="DEPT_COUNTRY == null or DEPT_COUNTRY == ''">
+            country.NAME as GROUP_NAME,
+        </if>
+        <if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
+            village.NAME as GROUP_NAME,
+        </if>
+        count(CASE WHEN h.HIDDEN_ID != '' THEN 1 ELSE NULL END) as SBHD_NUM,
+        count(case when h.STATE=4 then 1 else null end) as ZGHD_NUM
+        <if test="DEPT_COUNTRY == null or DEPT_COUNTRY == ''">
+            from sys_dictionaries country
+            LEFT join bus_corp_info f on country.BIANMA = f.COUNTRY and f.ISDELETE='0'
+        </if>
+        <if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
+            from sys_dictionaries village
+            LEFT join bus_corp_info f on village.BIANMA = f.VILLAGE and f.ISDELETE='0'
+        </if>
+        <if test="DEPT_PROVINCE != null and DEPT_PROVINCE != ''">
+            and f.PROVINCE = #{DEPT_PROVINCE}
+        </if>
+        <if test="DEPT_CITY != null and DEPT_CITY != ''">
+            and f.CITY = #{DEPT_CITY}
+        </if>
+        <if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
+            and f.COUNTRY = #{DEPT_COUNTRY}
+        </if>
+        <if test="DEPT_VILLAGE != null and DEPT_VILLAGE != ''">
+            and f.VILLAGE = #{DEPT_VILLAGE}
+        </if>
+        <if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
+            and f.CORP_OF_TYPE in (select CORPTYPE_ID from `qa-gwj-regulatory`.BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID})
+        </if>
+
+        left join BUS_HIDDEN h on f.CORPINFO_ID=h.CORPINFO_ID and h.ISDELETE='0'
+        where 1=1
+
+        <if test="DEPT_COUNTRY == null or DEPT_COUNTRY == ''">
+            and country.PARENT_ID = #{CITY_CODE}
+        </if>
+        <if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
+            and village.PARENT_ID in (select DICTIONARIES_ID from sys_dictionaries dic where dic.BIANMA=#{DEPT_COUNTRY})
+        </if>
+
+        <if test="DEPT_COUNTRY == null or DEPT_COUNTRY == ''">
+            group by f.COUNTRY,country.NAME
+        </if>
+        <if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
+            group by f.VILLAGE,village.NAME
+        </if>
+    </select>
+
+	<!-- 重大隐患核实列表 -->
+	<select id="verifydatalistPage" parameterType="page" resultType="pd">
+		select
+		f.*
+		,lv.NAME HIDDENLEVELNAME
+		,re.NAME  as RECTIFICATIONORNAME
+		,confirmUser.NAME  as confirmUserName
+		,hiddenType.NAME as hiddenTypeName
+		,hiddenType2.NAME as hiddenTypeName2
+		,hregion.HIDDENREGION as hregionName
+		,finduser.NAME as findUserNames
+		,od.NAME as findDeptNames
+		,(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1') as exaCount
+		from
+		<include refid="tableName"></include> f
+		LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER  <!-- 隐患确认人 -->
+		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+		left join <include refid="dicTableName"></include> hiddenType on f.HIDDENTYPE = hiddenType.BIANMA  <!-- 隐患类型-->
+		left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  <!-- 隐患类型-->
+		left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
+		left join sys_user finduser on finduser.USER_ID = f.CREATOR
+		left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
+		left join bus_listmanager list on list.LISTMANAGER_ID = f.LISTMANAGER_ID
+		left join OA_DEPARTMENT od on od.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		where f.ISDELETE = '0'
+		and f.state not in ('0')
+		<if test='pd.approvedstate != null and pd.approvedstate != ""'>
+			and f.STATE = '12'
+		</if>
+		<if test='pd.CORPINFO_ID != null and pd.CORPINFO_ID != "" '>
+			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test='pd.majorhiddenstate != null and pd.majorhiddenstate != ""'>
+			and f.STATE <![CDATA[ >= ]]> 13
+		</if>
+		<if test="pd.STATE != null and pd.STATE != ''">
+			and f.STATE = #{pd.STATE}
+		</if>
+		<if test='pd.stateConfirm != null and pd.stateConfirm != "" and pd.stateConfirm == "1"'><!-- 未确认确认隐患 -->
+			and f.state = '-2'
+		</if>
+		<if test='pd.stateConfirm != null and pd.stateConfirm != "" and pd.stateConfirm == "2"'><!-- 确认确认隐患 -->
+			and f.state != '-2'
+		</if>
+		<if test="pd.keySource != null and pd.keySource != '' "><!-- 隐患来源 -->
+			<if test='pd.keySource == "2"'>
+				and f.SOURCE in ('2','3')
+			</if>
+			<if test='pd.keySource != "2"'>
+				and f.SOURCE = #{pd.keySource}
+			</if>
+		</if>
+		<if test="pd.SOURCE != null and pd.SOURCE != '' "><!-- 隐患来源 -->
+			and f.SOURCE in ('2','3')
+		</if>
+		<if test="pd.keyHiddenDescr != null and pd.keyHiddenDescr != ''"><!-- 隐患描述 -->
+			and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.keyHiddenDescr}),'%'))
+		</if>
+		<if test="pd.HIDDENDESCR != null and pd.HIDDENDESCR != ''"><!-- 隐患描述 -->
+			and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%'))
+		</if>
+		<if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
+			and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+		</if>
+		<if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
+			and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
+		</if>
+		<if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
+			and f.HIDDENTYPE = #{pd.keyHiddenType}
+		</if>
+		<if test="pd.keyHiddenType2 != null and pd.keyHiddenType2 != ''"><!-- 隐患类型 -->
+			and f.HIDDENTYPE2 = #{pd.keyHiddenType2}
+		</if>
+		<if test="pd.keyHiddenPart != null and pd.keyHiddenPart != ''"><!-- 隐患部位 -->
+			and f.HIDDENPART = #{pd.keyHiddenPart}
+		</if>
+		<if test="pd.keyHiddenlevel = 'hiddenLevel2002'"><!-- 隐患级别 -->
+			and f.HIDDENLEVEL in ('jdyh001','hiddenLevel2002')
+		</if>
+		<if test="pd.CONFIRM_USER != null and pd.CONFIRM_USER != ''"><!-- 隐患确认人 -->
+			and f.CONFIRM_USER = #{pd.CONFIRM_USER}
+		</if>
+		<if test="pd.keyFindStateTime != null and pd.keyFindStateTime != ''"><!-- 隐患发现时间 -->
+			and f.DISCOVERYTIME >= #{pd.keyFindStateTime}
+		</if>
+		<if test="pd.keyFindEndTime != null and pd.keyFindEndTime != ''"><!-- 隐患发现时间 -->
+			and f.DISCOVERYTIME &lt;= #{pd.keyFindEndTime}
+		</if>
+		<if test="pd.keyConfirmUser != null and pd.keyConfirmUser != ''"><!-- 确认人 -->
+			and (confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.keyConfirmUser}),'%'))
+		</if>
+		<if test="pd.keyMajor != null and pd.keyMajor != ''"><!-- 重大隐患 -->
+			and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
+		</if>
+		<if test="pd.keyHiddenSpecialType != null and pd.keyHiddenSpecialType != ''">
+			and f.HIDDEN_ID in (select hex.HIDDEN_ID from bus_hiddenexamine hex
+			where hex.TYPE = #{pd.keyHiddenSpecialType} and hex.STATE ='1' )
+		</if>
+		<if test="pd.RECTIFICATIONOR != null and pd.RECTIFICATIONOR != ''"><!-- 整改人 -->
+			and f.RECTIFICATIONOR = #{pd.RECTIFICATIONOR}}
+		</if>
+		<!--<if test="pd.ArrayDATA_IDS != null and pd.ArrayDATA_IDS != ''">
+			or (list.DEPARTMENT_ID in (${pd.ArrayDATA_IDS})
+			)
+		</if>-->
+		order by  f.CREATTIME  desc,f.STATE + 0 asc
+	</select>
+
+
+	<!-- 列表(全部) -->
+	<select id="listAllInspection" parameterType="pd" resultType="pd">
+		select
+		f.*,
+		hr.HIDDENREGION HIDDENPART_NAME,
+		lv.NAME HIDDENLEVEL_NAME,
+		ht.NAME HIDDENTYPE_NAME,
+		ht2.NAME HIDDENTYPE2_NAME,
+		crd.NAME HIDDENFINDDEPT_NAME,
+		cr.NAME CREATOR_NAME,
+		cre.NAME CREATOR_NAMES,
+		u.UNITS_NAME as RECTIFICATIONDEPT_NAME,
+		p.NAME as RECTIFICATIONOR_NAME
+		from
+		<include refid="tableName"></include> f
+		left join bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
+		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+		left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
+		left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
+		left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		left join vi_user_all cr on cr.USER_ID = f.CREATOR
+		left join sys_user cre on cre.USER_ID = f.CREATOR
+		left join BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
+		left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
+		where f.ISDELETE = '0'
+		<if test="FOREIGN_ID != null and FOREIGN_ID !=''" >
+			and f.FOREIGN_ID = #{FOREIGN_ID}
+		</if>
+		<!-- Ai报警信息专查 -->
+		<if test="AI_WARNING != null and AI_WARNING !=''" >
+			and f.HIDDEN_ID in
+			    <foreach collection="array" item="item" separator="," open="(" close = ")">
+					#{item}
+				</foreach>
+		</if>
+		<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+			(
+			f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+			or
+			f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+			or
+			f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+			or
+			f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+			or
+			c.CORP_NAME LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+			)
+		</if>
+
+		<if test="DEPT_PROVINCE != null and DEPT_PROVINCE != ''">
+			and c.PROVINCE = #{DEPT_PROVINCE}
+		</if>
+		<if test="DEPT_CITY != null and DEPT_CITY != ''">
+			and c.CITY = #{DEPT_CITY}
+		</if>
+		<if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
+			and c.COUNTRY = #{DEPT_COUNTRY}
+		</if>
+		<if test="DEPT_VILLAGE != null and DEPT_VILLAGE != ''">
+			and c.VILLAGE = #{DEPT_VILLAGE}
+		</if>
+		<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
+			and c.CORP_OF_TYPE in (select CORPTYPE_ID from BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID})
+		</if>
+
+		<if test="COUNTRY != null and COUNTRY != ''">
+			and c.COUNTRY = #{COUNTRY}
+		</if>
+		<if test="VILLAGE != null and VILLAGE != ''">
+			and c.VILLAGE = #{VILLAGE}
+		</if>
+		<if test="CORP_OF_TYPE != null and CORP_OF_TYPE != ''">
+			and c.CORP_OF_TYPE = #{CORP_OF_TYPE}
+		</if>
+
+		<if test="STARTTIME != null and STARTTIME != ''"><!-- 关键词检索 -->
+			and f.RECTIFICATIONDEADLINE &gt;= #{STARTTIME}
+		</if>
+		<if test="ENDTIME != null and ENDTIME != ''">
+			and f.RECTIFICATIONDEADLINE &lt;= #{ENDTIME}
+		</if>
+		<if test="STATE != null and STATE !='' and STATE != 0" >
+			and f.STATE = #{STATE}
+		</if>
+
+		<if test="HIDDENLEVEL != null and HIDDENLEVEL !=''" >
+			and f.HIDDENLEVEL = #{HIDDENLEVEL}
+		</if>
+		order by f.CREATTIME ASC
+	</select>
+
+	<!-- 只用与修改隐患状态 -->
+	<update id="editStateInspection" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		STATE = #{STATE}
+		where
+		FOREIGN_ID = #{INSPECTION_ID}
+	</update>
+
+	<!-- 安全环保检查归档后的隐患列表 -->
+	<select id="hiddenInspectionlistPage" parameterType="page" resultType="pd">
+		select
+		iou.NAME INSPECTION_ORIGINATOR_NAME,
+		ild.NAME INSPECTION_LEADDEPARTMENT_NAME,
+		iod.NAME INSPECTION_DEPARTMENT_NAME,
+		isd.NAME INSPECTED_DEPARTMENT_NAME,
+		isda.NAME INSPECTED_CORPINFO_ID_NAME,
+		isu.NAME INSPECTED_SITEUSER_NAME,
+		se.INSPECTION_STATUS,
+		se.INSPECTION_ID,
+		f.HIDDENDESCR,
+		f.CREATOR,
+		c.NAME CREATOR_NAME,
+		f.CONFIRM_USER,
+		hcu.NAME CONFIRM_USER_NAME,
+		f.RECTIFICATIONOR,
+		f.CHECKOR,
+		f.STATE HIDDEN_STATUS,
+		f.FINAL_CHECK,
+		f.FINAL_CHECKOR,
+		f.FINAL_CHECKTIME,
+		f.FINAL_CHECKDESCR,
+		isa.INSPECTION_ASSESS_ID,
+		isa.ASSESS_SCORE,
+		isa.ASSESS_PENALTY_AMOUNT,
+		f.HIDDEN_ID
+		from
+		<include refid="tableName"></include> f
+		LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON se.INSPECTION_ID = f.FOREIGN_ID
+		LEFT JOIN VI_USER_ALL iou ON iou.USER_ID = se.INSPECTION_ORIGINATOR_ID
+		LEFT JOIN VI_DEPARTMENT_ALL iod ON iod.DEPARTMENT_ID = iou.DEPARTMENT_ID
+		LEFT JOIN VI_DEPARTMENT_ALL ild ON ild.DEPARTMENT_ID = se.INSPECTION_LEADDEPARTMENT_ID
+		LEFT JOIN OA_DEPARTMENT isd ON isd.DEPARTMENT_ID = se.INSPECTED_DEPARTMENT_ID
+		LEFT JOIN OA_DEPARTMENT isda ON isda.DEPARTMENT_ID = isd.CORPINFO_ID
+		LEFT JOIN vi_user_all isu ON isu.USER_ID = se.INSPECTED_SITEUSER_ID
+		LEFT JOIN vi_user_all c on c.USER_ID = f.CREATOR
+		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+		LEFT JOIN sys_user hcu on hcu.USER_ID = f.CONFIRM_USER
+		LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL_ASSESS isa on isa.HIDDEN_ID = f.HIDDEN_ID and isa.ISDELETE = '0'
+		<!--
+                left join <include refid="dicTableName"></include> hiddenType on f.HIDDENTYPE = hiddenType.BIANMA  &lt;!&ndash; 隐患类型&ndash;&gt;
+                left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  &lt;!&ndash; 隐患类型&ndash;&gt;
+                left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
+                left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
+                left join bus_listmanager list on list.LISTMANAGER_ID = f.LISTMANAGER_ID
+        -->
+		where f.ISDELETE = '0' and f.SOURCE IN ('4','5') and f.STATE != '100'
+		<if test='pd.CORPINFO_ID != null and pd.CORPINFO_ID != "" '>
+			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test="pd.INSPECTED_DEPARTMENT_NAME != null and pd.INSPECTED_DEPARTMENT_NAME != ''"><!-- 被检查单位 -->
+			and isd.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTED_DEPARTMENT_NAME}),'%')
+		</if>
+		<if test="pd.INSPECTION_DEPARTMENT_NAME != null and pd.INSPECTION_DEPARTMENT_NAME != ''"><!-- 检查部门 -->
+			and iod.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_DEPARTMENT_NAME}),'%')
+		</if>
+		<if test="pd.INSPECTION_ORIGINATOR_NAME != null and pd.INSPECTION_ORIGINATOR_NAME != ''"><!-- 检查发起人 -->
+			and iou.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_ORIGINATOR_NAME}),'%')
+		</if>
+		<if test="pd.HIDDENDESCR != null and pd.HIDDENDESCR != ''"><!-- 隐患描述 -->
+			and f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%')
+		</if>
+		<if test='pd.HIDDEN_STATUS != null and pd.HIDDEN_STATUS != ""'><!-- 分公司内隐患处理状态 -->
+			and f.STATE = #{pd.HIDDEN_STATUS}
+		</if>
+		<if test='pd.INSPECTION_ID != null and pd.INSPECTION_ID != ""'><!-- 安全环保检查ID -->
+			and f.FOREIGN_ID = #{pd.INSPECTION_ID}
+		</if>
+		<if test='pd.INSPECTION_STATUS != null and pd.INSPECTION_STATUS != ""'> <!-- 安全、环保检查隐患处理状态 -->
+			<choose>
+				<when test="pd.INSPECTION_STATUS == '3-7'">
+					and se.INSPECTION_STATUS in ('3','4','5','6','7')
+				</when>
+				<otherwise>
+					and se.INSPECTION_STATUS = #{pd.INSPECTION_STATUS}
+				</otherwise>
+			</choose>
+		</if>
+		<if test='pd.INSPECTION_ASSESS_ID != null and pd.INSPECTION_ASSESS_ID != ""'> <!-- 安全、环保检查隐患考评状态 -->
+			<choose>
+				<when test="pd.INSPECTION_ASSESS_ID == 1">
+					and isa.INSPECTION_ASSESS_ID IS NOT NULL
+				</when>
+				<otherwise>
+					and isa.INSPECTION_ASSESS_ID IS NULL
+				</otherwise>
+			</choose>
+		</if>
+		<!--
+                <if test='pd.stateConfirm != null and pd.stateConfirm != "" and pd.stateConfirm == "1"'>&lt;!&ndash; 未确认确认隐患 &ndash;&gt;
+                    and f.state = '-2'
+                </if>
+                <if test='pd.stateConfirm != null and pd.stateConfirm != "" and pd.stateConfirm == "2"'>&lt;!&ndash; 确认确认隐患 &ndash;&gt;
+                    and f.state != '-2'
+                </if>
+                <if test="pd.keyFindUserName != null and pd.keyFindUserName != ''">&lt;!&ndash; 隐患发现人 &ndash;&gt;
+                    and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+                </if>
+                <if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''">&lt;!&ndash; 隐患发现部门 &ndash;&gt;
+                    and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
+                </if>
+                <if test="pd.keyHiddenType != null and pd.keyHiddenType != ''">&lt;!&ndash; 隐患类型 &ndash;&gt;
+                    and f.HIDDENTYPE = #{pd.keyHiddenType}
+                </if>
+                <if test="pd.keyHiddenType2 != null and pd.keyHiddenType2 != ''">&lt;!&ndash; 隐患类型 &ndash;&gt;
+                    and f.HIDDENTYPE2 = #{pd.keyHiddenType2}
+                </if>
+                <if test="pd.keyHiddenPart != null and pd.keyHiddenPart != ''">&lt;!&ndash; 隐患部位 &ndash;&gt;
+                    and f.HIDDENPART = #{pd.keyHiddenPart}
+                </if>
+                <if test="pd.keyHiddenlevel = 'hiddenLevel2002'">&lt;!&ndash; 隐患级别 &ndash;&gt;
+                    and f.HIDDENLEVEL in ('hiddenLevel2001','hiddenLevel2002')
+                </if>
+                <if test="pd.CONFIRM_USER != null and pd.CONFIRM_USER != ''">&lt;!&ndash; 隐患确认人 &ndash;&gt;
+                    and f.CONFIRM_USER = #{pd.CONFIRM_USER}
+                </if>
+                <if test="pd.keyFindStateTime != null and pd.keyFindStateTime != ''">&lt;!&ndash; 隐患发现时间 &ndash;&gt;
+                    and f.DISCOVERYTIME >= #{pd.keyFindStateTime}
+                </if>
+                <if test="pd.keyFindEndTime != null and pd.keyFindEndTime != ''">&lt;!&ndash; 隐患发现时间 &ndash;&gt;
+                    and f.DISCOVERYTIME &lt;= #{pd.keyFindEndTime}
+                </if>
+                <if test="pd.keyConfirmUser != null and pd.keyConfirmUser != ''">&lt;!&ndash; 确认人 &ndash;&gt;
+                    and (confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.keyConfirmUser}),'%'))
+                </if>
+                <if test="pd.keyMajor != null and pd.keyMajor != ''">&lt;!&ndash; 重大隐患 &ndash;&gt;
+                    and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
+                </if>
+                <if test="pd.keyHiddenSpecialType != null and pd.keyHiddenSpecialType != ''">
+                    and f.HIDDEN_ID in (select hex.HIDDEN_ID from bus_hiddenexamine hex
+                    where hex.TYPE = #{pd.keyHiddenSpecialType} and hex.STATE ='1' )
+                </if>
+                <if test="pd.RECTIFICATIONOR != null and pd.RECTIFICATIONOR != ''">&lt;!&ndash; 整改人 &ndash;&gt;
+                    and f.RECTIFICATIONOR = #{pd.RECTIFICATIONOR}}
+                </if>
+        -->
+		GROUP BY f.HIDDEN_ID
+		ORDER BY f.CREATTIME desc,f.STATE + 0 asc
+	</select>
+
+	<!-- 重大隐患核实列表 -->
+	<select id="checkandacceptdatalistPage" parameterType="page" resultType="pd">
+		select
+		f.*
+		,lv.NAME HIDDENLEVELNAME
+		,re.NAME  as RECTIFICATIONORNAME
+		,confirmUser.NAME  as confirmUserName
+		,hiddenType.NAME as hiddenTypeName
+		,hiddenType2.NAME as hiddenTypeName2
+		,hregion.HIDDENREGION as hregionName
+		,finduser.NAME as findUserNames
+		,od.NAME as findDeptNames
+		,(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1') as exaCount
+		from
+		<include refid="tableName"></include> f
+		LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER  <!-- 隐患确认人 -->
+		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
+		left join <include refid="dicTableName"></include> hiddenType on f.HIDDENTYPE = hiddenType.BIANMA  <!-- 隐患类型-->
+		left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  <!-- 隐患类型-->
+		left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
+		left join sys_user finduser on finduser.USER_ID = f.CREATOR
+		left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
+		left join bus_listmanager list on list.LISTMANAGER_ID = f.LISTMANAGER_ID
+		left join OA_DEPARTMENT od on od.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		where f.ISDELETE = '0'
+		and f.state not in ('0')
+		and f.STATE in ('14','15')
+		<if test="pd.STATE != null and pd.STATE != ''">
+			and f.STATE = #{pd.STATE}
+		</if>
+		<if test='pd.CORPINFO_ID != null and pd.CORPINFO_ID != "" '>
+			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test='pd.majorhiddenstate != null and pd.majorhiddenstate != ""'>
+			and f.STATE = '13'
+		</if>
+		<if test='pd.stateConfirm != null and pd.stateConfirm != "" and pd.stateConfirm == "1"'><!-- 未确认确认隐患 -->
+			and f.state = '-2'
+		</if>
+		<if test='pd.stateConfirm != null and pd.stateConfirm != "" and pd.stateConfirm == "2"'><!-- 确认确认隐患 -->
+			and f.state != '-2'
+		</if>
+		<if test="pd.keySource != null and pd.keySource != '' "><!-- 隐患来源 -->
+			<if test='pd.keySource == "2"'>
+				and f.SOURCE in ('2','3')
+			</if>
+			<if test='pd.keySource != "2"'>
+				and f.SOURCE = #{pd.keySource}
+			</if>
+		</if>
+		<if test="pd.SOURCE != null and pd.SOURCE != '' "><!-- 隐患来源 -->
+			and f.SOURCE in ('2','3')
+		</if>
+		<if test="pd.keyHiddenDescr != null and pd.keyHiddenDescr != ''"><!-- 隐患描述 -->
+			and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.keyHiddenDescr}),'%'))
+		</if>
+		<if test="pd.HIDDENDESCR != null and pd.HIDDENDESCR != ''"><!-- 隐患描述 -->
+			and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%'))
+		</if>
+		<if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
+			and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+		</if>
+		<if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
+			and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
+		</if>
+		<if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
+			and f.HIDDENTYPE = #{pd.keyHiddenType}
+		</if>
+		<if test="pd.keyHiddenType2 != null and pd.keyHiddenType2 != ''"><!-- 隐患类型 -->
+			and f.HIDDENTYPE2 = #{pd.keyHiddenType2}
+		</if>
+		<if test="pd.keyHiddenPart != null and pd.keyHiddenPart != ''"><!-- 隐患部位 -->
+			and f.HIDDENPART = #{pd.keyHiddenPart}
+		</if>
+		<if test="pd.keyHiddenlevel = 'hiddenLevel2002'"><!-- 隐患级别 -->
+			and f.HIDDENLEVEL in ('jdyh001','hiddenLevel2002')
+		</if>
+		<if test="pd.CONFIRM_USER != null and pd.CONFIRM_USER != ''"><!-- 隐患确认人 -->
+			and f.CONFIRM_USER = #{pd.CONFIRM_USER}
+		</if>
+		<if test="pd.keyFindStateTime != null and pd.keyFindStateTime != ''"><!-- 隐患发现时间 -->
+			and f.DISCOVERYTIME >= #{pd.keyFindStateTime}
+		</if>
+		<if test="pd.keyFindEndTime != null and pd.keyFindEndTime != ''"><!-- 隐患发现时间 -->
+			and f.DISCOVERYTIME &lt;= #{pd.keyFindEndTime}
+		</if>
+		<if test="pd.keyConfirmUser != null and pd.keyConfirmUser != ''"><!-- 确认人 -->
+			and (confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.keyConfirmUser}),'%'))
+		</if>
+		<if test="pd.keyMajor != null and pd.keyMajor != ''"><!-- 重大隐患 -->
+			and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
+		</if>
+		<if test="pd.keyHiddenSpecialType != null and pd.keyHiddenSpecialType != ''">
+			and f.HIDDEN_ID in (select hex.HIDDEN_ID from bus_hiddenexamine hex
+			where hex.TYPE = #{pd.keyHiddenSpecialType} and hex.STATE ='1' )
+		</if>
+		<if test="pd.RECTIFICATIONOR != null and pd.RECTIFICATIONOR != ''"><!-- 整改人 -->
+			and f.RECTIFICATIONOR = #{pd.RECTIFICATIONOR}}
+		</if>
+		<!--<if test="pd.ArrayDATA_IDS != null and pd.ArrayDATA_IDS != ''">
+			or (list.DEPARTMENT_ID in (${pd.ArrayDATA_IDS})
+			)
+		</if>-->
+		order by  f.CREATTIME  desc,f.STATE + 0 asc
+	</select>
+
+	<!-- 验收 -->
+	<update id="finalcheck" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		FINAL_CHECK = #{FINAL_CHECK},
+		FINAL_CHECKOR = #{FINAL_CHECKOR},
+		FINAL_CHECKTIME = #{FINAL_CHECKTIME},
+		FINAL_CHECKDESCR = #{FINAL_CHECKDESCR}
+		where
+		HIDDEN_ID = #{HIDDEN_ID}
+	</update>
+
+	<select id="listOtherNotAccept" parameterType="pd" resultType="pd">
+		select
+		f.HIDDEN_ID
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+		<if test="ACCEPTSTEP == 6">
+			and f.STATE != '4'
+		</if>
+		<if test="ACCEPTSTEP == 7">
+			and (f.STATE != '4' OR (f.STATE = '4' AND f.FINAL_CHECK IS NULL))
+		</if>
+		and f.FOREIGN_ID = #{INSPECTION_ID} and f.HIDDEN_ID != #{HIDDEN_ID}
+	</select>
+
+	<update id="changeState" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		STATE = #{STATE}
+
+		<if test="BUHEGE != null and BUHEGE != ''"><!-- 关键词检索 -->
+			,RECTIFYDESCR = null
+			,RECTIFICATIONTIME = null
+		</if>
+		where
+		HIDDEN_ID = #{HIDDEN_ID}
+	</update>
+
+	<!-- 删除-->
+	<delete id="deleteByKey" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		ISDELETE = '1'
+		where
+		FOREIGN_ID = #{FOREIGN_ID}
+		and SOURCE = #{SOURCE}
+	</delete>
+
+	<select id="keyprojectcount" parameterType="pd" resultType="pd">
+		select count(1)                                                                as AI_COUNT,
+			   (		SELECT COUNT(t.HIDDEN_ID) FROM (
+		SELECT
+		f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
+		FROM
+		BUS_KEYPROJECT_HIDDEN f
+		LEFT JOIN bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
+		LEFT JOIN BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
+		WHERE
+		f.ISDELETE = '0'
+		AND f.SOURCE IN ( '4', '5', '1' )
+		AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
+		and f.ISPUNISH is null
+		and (
+		bo.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
+		OR boai.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
+		)
+	) t ) as HIDDEN_COUNT,
+		(	SELECT COUNT(DISTINCT t.HIDDEN_ID) FROM (
+		SELECT
+		f.HIDDEN_ID
+		FROM
+		BUS_KEYPROJECT_HIDDEN f
+		LEFT JOIN bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
+		LEFT JOIN BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
+		LEFT JOIN BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
+		WHERE
+		f.ISDELETE = '0'
+		AND f.SOURCE IN ( '4', '5', '1' )
+		AND f.STATE = '2'
+		AND f.CREATOR = #{loginUserId}
+		AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
+		) t)CF_COUNT
+		from `qa-gwj-regulatory`.bus_aiwarning f
+		where f.ISDELETE = '0'
+		  and f.STATUS = 0
+		  and VIDEOMANAGER_ID in (
+		      select vi.VIDEOMANAGER_ID
+								from `qa-gwj-regulatory`.bus_aiwarning_people aip
+		      left join `qa-gwj-regulatory`. bus_videomanager vi on vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
+								where aip.AIWARNING_PEOPLE = #{loginUserId}
+								  and aip.ISDELETE = 0
+		      )
+	</select>
+
+	<select id="getpunishlistPage" parameterType="page" resultType="pd">
+		SELECT
+			u.UNITS_NAME,
+			per.`NAME` as PERSON_NAME,
+			ifnull(v.`NAME`,vv.`NAME`) as CREATOR_NAME,
+			c.KEYPROJECTCHECK_ID,
+			p.KEYPROJECTPUNISH_ID,
+			p.HANDLED,
+			p.REASON,
+			vi.`NAME` as RECTIFICATIONOR_NAME,
+			h.*
+		FROM
+			bus_keyproject_hidden h
+			LEFT JOIN us_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
+			LEFT JOIN us_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
+			LEFT JOIN us_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
+			LEFT JOIN us_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
+			LEFT JOIN i_user_all v ON v.USER_ID = p.CREATOR
+			LEFT JOIN i_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
+			LEFT JOIN us_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
+		WHERE
+			h.ISDELETE = '0'
+			<if test="pd.HANDLED==1">
+				and (P.HANDLED = '0' OR  P.HANDLED IS NULL)
+			</if>
+			<if test="pd.HANDLED==2">
+				and P.HANDLED = '1'
+			</if>
+			AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID =  #{pd.OUTSOURCED_ID} )
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+			(
+			h.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			)
+		</if>
+		ORDER BY
+			h.ISPUNISH ASC,
+			p.HANDLED DESC
+	</select>
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
new file mode 100644
index 0000000..3356309
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.keyProjects.KeyprojectPunishMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		BUS_KEYPROJECTPUNISH
+	</sql>
+
+	<!--数据字典表名 -->
+	<sql id="dicTableName">
+		SYS_DICTIONARIES
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.ISDELETE,
+		f.KEYPROJECTCHECK_ID,
+		f.HIDDEN_ID,
+		f.UNITS_ID,
+		f.PERSONNELMANAGEMENT_ID,
+		f.REASON,
+		f.AMOUT,
+		f.DATE,
+		f.HANDLED,
+		f.HANDLE_IMG,
+		f.HANLDE_TIME,
+		f.KEYPROJECTPUNISH_ID
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		CREATOR,
+		CREATTIME,
+		OPERATOR,
+		OPERATTIME,
+		ISDELETE,
+		KEYPROJECTCHECK_ID,
+		HIDDEN_ID,
+		UNITS_ID,
+		PERSONNELMANAGEMENT_ID,
+		REASON,
+		AMOUT,
+		DATE,
+		HANDLED,
+		HANDLE_IMG,
+		HANLDE_TIME,
+		KEYPROJECTPUNISH_ID
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{CREATOR},
+		#{CREATTIME},
+		#{OPERATOR},
+		#{OPERATTIME},
+		#{ISDELETE},
+		#{KEYPROJECTCHECK_ID},
+		#{HIDDEN_ID},
+		#{UNITS_ID},
+		#{PERSONNELMANAGEMENT_ID},
+		#{REASON},
+		#{AMOUT},
+		#{DATE},
+		#{HANDLED},
+		#{HANDLE_IMG},
+		#{HANLDE_TIME},
+		#{KEYPROJECTPUNISH_ID}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			KEYPROJECTPUNISH_ID = #{KEYPROJECTPUNISH_ID}
+	</delete>
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			CREATOR = #{CREATOR},
+			CREATTIME = #{CREATTIME},
+			OPERATOR = #{OPERATOR},
+			OPERATTIME = #{OPERATTIME},
+			ISDELETE = #{ISDELETE},
+			KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID},
+			HIDDEN_ID = #{HIDDEN_ID},
+			UNITS_ID = #{UNITS_ID},
+			PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID},
+			REASON = #{REASON},
+			AMOUT = #{AMOUT},
+			DATE = #{DATE},
+			HANDLED = #{HANDLED},
+			HANDLE_IMG = #{HANDLE_IMG},
+			HANLDE_TIME = #{HANLDE_TIME},
+			KEYPROJECTPUNISH_ID = KEYPROJECTPUNISH_ID
+		where
+			KEYPROJECTPUNISH_ID = #{KEYPROJECTPUNISH_ID}
+	</update>
+
+	<!-- 修改 -->
+	<update id="editstate" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		HANDLED = #{HANDLED},
+		HANDLE_IMG = #{HANDLE_IMG},
+		HANLDE_TIME = #{HANLDE_TIME}
+		where
+		KEYPROJECTPUNISH_ID = #{KEYPROJECTPUNISH_ID}
+	</update>
+
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>,
+		cr.NAME CREATOR_NAME,
+		cre.NAME CREATOR_NAMES,
+		o.OUTSOURCED_NAME,
+		u.UNITS_NAME,
+		p.NAME AS PERSON_NAME
+		from
+		<include refid="tableName"></include> f
+		left join vi_user_all cr on cr.USER_ID = f.CREATOR
+		left join sys_user cre on cre.USER_ID = f.CREATOR
+		left join BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
+		left join BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
+		left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
+		where
+		<if test="KEYPROJECTPUNISH_ID != null and KEYPROJECTPUNISH_ID != ''"><!-- 关键词检索 -->
+			f.KEYPROJECTPUNISH_ID = #{KEYPROJECTPUNISH_ID}
+		</if>
+		<if test="HIDDEN_ID != null and HIDDEN_ID != ''"><!-- 关键词检索 -->
+			f.HIDDEN_ID = #{HIDDEN_ID}
+		</if>
+		GROUP BY f.KEYPROJECTPUNISH_ID
+	</select>
+
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>,
+		cre.NAME CREATOR_NAMES,
+		o.OUTSOURCED_ID,
+		o.OUTSOURCED_NAME,
+		u.UNITS_NAME,
+		p.NAME AS PERSON_NAME
+		from
+		<include refid="tableName"></include> f
+		left join sys_user cre on cre.USER_ID = f.CREATOR
+		left join BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
+		left join BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
+		left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
+		where f.ISDELETE = '0'
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+			(
+			o.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			or
+			u.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			)
+		</if>
+		<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID !='' " >
+			and o.OUTSOURCED_ID = #{pd.OUTSOURCED_ID}
+		</if>
+		<if test="pd.HANDLED != null and pd.HANDLED !='' and pd.HANDLED == 1" >
+			and f.HANDLED = 0
+		</if>
+		<if test="pd.HANDLED != null and pd.HANDLED !='' and pd.HANDLED == 2" >
+			and f.HANDLED &gt; 0
+		</if>
+		<if test="pd.PERSONNELMANAGEMENT_ID != null and pd.PERSONNELMANAGEMENT_ID !='' " >
+			and f.PERSONNELMANAGEMENT_ID = #{pd.PERSONNELMANAGEMENT_ID}
+		</if>
+		group by f.KEYPROJECTPUNISH_ID
+		order by f.CREATTIME desc
+	</select>
+
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+	</select>
+
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			KEYPROJECTPUNISH_ID in
+		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+	<!-- 根据添加人查询罚单 -->
+	<select id="findByOperator" parameterType="pd" resultType="pd">
+		select
+		fadan.CREATOR,
+		fadan.CREATTIME,
+		fadan.OPERATOR,
+		keyp.OUTSOURCED_ID,
+		keyp.KEYPROJECTCHECK_ID
+		from
+		<include refid="tableName"></include> fadan
+		left join bus_keyproject_hidden hidden on fadan.HIDDEN_ID = hidden.HIDDEN_ID
+		left join bus_keyprojectcheck keyp on hidden.FOREIGN_ID = keyp.KEYPROJECTCHECK_ID
+		where
+		keyp.OUTSOURCED_ID = #{OUTSOURCED_ID}
+		and
+		(fadan.CREATOR = #{CREATOR}
+		or
+		fadan.OPERATOR = #{CREATOR})
+
+	</select>
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml
index 7d20c6c..1991c69 100644
--- a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml
+++ b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml
@@ -250,7 +250,7 @@
 			ISDELETE = '1'
 		where
 			UNITS_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
                  #{item}
 		</foreach>
 	</delete>
diff --git a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
index b4cb1e5..d48cfb6 100644
--- a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
+++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
@@ -126,6 +126,16 @@
 		where
 			PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}
 	</update>
+
+	<!-- 重置密码 -->
+	<update id="editPassword" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set PASSWORD = #{PASSWORD}
+		where
+		PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}
+	</update>
+
 	<!-- 通过社会信用代码获取数据 -->
 	<select id="findByCertificate" parameterType="pd" resultType="pd" >
 		select
@@ -188,6 +198,16 @@
 		<include refid="Field"></include>
 		from
 		<include refid="tableName"></include> f
+		where f.ISDELETE ='0'
+		<if test="UNITS_ID != null and UNITS_ID !=''">
+			and f.UNITS_ID = #{UNITS_ID}
+		</if>
+		<if test="IDS != null and IDS.size()>0">
+			and f.UNITS_ID in
+			<foreach collection="IDS" index="index" item="item"   open="(" separator="," close=")">
+				#{IDS[${index}]}
+			</foreach>
+		</if>
 	</select>
 
 	<select id="namelist" parameterType="pd" resultType="pd">
@@ -214,7 +234,7 @@
 			ISDELETE = '1'
 		where
 			PERSONNELMANAGEMENT_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
                  #{item}
 		</foreach>
 	</delete>