From 42c4359074cd1fa3b3cc31b6ef9f6f87cfc3281d Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 12 Jul 2024 19:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/config/StartWebsocketServer.java | 17 ++ .../controller/app/AppHiddenController.java | 163 ++++++++++-------- .../check/AppCheckRecordController.java | 132 ++++++++++++-- .../controller/system/AppUsersController.java | 11 +- .../datasource/hidden/HiddenMapper.java | 2 + .../CustomCheckRecordMapper.java | 2 + .../CustomHiddenMapper.java | 2 + .../zcloud/service/hidden/HiddenService.java | 2 + .../hidden/impl/HiddenServiceImpl.java | 5 + .../CustomCheckRecordService.java | 2 + .../CustomHiddenService.java | 2 + .../impl/CustomCheckRecordServiceImpl.java | 5 + .../impl/CustomHiddenServiceImpl.java | 5 + .../datasource/hidden/HiddenMapper.xml | 10 ++ .../CustomCheckRecordMapper.xml | 9 + .../CustomHiddenMapper.xml | 13 +- .../CustomItemMapper.xml | 6 +- .../CustomMapper.xml | 3 + 18 files changed, 298 insertions(+), 93 deletions(-) diff --git a/src/main/java/com/zcloud/config/StartWebsocketServer.java b/src/main/java/com/zcloud/config/StartWebsocketServer.java index c2e2b2c..08f4593 100644 --- a/src/main/java/com/zcloud/config/StartWebsocketServer.java +++ b/src/main/java/com/zcloud/config/StartWebsocketServer.java @@ -1,6 +1,7 @@ package com.zcloud.config; import com.zcloud.plugins.websocketFace.FaceServer; +import com.zcloud.plugins.websocketOnline.OnlineChatServer; import org.java_websocket.WebSocketImpl; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -18,10 +19,26 @@ public class StartWebsocketServer implements ApplicationRunner{ @Override public void run(ApplicationArguments var1) throws Exception{ + startWebsocketInstantOnline(); //启动人员在线 startWebsocketInstantFace(); //启动定时人脸识别服务 System.out.println("-------------------系统启动成功-------------------"); } + /** + * 启动人员在线 + */ + public void startWebsocketInstantOnline(){ + WebSocketImpl.DEBUG = false; + OnlineChatServer s; + try { + String imPort = "8869"; //即时通讯端口 + s = new OnlineChatServer(Integer.parseInt(imPort)); + s.start(); + } catch (Exception e) { + e.printStackTrace(); + } + } + /** * 启动定时人脸识别服务 */ diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index 96cc98c..77c88ff 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -8,6 +8,7 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.logs.LogAnno; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomHiddenMapper; import com.zcloud.service.bus.*; import com.zcloud.service.check.ListCheckItemService; import com.zcloud.service.check.ListManagerService; @@ -18,6 +19,7 @@ import com.zcloud.service.hidden.HiddenService; import com.zcloud.service.hiddenApi.HiddenApiService; import com.zcloud.service.hiddenApi.HiddenCheckApiService; import com.zcloud.service.hiddenApi.HiddenExamineApiService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomHiddenService; import com.zcloud.service.inspection.SafetyEnvironmentalService; import com.zcloud.service.sms.MSMLoginService; import com.zcloud.service.sms.SMSManagementService; @@ -113,6 +115,9 @@ public class AppHiddenController extends BaseController { @Autowired private Smb smb; + @Autowired + private CustomHiddenService customHiddenService; + /** * app首页获取数量 * @@ -1521,82 +1526,96 @@ public class AppHiddenController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd = hiddenService.findById(pd); // 根据ID读取 - if (pd.getString("CONFIRM_USER") == null) { - pd.put("CONFIRM_USER", ""); - } - if (pd.getString("CONFIRM_USER") != null || pd.getString("CONFIRM_USER").equals("undefined")) { - pd.put("USER_ID", pd.getString("CONFIRM_USER")); - PageData user = usersService.findById(pd); - if (user != null) { - pd.put("confirmDeptId", user.getString("DEPARTMENT_ID")); - pd.put("conUserId", pd.getString("CONFIRM_USER")); + + if(StringUtils.isNotEmpty(pd.getString("OPERATION_TYPE")) || StringUtils.equals(pd.getString("OPERATION_TYPE"), "1")) { + pd.put("RECORDITEM_ID", pd.getString("HIDDEN_ID")); + PageData pageData = customHiddenService.findByRecorditemId(pd); + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pageData.getString("HIDDEN_ID")); + pd2.put("TYPE", 3); + List hImgs = imgFilesService.listAll(pd2);// 隐患图片 + map.put("hImgs", hImgs); + map.put("pd", pageData); + map.put("result", errInfo); + }else{ + pd = hiddenService.findById(pd); // 根据ID读取 + + if (StringUtils.isEmpty(pd.getString("CONFIRM_USER"))) { + pd.put("CONFIRM_USER", ""); } - } - PageData pd2 = new PageData(); - pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); - pd2.put("TYPE", 3); - List hImgs = imgFilesService.listAll(pd2);// 隐患图片 - pd2.put("TYPE", 4); - List rImgs = imgFilesService.listAll(pd2);// 整改图片 - pd2.put("TYPE", 22); - List pImgs = imgFilesService.listAll(pd2);// 计划图片 - pd2.put("TYPE", 50); - List yImgs = imgFilesService.listAll(pd2);// 安全环保检查验收图片 - /* - * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 d770367816c34f53bf22177da3965f6c - */ // 查询整改方案 - PageData hs = hiddenSchemeService.findByHdId(pd); - List sImgs = new ArrayList(); - - if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { - PageData pd3 = new PageData(); - pd3.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); - pd3.put("TYPE", 8); - sImgs = imgFilesService.listAll(pd3);// 方案图片 - - - PageData pd31 = new PageData(); - pd31.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); - pd31.put("TYPE", 8); - List sImgs2 = imgFilesService.listAll(pd31);// 方案图片 - sImgs.addAll(sImgs2); - } - - List checkList = hiddenCheckService.listAll(pd); - if (checkList != null && checkList.size() > 0) { - PageData pd3 = new PageData(); - pd3.put("TYPE", 5); - for (PageData check : checkList) { - pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); - check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 + if (pd.getString("CONFIRM_USER") != null || pd.getString("CONFIRM_USER").equals("undefined")) { + pd.put("USER_ID", pd.getString("CONFIRM_USER")); + PageData user = usersService.findById(pd); + if (user != null) { + pd.put("confirmDeptId", user.getString("DEPARTMENT_ID")); + pd.put("conUserId", pd.getString("CONFIRM_USER")); + } } - } - List hiddenExa = hiddenExamineService.listAllByHiddenId(pd.getString("HIDDEN_ID")); // 隐患流程信息 - List repulsecause = hiddenExamineService.findByHiddenId(pd);//确认人打回信息 - for (PageData pageData : hiddenExa) { - if ("0".equals(pageData.getString("TYPE"))) { - pd.put("editUserName", pageData.get("editUserName")); - pd.put("editDeptName", pageData.get("editDeptName")); - pd.put("editLevelName", pageData.get("editLevelName")); - pd.put("editRectificationDeadline", pageData.get("spare3")); + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd2.put("TYPE", 3); + List hImgs = imgFilesService.listAll(pd2);// 隐患图片 + pd2.put("TYPE", 4); + List rImgs = imgFilesService.listAll(pd2);// 整改图片 + pd2.put("TYPE", 22); + List pImgs = imgFilesService.listAll(pd2);// 计划图片 + pd2.put("TYPE", 50); + List yImgs = imgFilesService.listAll(pd2);// 安全环保检查验收图片 + /* + * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 d770367816c34f53bf22177da3965f6c + */ // 查询整改方案 + PageData hs = hiddenSchemeService.findByHdId(pd); + List sImgs = new ArrayList(); + + if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { + PageData pd3 = new PageData(); + pd3.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd3.put("TYPE", 8); + sImgs = imgFilesService.listAll(pd3);// 方案图片 + + + PageData pd31 = new PageData(); + pd31.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); + pd31.put("TYPE", 8); + List sImgs2 = imgFilesService.listAll(pd31);// 方案图片 + sImgs.addAll(sImgs2); } - } - map.put("hiddenExa", hiddenExa); // //特殊审批信息 - List hiddenFindPeople = hiddenUserService.listAll(pd);// 隐患相关人员信息 --隐患发现人 - map.put("pd", pd); - map.put("hs", hs); - map.put("hImgs", hImgs); - map.put("rImgs", rImgs); - map.put("pImgs", pImgs); - map.put("yImgs", yImgs); - map.put("hiddenVideo", imgFilesService.getListByKeyAndType(pd.getString("HIDDEN_ID"), "102"));// 隐患视频 + + List checkList = hiddenCheckService.listAll(pd); + if (checkList != null && checkList.size() > 0) { + PageData pd3 = new PageData(); + pd3.put("TYPE", 5); + for (PageData check : checkList) { + pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); + check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 + } + } + List hiddenExa = hiddenExamineService.listAllByHiddenId(pd.getString("HIDDEN_ID")); // 隐患流程信息 + List repulsecause = hiddenExamineService.findByHiddenId(pd);//确认人打回信息 + for (PageData pageData : hiddenExa) { + if ("0".equals(pageData.getString("TYPE"))) { + pd.put("editUserName", pageData.get("editUserName")); + pd.put("editDeptName", pageData.get("editDeptName")); + pd.put("editLevelName", pageData.get("editLevelName")); + pd.put("editRectificationDeadline", pageData.get("spare3")); + } + } + map.put("hiddenExa", hiddenExa); // //特殊审批信息 + List hiddenFindPeople = hiddenUserService.listAll(pd);// 隐患相关人员信息 --隐患发现人 + map.put("pd", pd); + map.put("hs", hs); + map.put("hImgs", hImgs); + map.put("rImgs", rImgs); + map.put("pImgs", pImgs); + map.put("yImgs", yImgs); + map.put("hiddenVideo", imgFilesService.getListByKeyAndType(pd.getString("HIDDEN_ID"), "102"));// 隐患视频 // map.put("cImgs", cImgs); - map.put("sImgs", sImgs); - map.put("hiddenFindPeople", hiddenFindPeople); // 隐患相关人员信息 - map.put("checkList", checkList); - map.put("repulsecause", repulsecause); - map.put("result", errInfo); + map.put("sImgs", sImgs); + map.put("hiddenFindPeople", hiddenFindPeople); // 隐患相关人员信息 + map.put("checkList", checkList); + map.put("repulsecause", repulsecause); + map.put("result", errInfo); + } return map; } diff --git a/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java b/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java index 5906109..680815f 100644 --- a/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java +++ b/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java @@ -1,5 +1,6 @@ package com.zcloud.controller.check; +import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; @@ -8,6 +9,9 @@ import com.zcloud.logs.LogAnno; import com.zcloud.service.check.*; import com.zcloud.service.corp.CorpInfoService; import com.zcloud.service.hidden.HiddenService; +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.sms.MSMLoginService; @@ -27,7 +31,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 说明：清单检查记录 作者：luoxiaobao 时间：2021-01-04 官网：www.zcloudchina.com @@ -70,6 +76,15 @@ public class AppCheckRecordController extends BaseController { private ListDisableTimeService listDisableTimeService; @Autowired private SendMessageUtil sendMessageUtil; + + @Autowired + private CustomService customService; + + @Autowired + private CustomCheckRecordService customCheckRecordService; + + @Autowired + private CustomItemService customItemService; /** * 新增 * @@ -353,14 +368,82 @@ public class AppCheckRecordController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) - pd.put("KEYWORDS", KEYWORDS.trim()); - PageData ls = listmanagerService.findById(pd); + 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")); + if(StringUtils.equals(pd.getString("SUB_DEPARTMENT_IDS"), "undefined")) { + pd.put("SUB_DEPARTMENT_IDS", ""); + } + 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()); + } - List varList = checkrecordService.appdatalist(pd); + } 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("ls", ls); + /*map.put("ls", ls);*/ map.put("result", errInfo); return map; } @@ -379,20 +462,33 @@ public class AppCheckRecordController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd = checkrecordService.findById(pd); // 根据ID读取 - PageData users = checkuserService.getCheckUser(pd); - List varList = recordItemService.listAll(pd); - pd.put("USERS", users.get("USERS")); - PageData pd2 = new PageData(); - pd2.put("FOREIGN_KEY",pd.get("CHECKRECORD_ID")); - pd2.put("TYPE","13"); - List qianming = imgFilesService.listAll(pd2); + if(!StringUtils.isEmpty(pd.getString("OPERATION")) || StringUtils.equals(pd.getString("OPERATION"), "1")) { + pd = listmanagerService.findById(pd); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + sdf.parse(pd.getString("CREATTIME")); + pd.put("CREATTIME",sdf.format(sdf.parse(pd.getString("CREATTIME")))); - map.put("qianming", qianming); - map.put("varList", varList); - map.put("pd", pd); - map.put("result", errInfo); + map.put("pd", pd); + map.put("result", errInfo); + }else{ + pd = customService.findById(pd); // 根据ID读取 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + sdf.parse(pd.getString("CREATTIME")); + pd.put("CREATTIME",sdf.format(sdf.parse(pd.getString("CREATTIME")))); + PageData pageData = customCheckRecordService.findByCustomId(pd); + List varList = customItemService.listAll(pd); + + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY",pd.get("CHECKRECORD_ID")); + pd2.put("TYPE","13"); + List qianming = imgFilesService.listAll(pd2); + qianming = qianming.stream().parallel().filter(item -> StringUtils.equals(item.getString("FOREIGN_KEY"), pageData.getString("CHECKRECORD_ID"))).collect(Collectors.toList()); + map.put("qianming", qianming); + map.put("varList", varList); + map.put("pd", pd); + map.put("result", errInfo); + } return map; } diff --git a/src/main/java/com/zcloud/controller/system/AppUsersController.java b/src/main/java/com/zcloud/controller/system/AppUsersController.java index 3452e75..d737b6d 100644 --- a/src/main/java/com/zcloud/controller/system/AppUsersController.java +++ b/src/main/java/com/zcloud/controller/system/AppUsersController.java @@ -15,7 +15,9 @@ import com.zcloud.service.system.impl.UserCorpServiceImpl; import com.zcloud.util.*; import net.sf.json.JSONObject; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.crypto.hash.SimpleHash; +import org.apache.shiro.util.CollectionUtils; import org.java_websocket.WebSocket; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -146,7 +148,14 @@ public class AppUsersController extends BaseController { String errInfo = "success"; pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List byUserId = userCorpService.findByUserId(pd); - map.put("pd", byUserId.get(0)); + PageData pd2 = new PageData(); + if(!CollectionUtils.isEmpty(byUserId)) { + pd2 = byUserId.get(0); + if(StringUtils.equals(pd2.getString("APPLY_TYPE"), "3") || StringUtils.equals(pd2.getString("APPLY_TYPE"), "4")) { + pd2.put("APPLY_STATUS", "1"); + } + } + map.put("pd", pd2); map.put("result", errInfo); return map; } 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 f3a2be0..0f56487 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hidden/HiddenMapper.java @@ -357,5 +357,7 @@ public interface HiddenMapper{ * @throws Exception */ List hiddenAlllistPage(Page page); + + PageData findById2(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.java index 1474581..317164b 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.java @@ -173,5 +173,7 @@ public interface CustomCheckRecordMapper { * @return */ public List listAllYearForTenday(PageData pd); + + PageData findByCustomId(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.java index 33d8afa..9ae16a9 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.java @@ -308,5 +308,7 @@ public interface CustomHiddenMapper { PageData findByEmisId(PageData pd); List getListForemisdatalistPage(Page page); + + PageData findByRecorditemId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/hidden/HiddenService.java b/src/main/java/com/zcloud/service/hidden/HiddenService.java index b86cfd4..822b71f 100644 --- a/src/main/java/com/zcloud/service/hidden/HiddenService.java +++ b/src/main/java/com/zcloud/service/hidden/HiddenService.java @@ -420,5 +420,7 @@ public interface HiddenService{ * @throws Exception */ public List hiddenlist(Page page)throws Exception; + + PageData findById2(PageData pd); } 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 2fc8faa..24ed0d3 100644 --- a/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/hidden/impl/HiddenServiceImpl.java @@ -854,5 +854,10 @@ public class HiddenServiceImpl implements HiddenService { public List hiddenlist(Page page)throws Exception{ return hiddenMapper.hiddenAlllistPage(page); } + + @Override + public PageData findById2(PageData pd) { + return hiddenMapper.findById2(pd); + } } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordService.java index e03e70a..92bcc02 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomCheckRecordService.java @@ -174,5 +174,7 @@ public interface CustomCheckRecordService { * @return */ List statisticsListCheckTenday(PageData pd)throws Exception; + + PageData findByCustomId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenService.java index 45d5e3a..1884e2c 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenService.java @@ -371,5 +371,7 @@ public interface CustomHiddenService { public PageData findByEmisId(PageData pd)throws Exception; public List getListForemis(Page page)throws Exception; + + PageData findByRecorditemId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckRecordServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckRecordServiceImpl.java index 587a385..cf5537e 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomCheckRecordServiceImpl.java @@ -790,5 +790,10 @@ public class CustomCheckRecordServiceImpl implements CustomCheckRecordService { } return list; } + + @Override + public PageData findByCustomId(PageData pd) { + return customCheckRecordMapper.findByCustomId(pd); + } } 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 74683c6..e5ff7b0 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java @@ -786,5 +786,10 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { .head(excel.getHead()) .doWrite(excel.getHand()); } + + @Override + public PageData findByRecorditemId(PageData pd) { + return customHiddenMapper.findByRecorditemId(pd); + } } diff --git a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml index c688ea6..c0880a9 100644 --- a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml @@ -4426,4 +4426,14 @@ order by f.CREATTIME desc + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml index bd9729a..0c48416 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml @@ -1594,4 +1594,13 @@ GROUP BY c.CHECKRECORD_ID order by PERIODSTART + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml index bfb9da6..21245e2 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml @@ -3053,7 +3053,7 @@ order by f.CREATTIME desc,f.STATE + 0 asc - + INSERT INTO bus_hidden_emis( HIDDEN_ID,,CHECK_CATEGORY_NAM,CHECK_CATEGORY_NAME,CHECK_ITEM,CHECK_ITEM_NAME,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR, CREATTIME,RECTIFYDESCR,RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE, @@ -3071,4 +3071,15 @@ HIDDEN_ID = #{HIDDEN_ID} + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml index 78d17b8..3437acb 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml @@ -190,7 +190,9 @@ blsd.BZ as TASK_TYPE_NUM, bhd1.DICTIONARY_NAME as CHECK_CATEGORY_NAME, bhd2.DICTIONARY_NAME as CHECK_ITEM_NAME, - btl.TERM_DESCRIBE as BAO_BAO_NUM_NAME + btl.TERM_DESCRIBE as BAO_BAO_NUM_NAME, + bhr.*, + bhh.* from f left join bus_hiddendangercheckstandard_custom bl on bl.CUSTOM_ID = f.CUSTOM_ID @@ -200,6 +202,8 @@ left join bus_hiddendangercheckstandard_dictionary bhd1 on bhd1.DICTIONARY_ID = f.CHECK_CATEGORY and bhd1.ISDELETE = 0 left join bus_hiddendangercheckstandard_dictionary bhd2 on bhd2.DICTIONARY_ID = f.CHECK_ITEM and bhd2.ISDELETE = 0 left join bus_hiddendangercheckstandard_term_library btl on btl.TASK_NUM = f.BAO_BAO_NUM and btl.WORK_TYPE = blsd.BZ + left join bus_hiddendangercheckstandard_recorditem bhr on bhr.CUSTOM_ID = f.CUSTOM_ID + left join bus_hiddendangercheckstandard_hidden bhh on bhh.RECORDITEM_ID = bhr.RECORDITEM_ID where f.ISDELETE = '0' and f.CUSTOM_ID = #{CUSTOM_ID} diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml index ca9ad55..997c681 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml @@ -870,6 +870,8 @@ f.START_DATE, f.END_DATE, f.BAO_BAO_TYPE, + u1.NAME BAO_BAO_USER_NAME, + f.START_DATE, COUNT(bhci.CUSTOM_ITEM_ID) count, getStandardCheckedNum(f.CUSTOM_ID) checkCount from @@ -878,6 +880,7 @@ left join sys_dictionaries p on f.PERIOD = p.BIANMA left join OA_DEPARTMENT d on d.DEPARTMENT_ID=f.DEPARTMENT_ID left join sys_user u on u.USER_ID = f.USER_ID + left join sys_user u1 on u.USER_ID = f.BAO_BAO_USER_ID left join bus_hiddendangercheckstandard_custom_item bhci on bhci.CUSTOM_ID = f.CUSTOM_ID and bhci.ISDELETE = '0' where f.ISDELETE = 0 and (f.TYPE != 'listType0005'