From 88efa3f0eaa1815bcca008e22572a4b06235d19a Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Sun, 4 Feb 2024 17:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomController.java | 179 ------------ .../ListcheckstandarditemService.java | 25 -- .../ListcheckstandarditemServiceImpl.java | 43 --- .../ListCheckStandardItemMapper.xml | 261 ------------------ 4 files changed, 508 deletions(-) delete mode 100644 src/main/java/com/zcloud/service/hiddenDangerCheckStandard/ListcheckstandarditemService.java delete mode 100644 src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/ListcheckstandarditemServiceImpl.java delete mode 100644 src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.xml diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java index acf077f..8c6c0de 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java @@ -492,185 +492,6 @@ public class CustomController extends BaseController { return map; } - -// /**列表 -// * @param page -// * @throws Exception -// */ -// @RequestMapping(value="/checkList") -// @ResponseBody -// @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单排查",instructionsType = "列表") -// public Object checkList(Page page) throws Exception{ -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// PageData isRest = this.getPageData(); -// isRest.put("ISREST", "1"); -// isRest.put("USER_ID", Jurisdiction.getUSER_ID()); -// isRest.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); -// List restList = offdutyService.listAll(isRest); -// if(restList != null && restList.size() > 0) { -// // 休假中 -// map.put("ISREST", "1"); -// } else { -// // 正常工作 -// map.put("ISREST", "0"); -// } -// PageData npd = new PageData(); -// npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 -//// pd.put("POST_ID", Jurisdiction.getPOST_ID()); //岗位 -// pd.put("USER_ID", Jurisdiction.getUSER_ID()); -// String indexType = pd.getString("indexType"); //关键词检索条件 -// if(Tools.notEmpty(indexType))pd.put("indexType", indexType.trim()); -// if("1".equals(indexType)) { -// npd.put("STATUS", "0"); -// String DEPARTMENT_ID = Jurisdiction.getDEPARTMENT_ID(); -// npd.put("DEPARTMENT_ID", DEPARTMENT_ID); -// } else if("2".equals(indexType)) { -// -// npd.put("STATUS", "1"); -// String DEPARTMENT_ID = Jurisdiction.getDEPARTMENT_ID(); -// npd.put("DEPARTMENT_ID", DEPARTMENT_ID); -// } else { -// String DEPARTMENT_ID = Jurisdiction.getDEPARTMENT_ID(); -// String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); -// if(Jurisdiction.getIS_MAIN().equals("0")) { -// 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_ID", DEPARTMENT_ID); -// } -// } -// } -// -// npd.put("orderUserId", Jurisdiction.getUSER_ID()); -// String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 -// if(Tools.notEmpty(KEYWORDS))npd.put("KEYWORDS", KEYWORDS.trim()); -// String USERNAME = pd.getString("USERNAME"); //关键词检索条件 -// if(Tools.notEmpty(USERNAME))npd.put("USERNAME", USERNAME.trim()); -// npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_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); -// } -// npd.put("PERIOD",pd.getString("PERIOD")); -// npd.put("STATUS",pd.getString("STATUS")); -// npd.put("LISTINGLEVEL",pd.getString("LISTINGLEVEL")); -// page.setPd(npd); -// List varList = listmanagerService.checklistPage(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; -// } - -// /**列表 -// * @param page -// * @throws Exception -// */ -// @RequestMapping(value="/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(); -// PageData npd = new PageData(); -// pd = this.getPageData(); -// npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 -//// pd.put("POST_ID", Jurisdiction.getPOST_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")); -// page.setPd(npd); -// List varList = listmanagerService.recordList(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/service/hiddenDangerCheckStandard/ListcheckstandarditemService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/ListcheckstandarditemService.java deleted file mode 100644 index ee502d9..0000000 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/ListcheckstandarditemService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.zcloud.service.hiddenDangerCheckStandard; - -import com.zcloud.entity.PageData; - -import java.util.List; - -public interface ListcheckstandarditemService { - /**新增 - * @param pd - * @throws Exception - */ - void save(PageData pd)throws Exception; - - /**列表(全部) - * @param pd - * @throws Exception - */ - List listAll(PageData pd)throws Exception; - - /**删除 - * @param pd - * @throws Exception - */ - public void delete(PageData pd)throws Exception; -} diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/ListcheckstandarditemServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/ListcheckstandarditemServiceImpl.java deleted file mode 100644 index 57e0e46..0000000 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/ListcheckstandarditemServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.zcloud.service.hiddenDangerCheckStandard.impl; - -import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.ListCheckStandardItemMapper; -import com.zcloud.service.hiddenDangerCheckStandard.ListcheckstandarditemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 说明：清单管理 - * 作者：luoxiaobao - * 时间：2020-12-30 - * 官网：www.zcloudchina.com - */ -@Service -@Transactional //开启事物 -public class ListcheckstandarditemServiceImpl implements ListcheckstandarditemService { - @Autowired - private ListCheckStandardItemMapper listCheckStandardItemMapper; - - @Override - public void save(PageData pd)throws Exception { - listCheckStandardItemMapper.save(pd); - } - - /**列表(全部) - * @param pd - * @throws Exception - */ - public List listAll(PageData pd)throws Exception{ - return listCheckStandardItemMapper.listAll(pd); - } - /**删除 - * @param pd - * @throws Exception - */ - public void delete(PageData pd)throws Exception{ - listCheckStandardItemMapper.delete(pd); - } -} diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.xml deleted file mode 100644 index cbce129..0000000 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/ListCheckStandardItemMapper.xml +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - LISTCHECKSTANDARDITEM_ID - - - - - SYS_DICTIONARIES - - - - - f.LISTCHECKSTANDARDITEM_ID, - f.LISTMANAGER_ID, - f.CUSTOM_ID, - f.CUSTOM_ITEM_ID, - f.CORPINFO_ID, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, - f.BAO_BAO_NUM - - - - - LISTCHECKSTANDARDITEM_ID, - LISTMANAGER_ID, - CUSTOM_ID, - CUSTOM_ITEM_ID, - CORPINFO_ID, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, - BAO_BAO_NUM - - - - - #{LISTCHECKSTANDARDITEM_ID}, - #{LISTMANAGER_ID}, - #{RISKPOINT_ID}, - #{RISKCHECKITEM_ID}, - #{CORPINFO_ID}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, - #{BAO_BAO_NUM} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1' - where - LISTCHECKSTANDARDITEM_ID = #{LISTCHECKSTANDARDITEM_ID} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -