diff --git a/src/main/java/com/zcloud/controller/check/AppListManagerController.java b/src/main/java/com/zcloud/controller/check/AppListManagerController.java index db9ae49..fc69183 100644 --- a/src/main/java/com/zcloud/controller/check/AppListManagerController.java +++ b/src/main/java/com/zcloud/controller/check/AppListManagerController.java @@ -56,7 +56,7 @@ public class AppListManagerController extends BaseController { */ @RequestMapping(value = "/checkList") @ResponseBody - @LogAnno(menuType = "手机", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "列表") + @LogAnno(menuType = "手机", menuServer = "风险排查", instructionsOperate = "清单管理", instructionsType = "列表") public Object checkList() throws Exception { Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java new file mode 100644 index 0000000..802270e --- /dev/null +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java @@ -0,0 +1,433 @@ +package com.zcloud.controller.hiddenDangerCheckStandard; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.check.*; +import com.zcloud.service.hiddenDangerCheckStandard.CustomCheckRecordItemService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomCheckRecordService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomItemService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomService; +import com.zcloud.service.offduty.OffDutyService; +import com.zcloud.service.risk.IdentificationPartsService; +import com.zcloud.service.risk.RiskPointService; +import com.zcloud.service.statistics.ListStatisticsService; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import com.zcloud.util.Warden; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明:清单管理-隐患排查清单 + * 作者:luoxiaobao + * 时间:2020-12-30 + * 官网:www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/hiddenDangerCheckStandardCustom") +public class AppCustomController extends BaseController { + + @Autowired + private CustomService customService; + @Autowired + private CustomItemService customItemService; + @Autowired + private ListCheckItemService listcheckitemService; + @Autowired + private DepartmentService departmentService; + @Autowired + private CustomCheckRecordService customCheckRecordService; + @Autowired + private CustomCheckRecordItemService customCheckRecordItemService; + @Autowired + private RiskPointService riskpointService; + @Autowired + private ListStatisticsService listStatisticsService; + @Autowired + private IdentificationPartsService identificationPartsService; + @Autowired + private ListDisableTimeService listdisabletimeService; + @Autowired + private CheckRouteService checkRouteService; + @Autowired + private UsersService usersService; + @Autowired + private OffDutyService offdutyService; + + /** + * 列表 + * + * @throws Exception + */ + @RequestMapping(value = "/checkList") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "列表") + public Object checkList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String USER_NAME = pd.getString("USER_NAME"); + PageData cpd = new PageData(); + cpd = usersService.findById(pd); + pd.put("ISLEADER", cpd.getString("ISLEADER")); + PageData dept = new PageData(); + dept.put("DEPARTMENT_ID", pd.getString("CHECK_DEPARTMENT_ID")); + dept = departmentService.findById(dept); + if (dept != null && dept.getString("ISSUPERVISE").equals("1")) { + pd.put("SUP_DEPARTMENT_ID", dept.getString("DEPARTMENT_ID")); + pd.put("ISSUPERVISE", dept.getString("ISSUPERVISE")); + } else { + pd.put("DEPARTMENT_ID", pd.getString("CHECK_DEPARTMENT_ID")); + } + if (cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")) { + String DEPARTMENT_ID = pd.getString("CHECK_DEPARTMENT_ID"); + String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); + ids = pd.getString("CHECK_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); + } + } + pd.put("orderUserId", pd.get("USER_ID")); + List varList = customService.getMyCheckList(pd);//列出ListManager列表 + for (PageData list : varList) { + String cycle = list.getString("PERIODNAME"); + if (cycle.equals("每日")) { + list.put("START_DATE", DateUtil.getDay()); + list.put("END_DATE", DateUtil.getDay()); + } else if (cycle.equals("每周")) { + list.put("START_DATE", DateUtil.getWeekStart().substring(0, 10)); + list.put("END_DATE", DateUtil.getWeekEnd().substring(0, 10)); + } else if (cycle.equals("每旬")) { + //1-10 + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { + list.put("START_DATE", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01"); + list.put("END_DATE", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10"); + } + //10-20 + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { + list.put("START_DATE", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11"); + list.put("END_DATE", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20"); + } + //20-月底 + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { + list.put("START_DATE", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21"); + list.put("END_DATE", DateUtil.getMonthEndDay()); + } + + } else if (cycle.equals("每月")) { + list.put("START_DATE", DateUtil.getMonthFirstDay()); + list.put("END_DATE", DateUtil.getMonthEndDay()); + } else if (cycle.equals("每季")) { + list.put("START_DATE", DateUtil.quarterStart()); + list.put("END_DATE", DateUtil.quarterEnd()); + } else if (cycle.equals("半年")) { + Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString()); + if (bmonth <= 6) { + list.put("START_DATE", DateUtil.getYear() + "-01-01"); + list.put("END_DATE", DateUtil.getYear() + "-06-30"); + } else if (bmonth > 6) { + list.put("START_DATE", DateUtil.getYear() + "-07-01"); + list.put("END_DATE", DateUtil.getYear() + "-12-31"); + } + } else if (cycle.equals("每年")) { + list.put("START_DATE", DateUtil.getCurrYearFirst()); + list.put("END_DATE", DateUtil.getCurrYearLast()); + } + } + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + + /** + * 获取清单风险点 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getCheckItem") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "获取清单风险点") + public Object getRisk() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String USER_ID = pd.getString("USER_NAME"); + List varList = customItemService.getCheckItem(pd); + map.put("varList", varList); + pd = customService.findById(pd); + if (pd.getString("TYPE").equals("listType0005")) { + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(pd.getString("START_DATE") + " 00:00:00"), DateUtil.fomatDateTime(pd.getString("END_DATE") + " 23:59:59"))) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_XUN", 1);//查询方法和旬一样,直接借用 + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", pd.getString("START_DATE") + " 00:00:00"); + type.put("ENDTIME", pd.getString("END_DATE") + " 23:59:59"); + List records = customCheckRecordService.listAllUnfinished(type); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } + map.put("result", errInfo); + return map; + } + String cycle = pd.getString("PERIODNAME"); + if (cycle.equals("每日")) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_DAY", 1); + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + List records = customCheckRecordService.listAllUnfinished(type); + pd.put("checkCount", records == null ? 0 : records.size()); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } else if (cycle.equals("每周")) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_WEEK", 1); + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + List records = customCheckRecordService.listAllUnfinished(type); + pd.put("checkCount", records == null ? 0 : records.size()); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } else if (cycle.equals("每旬")) { + //1-10 + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_XUN", 1); + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); + type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); + List records = customCheckRecordService.listAllUnfinished(type); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } + //10-20 + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_XUN", 1); + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); + type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); + List records = customCheckRecordService.listAllUnfinished(type); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } + //20-月底 + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_XUN", 1); + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); + type.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + List records = customCheckRecordService.listAllUnfinished(type); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } + + } else if (cycle.equals("每月")) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_MONTH", 1); + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + List records = customCheckRecordService.listAllUnfinished(type); + pd.put("checkCount", records == null ? 0 : records.size()); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } else if (cycle.equals("每季")) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_QUARTER", 1); + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + List records = customCheckRecordService.listAllUnfinished(type); + pd.put("checkCount", records == null ? 0 : records.size()); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } else if (cycle.equals("半年")) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_HALFYEAR", 1); + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + List records = customCheckRecordService.listAllUnfinished(type); + pd.put("checkCount", records == null ? 0 : records.size()); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } else if (cycle.equals("每年")) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_YEAR", 1); + type.put("FINISHED", '0'); + type.put("USER_ID", USER_ID); + List records = customCheckRecordService.listAllUnfinished(type); + pd.put("checkCount", records == null ? 0 : records.size()); + if (records != null && records.size() > 0) { + PageData record = new PageData(); + record.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + List checkedList = customCheckRecordItemService.listAll(record); + Map checkmap = new HashMap();//记录所有风险点 + for (PageData item : checkedList) { + if (!checkmap.containsKey(item.getString("IDENTIFICATION_ID"))) { + checkmap.put(item.getString("IDENTIFICATION_ID"), 1); + } else { + checkmap.put(item.getString("IDENTIFICATION_ID"), checkmap.get(item.getString("IDENTIFICATION_ID")) + 1); + } + } + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); + map.put("checkmap", checkmap); + } + } + map.put("result", errInfo); + return map; + } + + + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.java new file mode 100644 index 0000000..b70eac3 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明:检查记录详情 + * 作者:luoxiaobao + * 时间:2021-01-04 + * 官网:www.zcloudchina.com + */ +public interface CustomCheckRecordItemMapper { + + /**新增 + * @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); + + List listAllForMap(PageData pd); + + /**修改状态 + * @param pd + * @throws Exception + */ + void editIsnormal(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomItemMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomItemMapper.java index f66cc2b..d92942d 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomItemMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomItemMapper.java @@ -2,6 +2,8 @@ package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; import com.zcloud.entity.PageData; +import java.util.List; + /** * 说明:清单管理-检查标准项目 * 作者:luoxiaobao @@ -15,5 +17,11 @@ public interface CustomItemMapper { * @throws Exception */ void save(PageData pd); + + /**获取用户检查清单的检查项目 + * @param pd + * @throws Exception + */ + List getCheckItem(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomMapper.java index 9ef2d0c..c526345 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomMapper.java @@ -227,5 +227,11 @@ public interface CustomMapper { List findByCondition(PageData util); List analysis(PageData util); + + /**获取用户的检查清单 + * @param pd + * @throws Exception + */ + List getMyCheckList(PageData pd); } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordItemService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordItemService.java new file mode 100644 index 0000000..55210a5 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordItemService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明:检查记录详情 + * 作者:luoxiaobao + * 时间:2021-01-04 + * 官网:www.zcloudchina.com + */ +public interface CustomCheckRecordItemService { + + /**新增 + * @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; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + List listAllForMap(PageData pd) throws Exception; + + /**修改状态 + * @param pd + * @throws Exception + */ + public void editIsnormal(PageData pd)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomItemService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomItemService.java index 3b88ce0..1563662 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomItemService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomItemService.java @@ -2,6 +2,8 @@ package com.zcloud.service.hiddenDangerCheckStandard; import com.zcloud.entity.PageData; +import java.util.List; + /** * 说明:清单管理-检查标准项目 * 作者:luoxiaobao @@ -17,5 +19,11 @@ public interface CustomItemService { */ void save(PageData pd)throws Exception; + + /**获取用户检查清单的检查项目 + * @param pd + * @throws Exception + */ + List getCheckItem(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 c4860b2..4ad9a53 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java @@ -54,11 +54,16 @@ public interface CustomService { * @throws Exception */ public void enable(PageData pd)throws Exception; - - /**通过id获取数据 +/**通过id获取数据 * @param pd * @throws Exception */ - public PageData findById(PageData pd)throws Exception; + PageData findById(PageData pd)throws Exception; + + /**获取用户的检查清单 + * @param pd + * @throws Exception + */ + List getMyCheckList(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckRecordItemServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckRecordItemServiceImpl.java new file mode 100644 index 0000000..317e3f2 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckRecordItemServiceImpl.java @@ -0,0 +1,100 @@ +package com.zcloud.service.hiddenDangerCheckStandard.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomCheckRecordItemMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CustomCheckRecordItemService; +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-04 + * 官网:www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CustomCheckRecordItemServiceImpl implements CustomCheckRecordItemService { + + @Autowired + private CustomCheckRecordItemMapper customCheckRecordItemMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + customCheckRecordItemMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + customCheckRecordItemMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + customCheckRecordItemMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return customCheckRecordItemMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return customCheckRecordItemMapper.listAll(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + @Override + public List listAllForMap(PageData pd)throws Exception{ + return customCheckRecordItemMapper.listAllForMap(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return customCheckRecordItemMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + customCheckRecordItemMapper.deleteAll(ArrayDATA_IDS); + } + + /**改状态 + * @param pd + * @throws Exception + */ + public void editIsnormal(PageData pd)throws Exception{ + customCheckRecordItemMapper.editIsnormal(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomItemServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomItemServiceImpl.java index ce313ad..94ca954 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomItemServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomItemServiceImpl.java @@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** * 说明:清单管理-检查标准项目 * 作者:luoxiaobao @@ -29,6 +31,11 @@ public class CustomItemServiceImpl implements CustomItemService { customItemMapper.save(pd); } + @Override + public List getCheckItem(PageData pd)throws Exception { + return customItemMapper.getCheckItem(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 f76c04b..33c1397 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java @@ -87,6 +87,14 @@ public class CustomServiceImpl implements CustomService { public PageData findById(PageData pd)throws Exception{ return customMapper.findById(pd); } + + /**获取用户的检查清单 + * @param pd + * @throws Exception + */ + public List getMyCheckList(PageData pd)throws Exception{ + return customMapper.getMyCheckList(pd); + } } diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml new file mode 100644 index 0000000..612b627 --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml @@ -0,0 +1,202 @@ + + + + + + + BUS_HIDDENDANGERCHECKSTANDARD_RECORDITEM + + + + + SYS_DICTIONARIES + + + + + f.CHECKRECORD_ID, + f.CUSTOM_ID, + f.CUSTOM_ITEM_ID, + f.CHECK_CATEGORY, + f.CHECK_CATEGORY_NAME, + f.CHECK_ITEM, + f.CHECK_ITEM_NAME, + f.CHECK_CONTENT, + f.CHECK_STANDARD, + f.REFERENCE_BASIS, + f.ISNORMAL, + f.CHECK_RESULT, + f.COMMON_ITEM_SORT, + f.LONGITUDE, + f.LATITUDE, + f.CORPINFO_ID, + f.ISDELETE, + f.CREATOR_ID, + f.CREATOR_NAME, + f.CREATE_TIME, + f.RECORDITEM_ID + + + + + CHECKRECORD_ID, + CUSTOM_ID, + CUSTOM_ITEM_ID, + CHECK_CATEGORY, + CHECK_CATEGORY_NAME, + CHECK_ITEM, + CHECK_ITEM_NAME, + CHECK_CONTENT, + CHECK_STANDARD, + REFERENCE_BASIS, + ISNORMAL, + CHECK_RESULT, + COMMON_ITEM_SORT, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + ISDELETE, + CREATOR_ID, + CREATOR_NAME, + CREATE_TIME, + RECORDITEM_ID + + + + + #{CHECKRECORD_ID}, + #{CUSTOM_ID}, + #{CUSTOM_ITEM_ID}, + #{CHECK_CATEGORY}, + #{CHECK_CATEGORY_NAME}, + #{CHECK_ITEM}, + #{CHECK_ITEM_NAME}, + #{CHECK_CONTENT}, + #{CHECK_STANDARD}, + #{REFERENCE_BASIS}, + #{ISNORMAL}, + #{CHECK_RESULT}, + #{COMMON_ITEM_SORT}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{CREATOR_ID}, + #{CREATOR_NAME}, + #{CREATE_TIME}, + #{RECORDITEM_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + CHECKRECORD_ID = #{CHECKRECORD_ID} + + + + + update + + set + ISNORMAL = #{ISNORMAL}, + LONGITUDE=#{LONGITUDE}, + LATITUDE=#{LATITUDE} + where + RECORDITEM_ID = #{RECORDITEM_ID} + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + RECORDITEM_ID in + + #{item} + + + + + + update + + set + ISNORMAL = #{ISNORMAL} + where + CHECKRECORD_ID = #{CHECKRECORD_ID} + AND CUSTOM_ID = #{CUSTOM_ID} + AND CUSTOM_ITEM_ID = #{CUSTOM_ITEM_ID} + + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml index 6eb5b48..42541ad 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml @@ -894,9 +894,9 @@ and f.CREATOR=#{USER_ID} - + and - f.LISTMANAGER_ID = #{LISTMANAGER_ID} + f.CUSTOM_ID = #{CUSTOM_ID} and diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml index a7e903c..3b2570b 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml @@ -107,4 +107,24 @@ ) + + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml index e859278..917dceb 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml @@ -315,4 +315,41 @@ where f.CUSTOM_ID = #{CUSTOM_ID} + + +