diff --git a/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java b/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java index 9d08b4c..5906109 100644 --- a/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java +++ b/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java @@ -285,7 +285,7 @@ public class AppCheckRecordController extends BaseController { @RequestMapping(value = "/delete") // @RequiresPermissions("checkrecord:del") @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "删除检查记录") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "删除检查记录") public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -305,7 +305,7 @@ public class AppCheckRecordController extends BaseController { @RequestMapping(value = "/edit") // @RequiresPermissions("checkrecord:edit") @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "修改") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "修改") public Object edit() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -324,7 +324,7 @@ public class AppCheckRecordController extends BaseController { */ @RequestMapping(value = "/recordByIde") @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "指定辨识部位检查记录") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "指定辨识部位检查记录") public Object recordByIde() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -347,7 +347,7 @@ public class AppCheckRecordController extends BaseController { */ @RequestMapping(value = "/list") @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "检查记录列表") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "检查记录列表") public Object list() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -373,7 +373,7 @@ public class AppCheckRecordController extends BaseController { */ @RequestMapping(value = "/goEdit") @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "去修改页面获取数据") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "去修改页面获取数据") public Object goEdit() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -405,7 +405,7 @@ public class AppCheckRecordController extends BaseController { */ @RequestMapping(value = "/goEditWeui") @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "去修改页面获取数据") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "去修改页面获取数据") public Object goEditWeui() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -436,7 +436,7 @@ public class AppCheckRecordController extends BaseController { @RequestMapping(value = "/deleteAll") // @RequiresPermissions("checkrecord:del") @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "批量删除") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "批量删除") public Object deleteAll() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -461,7 +461,7 @@ public class AppCheckRecordController extends BaseController { * @throws Exception */ @RequestMapping(value = "/excel") - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "导出到excel") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "导出到excel") public ModelAndView exportExcel() throws Exception { ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java index 2366c34..53ed968 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java @@ -606,6 +606,74 @@ public class AppCustomController extends BaseController { return map; } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/recordList") // /app/listmanager/recordList + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "列表") + public Object recordList(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); +// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 +// pd.put("USER_ID",Jurisdiction.getUSER_ID()); + + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + String STARTTIME = pd.getString("STARTTIME"); //关键词检索条件 + if (Tools.notEmpty(STARTTIME)) pd.put("STARTTIME", STARTTIME.trim() + " 00:00:00"); + String ENDTIME = pd.getString("ENDTIME"); //关键词检索条件 + if (Tools.notEmpty(ENDTIME)) pd.put("ENDTIME", ENDTIME.trim() + " 23:59:59"); + PageData dept = new PageData(); + dept.put("DEPARTMENT_ID", pd.get("DEPARTMENT_ID").toString()); + dept = departmentService.findById(dept); + PageData cpd = new PageData(); + cpd = usersService.findById(pd); + pd.put("ISLEADER", cpd.getString("ISLEADER")); + if (dept.getString("ISSUPERVISE").equals("1")) { + pd.put("SUP_DEPARTMENT_ID", dept.getString("DEPARTMENT_ID")); + List subdept = departmentService.findBySubId(pd); //查询监管哪些部门 + String subIds = ""; //用于存储监管部门ID + for (int i = 0; i < subdept.size(); i++) { + subIds += subdept.get(i).getString("SUB_DEPARTMENT_ID") + ","; + } + pd.put("DEPARTMENT_IDS", subIds.split(",")); + } else { + pd.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID")); + + } + pd.put("ISSUPERVISE", dept.getString("ISSUPERVISE")); + if (cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")) { + String DEPARTMENT_ID = pd.getString("DEPARTMENT_ID"); + String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); + ids = pd.getString("DEPARTMENT_ID") + "," + ids; //把自己部门插入进去 + if (ids != null && Tools.notEmpty(ids) && ids.lastIndexOf(",") > -1) { + ids = ids.substring(0, ids.lastIndexOf(",")); + pd.put("DEPARTMENT_IDS", ids.split(",")); + } else { + pd.put("DEPARTMENT_IDS", DEPARTMENT_ID); + } + } + page.setPd(pd); + List varList = customService.recordList(page); //列出ListManager列表 + for (PageData list : varList) { + String userId = list.getString("USER_ID"); + if (userId.equals(pd.get("USER_ID").toString())) { + list.put("stateMy", "0"); + } else { + list.put("stateMy", "1"); + } + } + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java index c6b69d1..88ea7b8 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java @@ -1352,9 +1352,9 @@ public class AppCustomHiddenController extends BaseController { * @param * @throws Exception */ - @RequestMapping(value = "/getChcenkHidden") + @RequestMapping(value = "/getCheckHidden") @ResponseBody - public Object getChcenkHidden() throws Exception { + public Object getCheckHidden() throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.java new file mode 100644 index 0000000..0a9b61f --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.java @@ -0,0 +1,68 @@ +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明:隐患验收人员记录 + * 作者:luoxiaobao + * 时间:2021-01-20 + * 官网:www.zcloudchina.com + */ +public interface CustomHiddenCheckMapper { + + /**新增 + * @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 datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + PageData findByHidden(PageData pd); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listExport(PageData pd); + + List listAllByIds(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordItemService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordItemService.java index 55210a5..3f68554 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordItemService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordItemService.java @@ -17,43 +17,43 @@ public interface CustomCheckRecordItemService { * @param pd * @throws Exception */ - public void save(PageData pd)throws Exception; + void save(PageData pd)throws Exception; /**删除 * @param pd * @throws Exception */ - public void delete(PageData pd)throws Exception; + void delete(PageData pd)throws Exception; /**修改 * @param pd * @throws Exception */ - public void edit(PageData pd)throws Exception; + void edit(PageData pd)throws Exception; /**列表 * @param page * @throws Exception */ - public List list(Page page)throws Exception; + List list(Page page)throws Exception; /**列表(全部) * @param pd * @throws Exception */ - public List listAll(PageData pd)throws Exception; + List listAll(PageData pd)throws Exception; /**通过id获取数据 * @param pd * @throws Exception */ - public PageData findById(PageData pd)throws Exception; + PageData findById(PageData pd)throws Exception; /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ - public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + void deleteAll(String[] ArrayDATA_IDS)throws Exception; List listAllForMap(PageData pd) throws Exception; @@ -61,7 +61,7 @@ public interface CustomCheckRecordItemService { * @param pd * @throws Exception */ - public void editIsnormal(PageData pd)throws Exception; + void editIsnormal(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordService.java index c5646f5..e03e70a 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordService.java @@ -17,31 +17,31 @@ public interface CustomCheckRecordService { * @param pd * @throws Exception */ - public void save(PageData pd)throws Exception; + void save(PageData pd)throws Exception; /**删除 * @param pd * @throws Exception */ - public void delete(PageData pd)throws Exception; + void delete(PageData pd)throws Exception; /**修改 * @param pd * @throws Exception */ - public void edit(PageData pd)throws Exception; + void edit(PageData pd)throws Exception; /**清单逾期检查记录数 * @param pd * @throws Exception */ - public int countOverTime(PageData pd)throws Exception; + int countOverTime(PageData pd)throws Exception; /**列表 * @param page * @throws Exception */ - public List list(Page page)throws Exception; + List list(Page page)throws Exception; @@ -50,129 +50,129 @@ public interface CustomCheckRecordService { * @param page * @throws Exception */ - public List listAllList(Page page)throws Exception; + List listAllList(Page page)throws Exception; /**列表(全部) * @param pd * @throws Exception */ - public List listAll(PageData pd)throws Exception; + List listAll(PageData pd)throws Exception; /**列表(全部未完成的) * @param pd * @throws Exception */ - public List listAllUnfinished(PageData pd)throws Exception; + List listAllUnfinished(PageData pd)throws Exception; /**通过清单ID获取风险点数据 * @param pd * @throws Exception */ - public List findRiskPointByLId(PageData pd)throws Exception; + List findRiskPointByLId(PageData pd)throws Exception; /**通过id获取数据 * @param pd * @throws Exception */ - public PageData findById(PageData pd)throws Exception; + PageData findById(PageData pd)throws Exception; /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ - public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + void deleteAll(String[] ArrayDATA_IDS)throws Exception; /* 统计功能 */ - public List listCountDay(PageData pd)throws Exception;/* 统计日 */ - public List listCountWeek(PageData pd)throws Exception;/* 统计周 */ - public List listCountTenDays(PageData pd)throws Exception;/* 统计旬 */ - public List listCountMonth(PageData pd)throws Exception;/* 统计功月 */ - public List listCountQuarter(PageData pd)throws Exception;/* 统计季 */ - public List listCountHalfYear(PageData pd)throws Exception;/* 统计半年 */ - public List listCountYear(PageData pd)throws Exception;/* 统计年 */ - public Integer listCountJjr(PageData pd)throws Exception;/* 统计节假日 */ + List listCountDay(PageData pd)throws Exception;/* 统计日 */ + List listCountWeek(PageData pd)throws Exception;/* 统计周 */ + List listCountTenDays(PageData pd)throws Exception;/* 统计旬 */ + List listCountMonth(PageData pd)throws Exception;/* 统计功月 */ + List listCountQuarter(PageData pd)throws Exception;/* 统计季 */ + List listCountHalfYear(PageData pd)throws Exception;/* 统计半年 */ + List listCountYear(PageData pd)throws Exception;/* 统计年 */ + Integer listCountJjr(PageData pd)throws Exception;/* 统计节假日 */ /**修改统计状态 * @param pd * @throws Exception */ - public void editStatistics(PageData pd)throws Exception; + void editStatistics(PageData pd)throws Exception; /** * 查询辨识部位检查记录 * @param pd * @return */ - public List listLogByIde(PageData pd)throws Exception; + List listLogByIde(PageData pd)throws Exception; /** * 指定辨识部位检查记录 * @param pd * @return */ - public List recordByIde(PageData pd)throws Exception; + List recordByIde(PageData pd)throws Exception; /**补录 * @param pd * @throws Exception */ - public void recording(PageData pd)throws Exception; + void recording(PageData pd)throws Exception; /** * APP清单检查记录 * @param pd * @return */ - public List appdatalist(PageData pd)throws Exception; + List appdatalist(PageData pd)throws Exception; /** * 统计各用户各类型检查数据 * @param pd * @return */ - public List countByPeriodUser(PageData pd)throws Exception; + List countByPeriodUser(PageData pd)throws Exception; /** * 查询公司检查过清单的员工总数 * @param pd * @return */ - public int getWorkedUserCount(PageData pd) throws Exception; + int getWorkedUserCount(PageData pd) throws Exception; /** * 查询公司检查过清单的部门总数 * @param pd * @return */ - public int getWorkedDepCount(PageData pd)throws Exception; + int getWorkedDepCount(PageData pd)throws Exception; - public List listTypeBi(PageData pd)throws Exception; + List listTypeBi(PageData pd)throws Exception; /** * 查询检查记录(按ids) * @param pd * @return */ - public List listForIdsAndMonth(PageData pd)throws Exception; + List listForIdsAndMonth(PageData pd)throws Exception; /** * 清单检查记录(日检)统计(按清单ID统计指定年内检查情况) * @param pd * @return */ - public List listAllYearForDay(PageData pd)throws Exception; + List listAllYearForDay(PageData pd)throws Exception; /** * 清单检查记录(周检)统计(按清单ID统计指定年内检查情况) * @param pd * @return */ - public List listAllYearForWeek(PageData pd)throws Exception; + List listAllYearForWeek(PageData pd)throws Exception; /** * 清单检查记录(旬检)统计(按清单ID统计指定年内检查情况) * @param pd * @return */ - public List statisticsListCheckTenday(PageData pd)throws Exception; + List statisticsListCheckTenday(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckUserService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckUserService.java index 1451c8c..1e24626 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckUserService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckUserService.java @@ -17,62 +17,62 @@ public interface CustomCheckUserService { * @param pd * @throws Exception */ - public void save(PageData pd)throws Exception; + void save(PageData pd)throws Exception; /**删除 * @param pd * @throws Exception */ - public void delete(PageData pd)throws Exception; + void delete(PageData pd)throws Exception; /**修改 * @param pd * @throws Exception */ - public void edit(PageData pd)throws Exception; + void edit(PageData pd)throws Exception; /**列表 * @param page * @throws Exception */ - public List list(Page page)throws Exception; + List list(Page page)throws Exception; /**列表(全部) * @param pd * @throws Exception */ - public List listAll(PageData pd)throws Exception; + List listAll(PageData pd)throws Exception; /**通过id获取数据 * @param pd * @throws Exception */ - public PageData findById(PageData pd)throws Exception; + PageData findById(PageData pd)throws Exception; /**查看检查清单检查人 * @param pd * @throws Exception */ - public PageData getCheckUser(PageData pd)throws Exception; + PageData getCheckUser(PageData pd)throws Exception; /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ - public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + void deleteAll(String[] ArrayDATA_IDS)throws Exception; /**查询人员检查数 * @param pd * @throws Exception */ - public List countCheByUser(PageData pd)throws Exception; + List countCheByUser(PageData pd)throws Exception; /**绩效得分 * @param pd * @throws Exception */ - public List getDeptExamine(PageData pd)throws Exception; - public List getUserExamine(PageData pd)throws Exception; + List getDeptExamine(PageData pd)throws Exception; + List getUserExamine(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenCheckService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenCheckService.java new file mode 100644 index 0000000..20f554f --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenCheckService.java @@ -0,0 +1,73 @@ +package com.zcloud.service.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明:隐患验收人员记录 + * 作者:luoxiaobao + * 时间:2021-01-20 + * 官网:www.zcloudchina.com + */ +public interface CustomHiddenCheckService { + + /**新增 + * @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 list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findByHidden(PageData pd)throws Exception; + + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listExport(PageData pd)throws Exception; + + public List listAllByIds(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java index 5d385bd..dafe2c8 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java @@ -17,7 +17,7 @@ public interface CustomService { * @param pd * @throws Exception */ - public void save(PageData pd)throws Exception; + void save(PageData pd)throws Exception; /**列表 * @param pd @@ -78,19 +78,25 @@ public interface CustomService { * @param pd * @return */ - public int getListCount(PageData pd)throws Exception; + int getListCount(PageData pd)throws Exception; /** * 查询公司检查过清单的总数 * @param pd * @return */ - public int getWorkedListCount(PageData pd)throws Exception; + int getWorkedListCount(PageData pd)throws Exception; /**查询人员清单 * @param page * @throws Exception */ - public List getListByCorplistPage(Page page)throws Exception; + List getListByCorplistPage(Page page)throws Exception; + + /**部门清单列表 + * * @param pd + * @throws Exception + */ + List recordList(Page page)throws Exception; } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckUserServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckUserServiceImpl.java index de483a6..2d6bcca 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckUserServiceImpl.java @@ -3,6 +3,7 @@ package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.check.CheckUserMapper; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomCheckUserMapper; import com.zcloud.service.hiddenDangerCheckStandard.CustomCheckUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,14 +22,14 @@ import java.util.List; public class CustomCheckUserServiceImpl implements CustomCheckUserService { @Autowired - private CheckUserMapper checkuserMapper; + private CustomCheckUserMapper customCheckUserMapper; /**新增 * @param pd * @throws Exception */ public void save(PageData pd)throws Exception{ - checkuserMapper.save(pd); + customCheckUserMapper.save(pd); } /**删除 @@ -36,7 +37,7 @@ public class CustomCheckUserServiceImpl implements CustomCheckUserService { * @throws Exception */ public void delete(PageData pd)throws Exception{ - checkuserMapper.delete(pd); + customCheckUserMapper.delete(pd); } /**修改 @@ -44,7 +45,7 @@ public class CustomCheckUserServiceImpl implements CustomCheckUserService { * @throws Exception */ public void edit(PageData pd)throws Exception{ - checkuserMapper.edit(pd); + customCheckUserMapper.edit(pd); } /**列表 @@ -52,7 +53,7 @@ public class CustomCheckUserServiceImpl implements CustomCheckUserService { * @throws Exception */ public List list(Page page)throws Exception{ - return checkuserMapper.datalistPage(page); + return customCheckUserMapper.datalistPage(page); } /**列表(全部) @@ -60,7 +61,7 @@ public class CustomCheckUserServiceImpl implements CustomCheckUserService { * @throws Exception */ public List listAll(PageData pd)throws Exception{ - return checkuserMapper.listAll(pd); + return customCheckUserMapper.listAll(pd); } /**通过id获取数据 @@ -68,7 +69,7 @@ public class CustomCheckUserServiceImpl implements CustomCheckUserService { * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return checkuserMapper.findById(pd); + return customCheckUserMapper.findById(pd); } /**查看检查清单检查人 @@ -76,7 +77,7 @@ public class CustomCheckUserServiceImpl implements CustomCheckUserService { * @throws Exception */ public PageData getCheckUser(PageData pd)throws Exception{ - return checkuserMapper.getCheckUser(pd); + return customCheckUserMapper.getCheckUser(pd); } /**批量删除 @@ -84,7 +85,7 @@ public class CustomCheckUserServiceImpl implements CustomCheckUserService { * @throws Exception */ public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ - checkuserMapper.deleteAll(ArrayDATA_IDS); + customCheckUserMapper.deleteAll(ArrayDATA_IDS); } /**查询人员检查数 @@ -92,7 +93,7 @@ public class CustomCheckUserServiceImpl implements CustomCheckUserService { * @throws Exception */ public List countCheByUser(PageData pd)throws Exception{ - return checkuserMapper.countCheByUser(pd); + return customCheckUserMapper.countCheByUser(pd); } /**绩效得分 @@ -100,10 +101,10 @@ public class CustomCheckUserServiceImpl implements CustomCheckUserService { * @throws Exception */ public List getDeptExamine(PageData pd)throws Exception{ - return checkuserMapper.getDeptExamine(pd); + return customCheckUserMapper.getDeptExamine(pd); } public List getUserExamine(PageData pd)throws Exception{ - return checkuserMapper.getUserExamine(pd); + return customCheckUserMapper.getUserExamine(pd); } } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenCheckServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenCheckServiceImpl.java new file mode 100644 index 0000000..079e361 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenCheckServiceImpl.java @@ -0,0 +1,108 @@ +package com.zcloud.service.hiddenDangerCheckStandard.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.hidden.HiddenCheckMapper; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomHiddenCheckMapper; +import com.zcloud.service.hidden.HiddenCheckService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomHiddenCheckService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明:隐患验收人员记录 + * 作者:luoxiaobao + * 时间:2021-01-20 + * 官网:www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CustomHiddenCheckServiceImpl implements CustomHiddenCheckService { + + @Autowired + private CustomHiddenCheckMapper customHiddenCheckMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + customHiddenCheckMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + customHiddenCheckMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + customHiddenCheckMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return customHiddenCheckMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return customHiddenCheckMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return customHiddenCheckMapper.findById(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findByHidden(PageData pd)throws Exception{ + return customHiddenCheckMapper.findByHidden(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + customHiddenCheckMapper.deleteAll(ArrayDATA_IDS); + } + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listExport(PageData pd)throws Exception{ + return customHiddenCheckMapper.listExport(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return customHiddenCheckMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java index 57cda77..8267c35 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java @@ -125,6 +125,14 @@ public class CustomServiceImpl implements CustomService { public List getListByCorplistPage(Page page)throws Exception{ return customMapper.getListByCorplistPage(page); } + + /**部门清单列表 + * * @param pd + * @throws Exception + */ + public List recordList(Page page)throws Exception{ + return customMapper.recordlistPage(page); + } } diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml index 8a156ec..e2da625 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml @@ -4,7 +4,7 @@ - bus_hiddendangercheckstandard_checkrecord + BUS_HIDDENDANGERCHECKSTANDARD_CHECKRECORD @@ -15,6 +15,7 @@ f.CUSTOM_ID, + f.CUSTOM_NAME, f.CORPINFO_ID, f.CREATOR, f.CREATTIME, @@ -37,6 +38,7 @@ CUSTOM_ID, + CUSTOM_NAME, CORPINFO_ID, CREATOR, CREATTIME, @@ -61,6 +63,7 @@ #{CUSTOM_ID}, + #{CUSTOM_NAME}, #{CORPINFO_ID}, #{CREATOR}, #{CREATTIME}, @@ -136,7 +139,7 @@ l.END_DATE from f - left join bus_hiddendangercheckstandard_custom l on f.CUSTOM_ID = l.CUSTOM_ID + left join BUS_HIDDENDANGERCHECKSTANDARD_CUSTOM l on f.CUSTOM_ID = l.CUSTOM_ID left join sys_dictionaries p on l.PERIOD = p.BIANMA left join sys_dictionaries t on l.TYPE = t.BIANMA left join sys_dictionaries s on l.SCREENTYPE = s.BIANMA @@ -150,6 +153,7 @@ SELECT - GROUP_CONCAT(DISTINCT IFNULL(F.USER_NAME, U.NAME)) USERS + GROUP_CONCAT(DISTINCT IFNULL(f.USER_NAME, u.NAME)) USERS FROM - BUS_CHECKUSER F - LEFT JOIN SYS_USER U ON U.USER_ID = F.USER_ID - WHERE U.NAME IS NOT NULL - AND U.NAME != '' - AND F.CHECKRECORD_ID = #{CHECKRECORD_ID} + f + LEFT JOIN SYS_USER u ON u.USER_ID = f.USER_ID + WHERE u.NAME IS NOT NULL + AND u.NAME != '' + AND f.CHECKRECORD_ID = #{CHECKRECORD_ID} GROUP BY - F.CHECKRECORD_ID + f.CHECKRECORD_ID diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.xml new file mode 100644 index 0000000..ab874d1 --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.xml @@ -0,0 +1,271 @@ + + + + + + + BUS_HIDDENDANGERCHECKSTANDARD_HIDDENCHECK + + + + + SYS_DICTIONARIES + + + + + f.HIDDEN_ID, + f.DEPARTMENT_ID, + f.USER_ID, + f.STATUS, + f.CHECK_TIME, + f.CHECKDESCR, + f.HIDDENCHECK_ID + + + + + HIDDEN_ID, + DEPARTMENT_ID, + USER_ID, + STATUS, + CHECK_TIME, + CHECKDESCR, + HIDDENCHECK_ID + + + + + #{HIDDEN_ID}, + #{DEPARTMENT_ID}, + #{USER_ID}, + #{STATUS}, + #{CHECK_TIME}, + #{CHECKDESCR}, + #{HIDDENCHECK_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + set + HIDDEN_ID = #{HIDDEN_ID}, + DEPARTMENT_ID = #{DEPARTMENT_ID}, + USER_ID = #{USER_ID}, + STATUS = #{STATUS}, + CHECK_TIME = #{CHECK_TIME}, + CHECKDESCR = #{CHECKDESCR}, + HIDDENCHECK_ID = HIDDENCHECK_ID + where + HIDDENCHECK_ID = #{HIDDENCHECK_ID} + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HIDDENCHECK_ID in + + #{item} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml index d8ab5bc..d50c6e4 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml @@ -788,7 +788,7 @@ 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 + (select group_concat(chr.NAME) from BUS_HIDDENDANGERCHECKSTANDARD_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME from f left join sys_user cr on cr.USER_ID = f.CREATOR diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml index 8473d12..e59da6a 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml @@ -316,6 +316,345 @@ f.CUSTOM_ID = #{CUSTOM_ID} + + + +