diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java index 64f2b14..acf077f 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java @@ -100,211 +100,205 @@ public class CustomController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 String listPeriod = pd.getString("PERIOD"); - if (pd.get("USER_IDS") != null && Tools.notEmpty(pd.get("USER_IDS").toString())) { - String[] userIds = pd.get("USER_IDS").toString().split(","); - for (int i = 0; i < userIds.length; i++) { - pd.put("CUSTOM_ID", this.get32UUID()); //主键 - pd.put("USER_ID", userIds[i]); - 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; - } + pd.put("CUSTOM_ID", this.get32UUID()); //主键 + 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")); } - } - 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); - } - } - pd.put("PERIOD", listPeriod); - customService.save(pd); - // 修改清单统计 - if (!pd.getString("TYPE").equals("listType0006")) { - 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); + 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); } } + pd.put("PERIOD", listPeriod); + customService.save(pd); + // 修改清单统计 + if (!pd.getString("TYPE").equals("listType0006")) { + 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; } @@ -322,13 +316,49 @@ public class CustomController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); + PageData npd = new PageData(); pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); - page.setPd(pd); + npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + npd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + pd.put("USER_ID",Jurisdiction.getUSER_ID()); + String DEPTIDS = pd.getString("DEPTIDS"); + if(Tools.notEmpty(DEPTIDS)) { + String DEPT_IDS[] = DEPTIDS.split(","); + npd.put("DEPT_IDS", DEPT_IDS); + } + npd.put("HIDFORBIDDEN", "no"); //企业 + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))npd.put("KEYWORDS", KEYWORDS.trim()); + String USERNAME = pd.getString("USERNAME"); //关键词检索条件 + if(Tools.notEmpty(USERNAME))npd.put("USERNAME", USERNAME.trim()); + 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()); + } + } + npd.put("TYPE",pd.getString("TYPE")); + npd.put("LISTINGLEVEL",pd.getString("LISTINGLEVEL")); + npd.put("RISKCHECKLISTTYPE",pd.getString("RISKCHECKLISTTYPE")); + npd.put("POST_ID",pd.getString("POST_ID")); + npd.put("PERIOD",pd.getString("PERIOD")); + page.setPd(npd); List varList = customService.list(page); map.put("varList", varList); + map.put("page", page); map.put("result", errInfo); return map; } @@ -374,7 +404,7 @@ public class CustomController extends BaseController { 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("LISTSTATISTICS_ID") != null) { + if (statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString()) - 2); customStatisticsService.edit(statistics); } @@ -447,7 +477,7 @@ public class CustomController extends BaseController { } } PageData statistics = customStatisticsService.findByCondition(pd); - if (statistics != null && statistics.get("LISTSTATISTICS_ID") != null) { + if (statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString()) - 1); customStatisticsService.edit(statistics); } @@ -867,40 +897,18 @@ public class CustomController extends BaseController { 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 + List listPd = (List) ObjectExcelRead.readExcel(tempFile, 1, 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 :操作类型 + * var0 :检查类别 + * var1 :检查项目 + * var2 :检查内容 + * var3 :检查标准 + * var4 :参考依据 + * var5 :检查合格项 + * var6 :检查不合格项 + * var7 :操作类型 */ 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("检查内容"); @@ -916,40 +924,19 @@ public class CustomController extends BaseController { * 判断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;//行数，用于提示用户 + Boolean firstFlag = true; + String CUSTOM_ID = ""; for (PageData lpd : listPd) { try { number++; - for (int i = 0; i < 19; i++) { + for (int i = 0; i < 8; 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; } @@ -961,63 +948,21 @@ public class CustomController extends BaseController { } } - 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")); + String CHECK_CATEGORY = Tools.excelHandle(lpd.get("var0")); + String CHECK_ITEM = Tools.excelHandle(lpd.get("var1")); + String CHECK_CONTENT = Tools.excelHandle(lpd.get("var2")); + String CHECK_STANDARD = Tools.excelHandle(lpd.get("var3")); + String REFERENCE_BASIS = Tools.excelHandle(lpd.get("var4")); + String CHECK_QUALIFIED = Tools.excelHandle(lpd.get("var5")); + String CHECK_UNQUALIFIED = Tools.excelHandle(lpd.get("var6")); + String OPERATION_TYPE = "选择".equals(Tools.excelHandle(lpd.get("var7"))) ? "1" : "2"; //检查类别和检查项目如果字典里存在，则不存字典，如果不存在，则存一下 PageData dict = new PageData(); dict.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List dictList = standardDictionaryService.list(dict); int maxsortNum = 0; - Boolean exist = false; + Boolean existCategory = false; + String CHECK_CATEGORY_TEMP = ""; 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)) { //如果不存在该字典，获取最大排序号 @@ -1025,14 +970,16 @@ public class CustomController extends BaseController { maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT")); } } else { - exist = true; + CHECK_CATEGORY_TEMP = dictList.get(j).get("DICTIONARY_ID").toString(); + existCategory = true; } } } - if (!exist) { + maxsortNum = maxsortNum == 0 ? 1 : maxsortNum + 1; + if (!existCategory) { dict.put("DICTIONARY_ID", this.get32UUID()); dict.put("DICTIONARY_LEVEL", "1"); - dict.put("DICTIONARY_SORT", maxsortNum + 1); + dict.put("DICTIONARY_SORT", maxsortNum); dict.put("DICTIONARY_NAME", CHECK_CATEGORY); dict.put("PARENT_ID", "0"); dict.put("PARENT_IDS", dict.get("DICTIONARY_ID")); @@ -1049,11 +996,13 @@ public class CustomController extends BaseController { 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; - exist = false; + Boolean existItem = false; + String CHECK_ITEM_TEMP = ""; 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)) { //如果不存在该字典，获取最大排序号 @@ -1061,54 +1010,59 @@ public class CustomController extends BaseController { maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT")); } } else { - exist = true; + CHECK_ITEM_TEMP = dictList.get(j).get("DICTIONARY_ID").toString(); + existItem = true; } } } - maxsortNum = maxsortNum == 0 ? 1 : maxsortNum; - if (!exist) { + maxsortNum = maxsortNum == 0 ? 1 : maxsortNum + 1; + if (!existItem) { dictItem.put("DICTIONARY_ID", this.get32UUID()); dictItem.put("DICTIONARY_LEVEL", "2"); - dictItem.put("DICTIONARY_SORT", maxsortNum + 1); + dictItem.put("DICTIONARY_SORT", maxsortNum); 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); + CHECK_ITEM_TEMP = dictItem.get("DICTIONARY_ID").toString(); + } + if (firstFlag) { + // 隐患排查清单保存 + PageData customData = new PageData(); + customData.put("CUSTOM_ID", this.get32UUID()); + customData.put("NAME", pd.getString("NAME")); + customData.put("BAO_BAO_TYPE", pd.getString("BAO_BAO_TYPE")); + customData.put("TASK_TYPE", pd.getString("TASK_TYPE")); + customData.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID")); + customData.put("POST_ID", pd.getString("POST_ID")); + customData.put("USER_ID", pd.getString("USER_ID")); + customData.put("SCREENTYPE", pd.getString("SCREENTYPE")); + customData.put("PERIOD", pd.getString("PERIOD")); + customData.put("TYPE", pd.getString("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); + firstFlag = false; + CUSTOM_ID = customData.getString("CUSTOM_ID"); } - // 隐患排查清单保存 - 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("CUSTOM_ID", CUSTOM_ID); + customItemData.put("CHECK_CATEGORY", CHECK_CATEGORY_TEMP); + customItemData.put("CHECK_ITEM", CHECK_ITEM_TEMP); 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("OPERATION_TYPE", OPERATION_TYPE); + customItemData.put("COMMON_ITEM_SORT", maxsortNum); customItemData.put("CREATOR_ID", Jurisdiction.getUSER_ID()); customItemData.put("CREATOR_NAME", Jurisdiction.getUsername()); customItemData.put("CREATE_TIME", DateUtil.date2Str(new Date())); @@ -1117,20 +1071,20 @@ public class CustomController extends BaseController { 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())); + customItemData.put("ISDELETE", "0"); //是否删除 customItemService.save(customItemData); - listAll.add(customData); +// 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("CUSTOM_ID", CUSTOM_ID); + if ("listType0005".equals(pd.getString("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) { + if (statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString()) - 2); customStatisticsService.edit(statistics); } @@ -1138,7 +1092,7 @@ public class CustomController extends BaseController { // 本期已检查的不计入统计 customCheckRecordService.editStatistics(newpd); } else { - switch (PERIOD) { + switch (pd.getString("PERIOD")) { case "checkPeriod0001"://每日 newpd.put("STARTTIME", DateUtil.getDay() + " 00:00:00"); newpd.put("ENDTIME", DateUtil.getDay() + " 23:59:59"); @@ -1199,7 +1153,7 @@ public class CustomController extends BaseController { break; } PageData statistics = customStatisticsService.findByCondition(newpd); - if (statistics != null && statistics.get("LISTSTATISTICS_ID") != null) { + if (statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString()) - 1); customStatisticsService.edit(statistics); } @@ -1215,7 +1169,7 @@ public class CustomController extends BaseController { } if (Tools.isEmpty(errorStr.toString())) { - errorStr.append("成功导入" + listAll.size() + "条数据!"); + errorStr.append("成功导入" + (number - 1) + "条数据!"); } else { errInfo = "error"; } @@ -1232,34 +1186,37 @@ public class CustomController extends BaseController { map.put("resultStr", errorStr.toString()); return map; } - /**修改 + + /** + * 修改 + * * @param * @throws Exception */ - @RequestMapping(value="/edit") + @RequestMapping(value = "/edit") // @RequiresPermissions("listmanager:edit") @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "修改") - public Object edit() throws Exception{ - Map map = new HashMap(); + @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())); //修改时间 + 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); // + 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("")) { + 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; @@ -1362,37 +1319,37 @@ public class CustomController extends BaseController { customItemService.save(itme); } } - if(pd.getString("TYPE").equals("listType0006")){ - pd.put("ISDELETE","-99"); - }else { - pd.put("ISDELETE","0"); + 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"); + 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) { + 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); + 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())) { + 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"); + oldPd.put("STARTTIME", DateUtil.getDay() + " 00:00:00"); + oldPd.put("ENDTIME", DateUtil.getDay() + " 23:59:59"); break; case "checkPeriod0002"://每周 @@ -1406,44 +1363,44 @@ public class CustomController extends BaseController { 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"; + 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"; + 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"); + 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"); + 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"); + 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"); + 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; @@ -1452,37 +1409,37 @@ public class CustomController extends BaseController { } } PageData statistics = customStatisticsService.findByCondition(oldPd); - if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { - if(Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())-1 <=0) { + 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); + 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"); + 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); + 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())) { + 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"); + pd.put("STARTTIME", DateUtil.getDay() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.getDay() + " 23:59:59"); break; case "checkPeriod0002"://每周 @@ -1496,44 +1453,44 @@ public class CustomController extends BaseController { 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"; + 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"; + 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"); + 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"); + 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"); + 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"); + 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; @@ -1542,8 +1499,8 @@ public class CustomController extends BaseController { } } PageData statistics = customStatisticsService.findByCondition(pd); - if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) { - statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())+1); + 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); @@ -1554,7 +1511,8 @@ public class CustomController extends BaseController { map.put("result", errInfo); return map; } -// + + // // /**导出到excel // * @param // * @throws Exception @@ -1969,17 +1927,17 @@ public class CustomController extends BaseController { // return map; // } // -// @RequestMapping(value = "/saveBaoBaoType") -// @ResponseBody -// public Object saveBaoBaoType() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// listmanagerService.saveBaoBaoType(pd); -// map.put("result", errInfo); -// return map; -// } + @RequestMapping(value = "/saveBaoBaoType") + @ResponseBody + public Object saveBaoBaoType() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customService.saveBaoBaoType(pd); + map.put("result", errInfo); + return map; + } // // /**清单检查记录（日检）统计 // * @param diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomTermLibraryController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomTermLibraryController.java new file mode 100644 index 0000000..6eaed81 --- /dev/null +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomTermLibraryController.java @@ -0,0 +1,34 @@ +package com.zcloud.controller.hiddenDangerCheckStandard; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.hiddenDangerCheckStandard.CustomTermLibraryService; +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; + +@Controller +@RequestMapping("/customLabelFactory") +public class CustomTermLibraryController extends BaseController { + + @Autowired + private CustomTermLibraryService customTermLibraryService; + + @RequestMapping(value = "/termList") + @ResponseBody + public Object list() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = customTermLibraryService.listAll(pd); //列出LabelFacory列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomLabelFactoryMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomLabelFactoryMapper.java new file mode 100644 index 0000000..d0868b7 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomLabelFactoryMapper.java @@ -0,0 +1,64 @@ +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：标签库 + * 作者：luoxiaobao + * 时间：2022-12-27 + * 官网：www.zcloudchina.com + */ +public interface CustomLabelFactoryMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + List findByAncestors(PageData condition); + + void deleteByAncestors(PageData leafInfo); + + List findAllAncestors(PageData condition); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomTermLibraryMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomTermLibraryMapper.java new file mode 100644 index 0000000..17f17af --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomTermLibraryMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：包保责任人明细项 + * 作者：luoxiaobao + * 时间：2023-10-13 + * 官网：www.zcloudchina.com + */ +public interface CustomTermLibraryMapper { + + /**新增 + * @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/service/hiddenDangerCheckStandard/CustomLabelFactoryService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomLabelFactoryService.java new file mode 100644 index 0000000..53d6fa0 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomLabelFactoryService.java @@ -0,0 +1,64 @@ +package com.zcloud.service.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：标签库 + * 作者：luoxiaobao + * 时间：2022-12-27 + * 官网：www.zcloudchina.com + */ +public interface CustomLabelFactoryService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + List getTree(PageData condition) throws Exception; + + List saveTree(PageData pd) throws Exception; + + List findAllAncestors(PageData condition) 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 91840b6..abb6005 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java @@ -106,7 +106,7 @@ public interface CustomService { */ List getListByCorplistPage(Page page)throws Exception; - + void saveBaoBaoType(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomTermLibraryService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomTermLibraryService.java new file mode 100644 index 0000000..2e4cd32 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomTermLibraryService.java @@ -0,0 +1,59 @@ +package com.zcloud.service.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：包保责任人明细项 + * 作者：luoxiaobao + * 时间：2023-10-13 + * 官网：www.zcloudchina.com + */ +public interface CustomTermLibraryService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomLabelFacoryServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomLabelFacoryServiceImpl.java new file mode 100644 index 0000000..6f2f668 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomLabelFacoryServiceImpl.java @@ -0,0 +1,249 @@ +package com.zcloud.service.hiddenDangerCheckStandard.impl; + +import com.alibaba.fastjson.JSONArray; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomLabelFactoryMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CustomLabelFactoryService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Warden; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 说明：标签库 + * 作者：luoxiaobao + * 时间：2022-12-27 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CustomLabelFacoryServiceImpl implements CustomLabelFactoryService { + + @Resource + private CustomLabelFactoryMapper customLabelFactoryMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + customLabelFactoryMapper.save(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + customLabelFactoryMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + customLabelFactoryMapper.edit(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return customLabelFactoryMapper.datalistPage(page); + } + + /** + * 列表(全部) + * + * @param pd + * @throws Exception + */ + public List listAll(PageData pd) throws Exception { + return customLabelFactoryMapper.listAll(pd); + } + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return customLabelFactoryMapper.findById(pd); + } + + /** + * 批量删除 + * + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS) throws Exception { + customLabelFactoryMapper.deleteAll(ArrayDATA_IDS); + } + + @Override + public List getTree(PageData request) throws Exception { + List result = new ArrayList<>(); + PageData condition = new PageData(); + List labels = customLabelFactoryMapper.findByAncestors(condition); + for (PageData label : labels) { + if ("1".equals(label.getString("IS_ANCESTORS_FLAG"))){ + condition.clear(); + condition.put("BUS_LABEL_FACTORY_ID",label.getString("BUS_LABEL_FACTORY_ID")); + PageData ancestors = customLabelFactoryMapper.findById(condition); + analysis(labels, ancestors); + if (ancestors != null) { + result.add(ancestors); + } + } + } + result = result.stream().sorted(Comparator.comparing(o -> new BigDecimal(String.valueOf(o.get("SORT").toString())))).collect(Collectors.toList()); + return result; + } + + @Override + @Transactional + public List saveTree(PageData pd) throws Exception { + // 组织 + List _tree = Warden.getList(pd.getString("tree")); + PageData condition = new PageData(); + // 删除所有标签 + condition.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + condition.put("TYPE",pd.getString("TYPE")); + customLabelFactoryMapper.deleteByAncestors(condition); + List result = new ArrayList<>(); + for (PageData leaf : _tree) { + Warden.initDate(leaf); + leaf.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + if (leaf.get("BUS_LABEL_FACTORY_ID").toString().length() > 30) { + if ("1".equals(leaf.getString("IS_ANCESTORS_FLAG"))) { + leaf.put("NAME", leaf.getString("NAME")); + customLabelFactoryMapper.save(leaf); + } else { + leaf.put("ANCESTORS_ID", leaf.getString("BUS_LABEL_FACTORY_ID")); + leaf.put("NAME", leaf.getString("NAME")); + leaf.put("PARENT_ID", "0"); + leaf.put("IS_ANCESTORS_FLAG", "1"); + leaf.put("TYPE", pd.getString("TYPE")); + customLabelFactoryMapper.save(leaf); + } + } else { + leaf.put("BUS_LABEL_FACTORY_ID", Warden.get32UUID()); + leaf.put("ANCESTORS_ID", leaf.getString("BUS_LABEL_FACTORY_ID")); + leaf.put("NAME", leaf.getString("NAME")); + leaf.put("PARENT_ID", "0"); + leaf.put("IS_ANCESTORS_FLAG", "1"); + leaf.put("TYPE", pd.getString("TYPE")); + customLabelFactoryMapper.save(leaf); + } + analysis(leaf, result, 1); + } + return result; + } + + @Override + public List findAllAncestors(PageData condition) throws Exception { + return customLabelFactoryMapper.findAllAncestors(condition); + } + + private void analysis(PageData pd, List result, Integer level) { + JSONArray children = (JSONArray) pd.get("children"); + if (children == null || children.size() <= 0) { + return; + } + List tree = Warden.getList(children); + result.addAll(tree); + for (PageData leaf : tree) { + leaf.put("BUS_LABEL_FACTORY_ID", leaf.get("BUS_LABEL_FACTORY_ID").toString().length() > 30 ? leaf.getString("BUS_LABEL_FACTORY_ID") : Warden.get32UUID()); + leaf.put("ANCESTORS_ID", pd.getString("ANCESTORS_ID")); + leaf.put("PARENT_ID", pd.getString("BUS_LABEL_FACTORY_ID")); + leaf.put("IS_ANCESTORS_FLAG", "0"); + leaf.put("LEVEL", level); + leaf.put("CREATOR_ID", Jurisdiction.getUSER_ID()); + leaf.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + leaf.put("CREATED_TIME", DateUtil.date2Str(new Date())); + leaf.put("ISDELETE", "0"); + leaf.put("TYPE", pd.getString("TYPE")); + customLabelFactoryMapper.save(leaf); + analysis(leaf, result, ++level); + } + } + + private void analysis(List labels, PageData parent) { + List sons = labels.stream() + .filter(n -> n.getString("PARENT_ID").equals(parent.getString("BUS_LABEL_FACTORY_ID"))) + .sorted(Comparator.comparing(o -> new BigDecimal(String.valueOf(o.get("SORT").toString())))) + .collect(Collectors.toList()); + if (parent == null) { + return; + } + parent.put("children", sons); + if (sons.size() > 0) { + for (PageData son : sons) { + analysis(labels, son); + } + } + } + + private PageData findParentNode(List tree, PageData branch) throws Exception { + for (PageData root : tree) { + List branches = (List) root.get("children"); + if (branches.size() <= 0) { + continue; + } + for (PageData _branch : branches) { + if (branch.getString("BUS_LABEL_FACTORY_ID").equals(_branch.getString("BUS_LABEL_FACTORY_ID"))) { + return root; + } + } + PageData parentNode = findParentNode(branches, branch); + if (parentNode != null && parentNode.size() > 0) { + return parentNode; + } + } + return null; + } + + private void initNode(PageData info, PageData gene) { + info.put("BUS_LABEL_FACTORY_ID", info.get("BUS_LABEL_FACTORY_ID").toString().length() > 30 ? info.getString("BUS_LABEL_FACTORY_ID") : Warden.get32UUID()); + info.put("PARENT_ID", gene.getString("BUS_LABEL_FACTORY_ID")); + info.put("ANCESTORS_ID", gene.getString("ANCESTORS_ID")); + info.put("IS_ANCESTORS_FLAG", "0"); + info.put("LEVEL", Integer.parseInt(gene.get("LEVEL").toString()) + 1); + info.put("CREATOR_ID", Jurisdiction.getUSER_ID()); + info.put("CREATED_TIME", DateUtil.date2Str(new Date())); + info.put("ISDELETE", "0"); + info.put("TYPE", gene.getString("TYPE")); + JSONArray _children = (JSONArray) info.get("children"); + if (_children == null || _children.size() <= 0) { + return; + } + List children = Warden.getList(_children); + for (PageData child : children) { + initNode(child, info); + } + } + +} + 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 dbe9461..053e7f9 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java @@ -2,8 +2,11 @@ package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.check.ListCheckItemMapper; import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CustomItemService; import com.zcloud.service.hiddenDangerCheckStandard.CustomService; +import com.zcloud.util.Warden; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +25,8 @@ public class CustomServiceImpl implements CustomService { @Autowired private CustomMapper customMapper; + @Autowired + private CustomItemService customItemService; /**新增 @@ -147,6 +152,19 @@ public class CustomServiceImpl implements CustomService { public void edit(PageData pd)throws Exception{ customMapper.edit(pd); } + + @Override + @Transactional + public void saveBaoBaoType(PageData pd) throws Exception { + List itemList = Warden.getList(pd.getString("list")); + for (PageData dto : itemList) { + PageData condition = new PageData(); + condition.put("CUSTOM_ITEM_ID",dto.get("CUSTOM_ITEM_ID")); + PageData entity = customItemService.findById(condition); + entity.put("BAO_BAO_NUM",dto.get("BAO_BAO_NUM")); + customItemService.edit(entity); + } + } } diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomTermLibraryServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomTermLibraryServiceImpl.java new file mode 100644 index 0000000..0f28925 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomTermLibraryServiceImpl.java @@ -0,0 +1,83 @@ +package com.zcloud.service.hiddenDangerCheckStandard.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomTermLibraryMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CustomTermLibraryService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 说明：包保责任人明细项 + * 作者：luoxiaobao + * 时间：2023-10-13 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CustomTermLibraryServiceImpl implements CustomTermLibraryService { + + @Resource + private CustomTermLibraryMapper customTermLibraryMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + customTermLibraryMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + customTermLibraryMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + customTermLibraryMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return customTermLibraryMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return customTermLibraryMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return customTermLibraryMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + customTermLibraryMapper.deleteAll(ArrayDATA_IDS); + } + +} + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml index 71b9318..5cc32e5 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CommonMapper.xml @@ -98,10 +98,10 @@ and f.COMMON_STATUS = 1 and bhci.COMMON_ITEM_STATUS = 1 - + and ( - bhci.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') + bhci.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{pd.OTHERKEYWORDS}),'%') ) diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml index 83eb760..c60c70a 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml @@ -131,7 +131,7 @@ CHECK_UNQUALIFIED = #{CHECK_UNQUALIFIED}, OPERATION_TYPE = #{OPERATION_TYPE}, BAO_BAO_NUM = #{BAO_BAO_NUM}, - LISTCHECKITEM_ID = LISTCHECKITEM_ID + CUSTOM_ITEM_ID = CUSTOM_ITEM_ID where CUSTOM_ITEM_ID = #{CUSTOM_ITEM_ID} @@ -189,7 +189,8 @@ blsd.NAME as TASK_TYPE_NAME, blsd.BZ as TASK_TYPE_NUM, bhd1.DICTIONARY_NAME as CHECK_CATEGORY_NAME, - bhd2.DICTIONARY_NAME as CHECK_ITEM_NAME + bhd2.DICTIONARY_NAME as CHECK_ITEM_NAME, + btl.DESCRIBE as BAO_BAO_NUM_NAME from f left join bus_hiddendangercheckstandard_custom bl on bl.CUSTOM_ID = f.CUSTOM_ID @@ -198,6 +199,7 @@ left join sys_user u on u.USER_ID = bl.USER_ID left join bus_hiddendangercheckstandard_dictionary bhd1 on bhd1.DICTIONARY_ID = f.CHECK_CATEGORY and bhd1.ISDELETE = 0 left join bus_hiddendangercheckstandard_dictionary bhd2 on bhd2.DICTIONARY_ID = f.CHECK_ITEM and bhd2.ISDELETE = 0 + left join bus_hiddendangercheckstandard_term_library btl on btl.TASK_NUM = f.BAO_BAO_NUM and btl.WORK_TYPE = blsd.BZ where f.ISDELETE = '0' and f.CUSTOM_ID = #{CUSTOM_ID} diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomLabelFacoryMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomLabelFacoryMapper.xml new file mode 100644 index 0000000..69d0476 --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomLabelFacoryMapper.xml @@ -0,0 +1,197 @@ + + + + + + + BUS_HIDDENDANGERCHECKSTANDARD_TERM_LIBRARY + + + + + SYS_DICTIONARIES + + + + + f.PARENT_ID, + f.ANCESTORS_ID, + f.IS_ANCESTORS_FLAG, + f.LEVEL, + f.NAME, + f.CREATOR_ID, + f.CREATED_TIME, + f.ISDELETE, + f.SORT, + f.TYPE, + f.BUS_LABEL_FACTORY_ID, + f.CORPINFO_ID + + + + + PARENT_ID, + ANCESTORS_ID, + IS_ANCESTORS_FLAG, + LEVEL, + NAME, + CREATOR_ID, + CREATED_TIME, + ISDELETE, + SORT, + TYPE, + BUS_LABEL_FACTORY_ID, + CORPINFO_ID + + + + + #{PARENT_ID}, + #{ANCESTORS_ID}, + #{IS_ANCESTORS_FLAG}, + #{LEVEL}, + #{NAME}, + #{CREATOR_ID}, + #{CREATED_TIME}, + #{ISDELETE}, + #{SORT}, + #{TYPE}, + #{BUS_LABEL_FACTORY_ID}, + #{CORPINFO_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + BUS_LABEL_FACTORY_ID = #{BUS_LABEL_FACTORY_ID} + + + delete from + + where TYPE = #{TYPE} + + and CORPINFO_ID = #{CORPINFO_ID} + + + + + + update + + set + PARENT_ID = #{PARENT_ID}, + ANCESTORS_ID = #{ANCESTORS_ID}, + IS_ANCESTORS_FLAG = #{IS_ANCESTORS_FLAG}, + LEVEL = #{LEVEL}, + NAME = #{NAME}, + CREATOR_ID = #{CREATOR_ID}, + CREATED_TIME = #{CREATED_TIME}, + SORT = #{SORT}, + TYPE = #{TYPE}, + CORPINFO_ID = #{CORPINFO_ID}, + BUS_LABEL_FACTORY_ID = BUS_LABEL_FACTORY_ID + where + BUS_LABEL_FACTORY_ID = #{BUS_LABEL_FACTORY_ID} + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + BUS_LABEL_FACTORY_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml index 38e73ff..8cb4d3a 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml @@ -343,6 +343,72 @@ and f.TYPE = #{pd.TYPE} + + + + and + f.DEPARTMENT_ID in + + '${item}' + + + + + + + + + and + f.DEPARTMENT_ID in + + '${item}' + + + + and + (f.DEPARTMENT_ID in ( + select + SUB_DEPARTMENT_ID + from + oa_supervision_department osd + where + osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID} + and osd.ISDELETE = '0' + and osd.CORPINFO_ID = #{pd.CORPINFO_ID} + )or f.USER_ID = #{pd.USER_ID}) + + + + + + + and + f.DEPARTMENT_ID in + + '${item}' + + + + and + f.DEPARTMENT_ID in + + '${item}' + + + + + + and f.DEPARTMENT_ID=#{pd.DEPARTMENT_ID} + + + + + + @@ -353,8 +419,8 @@ - - and f.SCREENTYPE = #{pd.SCREENTYPE} + + and f.SCREENTYPE = #{pd.RISKCHECKLISTTYPE} order by f.ISDELETE,f.OPERATTIME desc diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomStatisticsMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomStatisticsMapper.xml index dda4455..83b8e19 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomStatisticsMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomStatisticsMapper.xml @@ -4,7 +4,7 @@ - bus_hiddendangercheckstandard_statistics + BUS_HIDDENDANGERCHECKSTANDARD_STATISTICS @@ -79,7 +79,7 @@ set ISDELETE = '1' where - LISTSTATISTICS_ID = #{LISTSTATISTICS_ID} + CUSTOMSTATISTICS_ID = #{CUSTOMSTATISTICS_ID} diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomTermLibraryMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomTermLibraryMapper.xml new file mode 100644 index 0000000..2f9af6a --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomTermLibraryMapper.xml @@ -0,0 +1,140 @@ + + + + + + + BUS_HIDDENDANGERCHECKSTANDARD_TERM_LIBRARY + + + + + SYS_DICTIONARIES + + + + + f.TASK_NUM, + f.DESCRIBE, + f.WORK_TYPE, + f.IS_DELETE, + f.CREATE_TIME, + f.TERM_LIBRARY_ID, + f.SORT + + + + + TASK_NUM, + DESCRIBE, + WORK_TYPE, + IS_DELETE, + CREATE_TIME, + TERM_LIBRARY_ID, + SORT + + + + + #{TASK_NUM}, + #{DESCRIBE}, + #{WORK_TYPE}, + #{IS_DELETE}, + #{CREATE_TIME}, + #{TERM_LIBRARY_ID}, + #{SORT} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + IS_DELETE = '1' + where + TERM_LIBRARY_ID = #{TERM_LIBRARY_ID} + + + + + update + + set + TASK_NUM = #{TASK_NUM}, + DESCRIBE = #{DESCRIBE}, + WORK_TYPE = #{WORK_TYPE}, + IS_DELETE = #{IS_DELETE}, + CREATE_TIME = #{CREATE_TIME}, + SORT = #{SORT}, + TERM_LIBRARY_ID = TERM_LIBRARY_ID + where + TERM_LIBRARY_ID = #{TERM_LIBRARY_ID} + + + + + + + + + + + + + + update + + set + IS_DELETE = '1' + where + TERM_LIBRARY_ID in + + #{item} + + + +