From 55141254925505407dce1365ff10bb96cf284432 Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Wed, 21 Feb 2024 16:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E6=9F=A5=E7=BB=9F=E8=AE=A1=E5=92=8C?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=B2=BB=E7=90=86=E8=8F=9C=E5=8D=95bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../check/ListManagerController.java | 75 ++++ .../controller/hidden/HiddenController.java | 135 +++++++ .../CustomController.java | 85 +++++ .../CustomHiddenController.java | 39 +- .../datasource/check/ListManagerMapper.java | 2 + .../datasource/hidden/HiddenMapper.java | 6 + .../service/check/ListManagerService.java | 6 + .../check/impl/ListManagerServiceImpl.java | 8 + .../zcloud/service/hidden/HiddenService.java | 6 + .../hidden/impl/HiddenServiceImpl.java | 8 + .../impl/CustomHiddenServiceImpl.java | 7 +- .../datasource/check/ListManagerMapper.xml | 342 ++++++++++++++++++ .../datasource/hidden/HiddenMapper.xml | 309 ++++++++++++++++ .../CustomCheckRecordMapper.xml | 24 +- .../CustomHiddenCheckMapper.xml | 6 +- 15 files changed, 1017 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/zcloud/controller/check/ListManagerController.java b/src/main/java/com/zcloud/controller/check/ListManagerController.java index 22f34c8..b6ecf25 100644 --- a/src/main/java/com/zcloud/controller/check/ListManagerController.java +++ b/src/main/java/com/zcloud/controller/check/ListManagerController.java @@ -1967,4 +1967,79 @@ public class ListManagerController extends BaseController { map.put("result", errInfo); return map; } + + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/recordListAll") + @ResponseBody + @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "列表") + public Object recordListAll(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + PageData npd = new PageData(); + pd = this.getPageData(); + npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 + pd.put("USER_ID", Jurisdiction.getUSER_ID()); + npd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + PageData cpd = new PageData(); + cpd = usersService.findById(pd); + npd.put("ISLEADER", cpd.getString("ISLEADER")); + if(cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")){ + String DEPARTMENT_ID = npd.getString("DEPARTMENT_ID"); + String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); + ids=npd.getString("DEPARTMENT_ID")+","+ids; //把自己部门插入进去 + if(ids!=null && Tools.notEmpty(ids)&& ids.lastIndexOf(",")>-1) { + ids = ids.substring(0,ids.lastIndexOf(",")); + npd.put("DEPARTMENT_IDS", ids.split(",")); + }else { + npd.put("DEPARTMENT_IDS", DEPARTMENT_ID); + } + }else { + if(npd.getString("ISMAIN").equals("0")){ + npd.put("USER_ID",Jurisdiction.getUSER_ID()); + } + } + String DEPTIDS = pd.getString("DEPTIDS"); + if(Tools.notEmpty(DEPTIDS)) { + String DEPT_IDS[] = DEPTIDS.split(","); + npd.put("DEPT_IDS", DEPT_IDS); + } + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))npd.put("KEYWORDS", KEYWORDS.trim()); + String STARTTIME = pd.getString("STARTTIME"); //关键词检索条件 + if(Tools.notEmpty(STARTTIME))npd.put("STARTTIME", STARTTIME.trim() + " 00:00:00"); + String ENDTIME = pd.getString("ENDTIME"); //关键词检索条件 + if(Tools.notEmpty(ENDTIME))npd.put("ENDTIME", ENDTIME.trim() + " 23:59:59"); + npd.put("ISDELETE",pd.getString("ISDELETE")); + npd.put("USERNAME",pd.getString("USERNAME")); + npd.put("STATUS",pd.getString("STATUS")); + npd.put("PERIOD",pd.getString("PERIOD")); + npd.put("OVERTIME",pd.getString("OVERTIME")); + npd.put("WORKSTATUS",pd.getString("WORKSTATUS")); + npd.put("LISTINGLEVEL",pd.getString("LISTINGLEVEL")); + npd.put("TYPE",pd.getString("TYPE")); + npd.put("HASHIDDEN",pd.getString("HASHIDDEN")); + npd.put("RISKCHECKLISTTYPE",pd.getString("RISKCHECKLISTTYPE")); + npd.put("LIST_TYPE",pd.getString("LIST_TYPE")); + page.setPd(npd); + List varList = listmanagerService.recordListAll(page); //列出ListManager列表 + for (PageData list : varList) { + String userId= list.getString("USER_ID"); + if(userId.equals(Jurisdiction.getUSER_ID())) { + 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/hidden/HiddenController.java b/src/main/java/com/zcloud/controller/hidden/HiddenController.java index d5fa301..c5b67a1 100644 --- a/src/main/java/com/zcloud/controller/hidden/HiddenController.java +++ b/src/main/java/com/zcloud/controller/hidden/HiddenController.java @@ -1941,4 +1941,139 @@ public class HiddenController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/hiddenListAll") + // @RequiresPermissions("hidden:list") + @ResponseBody + @LogAnno(menuType= "双重预防",menuServer= "隐患治理",instructionsOperate = "隐患整改",instructionsType = "列表") + public Object hiddenListAll(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()); // 企业id + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + pd.put("KEYWORDS", KEYWORDS.trim()); + String CREATORNAME = pd.getString("CREATORNAME"); // 关键词检索条件 + if (Tools.notEmpty(CREATORNAME)) + pd.put("CREATORNAME", CREATORNAME.trim()); + + String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 + if (Tools.notEmpty(ISQUALIFIED)) + pd.put("ISQUALIFIED", ISQUALIFIED.trim()); + String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 + if (Tools.notEmpty(HIDDENLEVELE)) + pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); + String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 + if (Tools.notEmpty(STARTTIME)) + pd.put("STARTTIME", STARTTIME.trim()); + String STATE = pd.getString("STATE"); // 关键词检索条件 + if (Tools.notEmpty(STATE)) + pd.put("STATE", STATE.trim()); + String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 + if (Tools.notEmpty(ENDTIME)) + pd.put("ENDTIME", ENDTIME + " 23:59:59"); + String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 + + String BISTATE = pd.getString("BISTATE"); // BI页跳转条件 + if (Tools.notEmpty(BISTATE)) + pd.put("BISTATE", BISTATE.trim()); + String IS_DAY = pd.getString("IS_DAY"); // BI页跳转条件 + if (Tools.notEmpty(IS_DAY)) + pd.put("IS_DAY", IS_DAY.trim()); + String IS_WEEK = pd.getString("IS_WEEK"); // BI页跳转条件 + if (Tools.notEmpty(IS_WEEK)) + pd.put("IS_WEEK", IS_WEEK.trim()); + String IS_XUN = pd.getString("IS_XUN"); // BI页跳转条件 + if (Tools.notEmpty(IS_XUN)) + pd.put("IS_XUN", IS_XUN.trim()); + String IS_MONTH = pd.getString("IS_MONTH"); // BI页跳转条件 + if (Tools.notEmpty(IS_MONTH)) + pd.put("IS_MONTH", IS_MONTH.trim()); + String IS_QUARTER = pd.getString("IS_QUARTER"); // BI页跳转条件 + if (Tools.notEmpty(IS_QUARTER)) + pd.put("IS_QUARTER", IS_QUARTER.trim()); + String IS_YEAR = pd.getString("IS_YEAR"); // BI页跳转条件 + if (Tools.notEmpty(IS_YEAR)) + pd.put("IS_YEAR", IS_YEAR.trim()); + if (Tools.notEmpty(DISPOSESTATE)) { + pd.put("DISPOSESTATE", DISPOSESTATE.trim()); + if("-1".equals(DISPOSESTATE.trim())) { + pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + String DEPTIDS = pd.getString("DEPTIDS"); + if(Tools.notEmpty(DEPTIDS)) { + String DEPT_IDS[] = DEPTIDS.split(","); + pd.put("DEPT_IDS", DEPT_IDS); + } + pd.put("USER_ID",Jurisdiction.getUSER_ID()); + PageData cpd = new PageData(); + cpd = usersService.findById(pd); + pd.put("ISLEADER", cpd.getString("ISLEADER")); + 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); + } + } + } + pd.put("SELFUSERID", Jurisdiction.getUSER_ID()); + pd.put("USERDEPT", Jurisdiction.getDEPARTMENT_ID()); + } + pd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + if (Jurisdiction.getIS_MAIN().equals("0")) { + String IS_SELF = pd.getString("IS_SELF"); // 关键词检索条件 + if (IS_SELF != null && IS_SELF.equals("1")) + pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID()); + } + ; + // 旬 + if (pd.get("IS_XUN") != null && Tools.notEmpty(pd.get("IS_XUN").toString())) { + // 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"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); + pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); + } + // 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"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); + pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); + } + // 20-月底 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); + pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + } + } + // 季度 + if (pd.get("IS_QUARTER") != null && Tools.notEmpty(pd.get("IS_QUARTER").toString())) { + pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); + } + page.setPd(pd); + + List varList = hiddenService.hiddenlist(page); // 列出Hidden列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java index ad577ad..56eba76 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java @@ -1882,4 +1882,89 @@ public class CustomController extends BaseController { return map; } + /**清单检查记录（日检）统计 + * @param + * @throws Exception + */ + @RequestMapping(value="/statisticsListCheckDay") + @ResponseBody + @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "清单检查记录（日检）统计") + public Object statisticsListCheckDay() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + pd.put("KEYWORDS", KEYWORDS.trim()); + + List varList = customItemService.listAll(pd); + PageData data = customService.findById(pd); //根据ID读取 + data.put("YEAR", pd.getString("YEAR")); + List recordList = customCheckRecordService.listAllYearForDay(data);//获取查询月在检查周期内的检查记录 + + map.put("pd", data); + map.put("varList", varList); + map.put("recordList", recordList); + map.put("result", errInfo); + return map; + } + + /**清单检查记录（周检）统计 + * @param + * @throws Exception + */ + @RequestMapping(value="/statisticsListCheckWeek") + @ResponseBody + @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "清单检查记录（周检）统计") + public Object statisticsListCheckWeek() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + pd.put("KEYWORDS", KEYWORDS.trim()); + + System.out.println(pd.getString("KEYWORDS")); + List varList = customItemService.listAll(pd); + PageData data = customService.findById(pd); //根据ID读取 + data.put("YEAR", pd.getString("YEAR")); + List recordList = customCheckRecordService.listAllYearForWeek(data);//获取检查周期内的检查记录 + + map.put("pd", data); + map.put("varList", varList); + map.put("recordList", recordList); + map.put("result", errInfo); + return map; + } + + /**清单检查记录（旬检）统计 + * @param + * @throws Exception + */ + @RequestMapping(value="/statisticsListCheckTenday") + @ResponseBody + @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "清单检查记录（旬检）统计") + public Object statisticsListCheckTenday() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + pd.put("KEYWORDS", KEYWORDS.trim()); + + System.out.println(pd.getString("KEYWORDS")); + List varList = customItemService.listAll(pd); + PageData data = customService.findById(pd); //根据ID读取 + data.put("YEAR", pd.getString("YEAR")); + List recordList = customCheckRecordService.statisticsListCheckTenday(data);//获取检查周期内的检查记录 + + map.put("pd", data); + map.put("varList", varList); + map.put("recordList", recordList); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java index cb0752b..367a5ca 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java @@ -14,8 +14,7 @@ import com.zcloud.service.corp.CorpInfoService; import com.zcloud.service.hidden.HiddenCheckService; import com.zcloud.service.hidden.HiddenSchemeService; import com.zcloud.service.hidden.HiddenService; -import com.zcloud.service.hiddenDangerCheckStandard.CustomHiddenService; -import com.zcloud.service.hiddenDangerCheckStandard.CustomService; +import com.zcloud.service.hiddenDangerCheckStandard.*; import com.zcloud.service.inspection.SafetyEnvironmentalService; import com.zcloud.service.sms.SMSLogService; import com.zcloud.service.sms.SMSManagementService; @@ -49,7 +48,7 @@ public class CustomHiddenController extends BaseController { @Autowired private CustomHiddenService customHiddenService; @Autowired - private HiddenUserService hiddenUserService; // 隐患相关人员信息 + private CustomHiddenUserService customHiddenUserService; // 隐患相关人员信息 @Autowired private ImgFilesService imgFilesService; @Autowired @@ -59,19 +58,15 @@ public class CustomHiddenController extends BaseController { @Autowired private HiddenSchemeService hiddenSchemeService; @Autowired - private HiddenCheckService hiddenCheckService; + private CustomHiddenCheckService customHiddenCheckService; @Autowired private CorpInfoService corpinfoService; @Autowired private DictionariesService dictionariesService; @Autowired - private SMSManagementService smsmanagementService; - @Autowired - private SMSLogService smSlogService; - @Autowired private CustomService customService; @Autowired - private RecordItemService recordItemService; + private CustomCheckRecordItemService customCheckRecordItemService; @Autowired private SendMessageUtil sendMessageUtil; @Autowired @@ -124,7 +119,7 @@ public class CustomHiddenController extends BaseController { hc.put("USER_ID", pd.get("CREATOR")); hc.put("STATUS", "1"); hc.put("CHECK_TIME", pd.get("CREATTIME").toString().substring(0, 10)); - hiddenCheckService.save(hc); + customHiddenCheckService.save(hc); } if(pd.get("STATE") != null && Tools.notEmpty(pd.get("STATE").toString()) && !"0".equals(pd.get("STATE").toString())) { @@ -168,7 +163,7 @@ public class CustomHiddenController extends BaseController { pd = Jurisdiction.getUserDataJurisdiction(pd); page.setPd(pd); List varList = customHiddenService.listForSafetyEnvironmental(page); // 列出Hidden列表 - varList = hiddenUserService.getHiddebFind(varList); + varList = customHiddenUserService.getHiddebFind(varList); for (PageData vector : varList) { safetyenvironmentalService.departmentUtil(vector); } @@ -250,9 +245,9 @@ public class CustomHiddenController extends BaseController { PageData ri = new PageData(); ri.put("ISNORMAL", "0"); ri.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - ri.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - ri.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); - recordItemService.editIsnormal(ri); + ri.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + ri.put("CUSTOM_ITEM_ID", pd.get("CUSTOM_ITEM_ID")); + customCheckRecordItemService.editIsnormal(ri); } map.put("result", errInfo); // 返回结果 return map; @@ -447,14 +442,14 @@ public class CustomHiddenController extends BaseController { } } - this.hiddenCheckService.delete(pd); + this.customHiddenCheckService.delete(pd); PageData checkUser = new PageData(); checkUser.put("HIDDENCHECK_ID", this.get32UUID()); // 主键 checkUser.put("HIDDEN_ID", pd.get("HIDDEN_ID")); checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT")); checkUser.put("USER_ID", pd.get("CHECKOR")); checkUser.put("STATUS", "0"); - hiddenCheckService.save(checkUser); + customHiddenCheckService.save(checkUser); if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { List list = (List) JSON.parse(pd.get("OTHER").toString()); for (JSONObject json : list) { @@ -466,7 +461,7 @@ public class CustomHiddenController extends BaseController { other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); other.put("USER_ID", json.get("USER_ID")); other.put("STATUS", "0"); - hiddenCheckService.save(other); + customHiddenCheckService.save(other); // 发短信 PageData mes = new PageData(); @@ -577,14 +572,14 @@ public class CustomHiddenController extends BaseController { pd = this.getPageData(); if (pd.get("ISQUALIFIED").equals("1")) { pd.put("CHECKOR", Jurisdiction.getUSER_ID()); - PageData pd2 = this.hiddenCheckService.findByHidden(pd); + PageData pd2 = customHiddenCheckService.findByHidden(pd); pd.put("STATUS", 1); pd.put("HIDDENCHECK_ID", pd2.get("HIDDENCHECK_ID")); pd.put("DEPARTMENT_ID", pd2.get("DEPARTMENT_ID")); pd.put("USER_ID", pd2.get("USER_ID")); - hiddenCheckService.edit(pd); + customHiddenCheckService.edit(pd); - List checkList = hiddenCheckService.listAll(pd); + List checkList = customHiddenCheckService.listAll(pd); for (PageData check : checkList) { if (check.get("STATUS").toString().equals("0")) { map.put("result", errInfo); @@ -941,7 +936,7 @@ public class CustomHiddenController extends BaseController { pImgs = imgFilesService.listAll(pd3);//方案图片 } - List checkList = hiddenCheckService.listAll(pd); + List checkList = customHiddenCheckService.listAll(pd); if (checkList != null && checkList.size() > 0) { PageData pd3 = new PageData(); pd3.put("TYPE", 5); @@ -1371,7 +1366,7 @@ public class CustomHiddenController extends BaseController { imgIds.add(pageData.getString("HIDDENSCHEME_ID")); } // 验收信息 - List checkList = hiddenCheckService.listExport(pd); + List checkList = customHiddenCheckService.listExport(pd); Map> checkMap = new HashMap<>(); Integer checkMaxCount = 1; for (PageData pageData : checkList) { diff --git a/src/main/java/com/zcloud/mapper/datasource/check/ListManagerMapper.java b/src/main/java/com/zcloud/mapper/datasource/check/ListManagerMapper.java index b45f365..04cb658 100644 --- a/src/main/java/com/zcloud/mapper/datasource/check/ListManagerMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/check/ListManagerMapper.java @@ -242,5 +242,7 @@ public interface ListManagerMapper { * @throws Exception */ List listAllRiskStandard(PageData pd); + + List recordAlllistPage(Page page); } diff --git a/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java b/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java index 71aeb39..f3a2be0 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java @@ -351,5 +351,11 @@ public interface HiddenMapper{ * @throws Exception */ List getRiskStandardCountByCreatorId(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List hiddenAlllistPage(Page page); } diff --git a/src/main/java/com/zcloud/service/check/ListManagerService.java b/src/main/java/com/zcloud/service/check/ListManagerService.java index 6a75d94..2bf0193 100644 --- a/src/main/java/com/zcloud/service/check/ListManagerService.java +++ b/src/main/java/com/zcloud/service/check/ListManagerService.java @@ -228,5 +228,11 @@ public interface ListManagerService { * @throws Exception */ List listAllRiskStandard(PageData pd)throws Exception; + + /**部门清单列表 + * * @param pd + * @throws Exception + */ + public List recordListAll(Page page)throws Exception; } diff --git a/src/main/java/com/zcloud/service/check/impl/ListManagerServiceImpl.java b/src/main/java/com/zcloud/service/check/impl/ListManagerServiceImpl.java index aee7a60..1a86ed5 100644 --- a/src/main/java/com/zcloud/service/check/impl/ListManagerServiceImpl.java +++ b/src/main/java/com/zcloud/service/check/impl/ListManagerServiceImpl.java @@ -344,6 +344,14 @@ public class ListManagerServiceImpl implements ListManagerService { public List listAllRiskStandard(PageData pd)throws Exception{ return listmanagerMapper.listAllRiskStandard(pd); } + + /**部门清单列表全部 + * * @param pd + * @throws Exception + */ + public List recordListAll(Page page)throws Exception{ + return listmanagerMapper.recordAlllistPage(page); + } } diff --git a/src/main/java/com/zcloud/service/hidden/HiddenService.java b/src/main/java/com/zcloud/service/hidden/HiddenService.java index f020245..b86cfd4 100644 --- a/src/main/java/com/zcloud/service/hidden/HiddenService.java +++ b/src/main/java/com/zcloud/service/hidden/HiddenService.java @@ -414,5 +414,11 @@ public interface HiddenService{ * @throws Exception */ List getRiskStandardCountByCreatorId(PageData pd) throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List hiddenlist(Page page)throws Exception; } diff --git a/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java b/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java index aa4078c..2fc8faa 100644 --- a/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java @@ -846,5 +846,13 @@ public class HiddenServiceImpl implements HiddenService { public List getRiskStandardCountByCreatorId(PageData pd) throws Exception{ return hiddenMapper.getRiskStandardCountByCreatorId(pd); } + + /**列表 + * @param page + * @throws Exception + */ + public List hiddenlist(Page page)throws Exception{ + return hiddenMapper.hiddenAlllistPage(page); + } } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java index 34c2a9d..74683c6 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java @@ -10,9 +10,8 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Dictionaries; import com.zcloud.mapper.datasource.bus.HiddenExamineMapper; -import com.zcloud.mapper.datasource.hidden.HiddenCheckMapper; -import com.zcloud.mapper.datasource.hidden.HiddenMapper; import com.zcloud.mapper.datasource.hidden.HiddenSchemeMapper; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomHiddenCheckMapper; import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomHiddenMapper; import com.zcloud.service.bus.HiddenRegionService; import com.zcloud.service.hiddenDangerCheckStandard.CustomHiddenService; @@ -52,7 +51,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { @Resource private HiddenSchemeMapper hiddenSchemeMapper; @Resource - private HiddenCheckMapper hiddenCheckMapper; + private CustomHiddenCheckMapper customHiddenCheckMapper; @Resource private ImgFilesService imgFilesService; @Resource @@ -732,7 +731,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { Map schemeMap = schemeList.stream().filter(n -> "0".equals(n.getString("ISDELETE"))).collect(Collectors.toMap((n -> n.getString("HIDDEN_ID")), (m -> m))); imgIds.addAll(schemeList.stream().map(n -> n.getString("HIDDENSCHEME_ID")).collect(Collectors.toSet())); // 验收信息 - List checkList = hiddenCheckMapper.listExport(condition); + List checkList = customHiddenCheckMapper.listExport(condition); imgIds.addAll(checkList.stream().map(n -> n.getString("HIDDENCHECK_ID")).collect(Collectors.toSet())); Map> checkMap = checkList.stream().collect(Collectors.toMap((n -> n.getString("HIDDEN_ID")), (Arrays::asList))); int checkMaxCount = checkMap.values().stream().mapToInt(List::size).max().orElse(0); diff --git a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml index dafe111..2bb2975 100644 --- a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml +++ b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml @@ -3468,4 +3468,346 @@ ) z order by z.USER_ID= #{orderUserId} desc ,z.CREATTIME desc ,z.DEPARTMENT_ID asc + + + + diff --git a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml index 85cae8e..dc264a0 100644 --- a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml @@ -4084,4 +4084,313 @@ + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml index e5434e3..fc5be9a 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml @@ -1528,7 +1528,7 @@ @@ -1553,7 +1553,7 @@ @@ -1575,7 +1575,7 @@ diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.xml index ab874d1..e74d689 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenCheckMapper.xml @@ -163,7 +163,7 @@ and EXISTS ( select 1 - from bus_hidden h + from BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN h where h.hidden_id = f.hidden_id and h.ISDELETE = '0' and h.STATE != '0' @@ -222,11 +222,11 @@ and h.STATE = '3' - and (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=h.HIDDEN_ID and bh.STATUS=0)>0 + and (select count(1) from BUS_HIDDENDANGERCHECKSTANDARD_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=h.HIDDEN_ID and bh.STATUS=0)>0 and h.STATE = '4' - and (h.RECTIFICATIONOR = #{SELFUSERID} or h.CREATOR = #{SELFUSERID} or (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=h.HIDDEN_ID)>0) + and (h.RECTIFICATIONOR = #{SELFUSERID} or h.CREATOR = #{SELFUSERID} or (select count(1) from BUS_HIDDENDANGERCHECKSTANDARD_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=h.HIDDEN_ID)>0)