重点工程（不包括AI报警和视频监控）

2024-01-25 18:04:53 +08:00 · 2024-01-25 18:04:53 +08:00 · 7ef83c4290
parent 922dbe51b3
commit 7ef83c4290
26 changed files with 4051 additions and 6 deletions
--- a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java
+++ 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;
+    }
+
+}
+
--- a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectPunishController.java
+++ 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;
+	}
+}
--- 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
 	 */
--- 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
 	 */
--- a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckInfoMapper.java
+++ 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);
+
+}
+
--- a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckMapper.java
+++ 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);
+
+}
+
--- a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java
+++ 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);
+
+}
+
--- a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectPunishMapper.java
+++ 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);
+}
+
--- 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);
 }

--- a/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckInfoService.java
+++ 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;
+
+}
+
--- a/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckService.java
+++ 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;
+
+}
+
--- a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java
+++ 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);
+}
+
--- a/src/main/java/com/zcloud/service/keyProjects/KeyprojectPunishService.java
+++ 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;
+}
+
--- a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckInfoServiceImpl.java
+++ 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);
+	}
+
+}
+
--- a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckServiceImpl.java
+++ 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);
+	}
+
+}
+
--- a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java
+++ 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);
+	}
+}
+
--- a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectPunishServiceImpl.java
+++ 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);
+	}
+}
+
--- 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;
+
 }

--- 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);
+	}
+
 }

--- 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";						//文件服务器地址
--- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckInfoMapper.xml
+++ 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>
--- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml
+++ 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>
--- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
+++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
--- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
+++ 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>
--- 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>
--- 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>