diff --git a/pom.xml b/pom.xml index 0d6aca9..b3ffe36 100644 --- a/pom.xml +++ b/pom.xml @@ -502,6 +502,11 @@ rocketmq-spring-boot-starter 2.2.2 + + cn.hutool + hutool-all + 5.0.5 + diff --git a/src/main/java/com/zcloud/controller/check/CheckRecordController.java b/src/main/java/com/zcloud/controller/check/CheckRecordController.java index 964bcd0..dfe43eb 100644 --- a/src/main/java/com/zcloud/controller/check/CheckRecordController.java +++ b/src/main/java/com/zcloud/controller/check/CheckRecordController.java @@ -9,6 +9,7 @@ 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.offduty.OffDutyService; import com.zcloud.service.sms.SMSLogService; import com.zcloud.service.sms.SMSManagementService; @@ -35,282 +36,284 @@ import java.util.*; @Controller @RequestMapping("/checkrecord") public class CheckRecordController extends BaseController { - @Autowired - private CorpInfoService corpinfoService; - @Autowired - private CheckRecordService checkrecordService; - @Autowired - private RecordItemService recordItemService; - @Autowired - private ListCheckItemService listcheckitemService; - @Autowired - private HiddenService hiddenService; - @Autowired - private CheckUserService checkuserService; - @Autowired - private ListStatisticsService listStatisticsService; - @Autowired - private ListManagerService listmanagerService; - @Autowired - private UsersService usersService; - @Autowired - private SMSManagementService smsmanagementService; - @Autowired - private SMSLogService smSlogService; - @Autowired - private DepartmentService departmentService; - @Autowired - private ImgFilesService imgFilesService; - @Autowired - private OffDutyService offDutyService; - @Autowired - private SysDateService sysDateService; - @Autowired - private ListDisableTimeService listDisableTimeService; - @Autowired - private SendMessageUtil sendMessageUtil; - /** - * 新增 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/add") - // @RequiresPermissions("checkrecord:add") - @ResponseBody - @Transactional - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单排查",instructionsType = "新增记录") - public Object add() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData sysdate = new PageData(); - sysdate.put("DATE", pd.get("CHECK_TIME")); - sysdate = sysDateService.findByDate(sysdate); - pd.put("CHECKRECORD_ID", this.get32UUID()); // 主键 - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - pd.put("ISDELETE", "0"); // 是否删除 - pd.put("CREATOR", Jurisdiction.getName()); // 添加人 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 创建时间 - pd.put("OPERATOR", Jurisdiction.getName()); // 修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); - pd.put("FINISHED", '1'); - pd.put("ISSTATISTICS", '1'); - pd.put("TYPE", '1'); - PageData list = listmanagerService.findById(pd); - String periodstart = ""; - String periodend = ""; - if(!list.get("TYPE").toString().equals("listType0005")) { - switch (list.get("PERIOD").toString()) { - case "checkPeriod0001": - periodstart = sysdate.getString("DAY_START"); - periodend = sysdate.getString("DAY_END"); - break; - case "checkPeriod0002": - periodstart = sysdate.getString("WEEK_START"); - periodend = sysdate.getString("WEEK_END"); - break; - case "checkPeriod0003": - periodstart = sysdate.getString("XUN_START"); - periodend = sysdate.getString("XUN_END"); - break; - case "checkPeriod0004": - periodstart = sysdate.getString("MONTH_START"); - periodend = sysdate.getString("MONTH_END"); - break; - case "checkPeriod0005": - periodstart = sysdate.getString("QUARTER_START"); - periodend = sysdate.getString("QUARTER_END"); - break; - case "checkPeriod0006": - periodstart = sysdate.getString("YEAR_START"); - periodend = sysdate.getString("YEAR_END"); - break; - case "checkPeriod0007": - periodstart = sysdate.getString("HALFYEAR_START"); - periodend = sysdate.getString("HALFYEAR_END"); - break; - } - pd.put("PERIODSTART", periodstart); - pd.put("PERIODEND", periodend); - } else { - pd.put("PERIODSTART", list.get("START_DATE")); - pd.put("PERIODEND", list.get("END_DATE")); - } - checkrecordService.save(pd); - checkuserService.delete(pd); - PageData checkUser = new PageData(); - checkUser.put("CHECKUSER_ID", this.get32UUID()); // 主键 - checkUser.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT")); - checkUser.put("USER_ID", pd.get("CHECKOR")); - PageData u = usersService.findUserDept(checkUser); + @Autowired + private CorpInfoService corpinfoService; + @Autowired + private CheckRecordService checkrecordService; + @Autowired + private RecordItemService recordItemService; + @Autowired + private ListCheckItemService listcheckitemService; + @Autowired + private HiddenService hiddenService; + @Autowired + private CheckUserService checkuserService; + @Autowired + private ListStatisticsService listStatisticsService; + @Autowired + private ListManagerService listmanagerService; + @Autowired + private UsersService usersService; + @Autowired + private SMSManagementService smsmanagementService; + @Autowired + private SMSLogService smSlogService; + @Autowired + private DepartmentService departmentService; + @Autowired + private ImgFilesService imgFilesService; + @Autowired + private OffDutyService offDutyService; + @Autowired + private SysDateService sysDateService; + @Autowired + private ListDisableTimeService listDisableTimeService; + @Autowired + private SendMessageUtil sendMessageUtil; - checkUser.put("USER_NAME", u.get("USER_NAME")); - checkUser.put("DEPARTMENT_NAME", u.get("DEPARTMENT_NAME")); + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + // @RequiresPermissions("checkrecord:add") + @ResponseBody + @Transactional + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单排查", instructionsType = "新增记录") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData sysdate = new PageData(); + sysdate.put("DATE", pd.get("CHECK_TIME")); + sysdate = sysDateService.findByDate(sysdate); + pd.put("CHECKRECORD_ID", this.get32UUID()); // 主键 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + pd.put("ISDELETE", "0"); // 是否删除 + pd.put("CREATOR", Jurisdiction.getName()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 创建时间 + pd.put("OPERATOR", Jurisdiction.getName()); // 修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + pd.put("FINISHED", '1'); + pd.put("ISSTATISTICS", '1'); + pd.put("TYPE", '1'); + PageData list = listmanagerService.findById(pd); + String periodstart = ""; + String periodend = ""; + if (!list.get("TYPE").toString().equals("listType0005")) { + switch (list.get("PERIOD").toString()) { + case "checkPeriod0001": + periodstart = sysdate.getString("DAY_START"); + periodend = sysdate.getString("DAY_END"); + break; + case "checkPeriod0002": + periodstart = sysdate.getString("WEEK_START"); + periodend = sysdate.getString("WEEK_END"); + break; + case "checkPeriod0003": + periodstart = sysdate.getString("XUN_START"); + periodend = sysdate.getString("XUN_END"); + break; + case "checkPeriod0004": + periodstart = sysdate.getString("MONTH_START"); + periodend = sysdate.getString("MONTH_END"); + break; + case "checkPeriod0005": + periodstart = sysdate.getString("QUARTER_START"); + periodend = sysdate.getString("QUARTER_END"); + break; + case "checkPeriod0006": + periodstart = sysdate.getString("YEAR_START"); + periodend = sysdate.getString("YEAR_END"); + break; + case "checkPeriod0007": + periodstart = sysdate.getString("HALFYEAR_START"); + periodend = sysdate.getString("HALFYEAR_END"); + break; + } + pd.put("PERIODSTART", periodstart); + pd.put("PERIODEND", periodend); + } else { + pd.put("PERIODSTART", list.get("START_DATE")); + pd.put("PERIODEND", list.get("END_DATE")); + } + checkrecordService.save(pd); + checkuserService.delete(pd); + PageData checkUser = new PageData(); + checkUser.put("CHECKUSER_ID", this.get32UUID()); // 主键 + checkUser.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT")); + checkUser.put("USER_ID", pd.get("CHECKOR")); + PageData u = usersService.findUserDept(checkUser); - checkuserService.save(checkUser); - if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { - List otherList = (List) JSON.parse(pd.get("OTHER").toString()); - for (JSONObject json : otherList) { - if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null - && json.get("USER_ID") != "") { - PageData other = new PageData(); - other.put("CHECKUSER_ID", this.get32UUID()); // 主键 - other.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); - other.put("USER_ID", json.get("USER_ID")); - PageData ou = usersService.findUserDept(other); + checkUser.put("USER_NAME", u.get("USER_NAME")); + checkUser.put("DEPARTMENT_NAME", u.get("DEPARTMENT_NAME")); - other.put("USER_NAME", ou.get("USER_NAME")); - other.put("DEPARTMENT_NAME", ou.get("DEPARTMENT_NAME")); + checkuserService.save(checkUser); + if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { + List otherList = (List) JSON.parse(pd.get("OTHER").toString()); + for (JSONObject json : otherList) { + if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null + && json.get("USER_ID") != "") { + PageData other = new PageData(); + other.put("CHECKUSER_ID", this.get32UUID()); // 主键 + other.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); + other.put("USER_ID", json.get("USER_ID")); + PageData ou = usersService.findUserDept(other); - checkuserService.save(other); - } - } - } - if (pd.get("ITEMS") != null && !pd.get("ITEMS").equals("")) { - List itemsList = (List) JSON.parse(pd.get("ITEMS").toString()); - for (JSONObject json : itemsList) { - PageData item = new PageData(); - item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键 - item.put("LISTCHECKITEM_ID", json.get("LISTCHECKITEM_ID")); - PageData chei = listcheckitemService.findById(item); - item.put("ISNORMAL", json.get("ISNORMAL")); - item.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - item.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - item.put("RISKUNITNAME", chei.get("RISKUNITNAME")); - item.put("PARTSNAME", chei.get("PARTSNAME")); - item.put("RISK_DESCR", chei.get("RISK_DESCR")); - item.put("POSITIONNAME", chei.get("POSITIONNAME")); - item.put("LEVEL_NAME", chei.get("DNAME5")); - item.put("CHECK_CONTENT", chei.get("CHECK_CONTENT")); - item.put("RISKPOINT_ID", chei.get("RISKPOINT_ID")); - item.put("LONGITUDE", pd.get("LONGITUDE")); - item.put("LATITUDE", pd.get("LATITUDE")); - item.put("CORPINFO_ID", pd.get("CORPINFO_ID")); - item.put("ISDELETE", pd.get("0")); - recordItemService.save(item); + other.put("USER_NAME", ou.get("USER_NAME")); + other.put("DEPARTMENT_NAME", ou.get("DEPARTMENT_NAME")); - } - } - if (pd.get("IDS") != null && !pd.get("IDS").equals("")) { - String ids = pd.get("IDS").toString(); - String ArrayDATA_IDS[] = ids.split(","); - PageData hiddens = new PageData(); - hiddens.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - hiddens.put("IDS", ArrayDATA_IDS); - hiddenService.updateAll(hiddens); - } - hiddenService.submit(pd); + checkuserService.save(other); + } + } + } + if (pd.get("ITEMS") != null && !pd.get("ITEMS").equals("")) { + List itemsList = (List) JSON.parse(pd.get("ITEMS").toString()); + for (JSONObject json : itemsList) { + PageData item = new PageData(); + item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键 + item.put("LISTCHECKITEM_ID", json.get("LISTCHECKITEM_ID")); + PageData chei = listcheckitemService.findById(item); + item.put("ISNORMAL", json.get("ISNORMAL")); + item.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + item.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + item.put("RISKUNITNAME", chei.get("RISKUNITNAME")); + item.put("PARTSNAME", chei.get("PARTSNAME")); + item.put("RISK_DESCR", chei.get("RISK_DESCR")); + item.put("POSITIONNAME", chei.get("POSITIONNAME")); + item.put("LEVEL_NAME", chei.get("DNAME5")); + item.put("CHECK_CONTENT", chei.get("CHECK_CONTENT")); + item.put("RISKPOINT_ID", chei.get("RISKPOINT_ID")); + item.put("LONGITUDE", pd.get("LONGITUDE")); + item.put("LATITUDE", pd.get("LATITUDE")); + item.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + item.put("ISDELETE", pd.get("0")); + recordItemService.save(item); - hiddenService.submitList(pd);// 其他隐患提交 + } + } + if (pd.get("IDS") != null && !pd.get("IDS").equals("")) { + String ids = pd.get("IDS").toString(); + String ArrayDATA_IDS[] = ids.split(","); + PageData hiddens = new PageData(); + hiddens.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + hiddens.put("IDS", ArrayDATA_IDS); + hiddenService.updateAll(hiddens); + } + hiddenService.submit(pd); - List hList = hiddenService.getHiddenByRecord(pd); - if (hList.size() > 0) { - for (PageData h : hList) { - if ("2".equals(h.get("RECTIFICATIONTYPE").toString())) { - // 发短信 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", h.get("RECTIFICATIONOR"));// 收信人userid - mes.put("templateCode", "SMS_215820677");// 短信模板编码 - mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + hiddenService.submitList(pd);// 其他隐患提交 - // 参数集合 - List paramsList = new ArrayList(); - // 第1个参数 - PageData params1 = new PageData(); - params1.put("name", "time");// 存入短信模板中的参数名称 - params1.put("value", h.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + List hList = hiddenService.getHiddenByRecord(pd); + if (hList.size() > 0) { + for (PageData h : hList) { + if ("2".equals(h.get("RECTIFICATIONTYPE").toString())) { + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", h.get("RECTIFICATIONOR"));// 收信人userid + mes.put("templateCode", "SMS_215820677");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id - sendMessageUtil.sendMessages(mes, paramsList); - } - } - } - map.put("result", errInfo); - return map; - } + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "time");// 存入短信模板中的参数名称 + params1.put("value", h.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - /** - * 删除 - * - * @param out - * @throws Exception - */ - @RequestMapping(value = "/delete") - // @RequiresPermissions("checkrecord:del") - @ResponseBody - @Transactional - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "删除检查记录") - public Object delete() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - checkrecordService.delete(pd); - recordItemService.delete(pd); - map.put("result", errInfo); // 返回结果 - return map; - } + sendMessageUtil.sendMessages(mes, paramsList); + } + } + } + map.put("result", errInfo); + return map; + } - /** - * 修改 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/edit") - // @RequiresPermissions("checkrecord:edit") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "修改") - public Object edit() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - checkrecordService.edit(pd); - map.put("result", errInfo); - return map; - } + /** + * 删除 + * + * @param out + * @throws Exception + */ + @RequestMapping(value = "/delete") + // @RequiresPermissions("checkrecord:del") + @ResponseBody + @Transactional + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "删除检查记录") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + checkrecordService.delete(pd); + recordItemService.delete(pd); + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * 获取隐患数据 - * @param - * @throws Exception - */ - @RequestMapping(value = "/findHidden") - @ResponseBody - public Object findHidden() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - map.put("pd",listcheckitemService.findHidden(pd)); - map.put("result", errInfo); - return map; - } + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + // @RequiresPermissions("checkrecord:edit") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "修改") + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + checkrecordService.edit(pd); + map.put("result", errInfo); + return map; + } - /** - * 列表 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/list") - // @RequiresPermissions("checkrecord:list") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "检查记录列表") - public Object list(Page page) 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()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + /** + * 获取隐患数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/findHidden") + @ResponseBody + public Object findHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + map.put("pd", listcheckitemService.findHidden(pd)); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + // @RequiresPermissions("checkrecord:list") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "检查记录列表") + public Object list(Page page) 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()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); /*PageData ls = listmanagerService.findById(pd); // 拼接sql语句 StringBuffer sql = new StringBuffer(); @@ -442,265 +445,264 @@ public class CheckRecordController extends BaseController { page.setPd(pd); varList = checkrecordService.list(page); // 列出CheckRecord列表 }*/ - page.setPd(pd); - List varList = checkrecordService.list(page); - PageData ls = listmanagerService.findById(pd); - map.put("varList", varList); - map.put("page", page); - map.put("ls", ls); - map.put("result", errInfo); - return map; - } + page.setPd(pd); + // 风险管控清单 + map.put("ls", listmanagerService.findById(pd)); + map.put("varList", checkrecordService.list(page)); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * 清单统计 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getListConut") - @ResponseBody - public Object getListConut() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - List lists = listStatisticsService.getCountList(pd); + /** + * 清单统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getListConut") + @ResponseBody + public Object getListConut() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List lists = listStatisticsService.getCountList(pd); - map.put("result", errInfo); - return map; - } + map.put("result", errInfo); + return map; + } - /** - * 去修改页面获取数据 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/goEdit") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "去修改页面获取数据") - public Object goEdit() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = checkrecordService.findById(pd); // 根据ID读取 - PageData condition = new PageData(); - condition.put("LISTMANAGER_ID",pd.getString("LISTMANAGER_ID")); - PageData listManager = listmanagerService.findById(condition); - pd.put("BAO_BAO_TYPE",listManager.getString("BAO_BAO_TYPE")); - PageData users = checkuserService.getCheckUser(pd); - List varList = recordItemService.listAll(pd); - if(users != null) { - 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); + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "去修改页面获取数据") + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = checkrecordService.findById(pd); // 根据ID读取 + PageData condition = new PageData(); + condition.put("LISTMANAGER_ID", pd.getString("LISTMANAGER_ID")); + PageData listManager = listmanagerService.findById(condition); + pd.put("BAO_BAO_TYPE", listManager.getString("BAO_BAO_TYPE")); + PageData users = checkuserService.getCheckUser(pd); + List varList = recordItemService.listAll(pd); + if (users != null) { + 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); - map.put("qianming", qianming); - map.put("varList", varList); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + map.put("qianming", qianming); + map.put("varList", varList); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - @RequestMapping(value = "/goMap") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "获取地图信息") - public Object goMap() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData checkrecord = checkrecordService.findById(pd); - List varList = recordItemService.listAllForMap(checkrecord); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - PageData cinfo = corpinfoService.findById(pd); - checkrecord.put("FIND_CHECKRECORD_ID", checkrecord.get("CHECKRECORD_ID")); - List hdList = hiddenService.listAll(checkrecord); - map.put("varList", varList); - map.put("hdList", hdList); - map.put("pd", pd); - map.put("cinfo", cinfo); - map.put("checkrecord", checkrecord); - map.put("result", errInfo); - return map; - } + @RequestMapping(value = "/goMap") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "获取地图信息") + public Object goMap() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData checkrecord = checkrecordService.findById(pd); + List varList = recordItemService.listAllForMap(checkrecord); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData cinfo = corpinfoService.findById(pd); + checkrecord.put("FIND_CHECKRECORD_ID", checkrecord.get("CHECKRECORD_ID")); + List hdList = hiddenService.listAll(checkrecord); + map.put("varList", varList); + map.put("hdList", hdList); + map.put("pd", pd); + map.put("cinfo", cinfo); + map.put("checkrecord", checkrecord); + map.put("result", errInfo); + return map; + } - /** - * 批量删除 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/deleteAll") - // @RequiresPermissions("checkrecord:del") - @ResponseBody - public Object deleteAll() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DATA_IDS = pd.getString("DATA_IDS"); - if (Tools.notEmpty(DATA_IDS)) { - String ArrayDATA_IDS[] = DATA_IDS.split(","); - checkrecordService.deleteAll(ArrayDATA_IDS); - errInfo = "success"; - } else { - errInfo = "error"; - } - map.put("result", errInfo); // 返回结果 - return map; - } + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + // @RequiresPermissions("checkrecord:del") + @ResponseBody + public Object deleteAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + checkrecordService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + } else { + errInfo = "error"; + } + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * 导出到excel - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/excel") - public ModelAndView exportExcel() throws Exception { - ModelAndView mv = new ModelAndView(); - PageData pd = new PageData(); - pd = this.getPageData(); - Map dataMap = new HashMap(); - List titles = new ArrayList(); - titles.add("清单ID"); // 1 - titles.add("清单名称"); // 2 - titles.add("企业"); // 3 - titles.add("添加人"); // 4 - titles.add("创建时间"); // 5 - titles.add("修改人"); // 6 - titles.add("修改时间"); // 7 - titles.add("是否删除"); // 8 - dataMap.put("titles", titles); - List varOList = checkrecordService.listAll(pd); - List varList = new ArrayList(); - for (int i = 0; i < varOList.size(); i++) { - PageData vpd = new PageData(); - vpd.put("var1", varOList.get(i).getString("LISTMANAGER_ID")); // 1 - vpd.put("var2", varOList.get(i).getString("LIST_NAME")); // 2 - vpd.put("var3", varOList.get(i).getString("CORPINFO_ID")); // 3 - vpd.put("var4", varOList.get(i).getString("CREATOR")); // 4 - vpd.put("var5", varOList.get(i).getString("CREATTIME")); // 5 - vpd.put("var6", varOList.get(i).getString("OPERATOR")); // 6 - vpd.put("var7", varOList.get(i).getString("OPERATTIME")); // 7 - vpd.put("var8", varOList.get(i).get("ISDELETE").toString()); // 8 - varList.add(vpd); - } - dataMap.put("varList", varList); - ObjectExcelView erv = new ObjectExcelView(); - mv = new ModelAndView(erv, dataMap); - return mv; - } + /** + * 导出到excel + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/excel") + public ModelAndView exportExcel() throws Exception { + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("清单ID"); // 1 + titles.add("清单名称"); // 2 + titles.add("企业"); // 3 + titles.add("添加人"); // 4 + titles.add("创建时间"); // 5 + titles.add("修改人"); // 6 + titles.add("修改时间"); // 7 + titles.add("是否删除"); // 8 + dataMap.put("titles", titles); + List varOList = checkrecordService.listAll(pd); + List varList = new ArrayList(); + for (int i = 0; i < varOList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", varOList.get(i).getString("LISTMANAGER_ID")); // 1 + vpd.put("var2", varOList.get(i).getString("LIST_NAME")); // 2 + vpd.put("var3", varOList.get(i).getString("CORPINFO_ID")); // 3 + vpd.put("var4", varOList.get(i).getString("CREATOR")); // 4 + vpd.put("var5", varOList.get(i).getString("CREATTIME")); // 5 + vpd.put("var6", varOList.get(i).getString("OPERATOR")); // 6 + vpd.put("var7", varOList.get(i).getString("OPERATTIME")); // 7 + vpd.put("var8", varOList.get(i).get("ISDELETE").toString()); // 8 + varList.add(vpd); + } + dataMap.put("varList", varList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } - public static String getLastDayOfMonth(int year, int month) { - Calendar cal = Calendar.getInstance(); - // 设置年份 - cal.set(Calendar.YEAR, year); - // 设置月份 - cal.set(Calendar.MONTH, month - 1); - // 获取某月最大天数 - int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH); - // 设置日历中月份的最大天数 - cal.set(Calendar.DAY_OF_MONTH, lastDay); - // 格式化日期 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String lastDayOfMonth = sdf.format(cal.getTime()); + public static String getLastDayOfMonth(int year, int month) { + Calendar cal = Calendar.getInstance(); + // 设置年份 + cal.set(Calendar.YEAR, year); + // 设置月份 + cal.set(Calendar.MONTH, month - 1); + // 获取某月最大天数 + int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH); + // 设置日历中月份的最大天数 + cal.set(Calendar.DAY_OF_MONTH, lastDay); + // 格式化日期 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String lastDayOfMonth = sdf.format(cal.getTime()); - return lastDayOfMonth; - } + return lastDayOfMonth; + } - /** - * main - */ - public static void main(String[] args) { - Double aDouble = 0d / 1d; - DecimalFormat df = new DecimalFormat("#0.00"); - System.out.println(df.format(aDouble)); - } + /** + * main + */ + public static void main(String[] args) { + Double aDouble = 0d / 1d; + DecimalFormat df = new DecimalFormat("#0.00"); + System.out.println(df.format(aDouble)); + } - /** - * 去修改页面获取数据 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/goBiListCount") - @ResponseBody - public Object goBiListCount() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goBiListCount") + @ResponseBody + public Object goBiListCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - switch (pd.get("COUNTTYPE").toString()) { - case "day":// 每日 - pd.put("STARTTIME", DateUtil.getDay() + " 00:00:00"); - pd.put("ENDTIME", DateUtil.getDay() + " 23:59:59"); - break; + switch (pd.get("COUNTTYPE").toString()) { + case "day":// 每日 + pd.put("STARTTIME", DateUtil.getDay() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.getDay() + " 23:59:59"); + break; - case "week":// 每周 - pd.put("STARTTIME", DateUtil.getWeekStart()); - pd.put("ENDTIME", DateUtil.getWeekEnd()); - break; + case "week":// 每周 + pd.put("STARTTIME", DateUtil.getWeekStart()); + pd.put("ENDTIME", DateUtil.getWeekEnd()); + break; - case "xun":// 每旬 - String year = DateUtil.getYear().toString(); - String month = DateUtil.getMonth().toString(); - Integer day = Integer.parseInt(DateUtil.getOnlyDay().toString()); - String startTime = year + "-" + month + "-"; - String endTime = year + "-" + month + "-"; - if (day <= 10) { - startTime = startTime + "01 00:00:00"; - endTime = endTime + "10 23:59:59"; - } else if (day > 10 && day <= 20) { - startTime = startTime + "11 00:00:00"; - endTime = endTime + "20 23:59:59"; - } else { - startTime = startTime + "21 00:00:00"; - endTime = DateUtil.getMonthEndDay() + " 23:59:59"; - } - pd.put("STARTTIME", startTime); - pd.put("ENDTIME", endTime); - break; + case "xun":// 每旬 + String year = DateUtil.getYear().toString(); + String month = DateUtil.getMonth().toString(); + Integer day = Integer.parseInt(DateUtil.getOnlyDay().toString()); + String startTime = year + "-" + month + "-"; + String endTime = year + "-" + month + "-"; + if (day <= 10) { + startTime = startTime + "01 00:00:00"; + endTime = endTime + "10 23:59:59"; + } else if (day > 10 && day <= 20) { + startTime = startTime + "11 00:00:00"; + endTime = endTime + "20 23:59:59"; + } else { + startTime = startTime + "21 00:00:00"; + endTime = DateUtil.getMonthEndDay() + " 23:59:59"; + } + pd.put("STARTTIME", startTime); + pd.put("ENDTIME", endTime); + break; - case "month":// 每月 - pd.put("STARTTIME", DateUtil.getMonthFirstDay() + " 00:00:00"); - pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); - break; + case "month":// 每月 + pd.put("STARTTIME", DateUtil.getMonthFirstDay() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + break; - case "quarter":// 每季 - pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); - pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); - break; + case "quarter":// 每季 + pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); + break; - case "year":// 每年 - pd.put("STARTTIME", DateUtil.getCurrYearFirst() + " 00:00:00"); - pd.put("ENDTIME", DateUtil.getCurrYearLast() + " 23:59:59"); - break; + case "year":// 每年 + pd.put("STARTTIME", DateUtil.getCurrYearFirst() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.getCurrYearLast() + " 23:59:59"); + break; - case "halfyear":// 半年 - String byear = DateUtil.getYear().toString(); - Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString()); - if (bmonth <= 6) { - pd.put("STARTTIME", byear + "-01-01 00:00:00"); - pd.put("ENDTIME", byear + "-06-30 23:59:59"); - } else if (bmonth > 6) { - pd.put("STARTTIME", byear + "-07-01 00:00:00"); - pd.put("ENDTIME", byear + "-12-31 23:59:59"); - } - break; + case "halfyear":// 半年 + String byear = DateUtil.getYear().toString(); + Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString()); + if (bmonth <= 6) { + pd.put("STARTTIME", byear + "-01-01 00:00:00"); + pd.put("ENDTIME", byear + "-06-30 23:59:59"); + } else if (bmonth > 6) { + pd.put("STARTTIME", byear + "-07-01 00:00:00"); + pd.put("ENDTIME", byear + "-12-31 23:59:59"); + } + break; - default: - break; - } + default: + break; + } // switch (pd.get("COUNTTYPE").toString()) { // case "month": // pd.put("STARTTIME", DateUtil.getMonthFirstDay()+" 00:00:00"); @@ -718,231 +720,231 @@ public class CheckRecordController extends BaseController { // default: // break; // } - String STARTTIME = pd.getString("STARTTIME"); - String ENDTIME = pd.getString("ENDTIME"); + String STARTTIME = pd.getString("STARTTIME"); + String ENDTIME = pd.getString("ENDTIME"); - /* - * List varList = new ArrayList(); PageData listType0001 = - * new PageData(); PageData listType0002 = new PageData(); PageData listType0003 - * = new PageData(); PageData listType0004 = new PageData(); PageData - * listType0005 = new PageData(); - */ - PageData all = new PageData(); - all.put("type", "all"); - all.put("name", "合计"); - all.put("molecule", 0); - all.put("denominator", 0); - all.put("percentage", 0d); - /* - * Map varMap = new HashMap(); - * - * listType0001.put("type", "listType0001"); listType0001.put("name", "日常"); - * listType0001.put("molecule", 0); listType0001.put("denominator", 0); - * listType0001.put("percentage", 0d); listType0002.put("type", "listType0002"); - * listType0002.put("name", "综合"); listType0002.put("molecule", 0); - * listType0002.put("denominator", 0); listType0002.put("percentage", 0d); - * - * - * listType0003.put("type", "listType0003"); listType0003.put("name", "专业"); - * listType0003.put("molecule", 0); listType0003.put("denominator", 0); - * listType0003.put("percentage", 0d); - * - * - * listType0004.put("type", "listType0004"); listType0004.put("name", "季节性"); - * listType0004.put("molecule", 0); listType0004.put("denominator", 0); - * listType0004.put("percentage", 0d); - * - * - * listType0005.put("type", "listType0005"); listType0005.put("name", "节假日"); - * listType0005.put("molecule", 0); listType0005.put("denominator", 0); - * listType0005.put("percentage", 0d); - * - * - * - * - * varMap.put("listType0001", listType0001); varMap.put("listType0002", - * listType0002); varMap.put("listType0003", listType0003); - * varMap.put("listType0004", listType0004); varMap.put("listType0005", - * listType0005); varMap.put("all", all); - */ + /* + * List varList = new ArrayList(); PageData listType0001 = + * new PageData(); PageData listType0002 = new PageData(); PageData listType0003 + * = new PageData(); PageData listType0004 = new PageData(); PageData + * listType0005 = new PageData(); + */ + PageData all = new PageData(); + all.put("type", "all"); + all.put("name", "合计"); + all.put("molecule", 0); + all.put("denominator", 0); + all.put("percentage", 0d); + /* + * Map varMap = new HashMap(); + * + * listType0001.put("type", "listType0001"); listType0001.put("name", "日常"); + * listType0001.put("molecule", 0); listType0001.put("denominator", 0); + * listType0001.put("percentage", 0d); listType0002.put("type", "listType0002"); + * listType0002.put("name", "综合"); listType0002.put("molecule", 0); + * listType0002.put("denominator", 0); listType0002.put("percentage", 0d); + * + * + * listType0003.put("type", "listType0003"); listType0003.put("name", "专业"); + * listType0003.put("molecule", 0); listType0003.put("denominator", 0); + * listType0003.put("percentage", 0d); + * + * + * listType0004.put("type", "listType0004"); listType0004.put("name", "季节性"); + * listType0004.put("molecule", 0); listType0004.put("denominator", 0); + * listType0004.put("percentage", 0d); + * + * + * listType0005.put("type", "listType0005"); listType0005.put("name", "节假日"); + * listType0005.put("molecule", 0); listType0005.put("denominator", 0); + * listType0005.put("percentage", 0d); + * + * + * + * + * varMap.put("listType0001", listType0001); varMap.put("listType0002", + * listType0002); varMap.put("listType0003", listType0003); + * varMap.put("listType0004", listType0004); varMap.put("listType0005", + * listType0005); varMap.put("all", all); + */ - List countList = listStatisticsService.getCountList(pd);// 统计分母 + List countList = listStatisticsService.getCountList(pd);// 统计分母 - if (countList != null && countList.size() > 0) { - int sum = 0; - List dayList = checkrecordService.listCountDay(pd); // 统计--日 - if (dayList != null && dayList.size() > 0) { - for (PageData count : dayList) { - sum += Integer.parseInt(count.get("NUM").toString()); - } - } - List weekList = checkrecordService.listCountWeek(pd); // 统计--周 - if (weekList != null && weekList.size() > 0) { - for (PageData count : weekList) { - sum += Integer.parseInt(count.get("NUM").toString()); - } - } - List monthList = checkrecordService.listCountMonth(pd); // 统计--月 + if (countList != null && countList.size() > 0) { + int sum = 0; + List dayList = checkrecordService.listCountDay(pd); // 统计--日 + if (dayList != null && dayList.size() > 0) { + for (PageData count : dayList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List weekList = checkrecordService.listCountWeek(pd); // 统计--周 + if (weekList != null && weekList.size() > 0) { + for (PageData count : weekList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List monthList = checkrecordService.listCountMonth(pd); // 统计--月 - if (monthList != null && monthList.size() > 0) { - for (PageData count : monthList) { - sum += Integer.parseInt(count.get("NUM").toString()); - } - } - List quarterList = checkrecordService.listCountQuarter(pd); // 统计--季 + if (monthList != null && monthList.size() > 0) { + for (PageData count : monthList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List quarterList = checkrecordService.listCountQuarter(pd); // 统计--季 - if (quarterList != null && quarterList.size() > 0) { - for (PageData count : quarterList) { - sum += Integer.parseInt(count.get("NUM").toString()); - } - } - List halfYearList = checkrecordService.listCountHalfYear(pd); // 统计--半年 + if (quarterList != null && quarterList.size() > 0) { + for (PageData count : quarterList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List halfYearList = checkrecordService.listCountHalfYear(pd); // 统计--半年 - if (halfYearList != null && halfYearList.size() > 0) { - for (PageData count : halfYearList) { - sum += Integer.parseInt(count.get("NUM").toString()); - } - } - List yearList = checkrecordService.listCountYear(pd); // 统计--年 - if (yearList != null && yearList.size() > 0) { - for (PageData count : yearList) { - sum += Integer.parseInt(count.get("NUM").toString()); - } - } - // 处理旬时间 - StringBuffer stt = new StringBuffer(); - stt.append(pd.getString("STARTTIME")); - stt.setCharAt(9, '1'); - pd.put("STARTTIME", stt.toString()); + if (halfYearList != null && halfYearList.size() > 0) { + for (PageData count : halfYearList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List yearList = checkrecordService.listCountYear(pd); // 统计--年 + if (yearList != null && yearList.size() > 0) { + for (PageData count : yearList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + // 处理旬时间 + StringBuffer stt = new StringBuffer(); + stt.append(pd.getString("STARTTIME")); + stt.setCharAt(9, '1'); + pd.put("STARTTIME", stt.toString()); - String endDay = ENDTIME.substring(8, 10); - Integer endTime = Integer.parseInt(endDay); - StringBuffer et = new StringBuffer(); - et.append(pd.getString("ENDTIME")); + String endDay = ENDTIME.substring(8, 10); + Integer endTime = Integer.parseInt(endDay); + StringBuffer et = new StringBuffer(); + et.append(pd.getString("ENDTIME")); - if (endTime <= 10) { - stt.setCharAt(8, '1'); - stt.setCharAt(9, '0'); - pd.put("ENDTIME", et.toString()); - } else if (endTime <= 20) { - stt.setCharAt(8, '2'); - stt.setCharAt(9, '0'); - pd.put("ENDTIME", et.toString()); - } else { - Integer endMonth = Integer.parseInt(ENDTIME.substring(5, 7)); - Integer endYear = Integer.parseInt(ENDTIME.substring(0, 4)); - pd.put("ENDTIME", getLastDayOfMonth(endYear, endMonth) + " 23:59:59"); - } - List tenDaysList = checkrecordService.listCountTenDays(pd); // 统计--旬 - if (tenDaysList != null && tenDaysList.size() > 0) { - for (PageData count : tenDaysList) { - sum += Integer.parseInt(count.get("NUM").toString()); - } - } - // 分母 - for (PageData count : countList) { + if (endTime <= 10) { + stt.setCharAt(8, '1'); + stt.setCharAt(9, '0'); + pd.put("ENDTIME", et.toString()); + } else if (endTime <= 20) { + stt.setCharAt(8, '2'); + stt.setCharAt(9, '0'); + pd.put("ENDTIME", et.toString()); + } else { + Integer endMonth = Integer.parseInt(ENDTIME.substring(5, 7)); + Integer endYear = Integer.parseInt(ENDTIME.substring(0, 4)); + pd.put("ENDTIME", getLastDayOfMonth(endYear, endMonth) + " 23:59:59"); + } + List tenDaysList = checkrecordService.listCountTenDays(pd); // 统计--旬 + if (tenDaysList != null && tenDaysList.size() > 0) { + for (PageData count : tenDaysList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + // 分母 + for (PageData count : countList) { - Integer allDenominator = Integer.parseInt(count.get("NOTEXAMINEDNUM").toString()) - + Integer.parseInt(all.get("denominator").toString()); - all.put("denominator", allDenominator); - } + Integer allDenominator = Integer.parseInt(count.get("NOTEXAMINEDNUM").toString()) + + Integer.parseInt(all.get("denominator").toString()); + all.put("denominator", allDenominator); + } - Integer jjr = checkrecordService.listCountJjr(pd) == null ? 0 : checkrecordService.listCountJjr(pd); - all.put("molecule", sum + jjr); - } - /* - * if(!varMap.get("listType0005").get("denominator").toString().equals("0")) { - * - * if(jjr == 0) { varMap.get("listType0005").put("percentage", 0d); } else { - * Double denominator= - * Double.parseDouble(varMap.get("listType0005").get("denominator").toString()); - * Double molecule= Double.valueOf(jjr); Double percentage = - * molecule/denominator*100; DecimalFormat df = new DecimalFormat("#.00"); - * varMap.get("listType0005").put("percentage", df.format(percentage)); } } - * Integer allMolecule = - * Integer.parseInt(varMap.get("listType0005").get("molecule").toString()) + - * Integer.parseInt(all.get("molecule").toString()); all.put("molecule", - * allMolecule); varList.add(varMap.get("listType0005")); - */ - if (!all.get("denominator").toString().equals("0")) { - if (all.get("molecule").toString().equals("0")) { - all.put("percentage", 0d); - } else { - Double denominator = Double.parseDouble(all.get("denominator").toString()); - Double molecule = Double.parseDouble(all.get("molecule").toString()); - Double percentage = molecule / denominator * 100; - DecimalFormat df = new DecimalFormat("#0.00"); - all.put("percentage", df.format(percentage)); - } - } + Integer jjr = checkrecordService.listCountJjr(pd) == null ? 0 : checkrecordService.listCountJjr(pd); + all.put("molecule", sum + jjr); + } + /* + * if(!varMap.get("listType0005").get("denominator").toString().equals("0")) { + * + * if(jjr == 0) { varMap.get("listType0005").put("percentage", 0d); } else { + * Double denominator= + * Double.parseDouble(varMap.get("listType0005").get("denominator").toString()); + * Double molecule= Double.valueOf(jjr); Double percentage = + * molecule/denominator*100; DecimalFormat df = new DecimalFormat("#.00"); + * varMap.get("listType0005").put("percentage", df.format(percentage)); } } + * Integer allMolecule = + * Integer.parseInt(varMap.get("listType0005").get("molecule").toString()) + + * Integer.parseInt(all.get("molecule").toString()); all.put("molecule", + * allMolecule); varList.add(varMap.get("listType0005")); + */ + if (!all.get("denominator").toString().equals("0")) { + if (all.get("molecule").toString().equals("0")) { + all.put("percentage", 0d); + } else { + Double denominator = Double.parseDouble(all.get("denominator").toString()); + Double molecule = Double.parseDouble(all.get("molecule").toString()); + Double percentage = molecule / denominator * 100; + DecimalFormat df = new DecimalFormat("#0.00"); + all.put("percentage", df.format(percentage)); + } + } - map.put("all", all); - map.put("result", errInfo); - return map; - } + map.put("all", all); + map.put("result", errInfo); + return map; + } - /** - * 去修改页面获取数据 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/goIndexCount") - @ResponseBody - @LogAnno(menuType= "首页",menuServer= "首页",instructionsOperate = "首页",instructionsType = "去修改页面获取数据") - public Object goIndexCount() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 - if (Tools.notEmpty(STARTTIME)) - pd.put("STARTTIME", STARTTIME.trim() + " 00:00:00"); - String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 - if (Tools.notEmpty(ENDTIME)) - pd.put("ENDTIME", ENDTIME.trim() + " 23:59:59"); + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goIndexCount") + @ResponseBody + @LogAnno(menuType = "首页", menuServer = "首页", instructionsOperate = "首页", instructionsType = "去修改页面获取数据") + public Object goIndexCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 + if (Tools.notEmpty(STARTTIME)) + pd.put("STARTTIME", STARTTIME.trim() + " 00:00:00"); + String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 + if (Tools.notEmpty(ENDTIME)) + pd.put("ENDTIME", ENDTIME.trim() + " 23:59:59"); - List varList = new ArrayList(); - PageData listType0001 = new PageData(); - PageData listType0002 = new PageData(); - PageData listType0003 = new PageData(); - PageData listType0004 = new PageData(); - PageData listType0005 = new PageData(); + List varList = new ArrayList(); + PageData listType0001 = new PageData(); + PageData listType0002 = new PageData(); + PageData listType0003 = new PageData(); + PageData listType0004 = new PageData(); + PageData listType0005 = new PageData(); // PageData listType0006 = new PageData(); - PageData all = new PageData(); + PageData all = new PageData(); - Map varMap = new HashMap(); + Map varMap = new HashMap(); - listType0001.put("type", "listType0001"); - listType0001.put("name", "日常"); - listType0001.put("molecule", 0); - listType0001.put("denominator", 0); - listType0001.put("percentage", 0d); + listType0001.put("type", "listType0001"); + listType0001.put("name", "日常"); + listType0001.put("molecule", 0); + listType0001.put("denominator", 0); + listType0001.put("percentage", 0d); - listType0002.put("type", "listType0002"); - listType0002.put("name", "综合"); - listType0002.put("molecule", 0); - listType0002.put("denominator", 0); - listType0002.put("percentage", 0d); + listType0002.put("type", "listType0002"); + listType0002.put("name", "综合"); + listType0002.put("molecule", 0); + listType0002.put("denominator", 0); + listType0002.put("percentage", 0d); - listType0003.put("type", "listType0003"); - listType0003.put("name", "专业"); - listType0003.put("molecule", 0); - listType0003.put("denominator", 0); - listType0003.put("percentage", 0d); + listType0003.put("type", "listType0003"); + listType0003.put("name", "专业"); + listType0003.put("molecule", 0); + listType0003.put("denominator", 0); + listType0003.put("percentage", 0d); - listType0004.put("type", "listType0004"); - listType0004.put("name", "季节性"); - listType0004.put("molecule", 0); - listType0004.put("denominator", 0); - listType0004.put("percentage", 0d); + listType0004.put("type", "listType0004"); + listType0004.put("name", "季节性"); + listType0004.put("molecule", 0); + listType0004.put("denominator", 0); + listType0004.put("percentage", 0d); - listType0005.put("type", "listType0005"); - listType0005.put("name", "节假日"); - listType0005.put("molecule", 0); - listType0005.put("denominator", 0); - listType0005.put("percentage", 0d); + listType0005.put("type", "listType0005"); + listType0005.put("name", "节假日"); + listType0005.put("molecule", 0); + listType0005.put("denominator", 0); + listType0005.put("percentage", 0d); // listType0006.put("type", "listType0006"); // listType0006.put("name", "临时"); @@ -950,345 +952,346 @@ public class CheckRecordController extends BaseController { // listType0006.put("denominator", 0); // listType0006.put("percentage", 0d); - all.put("type", "all"); - all.put("name", "合计"); - all.put("molecule", 0); - all.put("denominator", 0); - all.put("percentage", 0d); + all.put("type", "all"); + all.put("name", "合计"); + all.put("molecule", 0); + all.put("denominator", 0); + all.put("percentage", 0d); - varMap.put("listType0001", listType0001); - varMap.put("listType0002", listType0002); - varMap.put("listType0003", listType0003); - varMap.put("listType0004", listType0004); - varMap.put("listType0005", listType0005); + varMap.put("listType0001", listType0001); + varMap.put("listType0002", listType0002); + varMap.put("listType0003", listType0003); + varMap.put("listType0004", listType0004); + varMap.put("listType0005", listType0005); // varMap.put("listType0006", listType0006); - varMap.put("all", all); + varMap.put("all", all); - List countList = listStatisticsService.getCountList(pd);// 统计分母 + List countList = listStatisticsService.getCountList(pd);// 统计分母 - if (countList != null && countList.size() > 0) { - List dayList = checkrecordService.listCountDay(pd); // 统计--日 - if (dayList != null && dayList.size() > 0) { - for (PageData count : dayList) { - Integer molecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); - varMap.get(count.get("TYPE")).put("molecule", molecule); + if (countList != null && countList.size() > 0) { + List dayList = checkrecordService.listCountDay(pd); // 统计--日 + if (dayList != null && dayList.size() > 0) { + for (PageData count : dayList) { + Integer molecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); + varMap.get(count.get("TYPE")).put("molecule", molecule); - Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get("all").get("molecule").toString()); - varMap.get("all").put("molecule", allMolecule); - } - } - List weekList = checkrecordService.listCountWeek(pd); // 统计--周 - if (weekList != null && weekList.size() > 0) { - for (PageData count : weekList) { - Integer molecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); - varMap.get(count.get("TYPE")).put("molecule", molecule); + Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get("all").get("molecule").toString()); + varMap.get("all").put("molecule", allMolecule); + } + } + List weekList = checkrecordService.listCountWeek(pd); // 统计--周 + if (weekList != null && weekList.size() > 0) { + for (PageData count : weekList) { + Integer molecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); + varMap.get(count.get("TYPE")).put("molecule", molecule); - Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get("all").get("molecule").toString()); - varMap.get("all").put("molecule", allMolecule); - } - } - List monthList = checkrecordService.listCountMonth(pd); // 统计--月 + Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get("all").get("molecule").toString()); + varMap.get("all").put("molecule", allMolecule); + } + } + List monthList = checkrecordService.listCountMonth(pd); // 统计--月 - if (monthList != null && monthList.size() > 0) { - for (PageData count : monthList) { - Integer molecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); - varMap.get(count.get("TYPE")).put("molecule", molecule); + if (monthList != null && monthList.size() > 0) { + for (PageData count : monthList) { + Integer molecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); + varMap.get(count.get("TYPE")).put("molecule", molecule); - Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get("all").get("molecule").toString()); - varMap.get("all").put("molecule", allMolecule); - } - } - List quarterList = checkrecordService.listCountQuarter(pd); // 统计--季 + Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get("all").get("molecule").toString()); + varMap.get("all").put("molecule", allMolecule); + } + } + List quarterList = checkrecordService.listCountQuarter(pd); // 统计--季 - if (quarterList != null && quarterList.size() > 0) { - for (PageData count : quarterList) { - Integer molecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); - varMap.get(count.get("TYPE")).put("molecule", molecule); + if (quarterList != null && quarterList.size() > 0) { + for (PageData count : quarterList) { + Integer molecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); + varMap.get(count.get("TYPE")).put("molecule", molecule); - Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get("all").get("molecule").toString()); - varMap.get("all").put("molecule", allMolecule); - } - } - List halfYearList = checkrecordService.listCountHalfYear(pd); // 统计--半年 + Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get("all").get("molecule").toString()); + varMap.get("all").put("molecule", allMolecule); + } + } + List halfYearList = checkrecordService.listCountHalfYear(pd); // 统计--半年 - if (halfYearList != null && halfYearList.size() > 0) { - for (PageData count : halfYearList) { - Integer molecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); - varMap.get(count.get("TYPE")).put("molecule", molecule); + if (halfYearList != null && halfYearList.size() > 0) { + for (PageData count : halfYearList) { + Integer molecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); + varMap.get(count.get("TYPE")).put("molecule", molecule); - Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get("all").get("molecule").toString()); - varMap.get("all").put("molecule", allMolecule); - } - } - List yearList = checkrecordService.listCountYear(pd); // 统计--年 - if (yearList != null && yearList.size() > 0) { - for (PageData count : yearList) { - Integer molecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); - varMap.get(count.get("TYPE")).put("molecule", molecule); + Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get("all").get("molecule").toString()); + varMap.get("all").put("molecule", allMolecule); + } + } + List yearList = checkrecordService.listCountYear(pd); // 统计--年 + if (yearList != null && yearList.size() > 0) { + for (PageData count : yearList) { + Integer molecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); + varMap.get(count.get("TYPE")).put("molecule", molecule); - Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get("all").get("molecule").toString()); - varMap.get("all").put("molecule", allMolecule); - } - } - // 处理旬时间 - StringBuffer stt = new StringBuffer(); - stt.append(pd.getString("STARTTIME")); - stt.setCharAt(9, '1'); - pd.put("STARTTIME", stt.toString()); + Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get("all").get("molecule").toString()); + varMap.get("all").put("molecule", allMolecule); + } + } + // 处理旬时间 + StringBuffer stt = new StringBuffer(); + stt.append(pd.getString("STARTTIME")); + stt.setCharAt(9, '1'); + pd.put("STARTTIME", stt.toString()); - String endDay = ENDTIME.substring(8, 10); - Integer endTime = Integer.parseInt(endDay); - StringBuffer et = new StringBuffer(); - et.append(pd.getString("ENDTIME")); + String endDay = ENDTIME.substring(8, 10); + Integer endTime = Integer.parseInt(endDay); + StringBuffer et = new StringBuffer(); + et.append(pd.getString("ENDTIME")); - if (endTime <= 10) { - stt.setCharAt(8, '1'); - stt.setCharAt(9, '0'); - pd.put("ENDTIME", et.toString()); - } else if (endTime <= 20) { - stt.setCharAt(8, '2'); - stt.setCharAt(9, '0'); - pd.put("ENDTIME", et.toString()); - } else { - Integer endMonth = Integer.parseInt(ENDTIME.substring(5, 7)); - Integer endYear = Integer.parseInt(ENDTIME.substring(0, 4)); - pd.put("ENDTIME", getLastDayOfMonth(endYear, endMonth) + " 23:59:59"); - } - List tenDaysList = checkrecordService.listCountTenDays(pd); // 统计--旬 - if (tenDaysList != null && tenDaysList.size() > 0) { - for (PageData count : tenDaysList) { - Integer molecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); - varMap.get(count.get("TYPE")).put("molecule", molecule); + if (endTime <= 10) { + stt.setCharAt(8, '1'); + stt.setCharAt(9, '0'); + pd.put("ENDTIME", et.toString()); + } else if (endTime <= 20) { + stt.setCharAt(8, '2'); + stt.setCharAt(9, '0'); + pd.put("ENDTIME", et.toString()); + } else { + Integer endMonth = Integer.parseInt(ENDTIME.substring(5, 7)); + Integer endYear = Integer.parseInt(ENDTIME.substring(0, 4)); + pd.put("ENDTIME", getLastDayOfMonth(endYear, endMonth) + " 23:59:59"); + } + List tenDaysList = checkrecordService.listCountTenDays(pd); // 统计--旬 + if (tenDaysList != null && tenDaysList.size() > 0) { + for (PageData count : tenDaysList) { + Integer molecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get(count.get("TYPE")).get("molecule").toString()); + varMap.get(count.get("TYPE")).put("molecule", molecule); - Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) - + Integer.parseInt(varMap.get("all").get("molecule").toString()); - varMap.get("all").put("molecule", allMolecule); - } - } - // 分母 - for (PageData count : countList) { - Integer denominator = Integer.parseInt(count.get("NOTEXAMINEDNUM").toString()) - + Integer.parseInt(varMap.get(count.get("TYPE")).get("denominator").toString()); - varMap.get(count.get("TYPE")).put("denominator", denominator); + Integer allMolecule = Integer.parseInt(count.get("NUM").toString()) + + Integer.parseInt(varMap.get("all").get("molecule").toString()); + varMap.get("all").put("molecule", allMolecule); + } + } + // 分母 + for (PageData count : countList) { + Integer denominator = Integer.parseInt(count.get("NOTEXAMINEDNUM").toString()) + + Integer.parseInt(varMap.get(count.get("TYPE")).get("denominator").toString()); + varMap.get(count.get("TYPE")).put("denominator", denominator); - Integer allDenominator = Integer.parseInt(count.get("NOTEXAMINEDNUM").toString()) - + Integer.parseInt(varMap.get("all").get("denominator").toString()); - varMap.get("all").put("denominator", allDenominator); - } - } - for (int i = 1; i < 5; i++) { - String type = "listType000" + i; - if (!varMap.get(type).get("denominator").toString().equals("0")) { - if (varMap.get(type).get("molecule").toString().equals("0")) { - varMap.get(type).put("percentage", 0d); - } else { - Double denominator = Double.parseDouble(varMap.get(type).get("denominator").toString()); - Double molecule = Double.parseDouble(varMap.get(type).get("molecule").toString()); - Double percentage = molecule / denominator * 100; - DecimalFormat df = new DecimalFormat("#0.00"); - varMap.get(type).put("percentage", df.format(percentage)); - } + Integer allDenominator = Integer.parseInt(count.get("NOTEXAMINEDNUM").toString()) + + Integer.parseInt(varMap.get("all").get("denominator").toString()); + varMap.get("all").put("denominator", allDenominator); + } + } + for (int i = 1; i < 5; i++) { + String type = "listType000" + i; + if (!varMap.get(type).get("denominator").toString().equals("0")) { + if (varMap.get(type).get("molecule").toString().equals("0")) { + varMap.get(type).put("percentage", 0d); + } else { + Double denominator = Double.parseDouble(varMap.get(type).get("denominator").toString()); + Double molecule = Double.parseDouble(varMap.get(type).get("molecule").toString()); + Double percentage = molecule / denominator * 100; + DecimalFormat df = new DecimalFormat("#0.00"); + varMap.get(type).put("percentage", df.format(percentage)); + } - } - varList.add(varMap.get(type)); - } - if (!varMap.get("listType0005").get("denominator").toString().equals("0")) { - Integer jjr = checkrecordService.listCountJjr(pd) == null ? 0 : checkrecordService.listCountJjr(pd); - if (jjr == 0) { - varMap.get("listType0005").put("percentage", 0d); - } else { - Double denominator = Double.parseDouble(varMap.get("listType0005").get("denominator").toString()); - Double molecule = Double.valueOf(jjr); - Double percentage = molecule / denominator * 100; - DecimalFormat df = new DecimalFormat("#0.00"); - varMap.get("listType0005").put("percentage", df.format(percentage)); - } - } - Integer allMolecule = Integer.parseInt(varMap.get("listType0005").get("molecule").toString()) - + Integer.parseInt(varMap.get("all").get("molecule").toString()); - varMap.get("all").put("molecule", allMolecule); - varList.add(varMap.get("listType0005")); - if (!varMap.get("all").get("denominator").toString().equals("0")) { - if (varMap.get("all").get("molecule").toString().equals("0")) { - varMap.get("all").put("percentage", 0d); - } else { - Double denominator = Double.parseDouble(varMap.get("all").get("denominator").toString()); - Double molecule = Double.parseDouble(varMap.get("all").get("molecule").toString()); - Double percentage = molecule / denominator * 100; - DecimalFormat df = new DecimalFormat("#0.00"); - varMap.get("all").put("percentage", df.format(percentage)); - } - } - varList.add(varMap.get("all")); - map.put("varList", varList); - map.put("varMap", varMap); - map.put("result", errInfo); - return map; - } + } + varList.add(varMap.get(type)); + } + if (!varMap.get("listType0005").get("denominator").toString().equals("0")) { + Integer jjr = checkrecordService.listCountJjr(pd) == null ? 0 : checkrecordService.listCountJjr(pd); + if (jjr == 0) { + varMap.get("listType0005").put("percentage", 0d); + } else { + Double denominator = Double.parseDouble(varMap.get("listType0005").get("denominator").toString()); + Double molecule = Double.valueOf(jjr); + Double percentage = molecule / denominator * 100; + DecimalFormat df = new DecimalFormat("#0.00"); + varMap.get("listType0005").put("percentage", df.format(percentage)); + } + } + Integer allMolecule = Integer.parseInt(varMap.get("listType0005").get("molecule").toString()) + + Integer.parseInt(varMap.get("all").get("molecule").toString()); + varMap.get("all").put("molecule", allMolecule); + varList.add(varMap.get("listType0005")); + if (!varMap.get("all").get("denominator").toString().equals("0")) { + if (varMap.get("all").get("molecule").toString().equals("0")) { + varMap.get("all").put("percentage", 0d); + } else { + Double denominator = Double.parseDouble(varMap.get("all").get("denominator").toString()); + Double molecule = Double.parseDouble(varMap.get("all").get("molecule").toString()); + Double percentage = molecule / denominator * 100; + DecimalFormat df = new DecimalFormat("#0.00"); + varMap.get("all").put("percentage", df.format(percentage)); + } + } + varList.add(varMap.get("all")); + map.put("varList", varList); + map.put("varMap", varMap); + map.put("result", errInfo); + return map; + } - /** - * BI页辨识部位检查记录 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/listLogByIde") - @ResponseBody - public Object listLogByIde() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - List varList = checkrecordService.listLogByIde(pd); - map.put("varList", varList); - map.put("result", errInfo); - return map; - } + /** + * BI页辨识部位检查记录 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listLogByIde") + @ResponseBody + public Object listLogByIde() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + List varList = checkrecordService.listLogByIde(pd); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } - /** - * BI页隐患排查人员/部门/清单数据 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/countNumBi") - @ResponseBody - public Object countNumBi() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - int allUser = usersService.getUserCount(pd); - int workUser = checkrecordService.getWorkedUserCount(pd); - int allDep = departmentService.getDepCount(pd); - int workDep = checkrecordService.getWorkedDepCount(pd); - int allList = listmanagerService.getListCount(pd); - int workList = listmanagerService.getWorkedListCount(pd); - map.put("allUser", allUser); - map.put("workUser", workUser); - map.put("allDep", allDep); - map.put("workDep", workDep); - map.put("allList", allList); - map.put("workList", workList); - map.put("result", errInfo); - return map; - } + /** + * BI页隐患排查人员/部门/清单数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/countNumBi") + @ResponseBody + public Object countNumBi() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + int allUser = usersService.getUserCount(pd); + int workUser = checkrecordService.getWorkedUserCount(pd); + int allDep = departmentService.getDepCount(pd); + int workDep = checkrecordService.getWorkedDepCount(pd); + int allList = listmanagerService.getListCount(pd); + int workList = listmanagerService.getWorkedListCount(pd); + map.put("allUser", allUser); + map.put("workUser", workUser); + map.put("allDep", allDep); + map.put("workDep", workDep); + map.put("allList", allList); + map.put("workList", workList); + map.put("result", errInfo); + return map; + } - /** - * BI页清单排查类型统计 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/listTypeBi") - @ResponseBody - public Object listTypeBi() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + /** + * BI页清单排查类型统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listTypeBi") + @ResponseBody + public Object listTypeBi() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 // pd.put("YEAR",new Date().getYear()+1900); - List typeList = checkrecordService.listTypeBi(pd); - map.put("typeList", typeList); - map.put("result", errInfo); - return map; - } + List typeList = checkrecordService.listTypeBi(pd); + map.put("typeList", typeList); + map.put("result", errInfo); + return map; + } - /** - * 列表 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/allList") - // @RequiresPermissions("checkrecord:list") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "检查记录管理",instructionsType = "检查记录列表") - public Object allList(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - PageData npd = new PageData(); - pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) - npd.put("KEYWORDS", KEYWORDS.trim()); - npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); - npd.put("SELF_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); - npd.put("ISMAIN",Jurisdiction.getIS_MAIN()); - pd.put("USER_ID",Jurisdiction.getUSER_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("SELF_DEPARTMENT_ID"); - String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); - ids=npd.getString("SELF_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()); - } - } - npd.put("LISTMANAGER_ID",pd.getString("LISTMANAGER_ID")); - npd.put("DEPARTMENT_ID",pd.getString("DEPARTMENT_ID")); - npd.put("TYPE",pd.getString("TYPE")); - npd.put("STARTTIME",pd.getString("STARTTIME")); - npd.put("ENDTIME",pd.getString("ENDTIME")); - page.setPd(npd); - List varList = checkrecordService.list(page); - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/allList") + // @RequiresPermissions("checkrecord:list") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "检查记录管理", instructionsType = "检查记录列表") + public Object allList(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + PageData npd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + npd.put("KEYWORDS", KEYWORDS.trim()); + npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + npd.put("SELF_DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + npd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + pd.put("USER_ID", Jurisdiction.getUSER_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("SELF_DEPARTMENT_ID"); + String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); + ids = npd.getString("SELF_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()); + } + } + npd.put("LISTMANAGER_ID", pd.getString("LISTMANAGER_ID")); + npd.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID")); + npd.put("TYPE", pd.getString("TYPE")); + npd.put("STARTTIME", pd.getString("STARTTIME")); + npd.put("ENDTIME", pd.getString("ENDTIME")); + page.setPd(npd); + List varList = checkrecordService.list(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * 补录 - * TODO - * @param - * @throws Exception - */ - @RequestMapping(value = "/recording") - // @RequiresPermissions("checkrecord:add") - @ResponseBody - @Transactional - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "补录") - public Object recording() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); + /** + * 补录 + * TODO + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/recording") + // @RequiresPermissions("checkrecord:add") + @ResponseBody + @Transactional + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "补录") + public Object recording() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); - pd.put("TYPE", "1"); - pd.put("ISSTATISTICS", "1"); + pd.put("TYPE", "1"); + pd.put("ISSTATISTICS", "1"); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - pd.put("OPERATOR", Jurisdiction.getName()); // 添加人 - checkrecordService.recording(pd);// 修改检查记录 - //pd = checkrecordService.findById(pd); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + pd.put("OPERATOR", Jurisdiction.getName()); // 添加人 + checkrecordService.recording(pd);// 修改检查记录 + //pd = checkrecordService.findById(pd); // PageData sysdate = new PageData(); // sysdate.put("DATE", pd.get("CHECK_TIME")); // sysdate = sysDateService.findByDate(sysdate); @@ -1334,191 +1337,191 @@ public class CheckRecordController extends BaseController { // pd.put("PERIODEND", list.get("END_DATE")); // } // checkrecordService.save(pd); - checkuserService.delete(pd); - PageData checkUser = new PageData(); - checkUser.put("CHECKUSER_ID", this.get32UUID()); // 主键 - checkUser.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT")); - checkUser.put("USER_ID", pd.get("CHECKOR")); - PageData u = usersService.findUserDept(checkUser); + checkuserService.delete(pd); + PageData checkUser = new PageData(); + checkUser.put("CHECKUSER_ID", this.get32UUID()); // 主键 + checkUser.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT")); + checkUser.put("USER_ID", pd.get("CHECKOR")); + PageData u = usersService.findUserDept(checkUser); - checkUser.put("USER_NAME", u.get("USER_NAME")); - checkUser.put("DEPARTMENT_NAME", u.get("DEPARTMENT_NAME")); + checkUser.put("USER_NAME", u.get("USER_NAME")); + checkUser.put("DEPARTMENT_NAME", u.get("DEPARTMENT_NAME")); - checkuserService.save(checkUser); - if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { - List otherList = (List) JSON.parse(pd.get("OTHER").toString()); - for (JSONObject json : otherList) { - if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null - && json.get("USER_ID") != "") { - PageData other = new PageData(); - other.put("CHECKUSER_ID", this.get32UUID()); // 主键 - other.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); - other.put("USER_ID", json.get("USER_ID")); - PageData ou = usersService.findUserDept(other); + checkuserService.save(checkUser); + if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { + List otherList = (List) JSON.parse(pd.get("OTHER").toString()); + for (JSONObject json : otherList) { + if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null + && json.get("USER_ID") != "") { + PageData other = new PageData(); + other.put("CHECKUSER_ID", this.get32UUID()); // 主键 + other.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); + other.put("USER_ID", json.get("USER_ID")); + PageData ou = usersService.findUserDept(other); - other.put("USER_NAME", ou.get("USER_NAME")); - other.put("DEPARTMENT_NAME", ou.get("DEPARTMENT_NAME")); + other.put("USER_NAME", ou.get("USER_NAME")); + other.put("DEPARTMENT_NAME", ou.get("DEPARTMENT_NAME")); - checkuserService.save(other); - } - } - } - if (pd.get("ITEMS") != null && !pd.get("ITEMS").equals("")) { - List itemsList = (List) JSON.parse(pd.get("ITEMS").toString()); - for (JSONObject json : itemsList) { - PageData item = new PageData(); - item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键 - item.put("LISTCHECKITEM_ID", json.get("LISTCHECKITEM_ID")); - PageData chei = listcheckitemService.findById(item); - item.put("ISNORMAL", json.get("ISNORMAL")); - item.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - item.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - item.put("RISKUNITNAME", chei.get("RISKUNITNAME")); - item.put("PARTSNAME", chei.get("PARTSNAME")); - item.put("RISK_DESCR", chei.get("RISK_DESCR")); - item.put("POSITIONNAME", chei.get("POSITIONNAME")); - item.put("LEVEL_NAME", chei.get("DNAME5")); - item.put("CHECK_CONTENT", chei.get("CHECK_CONTENT")); - item.put("RISKPOINT_ID", chei.get("RISKPOINT_ID")); - item.put("LONGITUDE", pd.get("LONGITUDE")); - item.put("LATITUDE", pd.get("LATITUDE")); - item.put("CORPINFO_ID", pd.get("CORPINFO_ID")); - item.put("ISDELETE", pd.get("0")); - recordItemService.save(item); + checkuserService.save(other); + } + } + } + if (pd.get("ITEMS") != null && !pd.get("ITEMS").equals("")) { + List itemsList = (List) JSON.parse(pd.get("ITEMS").toString()); + for (JSONObject json : itemsList) { + PageData item = new PageData(); + item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键 + item.put("LISTCHECKITEM_ID", json.get("LISTCHECKITEM_ID")); + PageData chei = listcheckitemService.findById(item); + item.put("ISNORMAL", json.get("ISNORMAL")); + item.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + item.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + item.put("RISKUNITNAME", chei.get("RISKUNITNAME")); + item.put("PARTSNAME", chei.get("PARTSNAME")); + item.put("RISK_DESCR", chei.get("RISK_DESCR")); + item.put("POSITIONNAME", chei.get("POSITIONNAME")); + item.put("LEVEL_NAME", chei.get("DNAME5")); + item.put("CHECK_CONTENT", chei.get("CHECK_CONTENT")); + item.put("RISKPOINT_ID", chei.get("RISKPOINT_ID")); + item.put("LONGITUDE", pd.get("LONGITUDE")); + item.put("LATITUDE", pd.get("LATITUDE")); + item.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + item.put("ISDELETE", pd.get("0")); + recordItemService.save(item); - } - } - if (pd.get("IDS") != null && !pd.get("IDS").equals("")) { - String ids = pd.get("IDS").toString(); - String ArrayDATA_IDS[] = ids.split(","); - PageData hiddens = new PageData(); - hiddens.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - hiddens.put("IDS", ArrayDATA_IDS); - hiddenService.updateAll(hiddens); - } - hiddenService.submit(pd); + } + } + if (pd.get("IDS") != null && !pd.get("IDS").equals("")) { + String ids = pd.get("IDS").toString(); + String ArrayDATA_IDS[] = ids.split(","); + PageData hiddens = new PageData(); + hiddens.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + hiddens.put("IDS", ArrayDATA_IDS); + hiddenService.updateAll(hiddens); + } + hiddenService.submit(pd); - hiddenService.submitList(pd);// 其他隐患提交 - List hList = hiddenService.getHiddenByRecord(pd); - if (hList.size() > 0) { - for (PageData h : hList) { - if ("2".equals(h.get("RECTIFICATIONTYPE").toString())) { - // 发短信 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", h.get("RECTIFICATIONOR"));// 收信人userid - mes.put("templateCode", "SMS_215820677");// 短信模板编码 - mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + hiddenService.submitList(pd);// 其他隐患提交 + List hList = hiddenService.getHiddenByRecord(pd); + if (hList.size() > 0) { + for (PageData h : hList) { + if ("2".equals(h.get("RECTIFICATIONTYPE").toString())) { + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", h.get("RECTIFICATIONOR"));// 收信人userid + mes.put("templateCode", "SMS_215820677");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id - // 参数集合 - List paramsList = new ArrayList(); - // 第1个参数 - PageData params1 = new PageData(); - params1.put("name", "time");// 存入短信模板中的参数名称 - params1.put("value", h.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "time");// 存入短信模板中的参数名称 + params1.put("value", h.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - sendMessageUtil.sendMessages(mes, paramsList); - } - } - } - map.put("result", errInfo); - return map; - } + sendMessageUtil.sendMessages(mes, paramsList); + } + } + } + map.put("result", errInfo); + return map; + } - /** - * 员工清单检查情况（月） - * - * @throws Exception - */ - @RequestMapping(value = "/monthStatistics") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "员工清单检查情况",instructionsType = "员工清单检查情况（月）") - public Object monthStatistics(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - PageData npd = new PageData(); - pd = this.getPageData(); - String month = pd.getString("MONTH"); - npd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); - String DEPTIDS = pd.getString("DEPTIDS"); - if(Tools.notEmpty(DEPTIDS)) { - String DEPT_IDS[] = DEPTIDS.split(","); - npd.put("DEPT_IDS", DEPT_IDS); - } - npd.put("ISMAIN", Jurisdiction.getIS_MAIN()); - npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); - npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); - pd.put("USER_ID",Jurisdiction.getUSER_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 KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) - npd.put("KEYWORDS", KEYWORDS.trim()); - npd.put("USERNAME",pd.getString("USERNAME")); - page.setPd(npd); - List lists = listmanagerService.getListByCorplistPage(page); + /** + * 员工清单检查情况（月） + * + * @throws Exception + */ + @RequestMapping(value = "/monthStatistics") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "员工清单检查情况", instructionsType = "员工清单检查情况（月）") + public Object monthStatistics(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + PageData npd = new PageData(); + pd = this.getPageData(); + String month = pd.getString("MONTH"); + npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + String DEPTIDS = pd.getString("DEPTIDS"); + if (Tools.notEmpty(DEPTIDS)) { + String DEPT_IDS[] = DEPTIDS.split(","); + npd.put("DEPT_IDS", DEPT_IDS); + } + npd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + pd.put("USER_ID", Jurisdiction.getUSER_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 KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + npd.put("KEYWORDS", KEYWORDS.trim()); + npd.put("USERNAME", pd.getString("USERNAME")); + page.setPd(npd); + List lists = listmanagerService.getListByCorplistPage(page); - if(lists!=null && lists.size()>0){ - Map resmap = new HashMap<>(); - List listIds = new ArrayList<>(); - lists.forEach(list -> { - resmap.put(list.getString("LISTMANAGER_ID"),new HashMap()); - listIds.add(list.getString("LISTMANAGER_ID")); - if(DateSysUtil.isSameMonth(list.getString("CREATTIME"),month)){//如果清单创建时间是查询月 - List datesInRange = DateSysUtil.getDatesInRange(month+"-01 00:00:00",list.getString("CREATTIME")); - for (int i = 0; i < datesInRange.size()-1; i++) { - Map data = new HashMap(); - data.put("TYPE", "3"); - data.put("HIDDEN_COUNT", "-"); - resmap.get(list.getString("LISTMANAGER_ID")).put(datesInRange.get(i), data);//将1号到创建日期期间得值设为3:未建立 - } - } - }); + if (lists != null && lists.size() > 0) { + Map resmap = new HashMap<>(); + List listIds = new ArrayList<>(); + lists.forEach(list -> { + resmap.put(list.getString("LISTMANAGER_ID"), new HashMap()); + listIds.add(list.getString("LISTMANAGER_ID")); + if (DateSysUtil.isSameMonth(list.getString("CREATTIME"), month)) {//如果清单创建时间是查询月 + List datesInRange = DateSysUtil.getDatesInRange(month + "-01 00:00:00", list.getString("CREATTIME")); + for (int i = 0; i < datesInRange.size() - 1; i++) { + Map data = new HashMap(); + data.put("TYPE", "3"); + data.put("HIDDEN_COUNT", "-"); + resmap.get(list.getString("LISTMANAGER_ID")).put(datesInRange.get(i), data);//将1号到创建日期期间得值设为3:未建立 + } + } + }); - if(listIds.size() > 0){ - pd.put("LIST_IDS",listIds); - List recordList = checkrecordService.listForIdsAndMonth(pd);//获取查询月在检查周期内的检查记录 - recordList.forEach(record -> { - List datesInRange = DateSysUtil.getDatesInRange(record.getString("PERIODSTART"),record.getString("PERIODEND")); - for (int i = 0; i < datesInRange.size(); i++) { - Map data = new HashMap(); - data.put("TYPE", record.getString("TYPE")); - if ("1".equals(record.getString("TYPE"))) { - if (datesInRange.get(i).equals(record.getString("CREATTIME").substring(0, 10))) { - data.put("HIDDEN_COUNT", record.getString("HIDDEN_COUNT")); - } else { - data.put("HIDDEN_COUNT", "0"); - } - } - resmap.get(record.getString("LISTMANAGER_ID")).put(datesInRange.get(i), data); //2未检查 - } - }); - } + if (listIds.size() > 0) { + pd.put("LIST_IDS", listIds); + List recordList = checkrecordService.listForIdsAndMonth(pd);//获取查询月在检查周期内的检查记录 + recordList.forEach(record -> { + List datesInRange = DateSysUtil.getDatesInRange(record.getString("PERIODSTART"), record.getString("PERIODEND")); + for (int i = 0; i < datesInRange.size(); i++) { + Map data = new HashMap(); + data.put("TYPE", record.getString("TYPE")); + if ("1".equals(record.getString("TYPE"))) { + if (datesInRange.get(i).equals(record.getString("CREATTIME").substring(0, 10))) { + data.put("HIDDEN_COUNT", record.getString("HIDDEN_COUNT")); + } else { + data.put("HIDDEN_COUNT", "0"); + } + } + resmap.get(record.getString("LISTMANAGER_ID")).put(datesInRange.get(i), data); //2未检查 + } + }); + } - map.put("list",lists); - map.put("resmap",resmap); - } - map.put("page",page); - map.put("result", "success"); - return map; - } + map.put("list", lists); + map.put("resmap", resmap); + } + map.put("page", page); + map.put("result", "success"); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/corp/CorpInfoController.java b/src/main/java/com/zcloud/controller/corp/CorpInfoController.java index 9b7b2c9..985b58f 100644 --- a/src/main/java/com/zcloud/controller/corp/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/corp/CorpInfoController.java @@ -67,6 +67,22 @@ public class CorpInfoController extends BaseController { private StudyTaskService studyTaskService; @Autowired private Smb smb; + + @RequestMapping(value = "/listAll") + @ResponseBody + public Object listAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + List varList = corpinfoService.listAll(pd); //列出CorpInfo列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /**新增 * @param * @throws Exception diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java index ab942e1..7618458 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java @@ -7,6 +7,8 @@ import com.zcloud.service.corp.CorpInfoService; import com.zcloud.service.hiddenDangerCheckStandard.CommonService; import com.zcloud.util.Jurisdiction; import com.zcloud.util.Tools; +import com.zcloud.util.Warden; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,5 +56,22 @@ public class CommonController extends BaseController { map.put("result", errInfo); return map; } - + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Warden.updateDate(pd); + commonService.edit(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java index b723380..20f6604 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java @@ -173,7 +173,7 @@ public class CustomCheckRecordController extends BaseController { List itemsList = (List) JSON.parse(pd.get("ITEMS").toString()); for (JSONObject json : itemsList) { PageData item = new PageData(); - item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键 + item.put("RECORDITEM_ID", this.get32UUID()); // 主键 item.put("CUSTOM_ITEM_ID", json.get("CUSTOM_ITEM_ID")); PageData chei = customItemService.findById(item); item.put("ISNORMAL", json.get("ISNORMAL")); @@ -186,8 +186,7 @@ public class CustomCheckRecordController extends BaseController { item.put("CHECK_CONTENT", chei.get("CHECK_CONTENT")); item.put("CHECK_STANDARD", chei.get("CHECK_STANDARD")); item.put("REFERENCE_BASIS", chei.get("REFERENCE_BASIS")); - item.put("ISNORMAL", chei.get("ISNORMAL")); - item.put("CHECK_RESULT", chei.get("CHECK_RESULT")); + item.put("CHECK_RESULT", json.get("CHECK_RESULT")); item.put("COMMON_ITEM_SORT", chei.get("COMMON_ITEM_SORT")); item.put("LONGITUDE", pd.get("LONGITUDE")); item.put("LATITUDE", pd.get("LATITUDE")); @@ -195,7 +194,7 @@ public class CustomCheckRecordController extends BaseController { item.put("ISDELETE", "0"); item.put("CREATOR_ID", Jurisdiction.getUSER_ID()); item.put("CREATOR_NAME", Jurisdiction.getUsername()); - item.put("CREATOR_TIME", DateUtil.date2Str(new Date())); //删除时间 + item.put("CREATE_TIME", DateUtil.date2Str(new Date())); //删除时间 customCheckRecordItemService.save(item); } } @@ -491,7 +490,7 @@ public class CustomCheckRecordController extends BaseController { pd = this.getPageData(); pd = customCheckRecordService.findById(pd); // 根据ID读取 PageData condition = new PageData(); - condition.put("LISTMANAGER_ID",pd.getString("LISTMANAGER_ID")); + condition.put("CUSTOM_ID",pd.getString("CUSTOM_ID")); PageData listManager = customService.findById(condition); pd.put("BAO_BAO_TYPE",listManager.getString("BAO_BAO_TYPE")); PageData users = checkuserService.getCheckUser(pd); diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java index 0e0cfbe..64f2b14 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java @@ -5,25 +5,32 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Dictionaries; import com.zcloud.logs.LogAnno; import com.zcloud.service.check.*; import com.zcloud.service.hiddenDangerCheckStandard.*; +import com.zcloud.service.inspection.DictionaryService; import com.zcloud.service.offduty.OffDutyService; import com.zcloud.service.risk.IdentificationPartsService; import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.PostService; 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 com.zcloud.util.*; +import org.apache.commons.io.FileUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; 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.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * 说明：清单管理-隐患排查清单 @@ -59,6 +66,13 @@ public class CustomController extends BaseController { private UsersService usersService; @Autowired private OffDutyService offdutyService; + @Autowired + private StandardDictionaryService standardDictionaryService; + @Autowired + private DictionaryService dictionaryService; + @Autowired + private PostService postService; + /** * 新增 @@ -94,20 +108,92 @@ public class CustomController extends BaseController { if (pd.get("LISTITEM") != null && !pd.get("LISTITEM").equals("")) { List list = (List) JSON.parse(pd.get("LISTITEM").toString()); for (JSONObject json : list) { + int commonSort = 0; + String CHECK_CATEGORY_Temp = ""; + String CHECK_ITEM_Temp = ""; + if (Tools.isEmpty(json.get("CHECK_CATEGORY")) || Tools.isEmpty(json.get("CHECK_ITEM"))) { + PageData dict = new PageData(); + dict.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List dictList = standardDictionaryService.list(dict); + int maxsortNum = 0; + Boolean existCategory = false; + for (int j = 0; j < dictList.size(); j++) { + if ("1".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) { + if (!dictList.get(j).get("DICTIONARY_NAME").equals(json.get("CHECK_CATEGORY_NAME"))) { //如果不存在该字典，获取最大排序号 + if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) { + maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT")); + } + } else { + CHECK_CATEGORY_Temp = dictList.get(j).get("DICTIONARY_ID").toString(); + existCategory = true; + } + } + } + if (!existCategory) { + dict.put("DICTIONARY_ID", this.get32UUID()); + dict.put("DICTIONARY_LEVEL", "1"); + dict.put("DICTIONARY_SORT", maxsortNum + 1); + dict.put("DICTIONARY_NAME", json.get("CHECK_CATEGORY_NAME")); + dict.put("PARENT_ID", "0"); + dict.put("PARENT_IDS", dict.get("DICTIONARY_ID")); + dict.put("DICTIONARY_NAMES", dict.get("DICTIONARY_NAME")); + dict.put("DICTIONARY_SOURCE", "2"); + dict.put("ISDELETE", "0"); + dict.put("CREATOR_ID", Jurisdiction.getUSER_ID()); + dict.put("CREATOR_NAME", Jurisdiction.getUsername()); + dict.put("CREATE_TIME", DateUtil.date2Str(new Date())); + dict.put("OPERATOR_ID", Jurisdiction.getUSER_ID()); + dict.put("OPERATOR_NAME", Jurisdiction.getUsername()); + dict.put("OPERATE_TIME", DateUtil.date2Str(new Date())); + dict.put("DELETEOR_ID", Jurisdiction.getUSER_ID()); + dict.put("DELETEOR_NAME", Jurisdiction.getUsername()); + dict.put("DELETE_TIME", DateUtil.date2Str(new Date())); + standardDictionaryService.save(dict); + CHECK_CATEGORY_Temp = dict.get("DICTIONARY_ID").toString(); + } + PageData dictItem = new PageData(); + dictItem.putAll(dict); + maxsortNum = 0; + Boolean existItem = false; + for (int j = 0; j < dictList.size(); j++) { + if ("2".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) { + if (!dictList.get(j).get("DICTIONARY_NAME").equals(json.get("CHECK_ITEM_NAME"))) { //如果不存在该字典，获取最大排序号 + if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) { + maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT")); + } + } else { + CHECK_ITEM_Temp = dictList.get(j).get("DICTIONARY_ID").toString(); + existItem = true; + } + } + } + commonSort = maxsortNum == 0 ? 1 : maxsortNum; + if (!existItem) { + dictItem.put("DICTIONARY_ID", this.get32UUID()); + dictItem.put("DICTIONARY_LEVEL", "2"); + dictItem.put("DICTIONARY_SORT", maxsortNum + 1); + dictItem.put("DICTIONARY_NAME", json.get("CHECK_ITEM_NAME")); + dictItem.put("PARENT_ID", dict.get("DICTIONARY_ID")); + dictItem.put("PARENT_IDS", dictItem.getString("DICTIONARY_ID") + ',' + dict.getString("DICTIONARY_ID")); + dictItem.put("DICTIONARY_NAMES", dictItem.getString("DICTIONARY_NAME") + ',' + dict.getString("DICTIONARY_NAME")); + standardDictionaryService.save(dictItem); + CHECK_ITEM_Temp = dictItem.get("DICTIONARY_ID").toString(); + } + } PageData itme = new PageData(); itme.put("CUSTOM_ITEM_ID", this.get32UUID()); //主键 itme.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - itme.put("CHECK_CATEGORY", json.get("CHECK_CATEGORY")); - itme.put("CHECK_ITEM", json.get("CHECK_ITEM")); + itme.put("CHECK_CATEGORY", Tools.isEmpty(json.get("CHECK_CATEGORY")) ? CHECK_CATEGORY_Temp : json.get("CHECK_CATEGORY")); + itme.put("CHECK_ITEM", Tools.isEmpty(json.get("CHECK_ITEM")) ? CHECK_ITEM_Temp : json.get("CHECK_ITEM")); itme.put("CHECK_CONTENT", json.get("CHECK_CONTENT")); itme.put("CHECK_STANDARD", json.get("CHECK_STANDARD")); itme.put("REFERENCE_BASIS", json.get("REFERENCE_BASIS")); itme.put("CHECK_QUALIFIED", json.get("CHECK_QUALIFIED")); itme.put("CHECK_UNQUALIFIED", json.get("CHECK_UNQUALIFIED")); itme.put("OPERATION_TYPE", json.get("OPERATION_TYPE")); - itme.put("COMMON_ITEM_SORT", Tools.notEmpty(json.get("COMMON_ITEM_SORT").toString())? json.get("COMMON_ITEM_SORT") : ""); - itme.put("COMMON_ID", Tools.notEmpty(json.get("COMMON_ID").toString()) ? json.get("COMMON_ID") : ""); - itme.put("COMMON_ITEM_ID", Tools.notEmpty(json.get("COMMON_ITEM_ID").toString()) ? json.get("COMMON_ITEM_ID") : ""); + itme.put("COMMON_ITEM_SORT", commonSort); + itme.put("COMMON_ID", json.get("COMMON_ID") == null ? "" : json.get("COMMON_ID")); + itme.put("COMMON_ITEM_ID", json.get("COMMON_ITEM_ID") == null ? "" : json.get("COMMON_ITEM_ID")); itme.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 itme.put("ISDELETE", "0"); //是否删除 itme.put("CREATOR_ID", Jurisdiction.getUSER_ID()); //添加人id @@ -555,36 +641,38 @@ public class CustomController extends BaseController { // return map; // } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goEdit") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "去修改页面获取数据") - public Object goEdit() 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()); + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "去修改页面获取数据") + public Object goEdit() 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()); pd.put("CUSTOM_ID", pd.get("ID")); - List varList = customItemService.listAll(pd); - pd = customService.findById(pd); //根据ID读取 + List varList = customItemService.listAll(pd); + pd = customService.findById(pd); //根据ID读取 - for (PageData item : varList) { - item.put("RECORDITEM_ID", this.get32UUID()); //主键 - } + for (PageData item : varList) { + item.put("RECORDITEM_ID", this.get32UUID()); //主键 + } // List ideList = identificationPartsService.listAllByList(pd); - map.put("varList", varList); + map.put("varList", varList); // map.put("ideList", ideList); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } /** * 批量删除 @@ -756,6 +844,716 @@ public class CustomController extends BaseController { map.put("result", errInfo); //返回结果 return map; } + + + /** + * 从EXCEL导入到数据库 + * + * @param file + * @return + * @throws Exception + */ + @RequestMapping(value = "/readExcel") + @ResponseBody + @Transactional + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "导入") + public Object readExcel(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + StringBuffer errorStr = new StringBuffer(); + PageData pd = new PageData(); + pd = this.getPageData(); // COURSEWAREID + + if (null != file && !file.isEmpty()) { + File tempFile = new File(file.getOriginalFilename()); //新建file + FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); //将MultipartFile复制到File + List listPd = (List) ObjectExcelRead.readExcel(tempFile, 2, 0, 0); //执行读EXCEL操作,读出的数据导入List 2:从第3行开始；0:从第A列开始；0:第0个sheet + /** + * var0 :序号 + * var1 :清单名称 + * var2 :是否包保责任人任务 + * var3 :任务类型 + * var4 :部门 + * var5 :岗位 + * var6 :负责人 + * var7 :排查类型 + * var8 :排查周期 + * var9 :清单类型 + * var10 :排查日期 + * var11 :检查类别 + * var12 :检查项目 + * var13 :检查内容 + * var14 :检查标准 + * var15 :参考依据 + * var16 :检查合格项 + * var17 :检查不合格项 + * var18 :操作类型 + */ + List header = new ArrayList<>(); + header.add("序号"); + header.add("清单名称"); + header.add("是否包保责任人任务"); + header.add("任务类型"); + header.add("部门"); + header.add("岗位"); + header.add("负责人"); + header.add("排查类型"); + header.add("排查周期"); + header.add("清单类型"); + header.add("排查日期"); + header.add("检查类别"); + header.add("检查项目"); + header.add("检查内容"); + header.add("检查标准"); + header.add("参考依据"); + header.add("检查合格项"); + header.add("检查不合格项"); + header.add("操作类型"); + + if (listPd.size() > 0) { + /** + * 判断是否填写必填 + * 判断excel是有有重复数据 + * 判断数据库是否有重复数据 + * 导入 + * 判断题的CD 为空 ( 多选题 单选题 判断题 ) + * 答案是否正确 + * 长度 + */ + // 查询任务类型 + List taskTypeList = dictionaryService.listSubDictByParentId("7a1afe8a5e594b6a9e0cef42bd00f352"); + Map taskTypeDegreeMap = taskTypeList.stream().collect(Collectors.toMap(Dictionaries::getNAME, Dictionaries::getDICTIONARIES_ID)); + // 排查类型 + List troubleshootingTypeList = dictionaryService.listSubDictByParentId("dc92de8a375c4b638b1b9f8d374e6426"); + Map troubleshootingTypeDegreeMap = troubleshootingTypeList.stream().collect(Collectors.toMap(Dictionaries::getNAME, Dictionaries::getBIANMA)); + // 排查周期 + List troubleshootingCycleList = dictionaryService.listSubDictByParentId("f60cf0e8315b4993b6d6049dd29f2ba5"); + Map troubleshootingCycleDegreeMap = troubleshootingCycleList.stream().collect(Collectors.toMap(Dictionaries::getNAME, Dictionaries::getBIANMA)); + // 清单类型 + List inventoryTypeList = dictionaryService.listSubDictByParentId("4a3d0d99b0ea4e268c11dd0b18866917"); + Map inventoryTypeDegreeMap = inventoryTypeList.stream().collect(Collectors.toMap(Dictionaries::getNAME, Dictionaries::getBIANMA)); +// List departmentList = dictionaryService.listSubDictByParentId("4a3d0d99b0ea4e268c11dd0b18866917"); + List listAll = new ArrayList<>(); + + Integer number = 1;//行数，用于提示用户 + for (PageData lpd : listPd) { + try { + number++; + for (int i = 0; i < 19; i++) { + if (i == 0) { // var0 :序号 非必填 + continue; + } + if (!lpd.containsKey("var" + i) || Tools.isEmpty(lpd.get("var" + i))) { + if ("任务类型".equals(header.get(i))) { + continue; + } + if ("排查日期".equals(header.get(i))) { + continue; + } + if ("参考依据".equals(header.get(i))) { + continue; + } + errorStr.append("第" + number + "行的" + header.get(i) + "无数据;\n"); + continue; + } + if (lpd.get("var" + i).toString().length() >= 250) { //限制内容长度 + errorStr.append("第" + number + "行的 \"" + header.get(i) + "\"字符长度超出,请精简的250内;\n"); + } + + } + String NAME = Tools.excelHandle(lpd.get("var1")); + String BAO_BAO_TYPE = lpd.get("var2") == "是" ? "1" : "0"; + String TASK_TYPE = taskTypeDegreeMap.get(Tools.excelHandle(lpd.get("var3"))); + String DEPARTMENT_NAME = Tools.excelHandle(lpd.get("var4")); + PageData depPd = new PageData(); + depPd.put("NAME", DEPARTMENT_NAME); + depPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData depInfo = departmentService.findByName(depPd); + String DEPARTMENT_ID = ""; + if (depInfo != null && Tools.notEmpty(depInfo.getString("DEPARTMENT_ID"))) { + DEPARTMENT_ID = depInfo.get("DEPARTMENT_ID").toString(); + }else { + errorStr.append("第" + number + "行的部门不存在;\n"); + continue; + } + PageData postPd = new PageData(); + postPd.put("DEPARTMENT_ID", DEPARTMENT_ID); + postPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + postPd.put("NAME", Tools.excelHandle(lpd.get("var5"))); + List postList = postService.listAll(postPd); + String POST_ID = ""; + if (postList.size() != 0 && Tools.notEmpty(postList.get(0).getString("POST_ID"))) { + POST_ID = postList.get(0).getString("POST_ID"); + } else { + errorStr.append("第" + number + "行的岗位不存在;\n"); + continue; + } + PageData userPd = new PageData(); + userPd.put("DEPARTMENT_ID", DEPARTMENT_ID); + userPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + userPd.put("POST_ID", POST_ID); + userPd.put("NAME", Tools.excelHandle(lpd.get("var6"))); + List userList = usersService.listAllUser(userPd); + String USER_ID = ""; + if (userList.size() != 0 && Tools.notEmpty(userList.get(0).getString("USER_ID"))) { + USER_ID = userList.get(0).getString("USER_ID"); + } else { + errorStr.append("第" + number + "行的负责人不存在;\n"); + continue; + } + String SCREENTYPE = troubleshootingTypeDegreeMap.get(Tools.excelHandle(lpd.get("var7"))); + String PERIOD = troubleshootingCycleDegreeMap.get(Tools.excelHandle(lpd.get("var8"))); + String TYPE = inventoryTypeDegreeMap.get(Tools.excelHandle(lpd.get("var9"))); + String CHECK_CATEGORY = Tools.excelHandle(lpd.get("var11")); + String CHECK_ITEM = Tools.excelHandle(lpd.get("var12")); + String CHECK_CONTENT = Tools.excelHandle(lpd.get("var13")); + String CHECK_STANDARD = Tools.excelHandle(lpd.get("var14")); + String REFERENCE_BASIS = Tools.excelHandle(lpd.get("var15")); + String CHECK_QUALIFIED = Tools.excelHandle(lpd.get("var16")); + String CHECK_UNQUALIFIED = Tools.excelHandle(lpd.get("var17")); + String OPERATION_TYPE = Tools.excelHandle(lpd.get("var18")); + //检查类别和检查项目如果字典里存在，则不存字典，如果不存在，则存一下 + PageData dict = new PageData(); + dict.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List dictList = standardDictionaryService.list(dict); + int maxsortNum = 0; + Boolean exist = false; + for (int j = 0; j < dictList.size(); j++) { + if ("1".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) { + if (!dictList.get(j).get("DICTIONARY_NAME").equals(CHECK_CATEGORY)) { //如果不存在该字典，获取最大排序号 + if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) { + maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT")); + } + } else { + exist = true; + } + } + } + if (!exist) { + dict.put("DICTIONARY_ID", this.get32UUID()); + dict.put("DICTIONARY_LEVEL", "1"); + dict.put("DICTIONARY_SORT", maxsortNum + 1); + dict.put("DICTIONARY_NAME", CHECK_CATEGORY); + dict.put("PARENT_ID", "0"); + dict.put("PARENT_IDS", dict.get("DICTIONARY_ID")); + dict.put("DICTIONARY_NAMES", dict.get("DICTIONARY_NAME")); + dict.put("DICTIONARY_SOURCE", "2"); + dict.put("ISDELETE", "0"); + dict.put("CREATOR_ID", Jurisdiction.getUSER_ID()); + dict.put("CREATOR_NAME", Jurisdiction.getUsername()); + dict.put("CREATE_TIME", DateUtil.date2Str(new Date())); + dict.put("OPERATOR_ID", Jurisdiction.getUSER_ID()); + dict.put("OPERATOR_NAME", Jurisdiction.getUsername()); + dict.put("OPERATE_TIME", DateUtil.date2Str(new Date())); + dict.put("DELETEOR_ID", Jurisdiction.getUSER_ID()); + dict.put("DELETEOR_NAME", Jurisdiction.getUsername()); + dict.put("DELETE_TIME", DateUtil.date2Str(new Date())); + standardDictionaryService.save(dict); + } + PageData dictItem = new PageData(); + dictItem.putAll(dict); + maxsortNum = 0; + exist = false; + for (int j = 0; j < dictList.size(); j++) { + if ("2".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) { + if (!dictList.get(j).get("DICTIONARY_NAME").equals(CHECK_ITEM)) { //如果不存在该字典，获取最大排序号 + if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) { + maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT")); + } + } else { + exist = true; + } + } + } + maxsortNum = maxsortNum == 0 ? 1 : maxsortNum; + if (!exist) { + dictItem.put("DICTIONARY_ID", this.get32UUID()); + dictItem.put("DICTIONARY_LEVEL", "2"); + dictItem.put("DICTIONARY_SORT", maxsortNum + 1); + dictItem.put("DICTIONARY_NAME", CHECK_ITEM); + dictItem.put("PARENT_ID", dict.get("DICTIONARY_ID")); + dictItem.put("PARENT_IDS", dictItem.getString("DICTIONARY_ID") + ',' + dict.getString("DICTIONARY_ID")); + dictItem.put("DICTIONARY_NAMES", dictItem.getString("DICTIONARY_NAME") + ',' + dict.getString("DICTIONARY_NAME")); + standardDictionaryService.save(dictItem); + } + // 隐患排查清单保存 + PageData customData = new PageData(); + customData.put("CUSTOM_ID", this.get32UUID()); + customData.put("NAME", NAME); + customData.put("BAO_BAO_TYPE", BAO_BAO_TYPE); + customData.put("TASK_TYPE", TASK_TYPE); + customData.put("DEPARTMENT_ID", DEPARTMENT_ID); + customData.put("POST_ID", POST_ID); + customData.put("USER_ID", USER_ID); + customData.put("SCREENTYPE", SCREENTYPE); + customData.put("PERIOD", PERIOD); + customData.put("TYPE", TYPE); + customData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 + customData.put("ISDELETE", "0"); //是否删除 + customData.put("CREATOR", Jurisdiction.getUsername()); //添加人 + customData.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间 + customData.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + customData.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + customService.save(customData); + + // 隐患排查清单检查项保存 + PageData customItemData = new PageData(); + customItemData.putAll(customData); + customItemData.put("CUSTOM_ITEM_ID", this.get32UUID()); //主键 + customItemData.put("CHECK_CATEGORY", CHECK_CATEGORY); + customItemData.put("CHECK_ITEM", CHECK_ITEM); + customItemData.put("CHECK_CONTENT", CHECK_CONTENT); + customItemData.put("CHECK_STANDARD", CHECK_STANDARD); + customItemData.put("REFERENCE_BASIS", REFERENCE_BASIS); + customItemData.put("CHECK_QUALIFIED", CHECK_QUALIFIED); + customItemData.put("CHECK_UNQUALIFIED", CHECK_UNQUALIFIED); + customItemData.put("OPERATION_TYPE", OPERATION_TYPE == "选择" ? "1" : "2"); + customItemData.put("COMMON_ITEM_SORT", dictItem.get("DICTIONARY_SORT")); + customItemData.put("CREATOR_ID", Jurisdiction.getUSER_ID()); + customItemData.put("CREATOR_NAME", Jurisdiction.getUsername()); + customItemData.put("CREATE_TIME", DateUtil.date2Str(new Date())); + customItemData.put("OPERATOR_ID", Jurisdiction.getUSER_ID()); + customItemData.put("OPERATOR_NAME", Jurisdiction.getUsername()); + customItemData.put("OPERATE_TIME", DateUtil.date2Str(new Date())); + customItemData.put("DELETEOR_ID", Jurisdiction.getUSER_ID()); + customItemData.put("DELETEOR_NAME", Jurisdiction.getUsername()); + customItemData.put("DELETE_TIME", DateUtil.date2Str(new Date())); + customItemService.save(customItemData); + listAll.add(customData); + // 修改清单统计 + PageData newpd = new PageData(); + newpd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 + newpd.put("CUSTOM_ID", customData.get("CUSTOM_ID")); + if ("listType0005".equals(TYPE)) { + newpd.put("CUSTOMSTATISTICS_ID", this.get32UUID()); //主键 + newpd.put("STARTTIME", newpd.get("START_DATE").toString() + " 00:00:00"); + newpd.put("ENDTIME", newpd.get("END_DATE").toString() + " 23:59:59"); + newpd.put("PERIOD", null); + PageData statistics = customStatisticsService.findByCondition(newpd); + if (statistics != null && statistics.get("LISTSTATISTICS_ID") != null) { + statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString()) - 2); + customStatisticsService.edit(statistics); + } + newpd.put("ISSTATISTICS", '0'); + // 本期已检查的不计入统计 + customCheckRecordService.editStatistics(newpd); + } else { + switch (PERIOD) { + case "checkPeriod0001"://每日 + newpd.put("STARTTIME", DateUtil.getDay() + " 00:00:00"); + newpd.put("ENDTIME", DateUtil.getDay() + " 23:59:59"); + break; + + case "checkPeriod0002"://每周 + newpd.put("STARTTIME", DateUtil.getWeekStart()); + newpd.put("ENDTIME", DateUtil.getWeekEnd()); + break; + + case "checkPeriod0003"://每旬 + String year = DateUtil.getYear().toString(); + String month = DateUtil.getMonth().toString(); + Integer day = Integer.parseInt(DateUtil.getOnlyDay().toString()); + String startTime = year + "-" + month + "-"; + String endTime = year + "-" + month + "-"; + if (day <= 10) { + startTime = startTime + "01 00:00:00"; + endTime = endTime + "10 23:59:59"; + } else if (day > 10 && day <= 20) { + startTime = startTime + "11 00:00:00"; + endTime = endTime + "20 23:59:59"; + } else { + startTime = startTime + "21 00:00:00"; + endTime = DateUtil.getMonthEndDay() + " 23:59:59"; + } + newpd.put("STARTTIME", startTime); + newpd.put("ENDTIME", endTime); + break; + + case "checkPeriod0004"://每月 + newpd.put("STARTTIME", DateUtil.getMonthFirstDay() + " 00:00:00"); + newpd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + break; + + case "checkPeriod0005"://每季 + newpd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); + newpd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); + break; + + case "checkPeriod0006"://每年 + newpd.put("STARTTIME", DateUtil.getCurrYearFirst() + " 00:00:00"); + newpd.put("ENDTIME", DateUtil.getCurrYearLast() + " 23:59:59"); + break; + + case "checkPeriod0007"://半年 + String byear = DateUtil.getYear().toString(); + Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString()); + if (bmonth <= 6) { + pd.put("STARTTIME", byear + "-01-01 00:00:00"); + pd.put("ENDTIME", byear + "-06-30 23:59:59"); + } else if (bmonth > 6) { + pd.put("STARTTIME", byear + "-07-01 00:00:00"); + pd.put("ENDTIME", byear + "-12-31 23:59:59"); + } + break; + default: + break; + } + PageData statistics = customStatisticsService.findByCondition(newpd); + if (statistics != null && statistics.get("LISTSTATISTICS_ID") != null) { + statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString()) - 1); + customStatisticsService.edit(statistics); + } + newpd.put("ISSTATISTICS", '0'); + // 本期已检查的不计入统计 + customCheckRecordService.editStatistics(newpd); + } + } catch (Exception e) { + map.put("result", "fail"); //返回结果 + errorStr.append("第" + number + "行数据出现错误;
"); + return map; + } + } + + if (Tools.isEmpty(errorStr.toString())) { + errorStr.append("成功导入" + listAll.size() + "条数据!"); + } else { + errInfo = "error"; + } + FileUtils.deleteQuietly(tempFile);//删除临时文件 + } else { + map.put("result", "fail");//返回结果 + map.put("msg", "Excel数据为空，请检查数据后，重新上传！"); + FileUtils.deleteQuietly(tempFile);//删除临时文件 + return map; + } + } + map.put("result", errInfo); //返回结果 + map.put("msg", errorStr.toString()); //返回结果 + map.put("resultStr", errorStr.toString()); + return map; + } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + // @RequiresPermissions("listmanager:edit") + @ResponseBody + @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "修改") + public Object edit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + // 查询原数据 + PageData oldPd = customService.findById(pd); + + PageData pd2 = new PageData(); //删除原有内容 + pd2.put("CUSTOM_ID", pd.getString("CUSTOM_ID")); + List varList = customItemService.listAll(pd2); // + for (PageData pageData : varList) { + PageData citem = new PageData(); + citem.put("CUSTOM_ITEM_ID", pageData.getString("CUSTOM_ITEM_ID")); + customItemService.delete(citem); + } + + if(pd.get("LISTITEM")!=null && !pd.get("LISTITEM").equals("")) { + List list = (List) JSON.parse(pd.get("LISTITEM").toString()); + for (JSONObject json : list) { + int commonSort = 0; + String CHECK_CATEGORY_Temp = ""; + String CHECK_ITEM_Temp = ""; + if (Tools.isEmpty(json.get("CHECK_CATEGORY")) || Tools.isEmpty(json.get("CHECK_ITEM"))) { + PageData dict = new PageData(); + dict.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List dictList = standardDictionaryService.list(dict); + int maxsortNum = 0; + Boolean existCategory = false; + for (int j = 0; j < dictList.size(); j++) { + if ("1".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) { + if (!dictList.get(j).get("DICTIONARY_NAME").equals(json.get("CHECK_CATEGORY_NAME"))) { //如果不存在该字典，获取最大排序号 + if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) { + maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT")); + } + } else { + CHECK_CATEGORY_Temp = dictList.get(j).get("DICTIONARY_ID").toString(); + existCategory = true; + } + } + } + if (!existCategory) { + dict.put("DICTIONARY_ID", this.get32UUID()); + dict.put("DICTIONARY_LEVEL", "1"); + dict.put("DICTIONARY_SORT", maxsortNum + 1); + dict.put("DICTIONARY_NAME", json.get("CHECK_CATEGORY_NAME")); + dict.put("PARENT_ID", "0"); + dict.put("PARENT_IDS", dict.get("DICTIONARY_ID")); + dict.put("DICTIONARY_NAMES", dict.get("DICTIONARY_NAME")); + dict.put("DICTIONARY_SOURCE", "2"); + dict.put("ISDELETE", "0"); + dict.put("CREATOR_ID", Jurisdiction.getUSER_ID()); + dict.put("CREATOR_NAME", Jurisdiction.getUsername()); + dict.put("CREATE_TIME", DateUtil.date2Str(new Date())); + dict.put("OPERATOR_ID", Jurisdiction.getUSER_ID()); + dict.put("OPERATOR_NAME", Jurisdiction.getUsername()); + dict.put("OPERATE_TIME", DateUtil.date2Str(new Date())); + dict.put("DELETEOR_ID", Jurisdiction.getUSER_ID()); + dict.put("DELETEOR_NAME", Jurisdiction.getUsername()); + dict.put("DELETE_TIME", DateUtil.date2Str(new Date())); + standardDictionaryService.save(dict); + CHECK_CATEGORY_Temp = dict.get("DICTIONARY_ID").toString(); + } + PageData dictItem = new PageData(); + dictItem.putAll(dict); + maxsortNum = 0; + Boolean existItem = false; + for (int j = 0; j < dictList.size(); j++) { + if ("2".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) { + if (!dictList.get(j).get("DICTIONARY_NAME").equals(json.get("CHECK_ITEM_NAME"))) { //如果不存在该字典，获取最大排序号 + if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) { + maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT")); + } + } else { + CHECK_ITEM_Temp = dictList.get(j).get("DICTIONARY_ID").toString(); + existItem = true; + } + } + } + commonSort = maxsortNum == 0 ? 1 : maxsortNum; + if (!existItem) { + dictItem.put("DICTIONARY_ID", this.get32UUID()); + dictItem.put("DICTIONARY_LEVEL", "2"); + dictItem.put("DICTIONARY_SORT", maxsortNum + 1); + dictItem.put("DICTIONARY_NAME", json.get("CHECK_ITEM_NAME")); + dictItem.put("PARENT_ID", dict.get("DICTIONARY_ID")); + dictItem.put("PARENT_IDS", dictItem.getString("DICTIONARY_ID") + ',' + dict.getString("DICTIONARY_ID")); + dictItem.put("DICTIONARY_NAMES", dictItem.getString("DICTIONARY_NAME") + ',' + dict.getString("DICTIONARY_NAME")); + standardDictionaryService.save(dictItem); + CHECK_ITEM_Temp = dictItem.get("DICTIONARY_ID").toString(); + } + } + PageData itme = new PageData(); + itme.put("CUSTOM_ITEM_ID", this.get32UUID()); //主键 + itme.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + itme.put("CHECK_CATEGORY", Tools.isEmpty(json.get("CHECK_CATEGORY")) ? CHECK_CATEGORY_Temp : json.get("CHECK_CATEGORY")); + itme.put("CHECK_ITEM", Tools.isEmpty(json.get("CHECK_ITEM")) ? CHECK_ITEM_Temp : json.get("CHECK_ITEM")); + itme.put("CHECK_CONTENT", json.get("CHECK_CONTENT")); + itme.put("CHECK_STANDARD", json.get("CHECK_STANDARD")); + itme.put("REFERENCE_BASIS", json.get("REFERENCE_BASIS")); + itme.put("CHECK_QUALIFIED", json.get("CHECK_QUALIFIED")); + itme.put("CHECK_UNQUALIFIED", json.get("CHECK_UNQUALIFIED")); + itme.put("OPERATION_TYPE", json.get("OPERATION_TYPE")); + itme.put("COMMON_ITEM_SORT", commonSort); + itme.put("COMMON_ID", json.get("COMMON_ID") == null ? "" : json.get("COMMON_ID")); + itme.put("COMMON_ITEM_ID", json.get("COMMON_ITEM_ID") == null ? "" : json.get("COMMON_ITEM_ID")); + itme.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 + itme.put("ISDELETE", "0"); //是否删除 + itme.put("CREATOR_ID", Jurisdiction.getUSER_ID()); //添加人id + itme.put("CREATOR_NAME", Jurisdiction.getUsername()); //添加人 + itme.put("CREATE_TIME", DateUtil.date2Str(new Date())); //创建时间 + itme.put("OPERATOR_ID", Jurisdiction.getUSER_ID()); //修改人 + itme.put("OPERATOR_NAME", Jurisdiction.getUsername()); //修改时间 + itme.put("OPERATE_TIME", DateUtil.date2Str(new Date())); //修改时间 + itme.put("DELETEOR_ID", Jurisdiction.getUSER_ID()); //添加人id + itme.put("DELETEOR_NAME", Jurisdiction.getUsername()); //添加人 + itme.put("DELETE_TIME", DateUtil.date2Str(new Date())); //删除时间 + customItemService.save(itme); + } + } + if(pd.getString("TYPE").equals("listType0006")){ + pd.put("ISDELETE","-99"); + }else { + pd.put("ISDELETE","0"); + } + customService.edit(pd); // 修改清单管理的内容 + oldPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + // 修改清单统计 + if(oldPd.get("TYPE") != null && Tools.notEmpty(oldPd.get("TYPE").toString())) { + oldPd.put("CUSTOMSTATISTICS_ID", this.get32UUID()); //主键 + if("listType0005".equals(oldPd.get("TYPE").toString())) { + oldPd.put("STARTTIME", oldPd.get("START_DATE").toString()+" 00:00:00"); + oldPd.put("ENDTIME", oldPd.get("END_DATE").toString()+" 23:59:59"); + oldPd.put("PERIOD", null); + PageData statistics = customStatisticsService.findByCondition(oldPd); + if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { + if(Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())-2 <=0) { + customStatisticsService.deletewl(statistics); + } else { + statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())-2); + customStatisticsService.edit(statistics); + } + } + } else { + if(oldPd.get("PERIOD") != null && Tools.notEmpty(oldPd.get("PERIOD").toString())) { + String period = oldPd.get("PERIOD").toString(); + switch (period) { + case "checkPeriod0001"://每日 + oldPd.put("STARTTIME", DateUtil.getDay()+" 00:00:00"); + oldPd.put("ENDTIME", DateUtil.getDay()+" 23:59:59"); + break; + + case "checkPeriod0002"://每周 + oldPd.put("STARTTIME", DateUtil.getWeekStart()); + oldPd.put("ENDTIME", DateUtil.getWeekEnd()); + break; + + case "checkPeriod0003"://每旬 + String year = DateUtil.getYear().toString(); + String month = DateUtil.getMonth().toString(); + Integer day = Integer.parseInt(DateUtil.getOnlyDay().toString()); + String startTime = year + "-" + month + "-"; + String endTime = year + "-" + month + "-"; + if(day <= 10) { + startTime = startTime+"01 00:00:00"; + endTime = endTime+"10 23:59:59"; + } else if(day > 10 && day <= 20) { + startTime = startTime+"11 00:00:00"; + endTime = endTime+"20 23:59:59"; + } else { + startTime = startTime+"21 00:00:00"; + endTime = DateUtil.getMonthEndDay()+" 23:59:59"; + } + oldPd.put("STARTTIME", startTime); + oldPd.put("ENDTIME", endTime); + break; + + case "checkPeriod0004"://每月 + oldPd.put("STARTTIME", DateUtil.getMonthFirstDay()+" 00:00:00"); + oldPd.put("ENDTIME", DateUtil.getMonthEndDay()+" 23:59:59"); + break; + + case "checkPeriod0005"://每季 + oldPd.put("STARTTIME", DateUtil.quarterStart()+" 00:00:00"); + oldPd.put("ENDTIME", DateUtil.quarterEnd()+" 23:59:59"); + break; + + case "checkPeriod0006"://每年 + oldPd.put("STARTTIME", DateUtil.getCurrYearFirst()+" 00:00:00"); + oldPd.put("ENDTIME", DateUtil.getCurrYearLast()+" 23:59:59"); + break; + + case "checkPeriod0007"://半年 + String byear = DateUtil.getYear().toString(); + Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString()); + if(bmonth <= 6) { + oldPd.put("STARTTIME", byear+"-01-01 00:00:00"); + oldPd.put("ENDTIME", byear+"-06-30 23:59:59"); + } else if(bmonth > 6) { + oldPd.put("STARTTIME", byear+"-07-01 00:00:00"); + oldPd.put("ENDTIME", byear+"-12-31 23:59:59"); + } + break; + + default: + break; + } + } + PageData statistics = customStatisticsService.findByCondition(oldPd); + if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { + if(Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())-1 <=0) { + customStatisticsService.deletewl(statistics); + } else { + statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())-1); + customStatisticsService.edit(statistics); + } + } + } + } + if(pd.get("TYPE") != null && Tools.notEmpty(pd.get("TYPE").toString())) { + pd.put("CUSTOMSTATISTICS_ID", this.get32UUID()); //主键 + if("listType0005".equals(pd.get("TYPE").toString())) { + pd.put("STARTTIME", pd.get("START_DATE").toString()+" 00:00:00"); + pd.put("ENDTIME", pd.get("END_DATE").toString()+" 23:59:59"); + pd.put("PERIOD", null); + PageData statistics = customStatisticsService.findByCondition(pd); + if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { + statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())+2); + customStatisticsService.edit(statistics); + } else { + pd.put("NOTEXAMINEDNUM", 2); + customStatisticsService.save(pd); + } + } else { + if(pd.get("PERIOD") != null && Tools.notEmpty(pd.get("PERIOD").toString())) { + String period = pd.get("PERIOD").toString(); + switch (period) { + case "checkPeriod0001"://每日 + pd.put("STARTTIME", DateUtil.getDay()+" 00:00:00"); + pd.put("ENDTIME", DateUtil.getDay()+" 23:59:59"); + break; + + case "checkPeriod0002"://每周 + pd.put("STARTTIME", DateUtil.getWeekStart()); + pd.put("ENDTIME", DateUtil.getWeekEnd()); + break; + + case "checkPeriod0003"://每旬 + String year = DateUtil.getYear().toString(); + String month = DateUtil.getMonth().toString(); + Integer day = Integer.parseInt(DateUtil.getOnlyDay().toString()); + String startTime = year + "-" + month + "-"; + String endTime = year + "-" + month + "-"; + if(day <= 10) { + startTime = startTime+"01 00:00:00"; + endTime = endTime+"10 23:59:59"; + } else if(day > 10 && day <= 20) { + startTime = startTime+"11 00:00:00"; + endTime = endTime+"20 23:59:59"; + } else { + startTime = startTime+"21 00:00:00"; + endTime = DateUtil.getMonthEndDay()+" 23:59:59"; + } + pd.put("STARTTIME", startTime); + pd.put("ENDTIME", endTime); + break; + + case "checkPeriod0004"://每月 + pd.put("STARTTIME", DateUtil.getMonthFirstDay()+" 00:00:00"); + pd.put("ENDTIME", DateUtil.getMonthEndDay()+" 23:59:59"); + break; + + case "checkPeriod0005"://每季 + pd.put("STARTTIME", DateUtil.quarterStart()+" 00:00:00"); + pd.put("ENDTIME", DateUtil.quarterEnd()+" 23:59:59"); + break; + + case "checkPeriod0006"://每年 + pd.put("STARTTIME", DateUtil.getCurrYearFirst()+" 00:00:00"); + pd.put("ENDTIME", DateUtil.getCurrYearLast()+" 23:59:59"); + break; + + case "checkPeriod0007"://半年 + String byear = DateUtil.getYear().toString(); + Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString()); + if(bmonth <= 6) { + pd.put("STARTTIME", byear+"-01-01 00:00:00"); + pd.put("ENDTIME", byear+"-06-30 23:59:59"); + } else if(bmonth > 6) { + pd.put("STARTTIME", byear+"-07-01 00:00:00"); + pd.put("ENDTIME", byear+"-12-31 23:59:59"); + } + break; + + default: + break; + } + } + PageData statistics = customStatisticsService.findByCondition(pd); + if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { + statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())+1); + customStatisticsService.edit(statistics); + } else { + pd.put("NOTEXAMINEDNUM", 1); + customStatisticsService.save(pd); + } + } + } + map.put("result", errInfo); + return map; + } // // /**导出到excel // * @param diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java new file mode 100644 index 0000000..39e1271 --- /dev/null +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java @@ -0,0 +1,281 @@ +package com.zcloud.controller.keyProjects.app; + +import com.alibaba.fastjson.JSON; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.relatedparty.OutSourcedService; +import com.zcloud.service.relatedparty.UnitsService; +import com.zcloud.service.specialoperation.PersonnelManagementService; +import com.zcloud.service.system.DictionariesService; +import com.zcloud.service.video.VideoManagerService; +import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.crypto.hash.SimpleHash; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：相关方管理 + * 作者：luoxiaobao + * 时间：2022-06-07 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/keyProjects") +public class AppKeyProjectsController extends BaseController { + + @Autowired + private UnitsService unitsService; + @Autowired + private OutSourcedService outsourcedService; + @Autowired + private DictionariesService dictionariesService; + @Autowired + private PersonnelManagementService personnelmanagementService; + + @Autowired + private VideoManagerService videomanagerService; + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/listAppZdgcgl") + @ResponseBody + public Object listAppZdgcgl(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String UserId = pd.getString("UserId"); + pd.put("UserId",UserId); + if(!StringUtils.equals("1",UserId)){ + pd.put("DeptId",outsourcedService.getDeptId(UserId)); + } + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = outsourcedService.applylist(page); //列出OutSourced列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 重点工程定位 + * @return + * @throws Exception + */ + @RequestMapping(value="/editDingWei") + @ResponseBody + public Object editDingWei() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + outsourcedService.editDingWei(pd); //根据ID读取 + String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd); + pd.put("operatingCorpId",corpInfoId); + map.put("dockData", JSON.toJSONString(pd)); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/videomanagerList") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + page.setPd(pd); + List varList = videomanagerService.listApp(page); //列出VideoManager列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/getOutsourced") + @ResponseBody + public Object getOutsourced() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = outsourcedService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/listAllUnits") + @ResponseBody + public Object listAllUnits() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = unitsService.listAll(pd); //列出PersonnelManagement列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/listOutsourced") + @ResponseBody + public Object listOutsourced(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String UserId = pd.getString("UNITS_ID"); + pd.put("UserId",UserId); + if(!StringUtils.equals("1",UserId)){ + pd.put("DeptId",outsourcedService.getDeptId(UserId)); + } + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = outsourcedService. list(page); //列出OutSourced列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/listAllOutsourced") + @ResponseBody + public Object listAllOutsourced() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = outsourcedService.listAll(pd); //列出PersonnelManagement列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/listAllPersonnel") + @ResponseBody + public Object listAllPersonnel() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = personnelmanagementService.listAll(pd); //列出PersonnelManagement列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/login") + @ResponseBody + public Object login() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String pwd = new SimpleHash("SHA-1", pd.get("USERNAME"), pd.get("PASSWORD")).toString(); + pd.put("PHONENUM", pd.get("USERNAME")); + pd.put("PASSWORD",pwd); + pd = personnelmanagementService.findForLogin(pd); //列出PersonnelManagement列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + + /** + * @param page + * @throws Exception + */ + @RequestMapping(value="/editPwd") + @ResponseBody + public Object editPwd (Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pageData = personnelmanagementService.findById(pd); + String oldpwd = new SimpleHash("SHA-1", pageData.getString("PHONENUM"), pd.get("OLDPASSWORD")).toString(); + if(!pageData.getString("PASSWORD").equals(oldpwd)){ + errInfo = "error"; + map.put("msg","旧密码错误"); + return map; + } + String pwd = new SimpleHash("SHA-1", pageData.getString("PHONENUM"), pd.get("PASSWORD")).toString(); //新密码 + PageData updateUser = new PageData(); + updateUser.put("PASSWORD", pwd); + updateUser.put("PERSONNELMANAGEMENT_ID", pageData.getString("PERSONNELMANAGEMENT_ID")); + personnelmanagementService.editPassword(updateUser); + + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/homePageData") + @ResponseBody + public Object homePageData() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = outsourcedService.homepagedata(pd); //列出PersonnelManagement列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + +// /**去修改页面获取数据 +// * @param +// * @throws Exception +// */ +// @RequestMapping(value="/goEdit") +// @ResponseBody +// public Object goEdit() throws Exception{ +// Map map = new HashMap(); +// String errInfo = "success"; +// PageData pd = new PageData(); +// pd = this.getPageData(); +// pd = personnelmanagementService.findByOutsourced(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("result", errInfo); +// return map; +// } +} diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java new file mode 100644 index 0000000..f694b37 --- /dev/null +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -0,0 +1,656 @@ +package com.zcloud.controller.keyProjects.app; + +import java.io.File; +import java.util.*; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.service.keyProjects.*; +import com.zcloud.service.relatedparty.OutSourcedService; +import com.zcloud.service.specialoperation.PersonnelManagementService; +import com.zcloud.service.system.ImgFilesService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.*; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.springframework.web.multipart.MultipartFile; + +/** + * 说明：重点工程检查 + * 作者：luoxiaobao + * 时间：2022-09-19 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/keyprojectcheck") +public class AppKeyprojectCheckController extends BaseController { + + @Autowired + private KeyprojectCheckService keyprojectcheckService; + @Autowired + private KeyprojectCheckInfoService keyprojectcheckInfoService; + @Autowired + private KeyprojectHiddenService keyprojectHiddenService; + @Autowired + private ImgFilesService imgFilesService; + @Autowired + private KeyprojectPunishService keyprojectPunishService; + + @Autowired + private OutSourcedService outsourcedService; + + @Autowired + private PersonnelManagementService personnelmanagementService; + + @Autowired + private UsersService usersService; + + @Autowired + private KeyprojectPunishService keyprojectpunishService; + + @Autowired Smb smb; + + + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("KEYPROJECTCHECK_ID", this.get32UUID()); //主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", 0); //是否删除 + pd.put("SOURCE", 1); //企业ID + pd.put("CORPINFO_ID", 1); //检查人的企业id 监管端的企业id就是1 + keyprojectcheckService.save(pd); + + String currentTime = DateUtil.date2Str(new Date()); + List SITUATIONJSONDATA = new ArrayList<>(); //发送其他项目用 + if (Tools.notEmpty(pd.getString("SITUATIONJSON"))) { + List list = (List) JSON.parse(pd.getString("SITUATIONJSON")); + String time = currentTime; + for (JSONObject json : list) { + PageData situationPd = new PageData(); + situationPd.put("KEYPROJECTCHECKINFO_ID", UuidUtil.get32UUID()); //主键 + situationPd.put("KEYPROJECTCHECK_ID", pd.getString("KEYPROJECTCHECK_ID")); //检查ID + situationPd.put("SITUATION", json.get("SITUATION")); //检查情况 + situationPd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + situationPd.put("CREATOR", pd.getString("CREATOR")); //添加人 + situationPd.put("CREATTIME", time); //添加时间 + situationPd.put("OPERATOR", pd.getString("OPERATOR")); //修改人 + situationPd.put("OPERATTIME", time); //修改时间 + keyprojectcheckInfoService.save(situationPd); + SITUATIONJSONDATA.add(situationPd); + time = DateUtil.calculateDateSecond(time, 1); + } + } + Boolean boo = false; // 增加开关控制 + List HIDDENJSONDATA = new ArrayList<>(); //发送其他项目用 + if (Tools.notEmpty(pd.getString("HIDDENJSON"))) { + boo = true; + List hiddenList = new ArrayList(); + List list = (List) JSON.parse(pd.getString("HIDDENJSON")); + String time = currentTime; + for (JSONObject json : list) { + PageData hidden = new PageData(); + hidden.put("HIDDEN_ID", UuidUtil.get32UUID()); //主键 + hidden.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID")); //外键ID + hidden.put("HIDDENDESCR", json.getString("HIDDENDESCR")); //隐患描述 + hidden.put("HIDDENPART", json.getString("HIDDENPART")); //隐患部位 + hidden.put("HIDDENLEVEL", json.getString("HIDDENLEVEL")); //隐患级别 + hidden.put("HIDDENTYPE", json.getString("HIDDENTYPE")); //隐患类型1 + hidden.put("HIDDENTYPE2", json.getString("HIDDENTYPE2")); //隐患类型2 + hidden.put("LONGITUDE", json.getString("LONGITUDE")); //隐患位置经度 + hidden.put("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度 + hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间 + hidden.put("HIDDENFINDDEPT", json.getString("HIDDENFINDDEPT")); //隐患发现部门（隐患责任人部门） + hidden.put("RECTIFICATIONTYPE", json.getString("RECTIFICATIONTYPE")); //隐患处置 + hidden.put("RECTIFICATIONDEADLINE", json.getString("RECTIFICATIONDEADLINE")); //整改期限 + hidden.put("RECTIFYDESCR", json.getString("RECTIFYDESCR")); //整改描述 + hidden.put("RECTIFICATIONDEPT", json.getString("RECTIFICATIONDEPT")); //整改部门 + hidden.put("RECTIFICATIONOR", json.getString("RECTIFICATIONOR")); //整改人 + hidden.put("CREATOR", pd.getString("CREATOR")); //发现人（隐患责任人） + hidden.put("SOURCE", json.getString("SOURCE")); //隐患来源 + hidden.put("STATE", "1"); //隐患状态 100-安全环保检查暂存的隐患（流程完转0） + hidden.put("CREATTIME", time); //发现时间 + hidden.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); //企业ID + hidden.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + hidden.put("POSITIONDESC", json.getString("POSITIONDESC"));// 隐患位置描述 + keyprojectHiddenService.save(hidden); + hiddenList.add(hidden); + HIDDENJSONDATA.add(hidden); + time = DateUtil.calculateDateSecond(time, 1); + } + pd.put("hiddenList", hiddenList); + } + try { + //这里发送短信 通知 先判断重点工程是否要求发短信, 不发直接过，发的话 找到对应人以及对应手机号 发送对应模板短信啊 + PageData outSource = new PageData(); + outSource.put("OUTSOURCED_ID", pd.getString("OUTSOURCED_ID")); + outSource = outsourcedService.findById(outSource); + if (StringUtils.isNotBlank(outSource.getString("IS_SMS")) && StringUtils.equals("0", outSource.getString("IS_SMS"))) { + //发送短信 pd中 PERSONNELMANAGEMENT_ID 对应 `qa-gwj-regulatory`.`BUS_PERSONNELMANAGEMENT` 表中 PERSONNELMANAGEMENT_ID 获取到 PHONENUM 手机号字段 发送短信 + PageData person = new PageData(); + person.put("PERSONNELMANAGEMENT_ID", pd.getString("PERSONNELMANAGEMENT_ID")); + person = personnelmanagementService.findById(person); + // outSource.get("OUTSOURCED_NAME") + JSONArray jsonArray = new JSONArray(); + //接受返回结果 + JSONObject records = new JSONObject(); + //定义替换参数 + JSONObject tpContent = new JSONObject(); + tpContent.put("OUTSOURCEDNAME", outSource.getString("OUTSOURCED_NAME")); + records = SendSmsUtil.getRecords(person.getString("PHONENUM"), tpContent); + jsonArray.add(records); + SendSmsUtil.sendSms("121451", jsonArray, null); + //发送罚款待处理 上文开关控制这里发送不 + if (boo) { + List jsonList = (List) JSON.parse(pd.getString("HIDDENJSON")); + String PUNISHTHEPERSON = keyprojectHiddenService.getPUNISHTHEPERSON(pd); + if (!Tools.isEmpty(PUNISHTHEPERSON)) { + PageData selectPageData = new PageData(); + String[] split = PUNISHTHEPERSON.split(","); + selectPageData.put("ids", split); + List list = keyprojectHiddenService.getPhone(selectPageData); + for (JSONObject json : jsonList) { + for (String phone : list) { + JSONArray jsonBrray = new JSONArray(); + //接受返回结果 + JSONObject recordsB = new JSONObject(); + //定义替换参数 + JSONObject tpContentB = new JSONObject(); + tpContentB.put("HIDDENDESCR", json.getString("HIDDENDESCR")); //隐患描述 + if (StringUtils.isNotBlank(phone)) { + recordsB = SendSmsUtil.getRecords(phone, tpContentB); + jsonBrray.add(recordsB); + SendSmsUtil.sendSms("121487", jsonBrray, null); + } + } + } + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + //获取当前重点工程的所属企业 根据重点工程创建人获取 + PageData dataDock = new PageData(); + String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd); + pd.put("operatingCorpId", corpInfoId); + dataDock.putAll(pd); + if (SITUATIONJSONDATA.size() > 0) { + dataDock.put("SITUATIONJSONDATA", SITUATIONJSONDATA); + } + if (HIDDENJSONDATA.size() > 0) { + dataDock.put("HIDDENJSONDATA", HIDDENJSONDATA); + } + map.put("dockData", JSON.toJSONString(dataDock)); + map.put("pd", pd); + map.put("result", errInfo); + } + //map.put("pd", pd); + //map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + keyprojectcheckService.delete(pd); + map.put("result", errInfo); //返回结果 + String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd); + pd.put("operatingCorpId", corpInfoId); + map.put("dockData", JSON.toJSONString(pd)); + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + keyprojectcheckService.edit(pd); + map.put("result", errInfo); + String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd); + pd.put("operatingCorpId", corpInfoId); + map.put("dockData", JSON.toJSONString(pd)); + return map; + } + + /** + * 确认 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/confirm") + @ResponseBody + public Object confirm(@RequestParam(value = "FFILE", required = false) MultipartFile PERSON_SIGN) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + ArrayList pictureList = new ArrayList<>(); + if (PERSON_SIGN != null) { +// MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("PERSON_SIGN")); + String suffixName = PERSON_SIGN.getOriginalFilename().substring(PERSON_SIGN.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + map.put("result", "fail"); + map.put("exception", "上传文件格式不正确"); + return map; + } + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + PERSON_SIGN.getOriginalFilename().substring(PERSON_SIGN.getOriginalFilename().lastIndexOf(".")); + pd.put("PERSON_SIGN_IMG", Const.FILEPATHFILE + ffile + "/" + fileName); + pd.put("PERSON_SIGN_TIME", DateUtil.date2Str(new Date())); + smb.sshSftp(PERSON_SIGN, fileName, Const.FILEPATHFILE + ffile); + pictureList.add(pd.getString("PERSON_SIGN_IMG") + + "@@" + + fileName); + } + keyprojectcheckService.confirm(pd); + try { + //这里发送短信 判断公司是否需要发送短信 然后判断是否有隐患 有则发送 没有不发送 + List smsList = keyprojectcheckService.getSmsList(pd); + if (!Tools.isEmpty(smsList)) { + for (PageData pageData : smsList) { + JSONArray jsonArray = new JSONArray(); + //接受返回结果 + JSONObject records = new JSONObject(); + //定义替换参数 + JSONObject tpContent = new JSONObject(); + tpContent.put("HIDDENDESCR", pageData.getString("HIDDENDESCR")); + records = SendSmsUtil.getRecords(pageData.getString("PHONENUM"), tpContent); + jsonArray.add(records); + SendSmsUtil.sendSms("121486", jsonArray, null); + } + + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + map.put("result", errInfo); + } + map.put("sendPicturesList", JSON.toJSONString(pictureList)); + PageData pageData = keyprojectcheckService.findById(pd); + String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pageData); + pd.put("operatingCorpId", corpInfoId); + map.put("dockData", JSON.toJSONString(pd)); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(Page page) 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()); + page.setPd(pd); + List varList = keyprojectcheckService.list(page); //列出KeyprojectCheck列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = keyprojectcheckService.findById(pd); //根据ID读取 + + List situationList = keyprojectcheckInfoService.listAll(pd); + + pd.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID")); + pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd)); + pd.put("situationList", situationList); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 去隐患页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listHidden") + @ResponseBody + public Object listHidden(Page page) 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()); + page.setPd(pd); + List varList = keyprojectHiddenService.list(page); //列出KeyprojectCheck列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 去隐患页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/findHidden") + @ResponseBody + public Object findHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = keyprojectHiddenService.findById(pd); //根据ID读取 + + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd2.put("TYPE", 3); //隐患报警图片 + pd.put("hiddenImgs", imgFilesService.listAll(pd2)); + if (imgFilesService.listAll(pd2).size() == 0) { + pd2.put("TYPE", 114); //AI隐患图片 + pd.put("hiddenImgs", imgFilesService.listAll(pd2)); + } + pd2.put("TYPE", 102); //隐患视频 + pd.put("hiddenVideos", imgFilesService.listAll(pd2)); + pd2.put("TYPE", 4); + pd.put("zgImgs", imgFilesService.listAll(pd2));//整改图片 + pd2.put("TYPE", 5); + pd.put("ysImgs", imgFilesService.listAll(pd2));//整改图片 + PageData findTicketData = new PageData(); + findTicketData.put("HIDDEN_ID", pd.getString("HIDDEN_ID")); + pd.put("punishForm", keyprojectpunishService.findById(findTicketData)); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 整改 + * @param + * @throws Exception + */ + @RequestMapping(value = "/rectify") + @ResponseBody + @Transactional + public Object rectify(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("STATE", 2); + keyprojectHiddenService.editstate(pd); + + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + map.put("result", "fail"); + map.put("exception", "上传文件格式不正确"); + return map; + } + } + for (int i = 0; i < files.length; i++) { + MultipartFile file = files[i]; + + String ffile = DateUtil.getDays(); +// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 +// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + PageData img = new PageData(); + String id = this.get32UUID(); + img.put("IMGFILES_ID", id); + img.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); + img.put("TYPE", 4); + img.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + imgFilesService.save(img); + } + } + map.put("result", errInfo); + String corpInfoId = keyprojectHiddenService.getCorpInfoIdByHiddenId(pd); + pd.put("operatingCorpId", corpInfoId); + map.put("dockData", JSON.toJSONString(pd)); + return map; + } + + /** + * 验收 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/check") + @ResponseBody + @Transactional + public Object check() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("STATE", 4); + keyprojectHiddenService.editstate(pd); + //根据隐患获取重点工程所属企业 + String corpInfoId = keyprojectHiddenService.getCorpInfoIdByHiddenId(pd); + pd.put("operatingCorpId", corpInfoId); + map.put("dockData", JSON.toJSONString(pd)); + map.put("result", errInfo); + return map; + } + + + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + keyprojectcheckService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + } else { + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /** + * 去隐患页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/keyProjectCount") + @ResponseBody + public Object keyProjectCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = keyprojectHiddenService.keyprojectcount(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 修改处罚状态 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editHiddenIspunish") + @ResponseBody + @Transactional + public Object editHiddenIspunish() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + keyprojectHiddenService.editstate(pd); + map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); + return map; + } + + + /** + * 整改 只处理图片 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/rectifyOnlyFile") + @ResponseBody + @Transactional + public Object rectifyOnlyFile(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (files.length > 1) { + map.put("result", "fail"); + map.put("exception", "一次性上传图片过多！"); + return map; + } + if (files != null) { + MultipartFile file = files[0]; + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + map.put("result", "fail"); + map.put("exception", "上传文件格式不正确"); + return map; + } + String ffile = DateUtil.getDays(); +// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 +// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + PageData img = new PageData(); + String IMGFILES_ID = this.get32UUID(); + img.put("IMGFILES_ID", IMGFILES_ID); + img.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); + img.put("TYPE", 4); + img.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); + imgFilesService.save(img); + } + map.put("result", errInfo); + return map; + } + + /** + * 整改 只处理表单 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/rectifyOnlyForm") + @ResponseBody + @Transactional + public Object rectifyOnlyForm() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("STATE", 2); + keyprojectHiddenService.editstate(pd); + try { + //发送 隐患待验收模板 短信 + //这里发送短信 判断公司是否需要发送短信 然后判断是否有隐患 有则发送 没有不发送 + String HIDDENDESCR = ""; + List smsList = keyprojectHiddenService.getSmsList(pd); + if (!Tools.isEmpty(smsList)) { + for (PageData pageData : smsList) { + JSONArray jsonArray = new JSONArray(); + //接受返回结果 + JSONObject records = new JSONObject(); + //定义替换参数 + JSONObject tpContent = new JSONObject(); + tpContent.put("HIDDENDESCR", pageData.getString("HIDDENDESCR")); + HIDDENDESCR = pageData.getString("HIDDENDESCR"); + records = SendSmsUtil.getRecords(pageData.getString("PHONE"), tpContent); + jsonArray.add(records); + SendSmsUtil.sendSms("121488", jsonArray, null); + } + + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + map.put("result", errInfo); + } + map.put("result", errInfo); + pd.put("operatingCorpId", keyprojectHiddenService.getCorpInfoIdByHiddenId(pd)); + map.put("dockData", JSON.toJSONString(pd)); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java new file mode 100644 index 0000000..d9cdfcf --- /dev/null +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java @@ -0,0 +1,277 @@ +package com.zcloud.controller.keyProjects.app; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.keyProjects.KeyprojectCheckService; +import com.zcloud.service.keyProjects.KeyprojectHiddenService; +import com.zcloud.service.keyProjects.KeyprojectPunishService; +import com.zcloud.service.relatedparty.OutSourcedService; +import com.zcloud.service.specialoperation.PersonnelManagementService; +import com.zcloud.service.system.ImgFilesService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +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.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：重点工程处罚 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/keyprojectpunish") +public class AppKeyprojectPunishController extends BaseController { + + @Autowired + private KeyprojectPunishService keyprojectpunishService; + @Autowired + private KeyprojectHiddenService keyprojectHiddenService; + @Autowired + private ImgFilesService imgFilesService; + + @Autowired + private Smb smb; + + + @Autowired + private OutSourcedService outsourcedService; + + @Autowired + private KeyprojectCheckService keyprojectcheckService; + + @Autowired + private PersonnelManagementService personnelmanagementService; + + /**处理 + * @param + * @throws Exception + */ + @RequestMapping(value="/handle") + @ResponseBody + @Transactional + public Object handle(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HANDLED", 1); + + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + map.put("result", "fail"); + map.put("exception", "上传文件格式不正确"); + return map; + } + } + for (int i = 0; i < files.length; i++) { + MultipartFile file = files[i]; + + String ffile = DateUtil.getDays(); +// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 +// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); + pd.put("HANDLE_IMG", Const.FILEPATHFILE + ffile + "/" + fileName); + } + } + keyprojectpunishService.editstate(pd); + map.put("result", errInfo); + return map; + } + + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData hidden = keyprojectHiddenService.findById(pd); + pd.put("KEYPROJECTPUNISH_ID", this.get32UUID()); //主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", 0); //是否删除 + pd.put("HANDLED", 0); + pd.put("HIDDEN_ID", hidden.get("HIDDEN_ID")); + pd.put("KEYPROJECTCHECK_ID", hidden.get("FOREIGN_ID")); + pd.put("UNITS_ID", hidden.get("RECTIFICATIONDEPT")); + pd.put("PERSONNELMANAGEMENT_ID", hidden.get("RECTIFICATIONOR")); + keyprojectpunishService.save(pd); + //因发送其他项目需要 提出来 + PageData keyprote = new PageData(); + keyprote.put("KEYPROJECTCHECK_ID", pd.getString("KEYPROJECTCHECK_ID")); + keyprote = keyprojectcheckService.findById(keyprote); + //发送处罚短信通知 + try { + //这里发送短信 判断公司是否需要发送短信 然后判断是否有隐患 有则发送 没有不发送 + PageData outSource = new PageData(); + outSource.put("OUTSOURCED_ID", keyprote.getString("OUTSOURCED_ID")); + outSource = outsourcedService.findById(outSource); + if (StringUtils.isNotBlank(outSource.getString("IS_SMS")) && StringUtils.equals("0", outSource.getString("IS_SMS"))) { + //发送短信 pd中 PERSONNELMANAGEMENT_ID 对应 `qa-gwj-regulatory`.`BUS_PERSONNELMANAGEMENT` 表中 PERSONNELMANAGEMENT_ID 获取到 PHONENUM 手机号字段 发送短信 + PageData person = new PageData(); + person.put("PERSONNELMANAGEMENT_ID", pd.getString("PERSONNELMANAGEMENT_ID")); + person = personnelmanagementService.findById(person); + // outSource.get("OUTSOURCED_NAME") + JSONArray jsonArray = new JSONArray(); + //接受返回结果 + JSONObject records = new JSONObject(); + //定义替换参数 + JSONObject tpContent = new JSONObject(); + tpContent.put("REASON", pd.getString("REASON")); + records = SendSmsUtil.getRecords(person.getString("PHONENUM"), tpContent); + jsonArray.add(records); + SendSmsUtil.sendSms("121490", jsonArray, null); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + //获取当前重点工程的所属企业 根据重点工程创建人获取 + PageData dataDock = new PageData(); + String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd); + pd.put("operatingCorpId", corpInfoId); + dataDock.putAll(pd); + map.put("dockData", JSON.toJSONString(dataDock)); + map.put("result", errInfo); + } + return map; + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + keyprojectpunishService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @ResponseBody + public Object edit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + keyprojectpunishService.edit(pd); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody + public Object list(Page page) 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()); + page.setPd(pd); + List varList = keyprojectpunishService.list(page); //列出KeyprojectPunish列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = keyprojectpunishService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll") + @ResponseBody + public Object deleteAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if(Tools.notEmpty(DATA_IDS)){ + String ArrayDATA_IDS[] = DATA_IDS.split(","); + keyprojectpunishService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + }else{ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + +// /**重点工程处罚列表 包含 未选择处罚结果的隐患 已下发处罚但为反馈的隐患 不处罚的隐患 +// * @param page +// * @throws Exception +// */ +// @RequestMapping(value="/punishlist") +// @ResponseBody +// public Object punishlist(Page page) 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()); +// page.setPd(pd); +// List varList = keyprojectpunishService.getpunishlist(page); //列出KeyprojectCheck列表 +// map.put("varList", varList); +// map.put("page", page); +// map.put("result", errInfo); +// return map; +// } +} diff --git a/src/main/java/com/zcloud/controller/relatedparty/OutSourcedController.java b/src/main/java/com/zcloud/controller/relatedparty/OutSourcedController.java index ffef42b..b29d3e3 100644 --- a/src/main/java/com/zcloud/controller/relatedparty/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/relatedparty/OutSourcedController.java @@ -5,7 +5,13 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.logs.LogAnno; import com.zcloud.service.relatedparty.OutSourcedService; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.ImgFilesService; +import com.zcloud.service.system.UsersService; +import com.zcloud.service.video.AIWarningService; +import com.zcloud.service.video.VideoManagerService; import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -31,6 +37,100 @@ public class OutSourcedController extends BaseController { private OutSourcedService outsourcedService; @Autowired private Smb smb; + @Autowired + private AIWarningService aiWarningService; + + @Autowired + private DepartmentService departmentService; + @Autowired + private UsersService usersService; + @Autowired + private ImgFilesService imgfilesService; + + @Autowired + private VideoManagerService videoManagerService; + + @RequestMapping(value = "/start") + @ResponseBody + public Object start() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = outsourcedService.findById(pd); + if (!StringUtils.isNotBlank(pd.getString("WORK_LONGITUDE"))){ + map.put("result", errInfo); + map.put("message","工程未定位!"); + map.put("code","500"); + return map; + } + outsourcedService.start(pd); + map.put("code","0"); + map.put("result", errInfo); //返回结果 + return map; + } + + + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/jie") + @ResponseBody + public Object jie() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + //校验当前重点工程是否存在未完成的隐患 （包含未整改，未处罚，ai报警未处置的） + PageData pageData = outsourcedService.jieshuOutSourced(pd); + if(!StringUtils.equals("0",pageData.getString("qr"))){ + map.put("result", errInfo); + map.put("message","当前重点工程还有"+pageData.getString("qr")+"项待确认安全环保检查,请处理以后再结束"); + map.put("code","500"); + return map; + } + if(!StringUtils.equals("0",pageData.getString("zg"))){ + map.put("result", errInfo); + map.put("message","当前重点工程还有"+pageData.getString("zg")+"项需整改的隐患,请处理以后再结束"); + map.put("code","500"); + return map; + } + if(!StringUtils.equals("0",pageData.getString("ys"))){ + map.put("result", errInfo); + map.put("message","当前重点工程还有"+pageData.getString("ys")+"项待验收隐患,请处理以后再结束"); + map.put("code","500"); + return map; + } + if(!StringUtils.equals("0",pageData.getString("cf"))){ + map.put("result", errInfo); + map.put("message","当前重点工程还有"+pageData.getString("cf")+"项待处罚隐患,请处理以后再结束"); + map.put("code","500"); + return map; + } + if(!StringUtils.equals("0",pageData.getString("fk"))){ + map.put("result", errInfo); + map.put("message","当前重点工程还有"+pageData.getString("fk")+"项处罚待反馈隐患,请处理以后再结束"); + map.put("code","500"); + return map; + } + if(!StringUtils.equals("0",pageData.getString("ai"))){ + map.put("result", errInfo); + map.put("message","当前重点工程还有"+pageData.getString("ai")+"项AI报警待处置,请处理以后再结束"); + map.put("code","500"); + return map; + } + pd = outsourcedService.findById(pd); + outsourcedService.jie(pd); + //清空摄像头与重点工程的关联关系 + videoManagerService.updateAiByOUTSOURCED_ID(pd); + map.put("code","0"); + map.put("result", errInfo); //返回结果 + return map; + } + /**新增 * @param * @throws Exception @@ -128,7 +228,7 @@ public class OutSourcedController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -161,7 +261,8 @@ public class OutSourcedController extends BaseController { @RequestParam(value="file5",required=false) MultipartFile file5, @RequestParam(value="file6",required=false) MultipartFile file6, @RequestParam(value="file7",required=false) MultipartFile file7, - @RequestParam(value="file8",required=false) MultipartFile file8 ) throws Exception{ + @RequestParam(value="file8",required=false) MultipartFile file8, + @RequestParam(value= "file9", required = false) MultipartFile[] file9) throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -229,6 +330,36 @@ public class OutSourcedController extends BaseController { pd.put("OATTACHMENTS", file8.getOriginalFilename()); pd.put("OATTACHMENTSPATH", Const.FILEPATHFXGFGL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } + + if (null != file9 && file9.length > 0) { + //校验 + for (int i = 0; i < file9.length; i++) { + MultipartFile file9One = file9[i]; + String suffixName = file9One.getOriginalFilename().substring(file9One.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + map.put("result", "fail"); + map.put("exception", "上传文件格式不正确"); + return map; + } + } + for (int i = 0; i < file9.length; i++) { + MultipartFile file9One = file9[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file9One.getOriginalFilename(). + substring(file9One.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + PageData pdImg = new PageData(); + String fileUpdateName = file9One.getOriginalFilename(); + pdImg.put("IMGFILES_ID", this.get32UUID()); + pdImg.put("FILE_NAME", fileUpdateName); + pdImg.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + pdImg.put("TYPE", "300"); + pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); + imgfilesService.save(pdImg); + } + + } + outsourcedService.edit(pd); map.put("result", errInfo); return map; @@ -272,7 +403,26 @@ public class OutSourcedController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = outsourcedService.findById(pd); //根据ID读取 + PageData selectPageData = new PageData(); + selectPageData.put("CORPINFO_ID", pd.get("PUNISH_THE_PERSON")); + List deptList = departmentService.listAll(selectPageData); //根据ID读取 + String userStr = pd.getString("PUNISH_THE_PERSON"); + if (!Tools.isEmpty(userStr)) { + String[] split = userStr.split(","); + selectPageData.put("ids", split); +// List pageData = usersService.listUserAndDept(selectPageData); + // 监管与企业的 + List pageData = usersService.selectUserListByUserIds(selectPageData); + map.put("punishThePerson", pageData); + } + PageData pd3 = new PageData(); + pd3.put("TYPE", 300); + pd3.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); + List file9 = imgfilesService.listAll(pd3); + map.put("pd", pd); + map.put("deptList", deptList); + map.put("file9", file9); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementController.java b/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementController.java index 25e7255..3c835df 100644 --- a/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementController.java +++ b/src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementController.java @@ -49,6 +49,7 @@ public class PersonnelManagementController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("PHONENUM"), Const.DEFAULT_PASSWORD).toString()); personnelmanagementService.save(pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CommonMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CommonMapper.java index 4895922..678ca32 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CommonMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CommonMapper.java @@ -18,5 +18,11 @@ public interface CommonMapper { * @throws Exception */ List datalistPage(Page page); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.java index 7d76b4d..3758297 100644 --- a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.java @@ -1,5 +1,6 @@ package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; +import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import java.util.List; @@ -17,5 +18,55 @@ public interface StandardDictionaryMapper { * @throws Exception */ List list(PageData pd); + + /**新增 + * @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 pd + * @throws Exception + */ + void deleteAll(PageData pd); + + Integer getCount(PageData pd); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listSelect(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckMapper.java index 0b2f8e9..381de5e 100644 --- a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectCheckMapper.java @@ -55,5 +55,12 @@ public interface KeyprojectCheckMapper { */ void deleteAll(String[] ArrayDATA_IDS); + void confirm(PageData pd); + + /** 需要发送短信的列表(隐患待整改模板) + * @param pd + * @throws Exception + */ + List getSmsList(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java index 9fa7b3b..8fd9cb7 100644 --- a/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/KeyprojectHiddenMapper.java @@ -89,29 +89,6 @@ public interface KeyprojectHiddenMapper { */ List listExcelHidden(PageData pd); - /**一般隐患 - * @param page - * @throws Exception - */ - List generalHiddenlistPage(Page page); - - /**忽略隐患 - * @param page - * @throws Exception - */ - List ignoreHiddenlistPage(Page page); - - /**重大隐患 - * @param page - * @throws Exception - */ - List majorhiddenlistPage(Page page); - - /**通过部门ID查询特殊隐患列表 - * @param page - * @throws Exception - */ - List specialByIdlistPage(Page page); void editstate(PageData pd); @@ -158,5 +135,31 @@ public interface KeyprojectHiddenMapper { */ List getpunishlistPage(Page page); + /** 需要发送短信的列表(隐患待验收模板) + * @param pd + * @throws Exception + */ + List getSmsList(PageData pd); + + /** + * 获取当前隐患的处罚人 + * @param pd + * @return + */ + String getPUNISHTHEPERSON(PageData pd); + + + List getPhone(PageData pd); + + List hiddenlistPage(Page page); + + /** + * 根据隐患获取隐患所在重点工程的所属项目 + * @param pd + * @return + */ + String getCorpInfoIdByHiddenId(PageData pd); + + List specialByIdlistPage(Page page); } diff --git a/src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java new file mode 100644 index 0000000..02168e9 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.datasource.keyProjects; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +public interface PlatformvideomanagementMapper { + + /**新增 + * @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); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java b/src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java index 4002b13..2f4dabc 100644 --- a/src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java @@ -55,5 +55,34 @@ public interface OutSourcedMapper{ */ void deleteAll(String[] ArrayDATA_IDS); + /**通过登录人id获取首页数据 + * @param pd + * @throws Exception + */ + PageData homepagedata(PageData pd); + + String getDeptId(String userId); + + String getCorpInfoByOutsourcesCreator(PageData pd); + + /** + * 重点工程APP工程管理列表页 只查看未开工 和进行中的 + * @param page + * @return + */ + List applylistPage(Page page); + + void editDingWei(PageData pd); + + //校验结束重点工程是否有为完成的内容 + PageData jieshuOutSourced(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void jie(PageData pd); + + void start(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java index 5d1d664..cf7e812 100644 --- a/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java @@ -64,5 +64,7 @@ public interface PersonnelManagementMapper{ PageData findByCertificate(PageData pd); void editPassword(PageData pd); + + PageData findForLogin(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 0e009e1..2e9ac35 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -256,5 +256,7 @@ public interface UsersMapper { List getUserCardNoAll(PageData departPd); + List selectUserListByUserIds(PageData pd); + PageData getUserByCardNo(PageData pageData); } diff --git a/src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java b/src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java index ec919b5..3db4826 100644 --- a/src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java @@ -67,6 +67,10 @@ public interface VideoManagerMapper { PageData findByCode(PageData videoPd); + List dataApplistPage(Page page); + + void updateAiByOUTSOURCED_ID(PageData pd); + List getCameraAlarmCount(PageData pageData); List getCameraAlarmTypeCount(PageData pageData); diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java index b303e47..b1a760b 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java @@ -19,5 +19,10 @@ public interface CommonService { */ public List list(Page page)throws Exception; + /**修改 + * @param pd + * @throws Exception + */ + void edit(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 a321476..91840b6 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java @@ -107,5 +107,6 @@ public interface CustomService { List getListByCorplistPage(Page page)throws Exception; + } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/StandardDictionaryService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/StandardDictionaryService.java index ba60f7a..8d4fcb7 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/StandardDictionaryService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/StandardDictionaryService.java @@ -1,5 +1,6 @@ package com.zcloud.service.hiddenDangerCheckStandard; +import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import java.util.List; @@ -17,5 +18,65 @@ public interface StandardDictionaryService { * @throws Exception */ List list(PageData pd)throws Exception; + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listTree(PageData pd)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param pd + * @throws Exception + */ + void deleteAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + Integer getCount(PageData pd)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listSelect(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java index 6d9a7ee..ecf82fe 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java @@ -30,6 +30,17 @@ public class CommonServiceImpl implements CommonService { public List list(Page page)throws Exception{ return commonMapper.datalistPage(page); } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + @Override + public void edit(PageData pd) throws Exception { + commonMapper.edit(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 2cb20f7..dbe9461 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java @@ -80,13 +80,6 @@ public class CustomServiceImpl implements CustomService { customMapper.enable(pd); } - /**修改 - * @param pd - * @throws Exception - */ - public void edit(PageData pd)throws Exception{ - customMapper.edit(pd); - } public List stoplist(Page page)throws Exception{ return customMapper.stopdatalistPage(page); @@ -147,7 +140,13 @@ public class CustomServiceImpl implements CustomService { return customMapper.getListByCorplistPage(page); } - + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + customMapper.edit(pd); + } } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/StandardDictionaryServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/StandardDictionaryServiceImpl.java index c3f20eb..2736638 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/StandardDictionaryServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/StandardDictionaryServiceImpl.java @@ -1,5 +1,6 @@ package com.zcloud.service.hiddenDangerCheckStandard.impl; +import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.StandardDictionaryMapper; import com.zcloud.service.hiddenDangerCheckStandard.StandardDictionaryService; @@ -7,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; +import java.util.*; /** * 说明：清单管理 @@ -29,6 +30,134 @@ public class StandardDictionaryServiceImpl implements StandardDictionaryService public List list(PageData pd)throws Exception{ return dictionaryMapper.list(pd); } + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + dictionaryMapper.save(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + dictionaryMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + dictionaryMapper.edit(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return dictionaryMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listTree(PageData pd)throws Exception { + List list = new ArrayList<>(); + List listAll = dictionaryMapper.listAll(pd); + Map map = new HashMap<>(); + for (PageData r : listAll) { + map.put(r.getString("DICTIONARY_ID"), r); + } + Iterator> it = map.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry entry = it.next(); + PageData root = entry.getValue(); + if ("0".equals(root.getString("PARENT_ID"))) { + root.put("PARENT_NAME", "（无）"); + list.add(entry.getValue()); + it.remove();//使用迭代器的remove()方法删除元素 + } + } + list.sort((x, y) -> Integer.compare(Integer.parseInt(x.get("DICTIONARY_SORT").toString()), Integer.parseInt(y.get("DICTIONARY_SORT").toString()))); + TreeAppendChildren(map, list); + + return list; + } + + private void TreeAppendChildren(Map map, List list) { + if (!map.isEmpty()) { + for (PageData parent : list) { + List children = new ArrayList(); + Iterator> it = map.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry entry = it.next(); + PageData child = entry.getValue(); + if (parent.getString("DICTIONARY_ID").equals(child.getString("PARENT_ID"))) { + children.add(child); + it.remove();//使用迭代器的remove()方法删除元素 + } + } + if (children.size() > 0) { + children.sort((x, y) -> Integer.compare(Integer.parseInt(x.get("DICTIONARY_SORT").toString()), Integer.parseInt(y.get("DICTIONARY_SORT").toString()))); + parent.put("children", children); + TreeAppendChildren(map, children); + } + } + } + } + + /** + * 列表(全部) + * + * @param pd + * @throws Exception + */ + public List listAll(PageData pd) throws Exception { + return dictionaryMapper.listAll(pd); + } + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return dictionaryMapper.findById(pd); + } + + /** + * 批量删除 + * + * @param pd + * @throws Exception + */ + public void deleteAll(PageData pd) throws Exception { + dictionaryMapper.deleteAll(pd); + } + + @Override + public Integer getCount(PageData pd) throws Exception { + return dictionaryMapper.getCount(pd); + } + @Override + public List listSelect(PageData pd)throws Exception{ + return dictionaryMapper.listSelect(pd); + } + } diff --git a/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckService.java b/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckService.java index f27baa8..5776b92 100644 --- a/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckService.java +++ b/src/main/java/com/zcloud/service/keyProjects/KeyprojectCheckService.java @@ -55,5 +55,13 @@ public interface KeyprojectCheckService{ */ public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + public void confirm(PageData pd)throws Exception; + + /** 需要发送短信的列表(隐患待整改模板) + * @param pd + * @throws Exception + */ + List getSmsList(PageData pd); + } diff --git a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java index 954c4e8..df33096 100644 --- a/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java +++ b/src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java @@ -88,20 +88,20 @@ public interface KeyprojectHiddenService { */ public PageData yhpcCountForApp(PageData pd) throws Exception; - /** - * 清单其他隐患 - * @param pd - * @return - * @throws Exception - */ - public List getOtherHidden(PageData pd) throws Exception; + /** + * 清单其他隐患 + * @param pd + * @return + * @throws Exception + */ + public List getOtherHidden(PageData pd) throws Exception; - public List getListForApp(Page page) throws Exception; + public List getListForApp(Page page) throws Exception; public List mainStatistics(PageData pd) throws Exception; - public List mainStatisticsForApp(PageData pd) throws Exception; + public List mainStatisticsForApp(PageData pd) throws Exception; /**隐患导出EXCEL（企业隐患管理使用） * @param pd @@ -109,17 +109,6 @@ public interface KeyprojectHiddenService { */ public List listExcelHidden(PageData pd)throws Exception; - /**一般隐患查询列表 - * @param page - * @throws Exception - */ - public List generalHiddenlistPage(Page page)throws Exception; - - /**忽略隐患查询列表 - * @param page - * @throws Exception - */ - public List ignoreHiddenlistPage(Page page)throws Exception; /** * 重大隐患核实列表 -- 港务局 @@ -127,7 +116,7 @@ public interface KeyprojectHiddenService { * @return * @throws Exception */ - List verifylist(Page page) throws Exception; + List verifylist(Page page) throws Exception; /** * 获取安全环保检查下的隐患列表 @@ -149,7 +138,7 @@ public interface KeyprojectHiddenService { * @return * @throws Exception */ - List checkandaccept(Page page) throws Exception; + List checkandaccept(Page page) throws Exception; /**列表 * @param page @@ -169,7 +158,8 @@ public interface KeyprojectHiddenService { void changeState(PageData hidden) throws Exception; - void deleteByKey(PageData key) throws Exception; + void deleteByKey(PageData key) throws Exception; + /** * 手机端统计重点工程待处理信息 @@ -179,6 +169,28 @@ public interface KeyprojectHiddenService { */ public PageData keyprojectcount(PageData pd)throws Exception; - List getpunishlist(Page page); + /** 需要发送短信的列表(隐患待验收模板) + * @param pd + * @throws Exception + */ + List getSmsList(PageData pd); + + /** + * 获取当前隐患的处罚人 + * @param pd + * @return + */ + String getPUNISHTHEPERSON(PageData pd); + + List getPhone(PageData pd); + + List hiddenList(Page page); + + /** + * 根据隐患获取隐患所在重点工程的所属项目 + * @param pd + * @return + */ + String getCorpInfoIdByHiddenId(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckServiceImpl.java index 223eee6..b94d7a8 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectCheckServiceImpl.java @@ -79,5 +79,14 @@ public class KeyprojectCheckServiceImpl implements KeyprojectCheckService { keyprojectcheckMapper.deleteAll(ArrayDATA_IDS); } + public void confirm(PageData pd)throws Exception{ + keyprojectcheckMapper.confirm(pd); + } + + @Override + public List getSmsList(PageData pd) { + return keyprojectcheckMapper.getSmsList(pd); + } + } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java index 6d10025..4d9d1c8 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java @@ -155,15 +155,6 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService { return hiddenMapper.listExcelHidden(pd); } - @Override - public List generalHiddenlistPage(Page page) throws Exception { - return hiddenMapper.generalHiddenlistPage(page); - } - - @Override - public List ignoreHiddenlistPage(Page page) throws Exception { - return hiddenMapper.ignoreHiddenlistPage(page); - } @Override public List verifylist(Page page) throws Exception { @@ -245,9 +236,33 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService { return hiddenMapper.keyprojectcount(pd); } - @Override public List getpunishlist(Page page) { return hiddenMapper.getpunishlistPage(page); } + + @Override + public List getSmsList(PageData pd) { + return hiddenMapper.getSmsList(pd); + } + + @Override + public String getPUNISHTHEPERSON(PageData pd) { + return hiddenMapper.getPUNISHTHEPERSON(pd); + } + + @Override + public List getPhone(PageData pd) { + return hiddenMapper.getPhone(pd); + } + + @Override + public List hiddenList(Page page) { + return hiddenMapper.hiddenlistPage(page); + } + + @Override + public String getCorpInfoIdByHiddenId(PageData pd) { + return hiddenMapper.getCorpInfoIdByHiddenId(pd); + } } diff --git a/src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java b/src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java index a1aefed..c57b674 100644 --- a/src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java +++ b/src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java @@ -5,7 +5,7 @@ import com.zcloud.entity.PageData; import java.util.List; -/** +/** * 说明：外包工程 * 作者：luoxiaobao * 时间：2022-06-14 @@ -18,42 +18,71 @@ public interface OutSourcedService{ * @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; - + + /**通过登录人id获取首页数据 + * @param pd + * @throws Exception + */ + public PageData homepagedata(PageData pd)throws Exception; + + String getDeptId(String userId); + + String getCorpInfoByOutsourcesCreator(PageData pd); + + /** + * 重点工程APP 工程管理列表页 只查看未开工 和进行中的 + * @param page + * @return + */ + List applylist(Page page); + + void editDingWei(PageData pd)throws Exception; + + //校验结束重点工程是否有为完成的内容 + PageData jieshuOutSourced(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + public void jie(PageData pd)throws Exception; + + void start(PageData pd); } diff --git a/src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java b/src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java index 223999c..ab65130 100644 --- a/src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java +++ b/src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java @@ -79,5 +79,54 @@ public class OutSourcedServiceImpl implements OutSourcedService{ outsourcedMapper.deleteAll(ArrayDATA_IDS); } + /**通过登录人id获取首页数据 + * @param pd + * @throws Exception + */ + public PageData homepagedata(PageData pd)throws Exception{ + return outsourcedMapper.homepagedata(pd); + } + + public String getDeptId(String userId) { + return outsourcedMapper.getDeptId(userId); + } + + @Override + public String getCorpInfoByOutsourcesCreator(PageData pd) { + return outsourcedMapper.getCorpInfoByOutsourcesCreator(pd); + } + + @Override + public List applylist(Page page) { + return outsourcedMapper.applylistPage(page); + } + + /**坐标定位 + * @param pd + * @throws Exception + */ + public void editDingWei(PageData pd)throws Exception{ + outsourcedMapper.editDingWei(pd); + } + + @Override + public PageData jieshuOutSourced(PageData pd) { + return outsourcedMapper.jieshuOutSourced(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void jie(PageData pd)throws Exception{ + outsourcedMapper.jie(pd); + } + + @Override + public void start(PageData pd) { + outsourcedMapper.start(pd); + } + + } diff --git a/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java b/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java index e425a1c..cc17929 100644 --- a/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java +++ b/src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java @@ -65,5 +65,6 @@ public interface PersonnelManagementService{ void editPassword(PageData updateUser) throws Exception; + PageData findForLogin(PageData pd); } diff --git a/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java b/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java index 10eae8e..cac1592 100644 --- a/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java @@ -101,5 +101,9 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic personnelmanagementMapper.editPassword(pd); } + public PageData findForLogin(PageData pd){ + return personnelmanagementMapper.findForLogin(pd); + } + } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 7be1c69..4d09ed7 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -293,6 +293,8 @@ public interface UsersService { List getUserCardNoAll(PageData departPd); + List selectUserListByUserIds(PageData selectPageData); + /** * @Description: 根据id查卡号 * @Author: dearLin diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index fb7a54a..d55919e 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -613,4 +613,11 @@ public class UsersServiceImpl implements UsersService { return usersMapper.listUserlistPage(page); } + @Override + public List selectUserListByUserIds(PageData pd) { + return usersMapper.selectUserListByUserIds(pd); + } + + + } diff --git a/src/main/java/com/zcloud/service/video/VideoManagerService.java b/src/main/java/com/zcloud/service/video/VideoManagerService.java index 07e95ca..b321519 100644 --- a/src/main/java/com/zcloud/service/video/VideoManagerService.java +++ b/src/main/java/com/zcloud/service/video/VideoManagerService.java @@ -68,6 +68,10 @@ public interface VideoManagerService { PageData findByCode(PageData videoPd); + List listApp(Page page); + + void updateAiByOUTSOURCED_ID(PageData pd); + List getCameraAlarmCount(PageData pageData); List getCameraAlarmTypeCount(PageData pageData); diff --git a/src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java b/src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java index a833e48..a18813a 100644 --- a/src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java +++ b/src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java @@ -213,5 +213,15 @@ public class VideoManagerServiceImpl implements VideoManagerService { return collect; } + @Override + public List listApp(Page page) { + return videomanagerMapper.dataApplistPage(page); + } + + @Override + public void updateAiByOUTSOURCED_ID(PageData pd) { + videomanagerMapper.updateAiByOUTSOURCED_ID(pd); + } + } diff --git a/src/main/java/com/zcloud/util/SendSmsUtil.java b/src/main/java/com/zcloud/util/SendSmsUtil.java new file mode 100644 index 0000000..928fc5c --- /dev/null +++ b/src/main/java/com/zcloud/util/SendSmsUtil.java @@ -0,0 +1,116 @@ +package com.zcloud.util; + +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang.StringUtils; +import org.springframework.http.MediaType; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import static org.bouncycastle.asn1.x500.style.RFC4519Style.cn; + +/** + * 重点工程发送短信工具类 + */ +public class SendSmsUtil { + + private static String USERNAME = "qhdzyhy"; + + private static String PASSWORD = "3ba40593f514f0c1ebdfc278dddfc9ce"; + + private static String SIGNATURE = "【秦港双控】"; + + private static String URL = "https://api.mix2.zthysms.com/v2/sendSmsTp"; + + + /** + * 发送短信 + * @param records + * @param time 发送时间 为空或小于当前时间则立即发送 + * records格式实例 records是 JSONArray 里边的内容通过调用下方方法getRecords获取 JSONObject 定义一个JSONArray后 put进去即可 + * "records":[ + * { + * "mobile":"138****0000", + * "tpContent":{ + * "var1":"变量1", + * "var2":"变量2" + * } + * }, + * { + * "mobile":"138****0001", + * "tpContent":{ + * "var1":"变量2", + * "var2":"变量2" + * } + * } + * ] + */ + public static void sendSms(String tpId,JSONArray records ,String time) throws ParseException { + JSONObject json = new JSONObject(); + Long tKey = System.currentTimeMillis()/1000; + String passWord = MD5.md5(PASSWORD+tKey); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //扔参数 + json.put("username",USERNAME); + json.put("password",passWord); + json.put("tKey",tKey); + json.put("signature",SIGNATURE); + json.put("tpId",tpId); + if(StringUtils.isNotBlank(time)){ + if(sdf.parse(time).after(new Date())){ + json.put("time",time); + } + } + json.put("records",records); + System.out.println(json.toJSONString()); + String result = HttpRequest.post(URL) + .timeout(60000) + .body(json.toJSONString(), MediaType.APPLICATION_JSON_UTF8_VALUE).execute().body(); + System.out.println(result); + } + + + /** + * 封装要发送的电话以及要替换的内容 + * @param mobile 手机号 + * @param tpContent 替换内容 + * @return + * 格式实例 var1表示要替换的内容 与要替换的内容保持一致即可 变量1表示替换的内容 + * { + * "mobile":"138****0000", + * "tpContent":{ + * "var1":"变量1", + * "var2":"变量2" + * } + * } + */ + public static JSONObject getRecords(String mobile, JSONObject tpContent ){ + JSONObject json = new JSONObject(); + json.put("mobile",mobile); + if(ObjectUtils.hashCode(tpContent)!=0){ + json.put("tpContent",tpContent); + } + return json; + + }//d22f8a5d4a35b3761dc9525186e652a0 + + //测试接口 + public static void main(String[] args) throws ParseException { + JSONArray jsonArray = new JSONArray(); + + //接受返回结果 + JSONObject records = new JSONObject(); + //定义替换参数 + JSONObject tpContent = new JSONObject(); + tpContent.put("HIDDENDESCR","测试发送111--222-1"); + records = getRecords("18617456701",tpContent); + jsonArray.add(records); + + //sendSms("121487",jsonArray,null); + } + +} diff --git a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml index 0523511..63e30be 100644 --- a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml @@ -212,7 +212,8 @@ diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml index 94c2bbf..71b9318 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml @@ -112,4 +112,58 @@ order by bhci.CHECK_CATEGORY,bhci.CHECK_ITEM,bhci.COMMON_ITEM_SORT + + + update + + set + + INDUSTRY_TYPE = #{INDUSTRY_TYPE}, + + + INDUSTRY_TYPE_TREE = #{INDUSTRY_TYPE_TREE}, + + + INDUSTRY_TYPE_NAMES = #{INDUSTRY_TYPE_NAMES}, + + + CHECK_STANDARD_NAME = #{CHECK_STANDARD_NAME}, + + + COMMON_STATUS = #{COMMON_STATUS}, + + + ISDELETE = #{ISDELETE}, + + + CREATOR_ID = #{CREATOR_ID}, + + + CREATOR_NAME = #{CREATOR_NAME}, + + + CREATE_TIME = #{CREATE_TIME}, + + + OPERATOR_ID = #{OPERATOR_ID}, + + + OPERATOR_NAME = #{OPERATOR_NAME}, + + + OPERATE_TIME = #{OPERATE_TIME}, + + + DELETEOR_ID = #{DELETEOR_ID}, + + + DELETEOR_NAME = #{DELETEOR_NAME}, + + + DELETE_TIME = #{DELETE_TIME}, + + COMMON_ID = COMMON_ID + where + COMMON_ID = #{COMMON_ID} + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml index 23ec3d8..d03430e 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml @@ -157,8 +157,7 @@ select , (select h.HIDDEN_ID from BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN h where h.RECORDITEM_ID=f.RECORDITEM_ID and h.CHECKRECORD_ID=f.CHECKRECORD_ID and h.ISDELETE= '0') as HIDDEN_ID, - ( select count(1) from bus_imgfiles i where i.FOREIGN_KEY = f.RECORDITEM_ID and i.TYPE = '14' ) AS IMGCOUNT, - r.IDENTIFICATION_ID + ( select count(1) from bus_imgfiles i where i.FOREIGN_KEY = f.RECORDITEM_ID and i.TYPE = '14' ) AS IMGCOUNT from f where f.CHECKRECORD_ID=#{CHECKRECORD_ID} diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml index 5ccdb01..e5434e3 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml @@ -22,6 +22,7 @@ f.OPERATOR, f.OPERATTIME, f.ISDELETE, + f.CHECK_USERS, f.LONGITUDE, f.LATITUDE, f.CHECKRECORD_ID, @@ -32,7 +33,8 @@ f.TYPE, f.PERIODSTART, f.PERIODEND, - f.ISSTATISTICS + f.ISSTATISTICS, + f.IMEI @@ -210,7 +212,6 @@ order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml index 0052f3f..38e73ff 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml @@ -421,57 +421,6 @@ where CUSTOM_ID = #{CUSTOM_ID} - - update - - set - NAME = #{NAME}, - PERIOD = #{PERIOD}, - TYPE = #{TYPE}, - ACOUNT = #{ACOUNT}, - BCOUNT = #{BCOUNT}, - CCOUNT = #{CCOUNT}, - DCOUNT = #{DCOUNT}, - - BAO_BAO_DEPARTMENT_ID = #{BAO_BAO_DEPARTMENT_ID}, - - - ISDELETE = #{ISDELETE}, - - - BAO_BAO_USER_ID = #{BAO_BAO_USER_ID}, - - - BAO_BAO_TYPE = #{BAO_BAO_TYPE}, - - - TASK_TYPE = #{TASK_TYPE}, - - - DEPARTMENT_ID= #{DEPARTMENT_ID}, - - - POST_ID =#{POST_ID}, - - - SCREENTYPE =#{SCREENTYPE}, - - - START_DATE =#{START_DATE}, - - - END_DATE =#{END_DATE}, - - - OVERTIMENUM =#{OVERTIMENUM}, - - - USER_ID =#{USER_ID}, - - CUSTOM_ID = CUSTOM_ID - where - CUSTOM_ID = #{CUSTOM_ID} - + + + + update + + set + NAME = #{NAME}, + PERIOD = #{PERIOD}, + TYPE = #{TYPE}, + + BAO_BAO_DEPARTMENT_ID = #{BAO_BAO_DEPARTMENT_ID}, + + + ISDELETE = #{ISDELETE}, + + + BAO_BAO_USER_ID = #{BAO_BAO_USER_ID}, + + + BAO_BAO_TYPE = #{BAO_BAO_TYPE}, + + + TASK_TYPE = #{TASK_TYPE}, + + + DEPARTMENT_ID= #{DEPARTMENT_ID}, + + + POST_ID =#{POST_ID}, + + + SCREENTYPE =#{SCREENTYPE}, + + + START_DATE =#{START_DATE}, + + + END_DATE =#{END_DATE}, + + + OVERTIMENUM =#{OVERTIMENUM}, + + + USER_ID =#{USER_ID}, + + CUSTOM_ID = CUSTOM_ID + where + CUSTOM_ID = #{CUSTOM_ID} + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.xml index c692f51..108da7c 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/StandardDictionaryMapper.xml @@ -89,5 +89,195 @@ or ( f.DICTIONARY_SOURCE = 2 and f.CORPINFO_ID = #{CORPINFO_ID} ) + order by f.DICTIONARY_LEVEL desc , f.DICTIONARY_SORT desc + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1', + DELETEOR_ID = #{DELETEOR_ID}, + DELETEOR_NAME = #{DELETEOR_NAME}, + DELETE_TIME = #{DELETE_TIME} + where + DICTIONARY_ID = #{DICTIONARY_ID} + + + + + update + + set + + DICTIONARY_NAME = #{DICTIONARY_NAME}, + + + PARENT_ID = #{PARENT_ID}, + + + PARENT_IDS = #{PARENT_IDS}, + + + DICTIONARY_NAMES = #{DICTIONARY_NAMES}, + + + DICTIONARY_LEVEL = #{DICTIONARY_LEVEL}, + + + DICTIONARY_SORT = #{DICTIONARY_SORT}, + + + DICTIONARY_SOURCE = #{DICTIONARY_SOURCE}, + + + CORPINFO_ID = #{CORPINFO_ID}, + + + ISDELETE = #{ISDELETE}, + + + CREATOR_ID = #{CREATOR_ID}, + + + CREATOR_NAME = #{CREATOR_NAME}, + + + CREATE_TIME = #{CREATE_TIME}, + + + OPERATOR_ID = #{OPERATOR_ID}, + + + OPERATOR_NAME = #{OPERATOR_NAME}, + + + OPERATE_TIME = #{OPERATE_TIME}, + + + DELETEOR_ID = #{DELETEOR_ID}, + + + DELETEOR_NAME = #{DELETEOR_NAME}, + + + DELETE_TIME = #{DELETE_TIME}, + + DICTIONARY_ID = DICTIONARY_ID + where + DICTIONARY_ID = #{DICTIONARY_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1', + DELETEOR_ID = #{DELETEOR_ID}, + DELETEOR_NAME = #{DELETEOR_NAME}, + DELETE_TIME = #{DELETE_TIME} + where + DICTIONARY_ID in + + #{item} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/inspection/DictionaryMapper.xml b/src/main/resources/mybatis/datasource/inspection/DictionaryMapper.xml index 6f60d59..c5410a5 100644 --- a/src/main/resources/mybatis/datasource/inspection/DictionaryMapper.xml +++ b/src/main/resources/mybatis/datasource/inspection/DictionaryMapper.xml @@ -23,10 +23,7 @@ TBSNAME, TBFIELD, YNDEL, - DICTIONARIES_ID, - ISDELETE, - VISIBLE - + DICTIONARIES_ID @@ -53,9 +50,7 @@ #{TBSNAME}, #{TBFIELD}, #{YNDEL}, - #{DICTIONARIES_ID}, - #{ISDELETE}, - #{VISIBLE} + #{DICTIONARIES_ID} @@ -91,7 +86,6 @@ from where - ISDELETE = 0 and DICTIONARIES_ID = #{DICTIONARIES_ID} @@ -111,7 +104,6 @@ from where - ISDELETE = 0 and BIANMA = #{BIANMA} @@ -122,7 +114,6 @@ from where - ISDELETE = 0 and PARENT_ID = #{parentId} order by ORDER_BY ASC @@ -132,7 +123,7 @@ from - where ISDELETE = 0 + where and f.PROMISE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') @@ -146,11 +137,6 @@ from where - ISDELETE = 0 - - and VISIBLE = #{ pd.VISIBLE } - - and PARENT_ID = #{pd.DICTIONARIES_ID} @@ -192,7 +178,6 @@ from where - ISDELETE = 0 and DICTIONARIES_ID in #{item} @@ -208,9 +193,7 @@ f.DICTIONARIES_ID, f.NAME, f.BIANMA, p.NAME PARENTNAME, p.BIANMA PARENTBIANMA FROM sys_dictionaries f LEFT JOIN sys_dictionaries p ON p.DICTIONARIES_ID = f.PARENT_ID - WHERE - ISDELETE = 0 and - p.PARENT_ID = #{PARENT_ID} + WHERE p.PARENT_ID = #{PARENT_ID} order by f.ORDER_BY ASC @@ -230,7 +213,6 @@ WHERE - ISDELETE = 0 and f.PARENT_ID = #{DICTIONARIES_ID} AND c.ISDELETE = '0' GROUP BY f.DICTIONARIES_ID ORDER BY f.ORDER_BY ASC @@ -248,7 +230,6 @@ from t where - ISDELETE = 0 and PARENT_ID = #{parentId} order by ORDER_BY @@ -266,7 +247,6 @@ FROM f WHERE - ISDELETE = 0 and f.PARENT_ID = #{PARENT_ID} ORDER BY f.ORDER_BY @@ -275,7 +255,6 @@ select DICTIONARIES_ID ,queryRecursiveDictDown(DICTIONARIES_ID) ids from sys_dictionaries where - ISDELETE = 0 and PARENT_ID = #{PARENT_ID} diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml index a4295d2..6dd0afd 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml @@ -172,7 +172,7 @@ and f.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} - and f.PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID} + and f.PERSONNELMANAGEMENT_ID = #{pd.PERSONNELMANAGEMENT_ID} and @@ -205,4 +205,27 @@ + + + update + + set + INSPECTION_STATUS = 1, + PERSON_SIGN_IMG = #{PERSON_SIGN_IMG}, + PERSON_SIGN_TIME = #{PERSON_SIGN_TIME} + where + KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID} + + + + diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 8e9f26d..65c5ace 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -316,9 +316,11 @@ ht.NAME HIDDENTYPE_NAME, ht2.NAME HIDDENTYPE2_NAME, crd.NAME HIDDENFINDDEPT_NAME, + cr.NAME CREATOR_NAME, u.UNITS_NAME as RECTIFICATIONDEPT_NAME, p.NAME as RECTIFICATIONOR_NAME, bo.OUTSOURCED_NAME, + bo.PUNISH_THE_PERSON, bod.OUTSOURCED_NAME AIOUTSOURCED_NAME, pu.KEYPROJECTPUNISH_ID from @@ -331,6 +333,7 @@ left join ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86' left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT left join BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT + left join vi_user_all cr on cr.USER_ID = f.CREATOR left join BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID LEFT JOIN BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR @@ -363,6 +366,12 @@ and f.STATE > 1 + + and f.STATE = 2 + + and (f.CREATOR = #{pd.CREATOR} or bo.PUNISH_THE_PERSON like CONCAT(CONCAT('%', #{pd.CREATOR}),'%')) + + and f.STATE = 4 @@ -1597,4 +1606,84 @@ h.ISPUNISH ASC, p.HANDLED DESC + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml index 3356309..6b1d2fa 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml @@ -162,27 +162,29 @@ select , cre.NAME CREATOR_NAMES, - o.OUTSOURCED_ID, - o.OUTSOURCED_NAME, + bo.OUTSOURCED_ID, + bo.OUTSOURCED_NAME, u.UNITS_NAME, p.NAME AS PERSON_NAME from f left join sys_user cre on cre.USER_ID = f.CREATOR left join BUS_UNITS u on u.UNITS_ID = f.UNITS_ID - left join BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID + left join bus_keyproject_hidden h on f.HIDDEN_ID = h.HIDDEN_ID + LEFT JOIN BUS_KEYPROJECTCHECK ch ON ch.OUTSOURCED_ID = h.FOREIGN_ID or h.FOREIGN_ID = ch.KEYPROJECTCHECK_ID + LEFT JOIN BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID where f.ISDELETE = '0' and ( - o.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') + bo.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') or u.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ) - and o.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} + and bo.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} and f.HANDLED = 0 diff --git a/src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml b/src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml index 5df4202..0344d48 100644 --- a/src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml @@ -59,11 +59,16 @@ f.RECORDSPATH, f.SHEETPATH, f.EXAMINATIONPATH, - f.OATTACHMENTSPATH + f.OATTACHMENTSPATH, + f.PUNISH_THE_PERSON + IS_SMS, + PUNISH_THE_PERSON, + INVOLVING_CORPS_DEPART_ID, + COMPETENT_DEPT_ID, DEPARTMENT_ID, CONTRACT_PIC, OUTSOURCED_NAME, @@ -114,6 +119,10 @@ + #{IS_SMS}, + #{PUNISH_THE_PERSON}, + #{INVOLVING_CORPS_DEPART_ID}, + #{COMPETENT_DEPT_ID}, #{DEPARTMENT_ID}, #{CONTRACT_PIC}, #{OUTSOURCED_NAME}, @@ -238,9 +247,25 @@ f.*, a.NAME as DEPARTMENT_NAME, b.UNITS_NAME as UNITS_NAME, + pcij.NAME Q_DEPARTMENT_NAME, + pci.NAME Q_COMPETENT_DEPT_NAME, + vua.NAME OUTSOURCED_CREATOR_NAME, + isdd.NAME MANAGER_DEPARTMENT_NAME, + ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, + ( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME, + ( select count(1) from BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT, + ( select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME, + ( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME, + (select GROUP_CONCAT(t.NAME) from ( SELECT CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID FROM OA_DEPARTMENT t LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME, + (select NAME FROM bus_personnelmanagement p where p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC) as UNITS_PIC_NAME, c.NAME as CONTRACT_NAME from f + LEFT JOIN vi_user_all vua on f.CREATOR = vua.USER_ID + LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID + LEFT JOIN oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID + LEFT JOIN oa_department isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID + LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID left join oa_department a on a.DEPARTMENT_ID = f.DEPARTMENT_ID left join bus_units b using (UNITS_ID) left join sys_user c on c.USER_ID= f.CONTRACT_PIC @@ -296,11 +321,28 @@ f.EXAMINATIONPATH, f.OATTACHMENTSPATH, a.NAME as DEPARTMENT_ID, - b.UNITS_NAME as UNITS_NAME + pcij.NAME Q_DEPARTMENT_NAME, + isdd.NAME MANAGER_DEPARTMENT_NAME, + b.UNITS_NAME as UNITS_NAME, + vua.NAME OUTSOURCED_CREATOR_NAME, + pci.NAME Q_COMPETENT_DEPT_NAME, + ( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME, + ( select count(1) from BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT, + ( select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME, + ( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME, + (select GROUP_CONCAT(t.NAME) from ( SELECT CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID FROM OA_DEPARTMENT t LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME, + ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, + p.`NAME` as UNITS_PIC_NAME from f + LEFT JOIN oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID + LEFT JOIN oa_department isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID + LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID left join oa_department a on a.DEPARTMENT_ID = f.DEPARTMENT_ID left join bus_units b using (UNITS_ID) + LEFT JOIN vi_user_all vua on f.CREATOR = vua.USER_ID + LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID + LEFT JOIN bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC where f.ISDELETE = '0' and @@ -317,6 +359,9 @@ and f.STATE = #{pd.STATE} + + and f.UNITS_ID = #{pd.UNITS_ID} + and (f.CONTRACT_STIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME} or f.CONTRACT_ETIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME} @@ -349,4 +394,305 @@ + + + + + + + + + + + update + + set + WORK_LONGITUDE = #{WORK_LONGITUDE}, + WORK_LATITUDE = #{WORK_LATITUDE}, + LOCATION = #{LOCATION} + where + OUTSOURCED_ID = #{OUTSOURCED_ID} + + + + + + + update + + set + DEPARTMENT_ID = #{DEPARTMENT_ID}, + CONTRACT_PIC = #{CONTRACT_PIC}, + OUTSOURCED_NAME = #{OUTSOURCED_NAME}, + INVOLVING_CORPS = #{INVOLVING_CORPS}, + STARTTIME = #{STARTTIME}, + ENDTIME = #{ENDTIME}, + CONTRACT_STIME = #{CONTRACT_STIME}, + CONTRACT_ETIME = #{CONTRACT_ETIME}, + UNITS_ID = #{UNITS_ID}, + CONTRACT_NUM = #{CONTRACT_NUM}, + UNITS_APTITUDE = #{UNITS_APTITUDE}, + UNITS_PIC = #{UNITS_PIC}, + UNITS_PHONE = #{UNITS_PHONE}, + MANAGE_NAME = #{MANAGE_NAME}, + DESIGE = #{DESIGE}, + MANAGE_APTITUDE = #{MANAGE_APTITUDE}, + MANAGE_PIC = #{MANAGE_PIC}, + MANAGE_PHONE = #{MANAGE_PHONE}, + MEASURES = #{MEASURES}, + ATTACHMENTS = #{ATTACHMENTS}, + REMARKS = #{REMARKS}, + TRAINING_NAME = #{TRAINING_NAME}, + TRAINING_PIC = #{TRAINING_PIC}, + TRAINING_STIME = #{TRAINING_STIME}, + TRAINING_ETIME = #{TRAINING_ETIME}, + RECORDS = #{RECORDS}, + SHEET = #{SHEET}, + EXAMINATION = #{EXAMINATION}, + OATTACHMENTS = #{OATTACHMENTS}, + APPLICANT = #{APPLICANT}, + PUNISH_THE_PERSON = #{PUNISH_THE_PERSON}, + STATE = '2', + OUTSOURCED_ID = OUTSOURCED_ID + where + OUTSOURCED_ID = #{OUTSOURCED_ID} + + + update + + set + STATE = '1' + where + OUTSOURCED_ID = #{OUTSOURCED_ID} + + diff --git a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml index 1991c69..b678957 100644 --- a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml +++ b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml @@ -211,9 +211,13 @@ + select + + from + f + where + f.PHONENUM = #{PHONENUM} and f.PASSWORD = #{PASSWORD} + and f.ISDELETE='0' + + + + diff --git a/src/main/resources/mybatis/datasource/video/VideoManagerMapper.xml b/src/main/resources/mybatis/datasource/video/VideoManagerMapper.xml index 9d091b8..d7cb49b 100644 --- a/src/main/resources/mybatis/datasource/video/VideoManagerMapper.xml +++ b/src/main/resources/mybatis/datasource/video/VideoManagerMapper.xml @@ -161,6 +161,9 @@ and f.CORPINFO_ID=#{pd.CORPINFO_ID} + + and f.OUTSOURCED_ID=#{pd.OUTSOURCED_ID} + and ( @@ -259,4 +262,32 @@ SET ISSHOW = (CASE WHEN VIDEOMANAGER_ID = #{VIDEOMANAGER_ID} THEN 1 ELSE 0 END) where CORPINFO_ID = #{CORPINFO_ID} + + + + + + update + + set + PLATFORMVIDEOMANAGEMENT_ID = null, + VIDEO_RESOURCES_ID = null + where + OUTSOURCED_ID = #{OUTSOURCED_ID} +