diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index 8a7967f..ed968a2 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -52,260 +52,263 @@ import java.util.*; @RequestMapping("/app/hidden") public class AppHiddenController extends BaseController { - @Autowired - private HiddenService hiddenService; - @Autowired - private ImgFilesService imgFilesService; - @Autowired - private UsersService usersService; - @Autowired - private ListCheckItemService listcheckitemService; - @Autowired - private DepartmentService departmentService; - @Autowired - private HiddenSchemeService hiddenSchemeService; - @Autowired - private HiddenCheckService hiddenCheckService; - @Autowired - private CorpInfoService corpinfoService; - @Autowired - private ListManagerService listmanagerService; - //@Autowired - //private CheckRecordService checkrecordService; + @Autowired + private HiddenService hiddenService; + @Autowired + private ImgFilesService imgFilesService; + @Autowired + private UsersService usersService; + @Autowired + private ListCheckItemService listcheckitemService; + @Autowired + private DepartmentService departmentService; + @Autowired + private HiddenSchemeService hiddenSchemeService; + @Autowired + private HiddenCheckService hiddenCheckService; + @Autowired + private CorpInfoService corpinfoService; + @Autowired + private ListManagerService listmanagerService; + //@Autowired + //private CheckRecordService checkrecordService; - @Autowired - private SMSManagementService smsmanagementService; - @Autowired - private MSMLoginService msmloginService; - @Autowired - private SendMessageUtil sendMessageUtil; - @Autowired - private HiddenUserService hiddenUserService; // 隐患相关人员信息 - @Autowired - private HiddenExamineService hiddenexamineService; // 隐患意见 - @Autowired - private HiddenRegionService hiddenRegionService; - @Autowired - private SafetyEnvironmentalService safetyenvironmentalService; - @Autowired - private HiddenExamineService hiddenExamineService; //隐患审核 - @Autowired - private HiddenMailService hiddenMailService; - @Autowired - private FHlogService FHLOG;//日志记录 + @Autowired + private SMSManagementService smsmanagementService; + @Autowired + private MSMLoginService msmloginService; + @Autowired + private SendMessageUtil sendMessageUtil; + @Autowired + private HiddenUserService hiddenUserService; // 隐患相关人员信息 + @Autowired + private HiddenExamineService hiddenexamineService; // 隐患意见 + @Autowired + private HiddenRegionService hiddenRegionService; + @Autowired + private SafetyEnvironmentalService safetyenvironmentalService; + @Autowired + private HiddenExamineService hiddenExamineService; //隐患审核 + @Autowired + private HiddenMailService hiddenMailService; + @Autowired + private FHlogService FHLOG;//日志记录 - @Autowired - private NoticeCorpUtil noticeUtil; - @Resource - private ApplicationContext applicationContext; - @Autowired - private HiddenCheckApiService hiddenCheckApiService ; //隐患验收人 - @Autowired - private HiddenApiService hiddenApiService; - @Autowired - private HiddenExamineApiService hiddenExamineApiService; //隐患审核 隐患的审核步骤的人员的信息的记录 - @Autowired - private MessageService messageService; - @Autowired - private Smb smb; - /** - * app首页获取数量 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/getCountByUserId") - @ResponseBody - public Object getCountByUserId(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - Map hidCount = new HashMap<>(); - pd.put("userId", pd.getString("userId")); // 发现人 - Integer dzg = 0;// 待整改 1 - Integer ycq = 0;// 已超期 5 - Integer dfc = 0;// 待复查 2 - Integer yys = 0;// 已验收 4 - Integer dys = 0;// 待验收 3 - Integer dpc = 0;// 待排查 - Integer dqr = 0;// 待确认 - Integer tscz = 0;//特殊处置1 - Integer yq = 0;//延期2 - // STATE -- 隐患状态 0-未提交 1- 未整改 2-已整改 3-已复查 4-已验收 5-已过期 - if (Tools.notEmpty(pd.get("userId").toString())) { - pd.put("SELFUSERID", pd.get("userId")); + @Autowired + private NoticeCorpUtil noticeUtil; + @Resource + private ApplicationContext applicationContext; + @Autowired + private HiddenCheckApiService hiddenCheckApiService; //隐患验收人 + @Autowired + private HiddenApiService hiddenApiService; + @Autowired + private HiddenExamineApiService hiddenExamineApiService; //隐患审核 隐患的审核步骤的人员的信息的记录 + @Autowired + private MessageService messageService; + @Autowired + private Smb smb; + + /** + * app首页获取数量 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCountByUserId") + @ResponseBody + public Object getCountByUserId(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map hidCount = new HashMap<>(); + pd.put("userId", pd.getString("userId")); // 发现人 + Integer dzg = 0;// 待整改 1 + Integer ycq = 0;// 已超期 5 + Integer dfc = 0;// 待复查 2 + Integer yys = 0;// 已验收 4 + Integer dys = 0;// 待验收 3 + Integer dpc = 0;// 待排查 + Integer dqr = 0;// 待确认 + Integer tscz = 0;//特殊处置1 + Integer yq = 0;//延期2 + // STATE -- 隐患状态 0-未提交 1- 未整改 2-已整改 3-已复查 4-已验收 5-已过期 + if (Tools.notEmpty(pd.get("userId").toString())) { + pd.put("SELFUSERID", pd.get("userId")); // List rectifiHid = hiddenService.getCountByRectifiCationorId(pd); // 根据人员id获取整改隐患信息 state 1 5 - List rectifiHid = hiddenService.getRiskStandardCountByRectifiCationorId(pd); // 根据用户ID获取待整改隐患（app首页） - for (int i = 0; i < rectifiHid.size(); i++) { - PageData rec = rectifiHid.get(i); - if (null == rec.get("STATE")) { - continue; - } - if (rec.get("STATE").equals("1") || rec.get("STATE").equals("-1") || rec.get("STATE").equals("10")) { - dzg++; - } - } + List rectifiHid = hiddenService.getRiskStandardCountByRectifiCationorId(pd); // 根据用户ID获取待整改隐患（app首页） + for (int i = 0; i < rectifiHid.size(); i++) { + PageData rec = rectifiHid.get(i); + if (null == rec.get("STATE")) { + continue; + } + if (rec.get("STATE").equals("1") || rec.get("STATE").equals("-1") || rec.get("STATE").equals("10")) { + dzg++; + } + } // List checkorHid = hiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5 - List checkorHid = hiddenService.getRiskStandardCountByCheckorId(pd); // 根据用户ID获取待验收隐患（app首页） - for (int i = 0; i < checkorHid.size(); i++) { - PageData che = checkorHid.get(i); - if (null == che.get("STATE")) { - continue; - } + List checkorHid = hiddenService.getRiskStandardCountByCheckorId(pd); // 根据用户ID获取待验收隐患（app首页） + for (int i = 0; i < checkorHid.size(); i++) { + PageData che = checkorHid.get(i); + if (null == che.get("STATE")) { + continue; + } // if (che.get("STATE").equals("2")) { //原来是3，但是手机端待验收数据与列表数据不对。调整为2 - //待验收 清单排查是3，安全环保检查是2 - if ((che.get("STATE").equals("2") || che.get("STATE").equals("3")) && pd.getString("USER_ID").equals(che.get("CHECKOR"))) { - dys++; - } - } + //待验收 清单排查是3，安全环保检查是2 +// if ((che.get("STATE").equals("2") || che.get("STATE").equals("3")) && pd.getString("USER_ID").equals(che.get("CHECKOR"))) { + if ((che.get("STATE").equals("2") || che.get("STATE").equals("3"))) { + dys++; + } + } // List confirmHid = hiddenService.getCountByConfirmId(pd); // 根据人员id获取整改隐患信息 state 1 5 - List confirmHid = hiddenService.getRiskStandardCountByConfirmId(pd); // 根据用户ID获取待确认隐患（app首页） - for (int i = 0; i < confirmHid.size(); i++) { - PageData che = confirmHid.get(i); - if (null == che.get("STATE")) { - continue; - } - if (che.get("STATE").equals("-2")) { //待确认是-2 - dqr++; - } - } - // userId -> 85437f01be1f4c959f71a850b1d731a1 + List confirmHid = hiddenService.getRiskStandardCountByConfirmId(pd); // 根据用户ID获取待确认隐患（app首页） + for (int i = 0; i < confirmHid.size(); i++) { + PageData che = confirmHid.get(i); + if (null == che.get("STATE")) { + continue; + } + if (che.get("STATE").equals("-2")) { //待确认是-2 + dqr++; + } + } + // userId -> 85437f01be1f4c959f71a850b1d731a1 // List specialHid = hiddenService.getCountSpecialByhId(pd); // 根据人员id获取特殊处理隐患和延期隐患信息 state 1 5 - List specialHid = hiddenService.getRiskStandardCountSpecialByhId(pd); // 根据用户ID获取特殊处理隐患和延期隐患（app首页） - for (int i = 0; i < specialHid.size(); i++) { - PageData che = specialHid.get(i); - if (null == che.get("TYPE")) { - continue; - } - if (che.get("TYPE").toString().equals("1")) { //特殊处置1 - tscz++; - } - if (che.get("TYPE").toString().equals("2")) { //延期是2 - yq++; - } - } - pd.put("APPSELFUSERID", pd.get("userId")); + List specialHid = hiddenService.getRiskStandardCountSpecialByhId(pd); // 根据用户ID获取特殊处理隐患和延期隐患（app首页） + for (int i = 0; i < specialHid.size(); i++) { + PageData che = specialHid.get(i); + if (null == che.get("TYPE")) { + continue; + } + if (che.get("TYPE").toString().equals("1")) { //特殊处置1 + tscz++; + } + if (che.get("TYPE").toString().equals("2")) { //延期是2 + yq++; + } + } + pd.put("APPSELFUSERID", pd.get("userId")); // List creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 - List creatorHid = hiddenService.getRiskStandardCountByCreatorId(pd); // 根据用户ID获取发现隐患信息（app首页） - System.out.println(creatorHid); - for (int i = 0; i < creatorHid.size(); i++) { - PageData cre = creatorHid.get(i); - if (null == cre.get("STATE")) { - continue; - } - if (cre.get("STATE").equals("2")) { - dfc++; - } - if (cre.get("STATE").equals("4")) { - yys++; - } - if(cre.get("STATE").equals("3")) { - dys++; - } - if (cre.get("STATE").equals("-1")) { - ycq++; - } - } - } - hidCount.put("dys", dys); - hidCount.put("dzg", dzg); - hidCount.put("ycq", ycq); - hidCount.put("dfc", dfc); - hidCount.put("yys", yys); - hidCount.put("dqr", dqr); - hidCount.put("tscz", tscz); - hidCount.put("yq",yq); + List creatorHid = hiddenService.getRiskStandardCountByCreatorId(pd); // 根据用户ID获取发现隐患信息（app首页） + System.out.println(creatorHid); + for (int i = 0; i < creatorHid.size(); i++) { + PageData cre = creatorHid.get(i); + if (null == cre.get("STATE")) { + continue; + } + if (cre.get("STATE").equals("2")) { + dfc++; + } + if (cre.get("STATE").equals("4")) { + yys++; + } +// bug 14034 +// if(cre.get("STATE").equals("3")) { +// dys++; +// } + if (cre.get("STATE").equals("-1")) { + ycq++; + } + } + } + hidCount.put("dys", dys); + hidCount.put("dzg", dzg); + hidCount.put("ycq", ycq); + hidCount.put("dfc", dfc); + hidCount.put("yys", yys); + hidCount.put("dqr", dqr); + hidCount.put("tscz", tscz); + hidCount.put("yq", yq); - // 待排查数量 - String USER_NAME = pd.getString("USER_NAME"); - String DEPARTMENT_ID = pd.getString("CHECK_DEPARTMENT_ID"); - String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); + // 待排查数量 + String USER_NAME = pd.getString("USER_NAME"); + String DEPARTMENT_ID = pd.getString("CHECK_DEPARTMENT_ID"); + String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); // if(pd.getString("IS_MAIN").equals("0")) { - if (ids != null && Tools.notEmpty(ids) && ids.lastIndexOf(",") > -1) { - ids = ids.substring(0, ids.lastIndexOf(",")); - pd.put("DEPARTMENT_IDS", ids.split(",")); - } else { - pd.put("DEPARTMENT_ID", DEPARTMENT_ID); - } + if (ids != null && Tools.notEmpty(ids) && ids.lastIndexOf(",") > -1) { + ids = ids.substring(0, ids.lastIndexOf(",")); + pd.put("DEPARTMENT_IDS", ids.split(",")); + } else { + pd.put("DEPARTMENT_ID", DEPARTMENT_ID); + } // } - int wjcNum = 0; - int yjcNum = 0; + int wjcNum = 0; + int yjcNum = 0; // List varList = listmanagerService.listAll(pd);// 列出ListManager列表 - List varList = listmanagerService.listAllRiskStandard(pd);// 列出ListManager列表 - for (PageData list : varList) { - String cycle = list.getString("PERIODNAME"); - if (list.getString("TYPE").equals("listType0005")) { - if (Integer.parseInt(list.get("checkCount").toString()) > 0) { - yjcNum++; - } else { - wjcNum++; - } - continue; - } - if (Integer.parseInt(list.get("checkCount").toString()) > 0) { - yjcNum++; - } else { - wjcNum++; - } - } - hidCount.put("dpc", wjcNum); - map.put("hidCount", hidCount); + List varList = listmanagerService.listAllRiskStandard(pd);// 列出ListManager列表 + for (PageData list : varList) { + String cycle = list.getString("PERIODNAME"); + if (list.getString("TYPE").equals("listType0005")) { + if (Integer.parseInt(list.get("checkCount").toString()) > 0) { + yjcNum++; + } else { + wjcNum++; + } + continue; + } + if (Integer.parseInt(list.get("checkCount").toString()) > 0) { + yjcNum++; + } else { + wjcNum++; + } + } + hidCount.put("dpc", wjcNum); + map.put("hidCount", hidCount); - map.put("page", page); - map.put("result", errInfo); - return map; - } + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * 新增 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/riskListCheckAdd") // /add - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "风险清单检查",instructionsOperate = "隐患",instructionsType = "新增") - public Object riskListCheckAdd() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("HIDDEN_ID", this.get32UUID()); // 主键 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 - pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 - pd.put("ISCONFIRM", "0"); // - if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { - if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { - pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 - pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 - pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/riskListCheckAdd") // /add + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "风险清单检查", instructionsOperate = "隐患", instructionsType = "新增") + public Object riskListCheckAdd() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HIDDEN_ID", this.get32UUID()); // 主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("ISCONFIRM", "0"); // + if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { + if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { + pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 + pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 + pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); // pd.put("STATE", "4"); - } else { + } else { // pd.put("STATE", "1"); - } - } - if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { - PageData item = new PageData(); - item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); - item = this.listcheckitemService.findById(item); - pd.put("RISK_UNIT", item.get("RISKUNITNAME")); - pd.put("IDENTIFICATION", item.get("PARTSNAME")); - pd.put("RISK_DESCR", item.get("RISK_DESCR")); - pd.put("RISK_POSITION", item.get("POSITIONNAME")); - pd.put("LEVEL", item.get("DNAME5")); - } - hiddenService.save(pd); - // 清除同检查记录合格图片 - if(pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) { - imgFilesService.delete(pd); - PageData img = new PageData(); - img.put("FOREIGN_KEY", pd.get("RECORDITEM_ID")); - img.put("TYPE", "14"); + } + } + if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { + PageData item = new PageData(); + item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); + item = this.listcheckitemService.findById(item); + pd.put("RISK_UNIT", item.get("RISKUNITNAME")); + pd.put("IDENTIFICATION", item.get("PARTSNAME")); + pd.put("RISK_DESCR", item.get("RISK_DESCR")); + pd.put("RISK_POSITION", item.get("POSITIONNAME")); + pd.put("LEVEL", item.get("DNAME5")); + } + hiddenService.save(pd); + // 清除同检查记录合格图片 + if (pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) { + imgFilesService.delete(pd); + PageData img = new PageData(); + img.put("FOREIGN_KEY", pd.get("RECORDITEM_ID")); + img.put("TYPE", "14"); // List imgs = imgFilesService.listAll(img); //根据ID读取 // if(imgs != null && imgs.size() > 0) { // for(PageData i: imgs) { @@ -315,995 +318,1000 @@ public class AppHiddenController extends BaseController { // } // } - } - map.put("result", errInfo); - map.put("pd", pd); - return map; - } + } + map.put("result", errInfo); + map.put("pd", pd); + 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(); - PageData mes = new PageData(); - pd = this.getPageData(); - pd.put("HIDDEN_ID", this.get32UUID()); // 主键 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 - pd.put("CREATOR", pd.get("CREATOR")); // 发现时间 - pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 - pd.put("ISCONFIRM", "0"); // + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + PageData mes = new PageData(); + pd = this.getPageData(); + pd.put("HIDDEN_ID", this.get32UUID()); // 主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("CREATOR", pd.get("CREATOR")); // 发现时间 + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("ISCONFIRM", "0"); // // pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业id - if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { - if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { - pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 - pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 - pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); - } - } - if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { - PageData item = new PageData(); - item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); - item = this.listcheckitemService.findById(item); - pd.put("RISK_UNIT", item.get("RISKUNITNAME")); - pd.put("IDENTIFICATION", item.get("PARTSNAME")); - pd.put("RISK_DESCR", item.get("RISK_DESCR")); - pd.put("RISK_POSITION", item.get("POSITIONNAME")); - pd.put("LEVEL", item.get("DNAME5")); - } - List list = (List) JSON.parse(pd.get("other").toString()); // 隐患发现人 - for (JSONObject json : list){ - PageData hiddenconUserAdd = new PageData(); - hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID()); - hiddenconUserAdd.put("HIDDEN_ID",pd.getString("HIDDEN_ID")); - hiddenconUserAdd.put("USER_ID",json.get("USER_ID")); - hiddenconUserAdd.put("TYPE","1"); - hiddenconUserAdd.put("IS_MAIN","0"); - hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人 - } - if(pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")){//判断是否是重大隐患 - PageData userpd = new PageData(); - userpd.put("USER_ID",pd.getString("CREATOR")); - userpd.put("DEPARTMENT_ID",usersService.findById(userpd).getString("DEPARTMENT_ID"));//获取登录人的部门ID - if(departmentService.findById(userpd).getString("LEVEL").equals("departmentLevel0003")){//判断部门级别是不是班组 - userpd.put("DEPARTMENT_ID",departmentService.findById(userpd).getString("DEPARTMENT_ID")); - if(Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))){//判断部门是否有负责人 - map.put("msg", "所在部门未维护部门负责人"); - return map; - }else { - userpd.put("USER_ID",departmentService.findById(userpd).getString("HEADMAN")); - pd.put("CONFIRM_USER",usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID - mes.put("RECEIVER_ID",usersService.findById(userpd).getString("USER_ID")); // 如果是较大或重大隐患在这里给站内信接收人赋值 - } - }else{ - if(Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 - map.put("msg", "所在部门未维护部门负责人"); - return map; - }{ - userpd.put("USER_ID",departmentService.findById(userpd).getString("HEADMAN")); - userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); - if (Tools.isEmpty(usersService.findById(userpd))) { - map.put("msg", "所在部门未维护部门负责人"); - return map; - }else{ - pd.put("CONFIRM_USER", usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID - } - } - } + if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { + if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { + pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 + pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 + pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); + } + } + if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { + PageData item = new PageData(); + item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); + item = this.listcheckitemService.findById(item); + pd.put("RISK_UNIT", item.get("RISKUNITNAME")); + pd.put("IDENTIFICATION", item.get("PARTSNAME")); + pd.put("RISK_DESCR", item.get("RISK_DESCR")); + pd.put("RISK_POSITION", item.get("POSITIONNAME")); + pd.put("LEVEL", item.get("DNAME5")); + } + List list = (List) JSON.parse(pd.get("other").toString()); // 隐患发现人 + for (JSONObject json : list) { + PageData hiddenconUserAdd = new PageData(); + hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID()); + hiddenconUserAdd.put("HIDDEN_ID", pd.getString("HIDDEN_ID")); + hiddenconUserAdd.put("USER_ID", json.get("USER_ID")); + hiddenconUserAdd.put("TYPE", "1"); + hiddenconUserAdd.put("IS_MAIN", "0"); + hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人 + } + if (pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")) {//判断是否是重大隐患 + PageData userpd = new PageData(); + userpd.put("USER_ID", pd.getString("CREATOR")); + userpd.put("DEPARTMENT_ID", usersService.findById(userpd).getString("DEPARTMENT_ID"));//获取登录人的部门ID + if (departmentService.findById(userpd).getString("LEVEL").equals("departmentLevel0003")) {//判断部门级别是不是班组 + userpd.put("DEPARTMENT_ID", departmentService.findById(userpd).getString("DEPARTMENT_ID")); + if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 + map.put("msg", "所在部门未维护部门负责人"); + return map; + } else { + userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN")); + pd.put("CONFIRM_USER", usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID + mes.put("RECEIVER_ID", usersService.findById(userpd).getString("USER_ID")); // 如果是较大或重大隐患在这里给站内信接收人赋值 + } + } else { + if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 + map.put("msg", "所在部门未维护部门负责人"); + return map; + } + { + userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN")); + userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + if (Tools.isEmpty(usersService.findById(userpd))) { + map.put("msg", "所在部门未维护部门负责人"); + return map; + } else { + pd.put("CONFIRM_USER", usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID + } + } + } - } - PageData before = new PageData();// 添加隐患初始信息 - before.put("TYPE","0"); - before.put("STATE","2"); - before.put("HIDDEN_ID",pd.get("HIDDEN_ID")); - before.put("spare1",pd.getString("HIDDENLEVEL")); - before.put("spare2",pd.getString("RECTIFICATIONOR")); - before.put("spare3",pd.getString("RECTIFICATIONDEADLINE")); - before.put("spare4",pd.getString("RECTIFICATIONDEPT")); - before.put("CREATOR", pd.getString("loginUserId")); - before.put("OPERATOR",pd.getString("loginUserId")); - hiddenExamineService.saveApp(before); - hiddenService.save(pd); - if(!pd.getString("STATE").equals("0")){ - messageService.sendMessageByParameter("HIDDEN_MAIL_001","友情提示：有一条隐患需要确认",pd.getString("CORPINFO_ID"),pd.getString("CONFIRM_USER"),pd.getString("HIDDEN_ID"), - pd.getString("HIDDENDESCR"),"隐患确认","确认","",""); - } - // 清除同检查记录合格图片 - if(pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) { - imgFilesService.delete(pd); - PageData img = new PageData(); - img.put("FOREIGN_KEY", pd.get("RECORDITEM_ID")); - img.put("TYPE", "14"); - List imgs = imgFilesService.listAll(img); //根据ID读取 - if(imgs != null && imgs.size() > 0) { - for(PageData i: imgs) { - File file = new File(PathUtil.getProjectpath()+i.getString("FILEPATH")); - file.delete(); - imgFilesService.delete(i); - } - } + } + PageData before = new PageData();// 添加隐患初始信息 + before.put("TYPE", "0"); + before.put("STATE", "2"); + before.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + before.put("spare1", pd.getString("HIDDENLEVEL")); + before.put("spare2", pd.getString("RECTIFICATIONOR")); + before.put("spare3", pd.getString("RECTIFICATIONDEADLINE")); + before.put("spare4", pd.getString("RECTIFICATIONDEPT")); + before.put("CREATOR", pd.getString("loginUserId")); + before.put("OPERATOR", pd.getString("loginUserId")); + hiddenExamineService.saveApp(before); + hiddenService.save(pd); + if (!pd.getString("STATE").equals("0")) { + messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确认", pd.getString("CORPINFO_ID"), pd.getString("CONFIRM_USER"), pd.getString("HIDDEN_ID"), + pd.getString("HIDDENDESCR"), "隐患确认", "确认", "", ""); + } + // 清除同检查记录合格图片 + if (pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) { + imgFilesService.delete(pd); + PageData img = new PageData(); + img.put("FOREIGN_KEY", pd.get("RECORDITEM_ID")); + img.put("TYPE", "14"); + List imgs = imgFilesService.listAll(img); //根据ID读取 + if (imgs != null && imgs.size() > 0) { + for (PageData i : imgs) { + File file = new File(PathUtil.getProjectpath() + i.getString("FILEPATH")); + file.delete(); + imgFilesService.delete(i); + } + } - } - map.put("result", errInfo); - map.put("pd", pd); - return map; - } + } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } - /** - * 新增 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/riskListCheckAppAdd") // /appAdd - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "新增") - public Object riskListCheckAppAdd() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("HIDDEN_ID", this.get32UUID()); // 主键 + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/riskListCheckAppAdd") // /appAdd + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "隐患", instructionsOperate = "隐患", instructionsType = "新增") + public Object riskListCheckAppAdd() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HIDDEN_ID", this.get32UUID()); // 主键 // pd.put("CREATOR", Jurisdiction.getUSER_ID()); //发现人 // pd.put("HIDDENFINDDEPT", Jurisdiction.getDEPARTMENT_ID()); - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 - pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 // pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业id - if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { - if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { - pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 - pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 - pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); - pd.put("STATE", "4"); - } else { - pd.put("STATE", "1"); - } - } - if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { - PageData item = new PageData(); - item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); - item = this.listcheckitemService.findById(item); - pd.put("RISK_UNIT", item.get("RISKUNITNAME")); - pd.put("IDENTIFICATION", item.get("PARTSNAME")); - pd.put("RISK_DESCR", item.get("RISK_DESCR")); - pd.put("RISK_POSITION", item.get("POSITIONNAME")); - pd.put("LEVEL", item.get("DNAME5")); - } - pd.put("ISCONFIRM", "0"); - hiddenService.save(pd); + if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { + if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { + pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 + pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 + pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); + pd.put("STATE", "4"); + } else { + pd.put("STATE", "1"); + } + } + if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { + PageData item = new PageData(); + item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); + item = this.listcheckitemService.findById(item); + pd.put("RISK_UNIT", item.get("RISKUNITNAME")); + pd.put("IDENTIFICATION", item.get("PARTSNAME")); + pd.put("RISK_DESCR", item.get("RISK_DESCR")); + pd.put("RISK_POSITION", item.get("POSITIONNAME")); + pd.put("LEVEL", item.get("DNAME5")); + } + pd.put("ISCONFIRM", "0"); + hiddenService.save(pd); - // 发短信 - if ("2".equals(pd.get("RECTIFICATIONTYPE").toString())) {// 给整改人发送短信，暂时先用发验证码代替 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", pd.get("RECTIFICATIONOR"));// 收信人userid - mes.put("templateCode", "SMS_215820677");// 短信模板编码 - mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 发短信 + if ("2".equals(pd.get("RECTIFICATIONTYPE").toString())) {// 给整改人发送短信，暂时先用发验证码代替 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.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", pd.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "time");// 存入短信模板中的参数名称 + params1.put("value", pd.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - sendMessageUtil.sendMessages(mes, paramsList); - } + sendMessageUtil.sendMessages(mes, paramsList); + } - map.put("result", errInfo); - map.put("pd", pd); - return map; - } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } - /** - * 新增 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/appAdd") - @ResponseBody - public Object appAdd() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("HIDDEN_ID", this.get32UUID()); // 主键 + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/appAdd") + @ResponseBody + public Object appAdd() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HIDDEN_ID", this.get32UUID()); // 主键 // pd.put("CREATOR", Jurisdiction.getUSER_ID()); //发现人 // pd.put("HIDDENFINDDEPT", Jurisdiction.getDEPARTMENT_ID()); - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 - pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 // pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业id - if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { - if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { // 立即整改 - pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 - pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 - pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); - pd.put("RECTIFICATIONDEADLINE", DateUtil.date2Str(new Date())); - pd.put("STATE", "-2"); - } else { - pd.put("STATE", "-2"); - } - } - PageData before = new PageData();// 添加隐患初始信息 - before.put("TYPE","0"); - before.put("STATE","2"); - before.put("HIDDEN_ID",pd.get("HIDDEN_ID")); - before.put("spare1",pd.getString("HIDDENLEVEL")); - before.put("spare2",pd.getString("RECTIFICATIONOR")); - before.put("spare3",pd.getString("RECTIFICATIONDEADLINE")); - before.put("spare4",pd.getString("RECTIFICATIONDEPT")); - before.put("CREATOR", pd.getString("loginUserId")); - before.put("OPERATOR",pd.getString("loginUserId")); - hiddenExamineService.saveApp(before); - if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { - if("2".equals(pd.getString("SOURCE"))){ - PageData item = new PageData(); - item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); - item = this.listcheckitemService.findById(item); - pd.put("RISK_UNIT", item.get("RISKUNITNAME")); // 风险单元 - pd.put("IDENTIFICATION", item.get("PARTSNAME")); //辨识部位 - pd.put("RISK_DESCR", item.get("RISK_DESCR")); //存在风险 - pd.put("RISK_POSITION", item.get("POSITIONNAME")); // 风险点位置 - pd.put("LEVEL", item.get("DNAME5")); //风险分级 - }else if("6".equals(pd.getString("SOURCE"))){ - // 消防点检 切换为为提交的状态 - // 隐患状态 0-未提交 - // 1- 未整改 2-已整改 - // 3-已复查 4-已验收 - // 7待处理的特殊申请隐患 8已处理的特殊隐患 - // -1-已过期 -2待确认 - // ,5忽略隐患6重大隐患。 - // 7待处理的特殊隐患。8处理的特殊隐患。 - // 10验收打回。11分公司安委会办公室副主任核定。 - // 12分公司安委会办公室副主任核实 - //13港股分公司安委会办公室副主任核定、重大隐患待整改 - //14重大隐患待验收 - //15重大隐患已归档 - //16确认打回 - //100-安全环保检查暂存的隐患 - //101.检查已归档，待指派 - //102.检查已归档，指派中 - pd.put("STATE", "0"); - } + if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { + if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { // 立即整改 + pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 + pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 + pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); + pd.put("RECTIFICATIONDEADLINE", DateUtil.date2Str(new Date())); + pd.put("STATE", "-2"); + } else { + pd.put("STATE", "-2"); + } + } + PageData before = new PageData();// 添加隐患初始信息 + before.put("TYPE", "0"); + before.put("STATE", "2"); + before.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + before.put("spare1", pd.getString("HIDDENLEVEL")); + before.put("spare2", pd.getString("RECTIFICATIONOR")); + before.put("spare3", pd.getString("RECTIFICATIONDEADLINE")); + before.put("spare4", pd.getString("RECTIFICATIONDEPT")); + before.put("CREATOR", pd.getString("loginUserId")); + before.put("OPERATOR", pd.getString("loginUserId")); + hiddenExamineService.saveApp(before); + if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { + if ("2".equals(pd.getString("SOURCE"))) { + PageData item = new PageData(); + item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); + item = this.listcheckitemService.findById(item); + pd.put("RISK_UNIT", item.get("RISKUNITNAME")); // 风险单元 + pd.put("IDENTIFICATION", item.get("PARTSNAME")); //辨识部位 + pd.put("RISK_DESCR", item.get("RISK_DESCR")); //存在风险 + pd.put("RISK_POSITION", item.get("POSITIONNAME")); // 风险点位置 + pd.put("LEVEL", item.get("DNAME5")); //风险分级 + } else if ("6".equals(pd.getString("SOURCE"))) { + // 消防点检 切换为为提交的状态 + // 隐患状态 0-未提交 + // 1- 未整改 2-已整改 + // 3-已复查 4-已验收 + // 7待处理的特殊申请隐患 8已处理的特殊隐患 + // -1-已过期 -2待确认 + // ,5忽略隐患6重大隐患。 + // 7待处理的特殊隐患。8处理的特殊隐患。 + // 10验收打回。11分公司安委会办公室副主任核定。 + // 12分公司安委会办公室副主任核实 + //13港股分公司安委会办公室副主任核定、重大隐患待整改 + //14重大隐患待验收 + //15重大隐患已归档 + //16确认打回 + //100-安全环保检查暂存的隐患 + //101.检查已归档，待指派 + //102.检查已归档，指派中 + pd.put("STATE", "0"); + } - } + } - if("6".equals(pd.getString("SOURCE"))){ - // 消防点检 切换为为提交的状态 - // 隐患状态 0-未提交 - // 1- 未整改 2-已整改 - // 3-已复查 4-已验收 - // 7待处理的特殊申请隐患 8已处理的特殊隐患 - // -1-已过期 -2待确认 - // ,5忽略隐患6重大隐患。 - // 7待处理的特殊隐患。8处理的特殊隐患。 - // 10验收打回。11分公司安委会办公室副主任核定。 - // 12分公司安委会办公室副主任核实 - //13港股分公司安委会办公室副主任核定、重大隐患待整改 - //14重大隐患待验收 - //15重大隐患已归档 - //16确认打回 - //100-安全环保检查暂存的隐患 - //101.检查已归档，待指派 - //102.检查已归档，指派中 - pd.put("STATE", "0"); - } - List list = (List) JSON.parse(pd.get("other").toString()); // 隐患发现人 - for (JSONObject json : list){ - PageData hiddenconUserAdd = new PageData(); - hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID()); - hiddenconUserAdd.put("HIDDEN_ID",pd.getString("HIDDEN_ID")); - hiddenconUserAdd.put("USER_ID",json.get("USER_ID")); - hiddenconUserAdd.put("TYPE","1"); - hiddenconUserAdd.put("IS_MAIN","0"); - hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人 - } - pd.put("ISCONFIRM", "0"); - if(pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")){//判断是否是重大隐患 - PageData userpd = new PageData(); - userpd.put("USER_ID",pd.getString("CREATOR")); - userpd.put("DEPARTMENT_ID",usersService.findById(userpd).getString("DEPARTMENT_ID"));//获取登录人的部门ID - if(departmentService.findById(userpd).getString("LEVEL").equals("departmentLevel0003")){//判断部门级别是不是班组 - userpd.put("DEPARTMENT_ID",departmentService.findById(userpd).getString("DEPARTMENT_ID")); - if(Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))){//判断部门是否有负责人 - map.put("msg", "所在部门未维护部门负责人"); - return map; - }else { - userpd.put("USER_ID",departmentService.findById(userpd).getString("HEADMAN")); - if(Tools.notEmpty(usersService.findById(userpd).getString("USER_ID"))){ - pd.put("CONFIRM_USER",usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID - }else { - map.put("msg", "未查询到部门负责人"); - } - } - }else{ - if(Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 - map.put("msg", "所在部门未维护部门负责人"); - return map; - }{ - userpd.put("USER_ID",departmentService.findById(userpd).getString("HEADMAN")); - userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); - PageData usersPd = usersService.findById(userpd); - if(usersPd != null && Tools.notEmpty(usersPd.getString("USER_ID"))){ - pd.put("CONFIRM_USER",usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID - }else { - map.put("msg", "所在部门未维护部门负责人"); - return map; - } - } - } - } - hiddenService.save(pd); - // 发送短信 - if(Tools.notEmpty(pd.getString("CONFIRM_USER")) && !pd.getString("STATE").equals("0")){ - messageService.sendMessageByParameter("HIDDEN_MAIL_001","友情提示：有一条隐患需要确认",pd.getString("CORPINFO_ID"),pd.getString("CONFIRM_USER"),pd.getString("HIDDEN_ID"), - pd.getString("HIDDENDESCR"),"隐患确认","确认","",""); - } - map.put("result", errInfo); - map.put("pd", pd); - return map; - } + if ("6".equals(pd.getString("SOURCE"))) { + // 消防点检 切换为为提交的状态 + // 隐患状态 0-未提交 + // 1- 未整改 2-已整改 + // 3-已复查 4-已验收 + // 7待处理的特殊申请隐患 8已处理的特殊隐患 + // -1-已过期 -2待确认 + // ,5忽略隐患6重大隐患。 + // 7待处理的特殊隐患。8处理的特殊隐患。 + // 10验收打回。11分公司安委会办公室副主任核定。 + // 12分公司安委会办公室副主任核实 + //13港股分公司安委会办公室副主任核定、重大隐患待整改 + //14重大隐患待验收 + //15重大隐患已归档 + //16确认打回 + //100-安全环保检查暂存的隐患 + //101.检查已归档，待指派 + //102.检查已归档，指派中 + pd.put("STATE", "0"); + } + List list = (List) JSON.parse(pd.get("other").toString()); // 隐患发现人 + for (JSONObject json : list) { + PageData hiddenconUserAdd = new PageData(); + hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID()); + hiddenconUserAdd.put("HIDDEN_ID", pd.getString("HIDDEN_ID")); + hiddenconUserAdd.put("USER_ID", json.get("USER_ID")); + hiddenconUserAdd.put("TYPE", "1"); + hiddenconUserAdd.put("IS_MAIN", "0"); + hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人 + } + pd.put("ISCONFIRM", "0"); + if (pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")) {//判断是否是重大隐患 + PageData userpd = new PageData(); + userpd.put("USER_ID", pd.getString("CREATOR")); + userpd.put("DEPARTMENT_ID", usersService.findById(userpd).getString("DEPARTMENT_ID"));//获取登录人的部门ID + if (departmentService.findById(userpd).getString("LEVEL").equals("departmentLevel0003")) {//判断部门级别是不是班组 + userpd.put("DEPARTMENT_ID", departmentService.findById(userpd).getString("DEPARTMENT_ID")); + if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 + map.put("msg", "所在部门未维护部门负责人"); + return map; + } else { + userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN")); + if (Tools.notEmpty(usersService.findById(userpd).getString("USER_ID"))) { + pd.put("CONFIRM_USER", usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID + } else { + map.put("msg", "未查询到部门负责人"); + } + } + } else { + if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 + map.put("msg", "所在部门未维护部门负责人"); + return map; + } + { + userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN")); + userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + PageData usersPd = usersService.findById(userpd); + if (usersPd != null && Tools.notEmpty(usersPd.getString("USER_ID"))) { + pd.put("CONFIRM_USER", usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID + } else { + map.put("msg", "所在部门未维护部门负责人"); + return map; + } + } + } + } + hiddenService.save(pd); + // 发送短信 + if (Tools.notEmpty(pd.getString("CONFIRM_USER")) && !pd.getString("STATE").equals("0")) { + messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确认", pd.getString("CORPINFO_ID"), pd.getString("CONFIRM_USER"), pd.getString("HIDDEN_ID"), + pd.getString("HIDDENDESCR"), "隐患确认", "确认", "", ""); + } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } - public String getCode() { - String code = ""; - Random random = new Random(); - for (int i = 0; i < 6; i++) { + public String getCode() { + String code = ""; + Random random = new Random(); + for (int i = 0; i < 6; i++) { - int r = random.nextInt(10); // 每次随机出一个数字（0-9） + int r = random.nextInt(10); // 每次随机出一个数字（0-9） - code = code + r; // 把每次随机出的数字拼在一起 + code = code + r; // 把每次随机出的数字拼在一起 - } - return code; - } + } + return code; + } - /** - * 上传图片 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/uploadImg") - @ResponseBody - public Object uploadImg(@RequestParam(value = "FFILE", required = false) MultipartFile file, - @RequestParam(value = "TYPE", required = false) String TYPE, - @RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - 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)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - File tempFile = new File(file.getOriginalFilename()); - FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); - if (!FileUpload.isImage(tempFile)) { - tempFile.delete(); - map.put("result", "failed"); - map.put("exception", "上传图片格式不正确，请重新上传"); - return map; - } - if (tempFile.exists()) { - tempFile.delete(); - } - String ffile = DateUtil.getDays(); + /** + * 上传图片 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/uploadImg") + @ResponseBody + public Object uploadImg(@RequestParam(value = "FFILE", required = false) MultipartFile file, + @RequestParam(value = "TYPE", required = false) String TYPE, + @RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + 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)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + File tempFile = new File(file.getOriginalFilename()); + FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); + if (!FileUpload.isImage(tempFile)) { + tempFile.delete(); + map.put("result", "failed"); + map.put("exception", "上传图片格式不正确，请重新上传"); + return map; + } + if (tempFile.exists()) { + tempFile.delete(); + } + 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); - PageData pd = new PageData(); - pd.put("IMGFILES_ID", this.get32UUID()); - pd.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); - pd.put("TYPE", TYPE); - pd.put("FOREIGN_KEY", FOREIGN_KEY); - imgFilesService.save(pd); + String fileName = this.get32UUID() + + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); + PageData pd = new PageData(); + pd.put("IMGFILES_ID", this.get32UUID()); + pd.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); + pd.put("TYPE", TYPE); + pd.put("FOREIGN_KEY", FOREIGN_KEY); + imgFilesService.save(pd); - return map; - } + return map; + } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goEditWeui") - @ResponseBody - public Object goEditWeui() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = hiddenService.findById(pd); //根据ID读取 - PageData pd2 = new PageData(); - pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); - pd2.put("TYPE",3); - List hImgs = imgFilesService.listAll(pd2);//隐患图片 - pd2.put("TYPE",4); - List rImgs = imgFilesService.listAll(pd2);//整改图片 - pd2.put("TYPE",102); - List hiddenVideo = imgFilesService.listAll(pd2);//隐患视频 + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEditWeui") + @ResponseBody + public Object goEditWeui() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = hiddenService.findById(pd); //根据ID读取 + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd2.put("TYPE", 3); + List hImgs = imgFilesService.listAll(pd2);//隐患图片 + pd2.put("TYPE", 4); + List rImgs = imgFilesService.listAll(pd2);//整改图片 + pd2.put("TYPE", 102); + List hiddenVideo = imgFilesService.listAll(pd2);//隐患视频 /*pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 -*/ //查询整改方案 - PageData hs = hiddenSchemeService.findByHdId(pd); - List sImgs = new ArrayList(); +*/ //查询整改方案 + PageData hs = hiddenSchemeService.findByHdId(pd); + List sImgs = new ArrayList(); - if(hs != null && hs.getString("HIDDENSCHEME_ID") != null) { - PageData pd3 = new PageData(); - pd3.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); - pd3.put("TYPE",8); - sImgs = imgFilesService.listAll(pd3);//方案图片 - } + if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { + PageData pd3 = new PageData(); + pd3.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); + pd3.put("TYPE", 8); + sImgs = imgFilesService.listAll(pd3);//方案图片 + } - List checkList = hiddenCheckService.listAll(pd); - if(checkList != null && checkList.size() > 0) { - PageData pd3 = new PageData(); - pd3.put("TYPE",5); - for(PageData check: checkList) { - pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); - check.put("cImgs", imgFilesService.listAll(pd3));//验收图片 - } - } - map.put("pd", pd); - map.put("hs", hs); - map.put("hImgs", hImgs); - map.put("rImgs", rImgs); + List checkList = hiddenCheckService.listAll(pd); + if (checkList != null && checkList.size() > 0) { + PageData pd3 = new PageData(); + pd3.put("TYPE", 5); + for (PageData check : checkList) { + pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); + check.put("cImgs", imgFilesService.listAll(pd3));//验收图片 + } + } + map.put("pd", pd); + map.put("hs", hs); + map.put("hImgs", hImgs); + map.put("rImgs", rImgs); // map.put("cImgs", cImgs); - map.put("sImgs", sImgs); - map.put("checkList", checkList); - map.put("hiddenVideo",hiddenVideo); - map.put("result", errInfo); - return map; - } + map.put("sImgs", sImgs); + map.put("checkList", checkList); + map.put("hiddenVideo", hiddenVideo); + map.put("result", errInfo); + return map; + } - /** - * 删除 - * - * @param out - * @throws Exception - */ - @RequestMapping(value = "/riskListCheckHiddenDelete") // /delete - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "删除") - public Object riskListCheckHiddenDelete() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - hiddenService.delete(pd); - map.put("result", errInfo); // 返回结果 - return map; - } + /** + * 删除 + * + * @param out + * @throws Exception + */ + @RequestMapping(value = "/riskListCheckHiddenDelete") // /delete + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "隐患", instructionsOperate = "隐患", instructionsType = "删除") + public Object riskListCheckHiddenDelete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hiddenService.delete(pd); + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * 删除 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/delete") - @ResponseBody - public Object delete() throws Exception { - // 获取IP - HttpServletRequest request = this.getRequest(); - String ip = ""; - if (request.getHeader("x-forwarded-for") == null) { - ip = request.getRemoteAddr(); - }else{ - ip = request.getHeader("x-forwarded-for"); - } - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - hiddenService.delete(pd); - FHLOG.save(pd.getString("loginUserName"), "删除隐患ID:"+pd.getString("HIDDEN_ID"),ip); //记录日志 用户ID 隐患id 时间 - applicationContext.publishEvent(new DeviceHiddenEvent(new Object(),pd.getString("HIDDEN_ID"),"1")); - map.put("result", errInfo); // 返回结果 - return map; - } + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() throws Exception { + // 获取IP + HttpServletRequest request = this.getRequest(); + String ip = ""; + if (request.getHeader("x-forwarded-for") == null) { + ip = request.getRemoteAddr(); + } else { + ip = request.getHeader("x-forwarded-for"); + } + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hiddenService.delete(pd); + FHLOG.save(pd.getString("loginUserName"), "删除隐患ID:" + pd.getString("HIDDEN_ID"), ip); //记录日志 用户ID 隐患id 时间 + applicationContext.publishEvent(new DeviceHiddenEvent(new Object(), pd.getString("HIDDEN_ID"), "1")); + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * 获取清单风险点 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getOtherHidden") - @ResponseBody - public Object getOtherHidden() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String USER_ID = pd.getString("USER_ID"); - pd = listmanagerService.findById(pd); - if (pd.getString("TYPE").equals("listType0005")) { - if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(pd.getString("START_DATE") + " 00:00:00"), - DateUtil.fomatDateTime(pd.getString("END_DATE") + " 23:59:59"))) { - PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_XUN", 1);// 查询方法和旬一样,直接借用 - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - type.put("BEGINTIME", pd.getString("START_DATE") + " 00:00:00"); - type.put("ENDTIME", pd.getString("END_DATE") + " 23:59:59"); - List hiddenList = hiddenService.getOtherHidden(type); - map.put("hiddenList", hiddenList); - } - map.put("result", errInfo); - return map; - } - String cycle = pd.getString("PERIODNAME"); - PageData type = new PageData(); - if (cycle.equals("每日")) { - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_DAY", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("每周")) { - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_WEEK", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("每旬")) { - // 1-10 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_XUN", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); - type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); - } - // 11-20 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_XUN", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); - type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); - } - // 21-月底 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_XUN", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); - type.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); - } + /** + * 获取清单风险点 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getOtherHidden") + @ResponseBody + public Object getOtherHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String USER_ID = pd.getString("USER_ID"); + pd = listmanagerService.findById(pd); + if (pd.getString("TYPE").equals("listType0005")) { + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(pd.getString("START_DATE") + " 00:00:00"), + DateUtil.fomatDateTime(pd.getString("END_DATE") + " 23:59:59"))) { + PageData type = new PageData(); + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_XUN", 1);// 查询方法和旬一样,直接借用 + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", pd.getString("START_DATE") + " 00:00:00"); + type.put("ENDTIME", pd.getString("END_DATE") + " 23:59:59"); + List hiddenList = hiddenService.getOtherHidden(type); + map.put("hiddenList", hiddenList); + } + map.put("result", errInfo); + return map; + } + String cycle = pd.getString("PERIODNAME"); + PageData type = new PageData(); + if (cycle.equals("每日")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_DAY", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每周")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_WEEK", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每旬")) { + // 1-10 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_XUN", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); + type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); + } + // 11-20 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_XUN", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); + type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); + } + // 21-月底 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_XUN", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); + type.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + } - } else if (cycle.equals("每月")) { - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_MONTH", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("每季")) { - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_QUARTER", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("半年")) { - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_HALFYEAR", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("每年")) { - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - type.put("IS_YEAR", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } + } else if (cycle.equals("每月")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_MONTH", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每季")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_QUARTER", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("半年")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_HALFYEAR", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每年")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_YEAR", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } - List hiddenList = hiddenService.getOtherHidden(type); - map.put("result", errInfo); - map.put("hiddenList", hiddenList); - return map; - } + List hiddenList = hiddenService.getOtherHidden(type); + map.put("result", errInfo); + map.put("hiddenList", hiddenList); + return map; + } - /** - * 修改 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/riskListCheckEdit") // /edit - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "风险清单检查",instructionsOperate = "隐患",instructionsType = "修改") - public Object riskListCheckEdit() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - hiddenService.editInfo(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/riskListCheckEdit") // /edit + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "风险清单检查", instructionsOperate = "隐患", instructionsType = "修改") + public Object riskListCheckEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hiddenService.editInfo(pd); + map.put("pd", 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(); + /** + * 修改 + * + * @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(); - hiddenUserService.delete(pd); //删除隐患相关人员 -- 隐患发现人 - if(pd.getString("STATE").equals("16")){//如果状态等于16进入此方法肯定是提交过来的，赋值给待确认 - pd.put("STATE","-2"); - if(Tools.notEmpty(pd.getString("POSITIONDESC"))){hiddenService.editInformation(pd);} - hiddenService.editstate(pd); - } - hiddenService.editInfo(pd); + hiddenUserService.delete(pd); //删除隐患相关人员 -- 隐患发现人 + if (pd.getString("STATE").equals("16")) {//如果状态等于16进入此方法肯定是提交过来的，赋值给待确认 + pd.put("STATE", "-2"); + if (Tools.notEmpty(pd.getString("POSITIONDESC"))) { + hiddenService.editInformation(pd); + } + hiddenService.editstate(pd); + } + hiddenService.editInfo(pd); - List list = (List) JSON.parse(pd.get("other").toString()); // 隐患发现人 - for (JSONObject json : list){ - PageData hiddenconUserAdd = new PageData(); - hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID()); - hiddenconUserAdd.put("HIDDEN_ID",pd.getString("HIDDEN_ID")); - hiddenconUserAdd.put("USER_ID",json.get("USER_ID")); - hiddenconUserAdd.put("TYPE","1"); - hiddenconUserAdd.put("IS_MAIN","0"); - hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人 - } - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + List list = (List) JSON.parse(pd.get("other").toString()); // 隐患发现人 + for (JSONObject json : list) { + PageData hiddenconUserAdd = new PageData(); + hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID()); + hiddenconUserAdd.put("HIDDEN_ID", pd.getString("HIDDEN_ID")); + hiddenconUserAdd.put("USER_ID", json.get("USER_ID")); + hiddenconUserAdd.put("TYPE", "1"); + hiddenconUserAdd.put("IS_MAIN", "0"); + hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人 + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editRec") + @ResponseBody + public Object editRec() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hiddenService.edit(pd); - /** - * 修改 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/editRec") - @ResponseBody - public Object editRec() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - hiddenService.edit(pd); + pd = hiddenService.findById(pd); + PageData corpinfo = new PageData(); + corpinfo.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + corpinfo = corpinfoService.findById(pd); - pd = hiddenService.findById(pd); - PageData corpinfo = new PageData(); - corpinfo.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); - corpinfo = corpinfoService.findById(pd); + PageData lpd = new PageData(); + lpd.put("STATE", "OK"); + lpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + int usedCount = msmloginService.msUsedCount(lpd); + PageData sms = new PageData(); + sms.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + sms.put("ISENABLE", "1"); + sms.put("SMSCODE", "SMS_215820677"); + List sList = smsmanagementService.listAll(sms); + if (corpinfo.getString("ISRECEIVE").equals("1") + && Integer.parseInt(corpinfo.getString("SMS_COUNT")) - usedCount > 0 && sList.size() > 0) { + if (!"1".equals(pd.get("RECTIFICATIONTYPE").toString())) { - PageData lpd = new PageData(); - lpd.put("STATE", "OK"); - lpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); - int usedCount = msmloginService.msUsedCount(lpd); - PageData sms = new PageData(); - sms.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); - sms.put("ISENABLE", "1"); - sms.put("SMSCODE", "SMS_215820677"); - List sList = smsmanagementService.listAll(sms); - if (corpinfo.getString("ISRECEIVE").equals("1") - && Integer.parseInt(corpinfo.getString("SMS_COUNT")) - usedCount > 0 && sList.size() > 0) { - if (!"1".equals(pd.get("RECTIFICATIONTYPE").toString())) { + PageData user = new PageData(); + user.put("USER_ID", pd.get("RECTIFICATIONOR")); + user = usersService.findById(user); + if (user.get("USERNAME") != null && Tools.notEmpty(user.get("USERNAME").toString())) { + String phone = user.get("USERNAME").toString(); + Map mes = new HashMap(); + mes.put("phone", phone); + mes.put("templateCode", "SMS_215820677"); + mes.put("time", pd.get("RECTIFICATIONDEADLINE")); + mes.put("type", "1"); + SendSmsResponse ssms = AliSmsUtil.sendSms(mes); + msmloginService.addForAliSmsUtil(mes, pd.getString("CORPINFO_ID"), ssms); + // System.out.println(ssms.getCode()); + if (ssms.getCode().equals("OK")) { + map.put("result", "success"); + } else { + map.put("result", "fail"); + map.put("msg", "您的操作过去频繁，请稍后重试!"); + } + } + if (sList.get(0).getString("ADDRESSEE") != null) { + String[] uid = sList.get(0).getString("ADDRESSEE").split(","); + for (int i = 0; i < uid.length; i++) { + PageData suser = new PageData(); + suser.put("USER_ID", uid[i].toString()); + suser = usersService.findById(suser); + if (suser.get("USERNAME") != null && Tools.notEmpty(suser.get("USERNAME").toString())) { + String uphone = suser.get("USERNAME").toString(); + Map umes = new HashMap(); + umes.put("phone", uphone); + umes.put("templateCode", "SMS_215820677"); + umes.put("time", pd.get("RECTIFICATIONDEADLINE")); + umes.put("type", "1"); + PageData ewpd = new PageData(); + ewpd.put("STATE", "OK"); + ewpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + int ewusedCount = msmloginService.msUsedCount(ewpd); + if (Integer.parseInt(corpinfo.getString("SMS_COUNT")) - ewusedCount > 0) { + SendSmsResponse ussms = AliSmsUtil.sendSms(umes); + msmloginService.addForAliSmsUtil(umes, pd.getString("CORPINFO_ID"), ussms); + } + } - PageData user = new PageData(); - user.put("USER_ID", pd.get("RECTIFICATIONOR")); - user = usersService.findById(user); - if (user.get("USERNAME") != null && Tools.notEmpty(user.get("USERNAME").toString())) { - String phone = user.get("USERNAME").toString(); - Map mes = new HashMap(); - mes.put("phone", phone); - mes.put("templateCode", "SMS_215820677"); - mes.put("time", pd.get("RECTIFICATIONDEADLINE")); - mes.put("type", "1"); - SendSmsResponse ssms = AliSmsUtil.sendSms(mes); - msmloginService.addForAliSmsUtil(mes, pd.getString("CORPINFO_ID"), ssms); - // System.out.println(ssms.getCode()); - if (ssms.getCode().equals("OK")) { - map.put("result", "success"); - } else { - map.put("result", "fail"); - map.put("msg", "您的操作过去频繁，请稍后重试!"); - } - } - if (sList.get(0).getString("ADDRESSEE") != null) { - String[] uid = sList.get(0).getString("ADDRESSEE").split(","); - for (int i = 0; i < uid.length; i++) { - PageData suser = new PageData(); - suser.put("USER_ID", uid[i].toString()); - suser = usersService.findById(suser); - if (suser.get("USERNAME") != null && Tools.notEmpty(suser.get("USERNAME").toString())) { - String uphone = suser.get("USERNAME").toString(); - Map umes = new HashMap(); - umes.put("phone", uphone); - umes.put("templateCode", "SMS_215820677"); - umes.put("time", pd.get("RECTIFICATIONDEADLINE")); - umes.put("type", "1"); - PageData ewpd = new PageData(); - ewpd.put("STATE", "OK"); - ewpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); - int ewusedCount = msmloginService.msUsedCount(ewpd); - if (Integer.parseInt(corpinfo.getString("SMS_COUNT")) - ewusedCount > 0) { - SendSmsResponse ussms = AliSmsUtil.sendSms(umes); - msmloginService.addForAliSmsUtil(umes, pd.getString("CORPINFO_ID"), ussms); - } - } + } + } - } - } + } + } - } - } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - map.put("pd", pd); - map.put("result", errInfo); - return map; - } - - @RequestMapping(value = "/upFile") - @ResponseBody - public Object upFile(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if (null != file && !file.isEmpty()) { - 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)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - PageData hs = hiddenSchemeService.findById(pd); - String ffile = DateUtil.getDays(); + @RequestMapping(value = "/upFile") + @ResponseBody + public Object upFile(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (null != file && !file.isEmpty()) { + 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)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + PageData hs = hiddenSchemeService.findById(pd); + 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("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); - hs.put("ISDELETE", "0"); - hiddenSchemeService.edit(hs); - } + String fileName = this.get32UUID() + + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); + pd.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); + hs.put("ISDELETE", "0"); + hiddenSchemeService.edit(hs); + } - return map; - } + return map; + } - /** - * 整改 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/rectify") - @ResponseBody - @Transactional - public Object rectify() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData corpinfo = new PageData(); - corpinfo.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); - corpinfo = corpinfoService.findById(pd); - pd.put("STATE","2"); - pd.put("INVESTMENT_FUNDS",pd.getString("INVEST_FUNDS")); - pd.put("CHECKOR",pd.getString("USER_ID")); - pd.put("CHECKDEPT",pd.getString("DEPARTMENT_ID")); - hiddenService.rectify(pd); + /** + * 整改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/rectify") + @ResponseBody + @Transactional + public Object rectify() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData corpinfo = new PageData(); + corpinfo.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + corpinfo = corpinfoService.findById(pd); + pd.put("STATE", "2"); + pd.put("INVESTMENT_FUNDS", pd.getString("INVEST_FUNDS")); + pd.put("CHECKOR", pd.getString("USER_ID")); + pd.put("CHECKDEPT", pd.getString("DEPARTMENT_ID")); + hiddenService.rectify(pd); - pd.put("HIDDENSCHEME_ID", this.get32UUID()); // 主键 - hiddenSchemeService.deleteHd(pd); - if (Tools.notEmpty(pd.get("HAVESCHEME").toString())) { - pd.put("CREATOR", pd.get("USER_ID")); // - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // - pd.put("OPERATOR", pd.get("USER_ID")); // - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // - pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 - pd.put("CORPINFO_ID", pd.get("CORPINFO_ID")); // 企业id - hiddenSchemeService.save(pd); - } - this.hiddenCheckService.delete(pd); - if(Tools.notEmpty(pd.getString("CHECKOR"))){//判断验收人是否空，否就发送站内信 - PageData mes = new PageData(); - PageData hiddenPd = hiddenService.findById(pd); - messageService.sendMessageByParameter("HIDDEN_MAIL_004","友情提示：有一条隐患需要验收", - hiddenPd.getString("CORPINFO_ID"),pd.getString("USER_ID"),hiddenPd.getString("HIDDEN_ID"), - hiddenPd.getString("HIDDENDESCR"),"隐患验收","验收","",""); - } + pd.put("HIDDENSCHEME_ID", this.get32UUID()); // 主键 + hiddenSchemeService.deleteHd(pd); + if (Tools.notEmpty(pd.get("HAVESCHEME").toString())) { + pd.put("CREATOR", pd.get("USER_ID")); // + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // + pd.put("OPERATOR", pd.get("USER_ID")); // + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("CORPINFO_ID", pd.get("CORPINFO_ID")); // 企业id + hiddenSchemeService.save(pd); + } + this.hiddenCheckService.delete(pd); + if (Tools.notEmpty(pd.getString("CHECKOR"))) {//判断验收人是否空，否就发送站内信 + PageData mes = new PageData(); + PageData hiddenPd = hiddenService.findById(pd); + messageService.sendMessageByParameter("HIDDEN_MAIL_004", "友情提示：有一条隐患需要验收", + hiddenPd.getString("CORPINFO_ID"), pd.getString("USER_ID"), hiddenPd.getString("HIDDEN_ID"), + hiddenPd.getString("HIDDENDESCR"), "隐患验收", "验收", "", ""); + } - if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { - List list = (List) JSON.parse(pd.get("OTHER").toString()); - for (JSONObject json : list) { + if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { + List list = (List) JSON.parse(pd.get("OTHER").toString()); + for (JSONObject json : list) { // if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null // && json.get("USER_ID") != "") { - if(!Tools.isEmpty(json.get("DEPARTMENT_ID")) && !Tools.isEmpty(json.get("USER_ID")) ){ - PageData other = new PageData(); - other.put("HIDDENCHECK_ID", this.get32UUID()); // 主键 - other.put("HIDDEN_ID", pd.get("HIDDEN_ID")); - other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); - other.put("USER_ID", json.get("USER_ID")); - other.put("STATUS", "0"); - hiddenCheckService.save(other); - PageData hiddenPd = hiddenService.findById(pd); - messageService.sendMessageByParameter("HIDDEN_MAIL_004","友情提示：有一条隐患需要验收", - hiddenPd.getString("CORPINFO_ID"),json.get("USER_ID").toString(),hiddenPd.getString("HIDDEN_ID"), - hiddenPd.getString("HIDDENDESCR"),"隐患验收","验收","",""); - } - } - } - map.put("result", errInfo); - map.put("HIDDENSCHEME_ID", pd.get("HIDDENSCHEME_ID")); - return map; - } + if (!Tools.isEmpty(json.get("DEPARTMENT_ID")) && !Tools.isEmpty(json.get("USER_ID"))) { + PageData other = new PageData(); + other.put("HIDDENCHECK_ID", this.get32UUID()); // 主键 + other.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); + other.put("USER_ID", json.get("USER_ID")); + other.put("STATUS", "0"); + hiddenCheckService.save(other); + PageData hiddenPd = hiddenService.findById(pd); + messageService.sendMessageByParameter("HIDDEN_MAIL_004", "友情提示：有一条隐患需要验收", + hiddenPd.getString("CORPINFO_ID"), json.get("USER_ID").toString(), hiddenPd.getString("HIDDEN_ID"), + hiddenPd.getString("HIDDENDESCR"), "隐患验收", "验收", "", ""); + } + } + } + map.put("result", errInfo); + map.put("HIDDENSCHEME_ID", pd.get("HIDDENSCHEME_ID")); + return map; + } - /** - * 复查 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/review") - @ResponseBody - public Object review() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - hiddenService.review(pd); - // 删除整改照片 - if (pd.get("ISPASS") != null && Tools.notEmpty(pd.get("ISPASS").toString())) { - if ("0".equals(pd.get("ISPASS").toString())) { - PageData pic = new PageData(); - List picList = new ArrayList(); - pic.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); - pic.put("TYPE", "4"); - picList = imgFilesService.listAll(pic); - if (picList != null && picList.size() > 0) { - for (PageData deletePic : picList) { - File file = new File(PathUtil.getProjectpath() + deletePic.getString("FILEPATH")); - file.delete(); - } - } - imgFilesService.deleteList(pic); - List picsList = new ArrayList(); - pic.put("FOREIGN_KEY", pd.get("HIDDENSCHEME_ID")); - pic.put("TYPE", "8"); - picsList = imgFilesService.listAll(pic); - if (picsList != null && picsList.size() > 0) { - for (PageData deletePic : picsList) { - File file = new File(PathUtil.getProjectpath() + deletePic.getString("FILEPATH")); - file.delete(); - } - } - hiddenSchemeService.deleteHd(pd); - imgFilesService.deleteList(pic); - } + /** + * 复查 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/review") + @ResponseBody + public Object review() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hiddenService.review(pd); + // 删除整改照片 + if (pd.get("ISPASS") != null && Tools.notEmpty(pd.get("ISPASS").toString())) { + if ("0".equals(pd.get("ISPASS").toString())) { + PageData pic = new PageData(); + List picList = new ArrayList(); + pic.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + pic.put("TYPE", "4"); + picList = imgFilesService.listAll(pic); + if (picList != null && picList.size() > 0) { + for (PageData deletePic : picList) { + File file = new File(PathUtil.getProjectpath() + deletePic.getString("FILEPATH")); + file.delete(); + } + } + imgFilesService.deleteList(pic); + List picsList = new ArrayList(); + pic.put("FOREIGN_KEY", pd.get("HIDDENSCHEME_ID")); + pic.put("TYPE", "8"); + picsList = imgFilesService.listAll(pic); + if (picsList != null && picsList.size() > 0) { + for (PageData deletePic : picsList) { + File file = new File(PathUtil.getProjectpath() + deletePic.getString("FILEPATH")); + file.delete(); + } + } + hiddenSchemeService.deleteHd(pd); + imgFilesService.deleteList(pic); + } - } - map.put("result", errInfo); - return map; - } + } + map.put("result", errInfo); + return map; + } - /** - * 验收 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/riskListCheckInspection") // /check - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "验收") - public Object riskListCheckInspection() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if (pd.get("ISQUALIFIED").equals("1")) { - PageData pd2 = this.hiddenCheckService.findByHidden(pd); - pd.put("STATUS", 1); - pd.put("HIDDENCHECK_ID", pd2.get("HIDDENCHECK_ID")); - pd.put("DEPARTMENT_ID", pd2.get("DEPARTMENT_ID")); - pd.put("USER_ID", pd2.get("USER_ID")); - hiddenCheckService.edit(pd); + /** + * 验收 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/riskListCheckInspection") // /check + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "隐患", instructionsOperate = "隐患", instructionsType = "验收") + public Object riskListCheckInspection() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (pd.get("ISQUALIFIED").equals("1")) { + PageData pd2 = this.hiddenCheckService.findByHidden(pd); + pd.put("STATUS", 1); + pd.put("HIDDENCHECK_ID", pd2.get("HIDDENCHECK_ID")); + pd.put("DEPARTMENT_ID", pd2.get("DEPARTMENT_ID")); + pd.put("USER_ID", pd2.get("USER_ID")); + hiddenCheckService.edit(pd); - List checkList = hiddenCheckService.listAll(pd); - for (PageData check : checkList) { - if (check.get("STATUS").toString().equals("0")) { - map.put("result", errInfo); - map.put("check", pd); - return map; - } - } - hiddenService.check(pd); + List checkList = hiddenCheckService.listAll(pd); + for (PageData check : checkList) { + if (check.get("STATUS").toString().equals("0")) { + map.put("result", errInfo); + map.put("check", pd); + return map; + } + } + hiddenService.check(pd); - } else { - PageData hidden = new PageData(); - hidden.put("HIDDEN_ID", pd.get("HIDDEN_ID")); - hidden.put("STATE", 1); - hidden.put("BUHEGE", 1); + } else { + PageData hidden = new PageData(); + hidden.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + hidden.put("STATE", 1); + hidden.put("BUHEGE", 1); - hiddenService.changeState(hidden); + hiddenService.changeState(hidden); - hidden.put("FOREIGN_KEY",pd.get("HIDDEN_ID")); - hidden.put("TYPE",4); - List zgimgs = imgFilesService.listAll(hidden); - hidden.put("TYPE",5); - List ysimgs = imgFilesService.listAll(hidden); - hidden.put("TYPE",8); - List fsimgs = imgFilesService.listAll(hidden); - hidden.put("TYPE",22); - List jsimgs = imgFilesService.listAll(hidden); - List imgs = new ArrayList(); - imgs.addAll(zgimgs); - imgs.addAll(ysimgs); - imgs.addAll(fsimgs); - imgs.addAll(jsimgs); - for (PageData img : imgs) { - smb.deleteFile(img.getString("FILEPATH")); - imgFilesService.delete(img); - } - } - map.put("check", pd); - map.put("result", errInfo); - return map; - } + hidden.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + hidden.put("TYPE", 4); + List zgimgs = imgFilesService.listAll(hidden); + hidden.put("TYPE", 5); + List ysimgs = imgFilesService.listAll(hidden); + hidden.put("TYPE", 8); + List fsimgs = imgFilesService.listAll(hidden); + hidden.put("TYPE", 22); + List jsimgs = imgFilesService.listAll(hidden); + List imgs = new ArrayList(); + imgs.addAll(zgimgs); + imgs.addAll(ysimgs); + imgs.addAll(fsimgs); + imgs.addAll(jsimgs); + for (PageData img : imgs) { + smb.deleteFile(img.getString("FILEPATH")); + imgFilesService.delete(img); + } + } + map.put("check", pd); + map.put("result", errInfo); + return map; + } - /** - * 验收 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/check") - @ResponseBody - public Object check() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if (pd.get("ISQUALIFIED").equals("1")) { //验收合格 - //List pd2 = (List) this.hiddenCheckService.findByHidden(pd); //获取这个隐患的验收人信息 - PageData page = this.hiddenCheckService.findByHidden(pd); - List pd2 = new ArrayList<>(); - pd2.add(page); - if(pd2.size()>0){ - for(PageData checklist: pd2){ - pd.put("STATUS", 1); - pd.put("HIDDENCHECK_ID", checklist.get("HIDDENCHECK_ID")); - pd.put("DEPARTMENT_ID", checklist.get("DEPARTMENT_ID")); - pd.put("USER_ID", checklist.get("USER_ID")); - hiddenCheckService.edit(pd); - } - } + /** + * 验收 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/check") + @ResponseBody + public Object check() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (pd.get("ISQUALIFIED").equals("1")) { //验收合格 + //List pd2 = (List) this.hiddenCheckService.findByHidden(pd); //获取这个隐患的验收人信息 + PageData page = this.hiddenCheckService.findByHidden(pd); + List pd2 = new ArrayList<>(); + pd2.add(page); + if (pd2.size() > 0) { + for (PageData checklist : pd2) { + pd.put("STATUS", 1); + pd.put("HIDDENCHECK_ID", checklist.get("HIDDENCHECK_ID")); + pd.put("DEPARTMENT_ID", checklist.get("DEPARTMENT_ID")); + pd.put("USER_ID", checklist.get("USER_ID")); + hiddenCheckService.edit(pd); + } + } // List checkList = hiddenCheckService.listAll(pd); // for (PageData check : checkList) { @@ -1311,389 +1319,394 @@ public class AppHiddenController extends BaseController { // break; // } // } - List checkList = hiddenCheckService.listAll(pd); - for (PageData check : checkList) { - if (check.get("STATUS").toString().equals("0")) { - map.put("result", errInfo); - map.put("code","1000"); - map.put("errorMessage","此次检查还有未合格项，不能验收"); - map.put("check", pd); - return map; - } - } - if(Tools.isEmpty(pd.getString("CHECKTIME")) && Tools.notEmpty(pd.getString("CHECK_TIME"))){//用于手机端传验收时间，存隐患表20220920 - pd.put("CHECKTIME",pd.getString("CHECK_TIME")); - } - hiddenService.check(pd); - if (Tools.notEmpty(pd.getString("INSPECTION_ID"))) { //安全环保检查验收 - pd.put("ACCEPTSTEP", 6); - List list = hiddenService.listOtherNotAccept(pd); - PageData inspection = new PageData(); - if (list.size() == 0) { - inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); - inspection.put("OPERATOR", pd.getString("CHECKOR")); - inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); - inspection.put("INSPECTION_STATUS", "6"); // 已验收 - safetyenvironmentalService.editStatus(inspection); - } - inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); - inspection.put("OPERATOR", pd.getString("CHECKOR")); - inspection.put("HIDDEN_vector",pd.getString("HIDDEN_ID")); - noticeUtil.SE_ThreeStepUtil(inspection); - } - // 隐患验收清理点检处的状态 - applicationContext.publishEvent(new DeviceHiddenEvent(new Object(),pd.getString("HIDDEN_ID"),"0")); - } else { - PageData pd2 = new PageData(); //验收打回 - pd2.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); - pd2.put("TYPE", "4"); - List zgImgs = imgFilesService.listAll(pd2); - for (PageData pageData : zgImgs) { + List checkList = hiddenCheckService.listAll(pd); + for (PageData check : checkList) { + if (check.get("STATUS").toString().equals("0")) { + map.put("result", errInfo); + map.put("code", "1000"); + map.put("errorMessage", "此次检查还有未合格项，不能验收"); + map.put("check", pd); + return map; + } + } + if (Tools.isEmpty(pd.getString("CHECKTIME")) && Tools.notEmpty(pd.getString("CHECK_TIME"))) {//用于手机端传验收时间，存隐患表20220920 + pd.put("CHECKTIME", pd.getString("CHECK_TIME")); + } + hiddenService.check(pd); + if (Tools.notEmpty(pd.getString("INSPECTION_ID"))) { //安全环保检查验收 + pd.put("ACCEPTSTEP", 6); + List list = hiddenService.listOtherNotAccept(pd); + PageData inspection = new PageData(); + if (list.size() == 0) { + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("CHECKOR")); + inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); + inspection.put("INSPECTION_STATUS", "6"); // 已验收 + safetyenvironmentalService.editStatus(inspection); + } + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("CHECKOR")); + inspection.put("HIDDEN_vector", pd.getString("HIDDEN_ID")); + noticeUtil.SE_ThreeStepUtil(inspection); + } + // 隐患验收清理点检处的状态 + applicationContext.publishEvent(new DeviceHiddenEvent(new Object(), pd.getString("HIDDEN_ID"), "0")); + } else { + PageData pd2 = new PageData(); //验收打回 + pd2.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + pd2.put("TYPE", "4"); + List zgImgs = imgFilesService.listAll(pd2); + for (PageData pageData : zgImgs) { - imgFilesService.delete(pageData); - if(Tools.notEmpty(pageData.getString("FILEPATH"))) { - smb.deleteFile(pageData.getString("FILEPATH")); - } + imgFilesService.delete(pageData); + if (Tools.notEmpty(pageData.getString("FILEPATH"))) { + smb.deleteFile(pageData.getString("FILEPATH")); + } - } - /** 删除所有验收人数据。**/ - hiddenCheckApiService.deleteByHiddenId(pd.getString("HIDDEN_ID")); - /** 验收打回 **/ - hiddenApiService.repulseCheck(pd.getString("HIDDEN_ID")); - /** 记录打回 **/ - hiddenExamineApiService.saveRepulseCheckApp(pd.getString("HIDDEN_ID"),pd.getString("CONTENT"),pd.getString("CHECKOR")); - } - hiddenMailService.apphiddneCheckAdopt(pd); - map.put("check", pd); - map.put("result", errInfo); - return map; - } + } + /** 删除所有验收人数据。**/ + hiddenCheckApiService.deleteByHiddenId(pd.getString("HIDDEN_ID")); + /** 验收打回 **/ + hiddenApiService.repulseCheck(pd.getString("HIDDEN_ID")); + /** 记录打回 **/ + hiddenExamineApiService.saveRepulseCheckApp(pd.getString("HIDDEN_ID"), pd.getString("CONTENT"), pd.getString("CHECKOR")); + } + hiddenMailService.apphiddneCheckAdopt(pd); + map.put("check", pd); + map.put("result", errInfo); + return map; + } - /** - * 列表 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/list") - @ResponseBody - public Object list() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - Page page = new Page(); - pd = this.getPageData(); - page.setCurrentPage(Integer.parseInt(pd.get("currentPage").toString())); - page.setShowCount(Integer.parseInt(pd.get("showCount").toString())); - page.setTotalResult(Integer.parseInt(pd.get("totalResult").toString())); + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + Page page = new Page(); + pd = this.getPageData(); + page.setCurrentPage(Integer.parseInt(pd.get("currentPage").toString())); + page.setShowCount(Integer.parseInt(pd.get("showCount").toString())); + page.setTotalResult(Integer.parseInt(pd.get("totalResult").toString())); // String DEPARTMENT_ID = pd.getString("USERDEPT"); // String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); // if(ids!=null && Tools.notEmpty(ids)) { // ids = ids.substring(0,ids.lastIndexOf(",")); // pd.put("DEPARTMENT_IDS", ids.split(",")); // } - String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) - pd.put("KEYWORDS", KEYWORDS.trim()); - String HIDDENDESCR = pd.getString("HIDDENDESCR"); // 关键词检索条件 - if (Tools.notEmpty(HIDDENDESCR)) - pd.put("HIDDENDESCR", HIDDENDESCR.trim()); - String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 - if (Tools.notEmpty(ISQUALIFIED)) - pd.put("ISQUALIFIED", ISQUALIFIED.trim()); - String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 - if (Tools.notEmpty(HIDDENLEVELE)) - pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); - String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 - if (Tools.notEmpty(STARTTIME)) - pd.put("STARTTIME", STARTTIME.trim()); - String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 - if (Tools.notEmpty(ENDTIME)) - pd.put("ENDTIME", ENDTIME.trim()); - if ("undefined".equals(pd.getString("isIndex"))) { - pd.put("isIndex", ""); - } - if (pd.get("isIndex") != null && Tools.notEmpty(pd.get("isIndex").toString()) - && "1".equals(pd.get("isIndex").toString())) { - pd.put("SELF_USER_ID", pd.get("SELFUSERID")); - } - pd.put("ISMAIN", "0"); - String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 - if (Tools.notEmpty(DISPOSESTATE)) { - pd.put("DISPOSESTATE", DISPOSESTATE.trim()); - pd.put("SELFUSERID", pd.get("SELFUSERID")); - pd.put("USERDEPT", pd.get("USERDEPT")); - } - page.setPd(pd); - List varList = hiddenService.list(page); // 列出Hidden列表 - varList = hiddenUserService.getHiddebFind(varList); - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + pd.put("KEYWORDS", KEYWORDS.trim()); + String HIDDENDESCR = pd.getString("HIDDENDESCR"); // 关键词检索条件 + if (Tools.notEmpty(HIDDENDESCR)) + pd.put("HIDDENDESCR", HIDDENDESCR.trim()); + String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 + if (Tools.notEmpty(ISQUALIFIED)) + pd.put("ISQUALIFIED", ISQUALIFIED.trim()); + String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 + if (Tools.notEmpty(HIDDENLEVELE)) + pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); + String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 + if (Tools.notEmpty(STARTTIME)) + pd.put("STARTTIME", STARTTIME.trim()); + String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 + if (Tools.notEmpty(ENDTIME)) + pd.put("ENDTIME", ENDTIME.trim()); + if ("undefined".equals(pd.getString("isIndex"))) { + pd.put("isIndex", ""); + } + if (pd.get("isIndex") != null && Tools.notEmpty(pd.get("isIndex").toString()) + && "1".equals(pd.get("isIndex").toString())) { + pd.put("SELF_USER_ID", pd.get("SELFUSERID")); + } + pd.put("ISMAIN", "0"); + String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 + if (Tools.notEmpty(DISPOSESTATE)) { + pd.put("DISPOSESTATE", DISPOSESTATE.trim()); + pd.put("SELFUSERID", pd.get("SELFUSERID")); + pd.put("USERDEPT", pd.get("USERDEPT")); + } + page.setPd(pd); + List varList = hiddenService.list(page); // 列出Hidden列表 + varList = hiddenUserService.getHiddebFind(varList); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * 去修改页面获取数据 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/goRiskListCheckEdit") // /goEdit - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "风险清单检查隐患",instructionsOperate = "隐患",instructionsType = "去修改页面获取数据") - public Object goRiskListCheckEdit() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = hiddenService.findById(pd); // 根据ID读取 - PageData pd2 = new PageData(); - pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); - pd2.put("TYPE", 3); - List hImgs = imgFilesService.listAll(pd2);// 隐患图片 - pd2.put("TYPE", 4); - List rImgs = imgFilesService.listAll(pd2);// 整改图片 - /* - * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 - */ // 查询整改方案 - PageData hs = hiddenSchemeService.findByHdId(pd); - List sImgs = new ArrayList(); + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goRiskListCheckEdit") // /goEdit + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "风险清单检查隐患", instructionsOperate = "隐患", instructionsType = "去修改页面获取数据") + public Object goRiskListCheckEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = hiddenService.findById(pd); // 根据ID读取 + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd2.put("TYPE", 3); + List hImgs = imgFilesService.listAll(pd2);// 隐患图片 + pd2.put("TYPE", 4); + List rImgs = imgFilesService.listAll(pd2);// 整改图片 + /* + * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 + */ // 查询整改方案 + PageData hs = hiddenSchemeService.findByHdId(pd); + List sImgs = new ArrayList(); - if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { - PageData pd3 = new PageData(); - pd3.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); - pd3.put("TYPE", 8); - sImgs = imgFilesService.listAll(pd3);// 方案图片 - } + if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { + PageData pd3 = new PageData(); + pd3.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); + pd3.put("TYPE", 8); + sImgs = imgFilesService.listAll(pd3);// 方案图片 + } - List pImgs = new ArrayList(); - if("1".equals(pd.get("HAVEPLAN"))) { - PageData pd3 = new PageData(); - pd3.put("FOREIGN_KEY", hs.getString("HIDDEN_ID")); - pd3.put("TYPE",22); - pImgs = imgFilesService.listAll(pd3);//方案图片 - } + List pImgs = new ArrayList(); + if ("1".equals(pd.get("HAVEPLAN"))) { + PageData pd3 = new PageData(); + pd3.put("FOREIGN_KEY", hs.getString("HIDDEN_ID")); + pd3.put("TYPE", 22); + pImgs = imgFilesService.listAll(pd3);//方案图片 + } - List checkList = hiddenCheckService.listAll(pd); - if (checkList != null && checkList.size() > 0) { - PageData pd3 = new PageData(); - pd3.put("TYPE", 5); - for (PageData check : checkList) { - pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); - check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 - } - } - map.put("pd", pd); - map.put("hs", hs); - map.put("hImgs", hImgs); - map.put("rImgs", rImgs); - map.put("sImgs", sImgs); - map.put("pImgs", pImgs); - map.put("checkList", checkList); + List checkList = hiddenCheckService.listAll(pd); + if (checkList != null && checkList.size() > 0) { + PageData pd3 = new PageData(); + pd3.put("TYPE", 5); + for (PageData check : checkList) { + pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); + check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 + } + } + map.put("pd", pd); + map.put("hs", hs); + map.put("hImgs", hImgs); + map.put("rImgs", rImgs); + map.put("sImgs", sImgs); + map.put("pImgs", pImgs); + map.put("checkList", checkList); - map.put("result", errInfo); - return map; - } + 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 = hiddenService.findById(pd); // 根据ID读取 - if(pd.getString("CONFIRM_USER")==null){ - pd.put("CONFIRM_USER",""); - } - if(pd.getString("CONFIRM_USER")!=null || pd.getString("CONFIRM_USER").equals("undefined")){ - pd.put("USER_ID",pd.getString("CONFIRM_USER")); - PageData user = usersService.findById(pd); - if(user!=null){ - pd.put("confirmDeptId",user.getString("DEPARTMENT_ID")); - pd.put("conUserId",pd.getString("CONFIRM_USER")); - } - } - PageData pd2 = new PageData(); - pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); - pd2.put("TYPE", 3); - List hImgs = imgFilesService.listAll(pd2);// 隐患图片 - pd2.put("TYPE", 4); - List rImgs = imgFilesService.listAll(pd2);// 整改图片 - pd2.put("TYPE", 22); - List pImgs = imgFilesService.listAll(pd2);// 计划图片 - /* - * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 d770367816c34f53bf22177da3965f6c - */ // 查询整改方案 - PageData hs = hiddenSchemeService.findByHdId(pd); - List sImgs = new ArrayList(); + /** + * 去修改页面获取数据 + * + * @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 = hiddenService.findById(pd); // 根据ID读取 + if (pd.getString("CONFIRM_USER") == null) { + pd.put("CONFIRM_USER", ""); + } + if (pd.getString("CONFIRM_USER") != null || pd.getString("CONFIRM_USER").equals("undefined")) { + pd.put("USER_ID", pd.getString("CONFIRM_USER")); + PageData user = usersService.findById(pd); + if (user != null) { + pd.put("confirmDeptId", user.getString("DEPARTMENT_ID")); + pd.put("conUserId", pd.getString("CONFIRM_USER")); + } + } + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd2.put("TYPE", 3); + List hImgs = imgFilesService.listAll(pd2);// 隐患图片 + pd2.put("TYPE", 4); + List rImgs = imgFilesService.listAll(pd2);// 整改图片 + pd2.put("TYPE", 22); + List pImgs = imgFilesService.listAll(pd2);// 计划图片 + pd2.put("TYPE", 50); + List yImgs = imgFilesService.listAll(pd2);// 安全环保检查验收图片 + /* + * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 d770367816c34f53bf22177da3965f6c + */ // 查询整改方案 + PageData hs = hiddenSchemeService.findByHdId(pd); + List sImgs = new ArrayList(); - if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { - PageData pd3 = new PageData(); - pd3.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); - pd3.put("TYPE", 8); - sImgs = imgFilesService.listAll(pd3);// 方案图片 + if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { + PageData pd3 = new PageData(); + pd3.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd3.put("TYPE", 8); + sImgs = imgFilesService.listAll(pd3);// 方案图片 - PageData pd31 = new PageData(); - pd31.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); - pd31.put("TYPE", 8); - List sImgs2 = imgFilesService.listAll(pd31);// 方案图片 - sImgs.addAll(sImgs2); - } + PageData pd31 = new PageData(); + pd31.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); + pd31.put("TYPE", 8); + List sImgs2 = imgFilesService.listAll(pd31);// 方案图片 + sImgs.addAll(sImgs2); + } - List checkList = hiddenCheckService.listAll(pd); - if (checkList != null && checkList.size() > 0) { - PageData pd3 = new PageData(); - pd3.put("TYPE", 5); - for (PageData check : checkList) { - pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); - check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 - } - } - List hiddenExa = hiddenExamineService.listAllByHiddenId(pd.getString("HIDDEN_ID")); // 隐患流程信息 - List repulsecause = hiddenExamineService.findByHiddenId(pd);//确认人打回信息 - for (PageData pageData :hiddenExa){ - if("0".equals(pageData.getString("TYPE"))){ - pd.put("editUserName",pageData.get("editUserName")); - pd.put("editDeptName",pageData.get("editDeptName")); - pd.put("editLevelName",pageData.get("editLevelName")); - pd.put("editRectificationDeadline",pageData.get("spare3")); - } - } - map.put("hiddenExa", hiddenExa); // //特殊审批信息 - List hiddenFindPeople = hiddenUserService.listAll(pd);// 隐患相关人员信息 --隐患发现人 - map.put("pd", pd); - map.put("hs", hs); - map.put("hImgs", hImgs); - map.put("rImgs", rImgs); - map.put("pImgs", pImgs); - map.put("hiddenVideo", imgFilesService.getListByKeyAndType(pd.getString("HIDDEN_ID"),"102"));// 隐患视频 + List checkList = hiddenCheckService.listAll(pd); + if (checkList != null && checkList.size() > 0) { + PageData pd3 = new PageData(); + pd3.put("TYPE", 5); + for (PageData check : checkList) { + pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); + check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 + } + } + List hiddenExa = hiddenExamineService.listAllByHiddenId(pd.getString("HIDDEN_ID")); // 隐患流程信息 + List repulsecause = hiddenExamineService.findByHiddenId(pd);//确认人打回信息 + for (PageData pageData : hiddenExa) { + if ("0".equals(pageData.getString("TYPE"))) { + pd.put("editUserName", pageData.get("editUserName")); + pd.put("editDeptName", pageData.get("editDeptName")); + pd.put("editLevelName", pageData.get("editLevelName")); + pd.put("editRectificationDeadline", pageData.get("spare3")); + } + } + map.put("hiddenExa", hiddenExa); // //特殊审批信息 + List hiddenFindPeople = hiddenUserService.listAll(pd);// 隐患相关人员信息 --隐患发现人 + map.put("pd", pd); + map.put("hs", hs); + map.put("hImgs", hImgs); + map.put("rImgs", rImgs); + map.put("pImgs", pImgs); + map.put("yImgs", yImgs); + map.put("hiddenVideo", imgFilesService.getListByKeyAndType(pd.getString("HIDDEN_ID"), "102"));// 隐患视频 // map.put("cImgs", cImgs); - map.put("sImgs", sImgs); - map.put("hiddenFindPeople", hiddenFindPeople); // 隐患相关人员信息 - map.put("checkList", checkList); - map.put("repulsecause",repulsecause); - map.put("result", errInfo); - return map; - } + map.put("sImgs", sImgs); + map.put("hiddenFindPeople", hiddenFindPeople); // 隐患相关人员信息 + map.put("checkList", checkList); + map.put("repulsecause", repulsecause); + map.put("result", errInfo); + return map; + } - /** - * 首页统计 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/statistic") - @ResponseBody - public Object statistic() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式 - Date now = new Date(); - String endDay = sdf.format(now); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(now); - calendar.add(Calendar.DATE, -15); - String startDay = sdf.format(calendar.getTime()); - pd.put("START_DAY", startDay); - pd.put("END_DAY", endDay); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - pd.put("HIDDENLEVEL", "hiddenLevel0001");// 一般隐患 - List nhds = hiddenService.hiddenStatisticsByDay(pd); - pd.put("HIDDENLEVEL", "hiddenLevel0002");// 一般隐患 - List zhds = hiddenService.hiddenStatisticsByDay(pd); + /** + * 首页统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/statistic") + @ResponseBody + public Object statistic() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式 + Date now = new Date(); + String endDay = sdf.format(now); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(now); + calendar.add(Calendar.DATE, -15); + String startDay = sdf.format(calendar.getTime()); + pd.put("START_DAY", startDay); + pd.put("END_DAY", endDay); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("HIDDENLEVEL", "hiddenLevel0001");// 一般隐患 + List nhds = hiddenService.hiddenStatisticsByDay(pd); + pd.put("HIDDENLEVEL", "hiddenLevel0002");// 一般隐患 + List zhds = hiddenService.hiddenStatisticsByDay(pd); - List hdAll = hiddenService.hiddenStatisticsAll(pd); - map.put("nhds", nhds); - map.put("zhds", zhds); - map.put("hdAll", hdAll); - map.put("result", errInfo); - return map; - } + List hdAll = hiddenService.hiddenStatisticsAll(pd); + map.put("nhds", nhds); + map.put("zhds", zhds); + map.put("hdAll", hdAll); + map.put("result", errInfo); + return map; + } - /** - * 首页统计 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getIndexCount") - @ResponseBody - public Object getIndexCount() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - List varList = hiddenService.getBICount(pd); - if (varList != null && varList.size() > 0) { - map.put("total", varList.size()); - int checked = 0; - int uncheck = 0; - for (PageData hidden : varList) { - if (hidden.get("STATE").toString().equals("4")||hidden.get("STATE").toString().equals("2")) { - checked++; - } else { - uncheck++; - } + /** + * 首页统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getIndexCount") + @ResponseBody + public Object getIndexCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = hiddenService.getBICount(pd); + if (varList != null && varList.size() > 0) { + map.put("total", varList.size()); + int checked = 0; + int uncheck = 0; + for (PageData hidden : varList) { + if (hidden.get("STATE").toString().equals("4") || hidden.get("STATE").toString().equals("2")) { + checked++; + } else { + uncheck++; + } - } - map.put("checked", checked); - map.put("uncheck", uncheck); - } else { - map.put("total", 0); - map.put("checked", 0); - map.put("uncheck", 0); - } + } + map.put("checked", checked); + map.put("uncheck", uncheck); + } else { + map.put("total", 0); + map.put("checked", 0); + map.put("uncheck", 0); + } - map.put("result", errInfo); - return map; - } - /** - * 获取检查记录风险点 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getChcenkHidden") - @ResponseBody - public Object getChcenkHidden() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - List hiddenList = hiddenService.getOtherHidden(pd); - map.put("result", errInfo); - map.put("hiddenList", hiddenList); - return map; - } - /** - * 列表 隐患列表接口 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/listGwj") - @ResponseBody - public Object listGwj(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if(Tools.isEmpty(pd.get("loginUserId"))){ // 由我确认的隐患 - map.put("varList", new ArrayList<>()); - map.put("page", page); - map.put("result", "Error"); - map.put("msg", "未找到登录人信息，请联系管理员"); - } + map.put("result", errInfo); + return map; + } + + /** + * 获取检查记录风险点 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getChcenkHidden") + @ResponseBody + public Object getChcenkHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List hiddenList = hiddenService.getOtherHidden(pd); + map.put("result", errInfo); + map.put("hiddenList", hiddenList); + return map; + } + + /** + * 列表 隐患列表接口 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listGwj") + @ResponseBody + public Object listGwj(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (Tools.isEmpty(pd.get("loginUserId"))) { // 由我确认的隐患 + map.put("varList", new ArrayList<>()); + map.put("page", page); + map.put("result", "Error"); + map.put("msg", "未找到登录人信息，请联系管理员"); + } /* 1. 让我确认的信息 -- 确认人是我的隐患 @@ -1701,410 +1714,412 @@ public class AppHiddenController extends BaseController { 3.让我验收的隐患 */ - if("0".equals(pd.getString("stateConfirm"))){ //确认的隐患 stateConfirm：0全部 。1未确认的，2已确认的 - pd.put("CONFIRM_USER",pd.get("loginUserId")); - } - if("0".equals(pd.getString("stateRectify"))){ //我整改的隐患 - pd.put("RECTIFICATIONOR",pd.get("loginUserId")); - pd.put("STATE","1"); - } - if (!Tools.isEmpty(pd.get("corpinfoId"))){ - pd.put("CORPINFO_ID",pd.getString("corpinfoId")); - } - page.setPd(pd); - List varList = hiddenService.listGwj(page); // 列出Hidden列表 - varList = hiddenUserService.getHiddebFind(varList); //添加发现人 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + if ("0".equals(pd.getString("stateConfirm"))) { //确认的隐患 stateConfirm：0全部 。1未确认的，2已确认的 + pd.put("CONFIRM_USER", pd.get("loginUserId")); + } + if ("0".equals(pd.getString("stateRectify"))) { //我整改的隐患 + pd.put("RECTIFICATIONOR", pd.get("loginUserId")); + pd.put("STATE", "1"); + } + if (!Tools.isEmpty(pd.get("corpinfoId"))) { + pd.put("CORPINFO_ID", pd.getString("corpinfoId")); + } + page.setPd(pd); + List varList = hiddenService.listGwj(page); // 列出Hidden列表 + varList = hiddenUserService.getHiddebFind(varList); //添加发现人 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * 列表 隐患列表接口 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/listIgnore") - @ResponseBody - public Object listIgnore(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if(Tools.isEmpty(pd.get("loginUserId"))){ // 由我确认的隐患 - map.put("varList", new ArrayList<>()); - map.put("page", page); - map.put("result", "Error"); - map.put("msg", "未找到登录人信息，请联系管理员"); - } - pd.put("CONFIRM_USER",pd.getString("loginUserId")); - if (!Tools.isEmpty(pd.get("corpinfoId"))){ - pd.put("CORPINFO_ID",pd.getString("corpinfoId")); - } - page.setPd(pd); - List varList = hiddenService.listIgnore(page); // 列出Hidden列表 - varList = hiddenUserService.getHiddebFind(varList); //添加发现人 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + /** + * 列表 隐患列表接口 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listIgnore") + @ResponseBody + public Object listIgnore(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (Tools.isEmpty(pd.get("loginUserId"))) { // 由我确认的隐患 + map.put("varList", new ArrayList<>()); + map.put("page", page); + map.put("result", "Error"); + map.put("msg", "未找到登录人信息，请联系管理员"); + } + pd.put("CONFIRM_USER", pd.getString("loginUserId")); + if (!Tools.isEmpty(pd.get("corpinfoId"))) { + pd.put("CORPINFO_ID", pd.getString("corpinfoId")); + } + page.setPd(pd); + List varList = hiddenService.listIgnore(page); // 列出Hidden列表 + varList = hiddenUserService.getHiddebFind(varList); //添加发现人 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * --确认隐患 - * - * @throws Exception - */ - @RequestMapping(value = "/confirm") - @ResponseBody - public Object confirmUpdate() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if("1".equals(pd.get("isEmis"))){ - errInfo = hiddenService.goEmis(pd); - if("success".equals(errInfo)){ - map.put("result", errInfo); - return map; - }else{ - map.put("result", "errInfo"); - map.put("msg", errInfo); - return map; - } - } - PageData editHidden = new PageData(); - if("hiddenLevel1001".equals(pd.getString("HIDDENLEVEL"))){ // 如果是忽略隐患 - editHidden.put("STATE","5"); - applicationContext.publishEvent(new DeviceHiddenEvent(new Object(),pd.getString("HIDDEN_ID"),"0")); - }else if("hiddenLevel2002".equals(pd.getString("HIDDENLEVEL"))){ // 如果是是重大隐患 - editHidden.put("STATE","6"); - }else { - editHidden.put("STATE","1"); - } + /** + * --确认隐患 + * + * @throws Exception + */ + @RequestMapping(value = "/confirm") + @ResponseBody + public Object confirmUpdate() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if ("1".equals(pd.get("isEmis"))) { + errInfo = hiddenService.goEmis(pd); + if ("success".equals(errInfo)) { + map.put("result", errInfo); + return map; + } else { + map.put("result", "errInfo"); + map.put("msg", errInfo); + return map; + } + } + PageData editHidden = new PageData(); + if ("hiddenLevel1001".equals(pd.getString("HIDDENLEVEL"))) { // 如果是忽略隐患 + editHidden.put("STATE", "5"); + applicationContext.publishEvent(new DeviceHiddenEvent(new Object(), pd.getString("HIDDEN_ID"), "0")); + } else if ("hiddenLevel2002".equals(pd.getString("HIDDENLEVEL"))) { // 如果是是重大隐患 + editHidden.put("STATE", "6"); + } else { + editHidden.put("STATE", "1"); + } - editHidden.put("CONFIRM_USER",pd.get("USER_ID")); // 隐患确认人 - editHidden.put("CONFIRM_TIME",DateUtil.date2Str(new Date())); // 隐患确认时间 - editHidden.put("RECTIFICATIONDEPT",pd.get("RECTIFICATIONDEPT")); // 整改部门 - editHidden.put("RECTIFICATIONOR",pd.get("RECTIFICATIONOR")); // 整改人 - editHidden.put("RECTIFICATIONDEADLINE",pd.get("RECTIFICATIONDEADLINE")); // 整改期限 - editHidden.put("HIDDENLEVEL",pd.get("HIDDENLEVEL")); // 隐患级别 - editHidden.put("HIDDEN_ID",pd.get("HIDDEN_ID")); // 隐患id - editHidden.put("RECTIFICATIONTYPE",pd.get("RECTIFICATIONTYPE")); - PageData hidden = hiddenService.findById(pd); - if("1".equals(hidden.get("RECTIFICATIONTYPE")+"")){ - editHidden.put("STATE","4"); - } - PageData exaPd = new PageData(); // 添加隐患确认信息 - exaPd.put("TYPE","4"); - exaPd.put("STATE","2"); - exaPd.put("HIDDEN_ID",hidden.get("HIDDEN_ID")); - exaPd.put("spare1",pd.getString("HIDDENLEVEL")); - exaPd.put("spare2",pd.getString("RECTIFICATIONOR")); - exaPd.put("spare3",pd.getString("RECTIFICATIONDEADLINE")); - exaPd.put("spare4",pd.getString("RECTIFICATIONDEPT")); - exaPd.put("CREATOR", pd.getString("loginUserId")); - exaPd.put("OPERATOR",pd.getString("loginUserId")); - hiddenExamineService.saveApp(exaPd); - if("1".equals(hidden.get("RECTIFICATIONTYPE")+"")){ //确认时判断是否是立即整改 - if(pd.getString("isTrue").equals("1")){ - editHidden.put("STATE","4"); - editHidden.put("CHECKOR",hidden.getString("CREATOR")); - }else { - editHidden.put("STATE","1"); - editHidden.put("RECTIFICATIONTYPE","2"); - } - } - pd.put("STATE", pd.getString("HIDDEN_STATUS")); - List list = hiddenService.listOtherNotAssign(pd); - PageData inspection = new PageData(); - inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); - inspection.put("OPERATOR", pd.getString("OPERATOR")); - inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); - if ("-2".equals(pd.getString("HIDDEN_STATUS"))) { - pd.put("ISCONFIRM", "0"); // - pd.put("CONFIRM_TIME",DateUtil.date2Str(new Date())); - if (list.size() == 0) { - inspection.put("INSPECTION_STATUS", "5"); // 指派完成 - } else { - inspection.put("INSPECTION_STATUS", "4"); // 指派中 - } - safetyenvironmentalService.editStatus(inspection); - } - hiddenService.confirmHidden(editHidden); // 隐患确认 - if(Tools.notEmpty(pd.getString("RECTIFICATIONOR")) && !hidden.getString("RECTIFICATIONTYPE").equals("1")){ - messageService.sendMessageByParameter("HIDDEN_MAIL_002","友情提示：有一条隐患需要整改", - hidden.getString("CORPINFO_ID"),pd.getString("USER_ID"),hidden.getString("HIDDEN_ID"), - hidden.getString("HIDDENDESCR"),"隐患整改","整改","",""); - }else if("1".equals(hidden.getString("RECTIFICATIONTYPE"))){ - messageService.sendMessageByParameter("HIDDEN_MAIL_003","友情提示：有一条隐患已验收", - hidden.getString("CORPINFO_ID"),pd.getString("USER_ID"),hidden.getString("HIDDEN_ID"), - hidden.getString("HIDDENDESCR"),"通过","整改","",""); - } - List repulsecause = hiddenExamineService.findByHiddenId(pd);//确认人打回信息 - if(repulsecause.size()>0){ - for(PageData IDS:repulsecause){ - PageData repulse = new PageData(); - repulse.put("HIDDENEXAMINE_ID",IDS.getString("HIDDENEXAMINE_ID")); - hiddenExamineService.editrepulse(repulse); //有打回记录的隐患信息，把spare5改成1。确认通过后就不显示出来 - } - } + editHidden.put("CONFIRM_USER", pd.get("USER_ID")); // 隐患确认人 + editHidden.put("CONFIRM_TIME", DateUtil.date2Str(new Date())); // 隐患确认时间 + editHidden.put("RECTIFICATIONDEPT", pd.get("RECTIFICATIONDEPT")); // 整改部门 + editHidden.put("RECTIFICATIONOR", pd.get("RECTIFICATIONOR")); // 整改人 + editHidden.put("RECTIFICATIONDEADLINE", pd.get("RECTIFICATIONDEADLINE")); // 整改期限 + editHidden.put("HIDDENLEVEL", pd.get("HIDDENLEVEL")); // 隐患级别 + editHidden.put("HIDDEN_ID", pd.get("HIDDEN_ID")); // 隐患id + editHidden.put("RECTIFICATIONTYPE", pd.get("RECTIFICATIONTYPE")); + PageData hidden = hiddenService.findById(pd); + if ("1".equals(hidden.get("RECTIFICATIONTYPE") + "")) { + editHidden.put("STATE", "4"); + } + PageData exaPd = new PageData(); // 添加隐患确认信息 + exaPd.put("TYPE", "4"); + exaPd.put("STATE", "2"); + exaPd.put("HIDDEN_ID", hidden.get("HIDDEN_ID")); + exaPd.put("spare1", pd.getString("HIDDENLEVEL")); + exaPd.put("spare2", pd.getString("RECTIFICATIONOR")); + exaPd.put("spare3", pd.getString("RECTIFICATIONDEADLINE")); + exaPd.put("spare4", pd.getString("RECTIFICATIONDEPT")); + exaPd.put("CREATOR", pd.getString("loginUserId")); + exaPd.put("OPERATOR", pd.getString("loginUserId")); + hiddenExamineService.saveApp(exaPd); + if ("1".equals(hidden.get("RECTIFICATIONTYPE") + "")) { //确认时判断是否是立即整改 + if (pd.getString("isTrue").equals("1")) { + editHidden.put("STATE", "4"); + editHidden.put("CHECKOR", hidden.getString("CREATOR")); + } else { + editHidden.put("STATE", "1"); + editHidden.put("RECTIFICATIONTYPE", "2"); + } + } + pd.put("STATE", pd.getString("HIDDEN_STATUS")); + List list = hiddenService.listOtherNotAssign(pd); + PageData inspection = new PageData(); + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("OPERATOR")); + inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); + if ("-2".equals(pd.getString("HIDDEN_STATUS"))) { + pd.put("ISCONFIRM", "0"); // + pd.put("CONFIRM_TIME", DateUtil.date2Str(new Date())); + if (list.size() == 0) { + inspection.put("INSPECTION_STATUS", "5"); // 指派完成 + } else { + inspection.put("INSPECTION_STATUS", "4"); // 指派中 + } + safetyenvironmentalService.editStatus(inspection); + } + hiddenService.confirmHidden(editHidden); // 隐患确认 + if (Tools.notEmpty(pd.getString("RECTIFICATIONOR")) && !hidden.getString("RECTIFICATIONTYPE").equals("1")) { + messageService.sendMessageByParameter("HIDDEN_MAIL_002", "友情提示：有一条隐患需要整改", + hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), + hidden.getString("HIDDENDESCR"), "隐患整改", "整改", "", ""); + } else if ("1".equals(hidden.getString("RECTIFICATIONTYPE"))) { + messageService.sendMessageByParameter("HIDDEN_MAIL_003", "友情提示：有一条隐患已验收", + hidden.getString("CORPINFO_ID"), pd.getString("USER_ID"), hidden.getString("HIDDEN_ID"), + hidden.getString("HIDDENDESCR"), "通过", "整改", "", ""); + } + List repulsecause = hiddenExamineService.findByHiddenId(pd);//确认人打回信息 + if (repulsecause.size() > 0) { + for (PageData IDS : repulsecause) { + PageData repulse = new PageData(); + repulse.put("HIDDENEXAMINE_ID", IDS.getString("HIDDENEXAMINE_ID")); + hiddenExamineService.editrepulse(repulse); //有打回记录的隐患信息，把spare5改成1。确认通过后就不显示出来 + } + } - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /** - * 获取隐患部位列表(菜单管理) - * @return - */ - @RequestMapping(value="/getTreehiddenRegionListAll") - @ResponseBody - public Object getTreehiddenRegionListAll()throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - JSONArray arr = JSONArray.fromObject(hiddenRegionService.listAll("0" , pd.getString("CORPINFO_ID"))); - String json = arr.toString(); - json = json.replaceAll("HIDDENREGION_ID", "id") - .replaceAll("PARENT_ID", "pId") - .replaceAll("HIDDENREGION", "name") - .replaceAll("subhiddenRegion", "children") - .replaceAll("hashiddenRegion", "checked") - .replaceAll("HIDDENREGION_URL", "url"); - map.put("zTreeNodes", json); - map.put("result", errInfo); - return map; - } + /** + * 获取隐患部位列表(菜单管理) + * + * @return + */ + @RequestMapping(value = "/getTreehiddenRegionListAll") + @ResponseBody + public Object getTreehiddenRegionListAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + JSONArray arr = JSONArray.fromObject(hiddenRegionService.listAll("0", pd.getString("CORPINFO_ID"))); + String json = arr.toString(); + json = json.replaceAll("HIDDENREGION_ID", "id") + .replaceAll("PARENT_ID", "pId") + .replaceAll("HIDDENREGION", "name") + .replaceAll("subhiddenRegion", "children") + .replaceAll("hashiddenRegion", "checked") + .replaceAll("HIDDENREGION_URL", "url"); + map.put("zTreeNodes", json); + map.put("result", errInfo); + return map; + } - /** - * 获取部门检查数据 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getDeptIndexData") - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "首页",instructionsOperate = "首页",instructionsType = "获取部门检查数据") - public Object getDeptIndexData() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - map.put("pd", hiddenService.getDeptIndexData(pd)); - map.put("result", errInfo); // 返回结果 - return map; - } + /** + * 获取部门检查数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getDeptIndexData") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "首页", instructionsOperate = "首页", instructionsType = "获取部门检查数据") + public Object getDeptIndexData() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + map.put("pd", hiddenService.getDeptIndexData(pd)); + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * 获取检查记录风险点 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getHiddenByCorp") - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "获取检查记录风险点") - public Object getHiddenByCorp() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - List hiddenList = hiddenService.listAllRoll(pd); - map.put("result", errInfo); - map.put("hiddenList", hiddenList); - return map; - } + /** + * 获取检查记录风险点 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getHiddenByCorp") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "隐患", instructionsOperate = "隐患", instructionsType = "获取检查记录风险点") + public Object getHiddenByCorp() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List hiddenList = hiddenService.listAllRoll(pd); + map.put("result", errInfo); + map.put("hiddenList", hiddenList); + return map; + } - /** - * 获取监管部门检查数据 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getSuperviseDeptIndexData") - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "首页",instructionsOperate = "首页",instructionsType = "获取监管部门检查数据") - public Object getSuperviseDeptIndexData() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData od = departmentService.findById(pd); - if(od != null){ - if(od.getString("ISSUPERVISE").equals("1")){ //判断是否是监管部门 - pd.put("SUP_DEPARTMENT_ID", od.getString("DEPARTMENT_ID")); - List subdept = departmentService.findBySubId(pd); //查询监管哪些部门 - ArrayList arr = new ArrayList(); - for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData od = departmentService.findById(pd); + if (od != null) { + if (od.getString("ISSUPERVISE").equals("1")) { //判断是否是监管部门 + pd.put("SUP_DEPARTMENT_ID", od.getString("DEPARTMENT_ID")); + List subdept = departmentService.findBySubId(pd); //查询监管哪些部门 + ArrayList arr = new ArrayList(); + for (int i = 0; i < subdept.size(); i++) { + arr.add(subdept.get(i).getString("SUB_DEPARTMENT_ID")); + } + pd.put("SUB_DEPARTMENT_ID", arr); + map.put("pd", hiddenService.getSuperviseDeptIndexData(pd)); + } + } + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * 获取个人检查数据 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getUserIndexData") - @ResponseBody - @LogAnno(menuType= "手机",menuServer= "首页",instructionsOperate = "首页",instructionsType = "获取个人检查数据") - public Object getUserIndexData() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - map.put("pd", hiddenService.getUserIndexData(pd)); - map.put("result", errInfo); // 返回结果 - return map; - } + /** + * 获取个人检查数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getUserIndexData") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "首页", instructionsOperate = "首页", instructionsType = "获取个人检查数据") + public Object getUserIndexData() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + map.put("pd", hiddenService.getUserIndexData(pd)); + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * 列表 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/listForSafetyEnvironmental") - @ResponseBody - public Object listForSafetyEnvironmental(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listForSafetyEnvironmental") + @ResponseBody + public Object listForSafetyEnvironmental(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); - page.setPd(pd); + page.setPd(pd); - List varList = hiddenService.listForSafetyEnvironmental(page); // 列出Hidden列表 - varList = hiddenUserService.getHiddebFind(varList); - //对于超期数据状态的 - varList.stream() - .filter(n -> "1".equals(n.getString("STATE"))) - .forEach(n -> { - String limit_date = n.getString("RECTIFICATIONDEADLINE"); - if (StringUtils.isNotBlank(limit_date)) { - if ("1".equals(n.getString("RECTIFICATIONTYPE"))) { - if (DateUtil.fomatDate(limit_date).getTime() < new Date().getTime()) - n.put("OVERTIME_FLAG", "1"); - } else { - if (DateUtil.fomatDate(limit_date).getTime() < new Date().getTime()) - n.put("OVERTIME_FLAG", "2"); - } - } - }); - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } - /** - * 安全环保检查隐患指派 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/assign") - @ResponseBody - public Object assign() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); + List varList = hiddenService.listForSafetyEnvironmental(page); // 列出Hidden列表 + varList = hiddenUserService.getHiddebFind(varList); + //对于超期数据状态的 + varList.stream() + .filter(n -> "1".equals(n.getString("STATE"))) + .forEach(n -> { + String limit_date = n.getString("RECTIFICATIONDEADLINE"); + if (StringUtils.isNotBlank(limit_date)) { + if ("1".equals(n.getString("RECTIFICATIONTYPE"))) { + if (DateUtil.fomatDate(limit_date).getTime() < new Date().getTime()) + n.put("OVERTIME_FLAG", "1"); + } else { + if (DateUtil.fomatDate(limit_date).getTime() < new Date().getTime()) + n.put("OVERTIME_FLAG", "2"); + } + } + }); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 安全环保检查隐患指派 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/assign") + @ResponseBody + public Object assign() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); // PageData hidden = hiddenService.findById(pd); - pd.put("STATE", pd.getString("HIDDEN_STATUS")); - List list = hiddenService.listOtherNotAssign(pd); - PageData inspection = new PageData(); - inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); - inspection.put("OPERATOR", pd.getString("OPERATOR")); - inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); - if ("-2".equals(pd.getString("HIDDEN_STATUS"))) { - pd.put("ISCONFIRM", "0"); // - pd.put("CONFIRM_TIME",DateUtil.date2Str(new Date())); - if (list.size() == 0) { - inspection.put("INSPECTION_STATUS", "5"); // 指派完成 - } else { - inspection.put("INSPECTION_STATUS", "4"); // 指派中 - } - safetyenvironmentalService.editStatus(inspection); - } - hiddenService.assign(pd); - if(Tools.notEmpty(pd.getString("CONFIRM_USER"))){ - messageService.sendMessageByParameter("HIDDEN_MAIL_001","友情提示：有一条隐患需要确定",pd.getString("CORPINFO_ID"), - pd.getString("CONFIRM_USER"),"", - pd.getString("HIDDENDESCR"),"隐患确认","确认","",""); - } - map.put("result", errInfo); - map.put("pd", pd); - return map; - } + pd.put("STATE", pd.getString("HIDDEN_STATUS")); + List list = hiddenService.listOtherNotAssign(pd); + PageData inspection = new PageData(); + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("OPERATOR")); + inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); + if ("-2".equals(pd.getString("HIDDEN_STATUS"))) { + pd.put("ISCONFIRM", "0"); // + pd.put("CONFIRM_TIME", DateUtil.date2Str(new Date())); + if (list.size() == 0) { + inspection.put("INSPECTION_STATUS", "5"); // 指派完成 + } else { + inspection.put("INSPECTION_STATUS", "4"); // 指派中 + } + safetyenvironmentalService.editStatus(inspection); + } + hiddenService.assign(pd); + if (Tools.notEmpty(pd.getString("CONFIRM_USER"))) { + messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确定", pd.getString("CORPINFO_ID"), + pd.getString("CONFIRM_USER"), "", + pd.getString("HIDDENDESCR"), "隐患确认", "确认", "", ""); + } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } - /** - * 安全环保检查验收 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/finalcheck") - @ResponseBody - public Object finalcheck() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - hiddenService.finalcheck(pd); - if ("1".equals(pd.get("FINAL_CHECK").toString())) { - if (Tools.notEmpty(pd.getString("INSPECTION_ID"))) { //安全环保检查验收 - pd.put("ACCEPTSTEP", 7); - List list = hiddenService.listOtherNotAccept4pc(pd); - if (list.size() == 0) { - PageData inspection = new PageData(); - inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); - inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR")); - inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); - inspection.put("INSPECTION_STATUS", "7"); // 已验收 - safetyenvironmentalService.editStatus(inspection); - } - } - } else { - PageData pd2 = new PageData(); - pd2.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); - pd2.put("TYPE", "4"); - List zgImgs = imgFilesService.listAll(pd2); - for (PageData pageData : zgImgs) { + /** + * 安全环保检查验收 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/finalcheck") + @ResponseBody + public Object finalcheck() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hiddenService.finalcheck(pd); + if ("1".equals(pd.get("FINAL_CHECK").toString())) { + if (Tools.notEmpty(pd.getString("INSPECTION_ID"))) { //安全环保检查验收 + pd.put("ACCEPTSTEP", 7); + List list = hiddenService.listOtherNotAccept4pc(pd); + if (list.size() == 0) { + PageData inspection = new PageData(); + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR")); + inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); + inspection.put("INSPECTION_STATUS", "7"); // 已验收 + safetyenvironmentalService.editStatus(inspection); + } + } + } else { + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + pd2.put("TYPE", "4"); + List zgImgs = imgFilesService.listAll(pd2); + for (PageData pageData : zgImgs) { - imgFilesService.delete(pageData); - if(Tools.notEmpty(pageData.getString("FILEPATH"))) { - smb.deleteFile(pageData.getString("FILEPATH")); - } - } - PageData hidden = new PageData(); - hidden.put("HIDDEN_ID", pd.get("HIDDEN_ID")); - hidden.put("STATE", "101"); //修改隐患表状态为验收打回 - hiddenService.changeState(hidden); + imgFilesService.delete(pageData); + if (Tools.notEmpty(pageData.getString("FILEPATH"))) { + smb.deleteFile(pageData.getString("FILEPATH")); + } + } + PageData hidden = new PageData(); + hidden.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + hidden.put("STATE", "101"); //修改隐患表状态为验收打回 + hiddenService.changeState(hidden); - PageData inspection = new PageData(); - inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); - inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR")); - inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); - inspection.put("INSPECTION_STATUS", "3"); // 安全环保检查打回到归档，隐患待指派 - safetyenvironmentalService.editStatus(inspection); + PageData inspection = new PageData(); + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR")); + inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); + inspection.put("INSPECTION_STATUS", "3"); // 安全环保检查打回到归档，隐患待指派 + safetyenvironmentalService.editStatus(inspection); - inspection.put("SENDER_ID",pd.getString("FINAL_CHECKOR")); - inspection.put("SENDER_NAME",pd.getString("FINAL_CHECKOR")); - noticeUtil.SE_Repulse(inspection); - // hiddenExamineService.deleteByHiddenId(pd); //如果验收打回删除隐患相关信息 + inspection.put("SENDER_ID", pd.getString("FINAL_CHECKOR")); + inspection.put("SENDER_NAME", pd.getString("FINAL_CHECKOR")); + noticeUtil.SE_Repulse(inspection); + // hiddenExamineService.deleteByHiddenId(pd); //如果验收打回删除隐患相关信息 // hidden.put("HIDDENEXAMINE_ID",this.get32UUID()); // hidden.put("EXAMINE",pd.get("CONTENT"));//打回意见 // hidden.put("CREATOR",pd.getString("FINAL_CHECKOR")); @@ -2114,150 +2129,155 @@ public class AppHiddenController extends BaseController { // hidden.put("TYPE",3);//验收打回 // hidden.put("STATE",-1);//验收打回变成初始状态-1 // hiddenExamineService.saveApp(hidden); - } - map.put("check", pd); - map.put("result", errInfo); - return map; - } + } + map.put("check", pd); + map.put("result", errInfo); + return map; + } - /** - * 隐患确认打回 - * @param - * @throws Exception - */ - @RequestMapping(value = "/repulseHidden") - //// @RequiresPermissions("hidden:edit") - @ResponseBody - public Object repulseHidden() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - hiddenService.editstate(pd); - pd.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID()); - pd.put("CREATTIME", DateUtil.date2Str(new Date())); - pd.put("OPERATTIME",DateUtil.date2Str(new Date())); - hiddenExamineService.saverepulse(pd); - hiddenMailService.reject(pd); - map.put("result",errInfo); - return map; - } + /** + * 隐患确认打回 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/repulseHidden") + //// @RequiresPermissions("hidden:edit") + @ResponseBody + public Object repulseHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hiddenService.editstate(pd); + pd.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID()); + pd.put("CREATTIME", DateUtil.date2Str(new Date())); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + hiddenExamineService.saverepulse(pd); + hiddenMailService.reject(pd); + map.put("result", errInfo); + return map; + } - /** - * 列表 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/listV2") - @ResponseBody - public Object listV2() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - Page page = new Page(); - pd = this.getPageData(); - page.setCurrentPage(Integer.parseInt(pd.get("currentPage").toString())); - page.setShowCount(Integer.parseInt(pd.get("showCount").toString())); - page.setTotalResult(Integer.parseInt(pd.get("totalResult").toString())); + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listV2") + @ResponseBody + public Object listV2() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + Page page = new Page(); + pd = this.getPageData(); + page.setCurrentPage(Integer.parseInt(pd.get("currentPage").toString())); + page.setShowCount(Integer.parseInt(pd.get("showCount").toString())); + page.setTotalResult(Integer.parseInt(pd.get("totalResult").toString())); - pd.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); - pd.put("queryUserId",pd.getString("SELFUSERID")); - page.setPd(pd); - List varList = hiddenService.getListForTianzhang(page); // 列出Hidden列表 - varList = hiddenUserService.getHiddebFind(varList); - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + pd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + pd.put("queryUserId", pd.getString("SELFUSERID")); + page.setPd(pd); + List varList = hiddenService.getListForTianzhang(page); // 列出Hidden列表 + varList = hiddenUserService.getHiddebFind(varList); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * 判断登录人是否已经验收 - * @param - * @throws Exception - */ - @RequestMapping(value = "/isChek") - //// @RequiresPermissions("hidden:edit") - @ResponseBody - public Object isChek() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - List checkList = (List) hiddenCheckService.findByHidden(pd); - if(checkList.size()>0){ - for(PageData arr:checkList){ - if(arr.getString("STATUS").equals("1")){ - map.put("istrue","1"); - } else if (arr.getString("STATUS").equals("0")){ - map.put("istrue","0"); - } - } - } - map.put("result",errInfo); - return map; - } + /** + * 判断登录人是否已经验收 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/isChek") + //// @RequiresPermissions("hidden:edit") + @ResponseBody + public Object isChek() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List checkList = (List) hiddenCheckService.findByHidden(pd); + if (checkList.size() > 0) { + for (PageData arr : checkList) { + if (arr.getString("STATUS").equals("1")) { + map.put("istrue", "1"); + } else if (arr.getString("STATUS").equals("0")) { + map.put("istrue", "0"); + } + } + } + map.put("result", errInfo); + return map; + } - /** - * 列表 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/listRiskStandard") - @ResponseBody - public Object listRiskStandard() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - Page page = new Page(); - pd = this.getPageData(); - page.setCurrentPage(Integer.parseInt(pd.get("currentPage").toString())); - page.setShowCount(Integer.parseInt(pd.get("showCount").toString())); - page.setTotalResult(Integer.parseInt(pd.get("totalResult").toString())); + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listRiskStandard") + @ResponseBody + public Object listRiskStandard() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + Page page = new Page(); + pd = this.getPageData(); + page.setCurrentPage(Integer.parseInt(pd.get("currentPage").toString())); + page.setShowCount(Integer.parseInt(pd.get("showCount").toString())); + page.setTotalResult(Integer.parseInt(pd.get("totalResult").toString())); // String DEPARTMENT_ID = pd.getString("USERDEPT"); // String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); // if(ids!=null && Tools.notEmpty(ids)) { // ids = ids.substring(0,ids.lastIndexOf(",")); // pd.put("DEPARTMENT_IDS", ids.split(",")); // } - String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) - pd.put("KEYWORDS", KEYWORDS.trim()); - String HIDDENDESCR = pd.getString("HIDDENDESCR"); // 关键词检索条件 - if (Tools.notEmpty(HIDDENDESCR)) - pd.put("HIDDENDESCR", HIDDENDESCR.trim()); - String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 - if (Tools.notEmpty(ISQUALIFIED)) - pd.put("ISQUALIFIED", ISQUALIFIED.trim()); - String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 - if (Tools.notEmpty(HIDDENLEVELE)) - pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); - String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 - if (Tools.notEmpty(STARTTIME)) - pd.put("STARTTIME", STARTTIME.trim()); - String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 - if (Tools.notEmpty(ENDTIME)) - pd.put("ENDTIME", ENDTIME.trim()); - if (pd.get("isIndex") != null && Tools.notEmpty(pd.get("isIndex").toString()) - && pd.get("isIndex").toString().equals("1")) { - pd.put("SELF_USER_ID", pd.get("SELFUSERID")); - } - pd.put("ISMAIN", "0"); - String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 - if (Tools.notEmpty(DISPOSESTATE)) { - pd.put("DISPOSESTATE", DISPOSESTATE.trim()); - pd.put("SELFUSERID", pd.get("SELFUSERID")); - pd.put("USERDEPT", pd.get("USERDEPT")); - } - page.setPd(pd); - List varList = hiddenService.listRiskStandard(page); // 列出Hidden列表 - varList = hiddenUserService.getRiskStandardHiddenFindUser(varList); - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + pd.put("KEYWORDS", KEYWORDS.trim()); + String HIDDENDESCR = pd.getString("HIDDENDESCR"); // 关键词检索条件 + if (Tools.notEmpty(HIDDENDESCR)) + pd.put("HIDDENDESCR", HIDDENDESCR.trim()); + String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 + if (Tools.notEmpty(ISQUALIFIED)) + pd.put("ISQUALIFIED", ISQUALIFIED.trim()); + String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 + if (Tools.notEmpty(HIDDENLEVELE)) + pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); + String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 + if (Tools.notEmpty(STARTTIME)) + pd.put("STARTTIME", STARTTIME.trim()); + String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 + if (Tools.notEmpty(ENDTIME)) + pd.put("ENDTIME", ENDTIME.trim()); + if (pd.get("isIndex") != null && Tools.notEmpty(pd.get("isIndex").toString()) + && pd.get("isIndex").toString().equals("1")) { + pd.put("SELF_USER_ID", pd.get("SELFUSERID")); + } + if ("undefined".equals(pd.getString("isIndex"))) { + pd.put("isIndex", ""); + } + pd.put("ISMAIN", "0"); + String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 + if (Tools.notEmpty(DISPOSESTATE)) { + pd.put("DISPOSESTATE", DISPOSESTATE.trim()); + pd.put("SELFUSERID", pd.get("SELFUSERID")); + pd.put("USERDEPT", pd.get("USERDEPT")); + } + page.setPd(pd); + List varList = hiddenService.listRiskStandard(page); // 列出Hidden列表 + varList = hiddenUserService.getRiskStandardHiddenFindUser(varList); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java new file mode 100644 index 0000000..1c1b171 --- /dev/null +++ b/src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java @@ -0,0 +1,155 @@ +package com.zcloud.controller.assignedManage; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.assignedManage.AssignedManageService; +import com.zcloud.service.taxationManage.TaxationManageService; +import com.zcloud.util.*; +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.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; + +@Controller +@RequestMapping("/assignedmanage") +public class AssignedManageController extends BaseController { + + @Autowired + private AssignedManageService assignedManageService; + + @Autowired + private Smb smb; + + /**新增 + * @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(); + pd.put("ASSIGNED_ID", this.get32UUID()); //车船税主键 + pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id + pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + pd.put("ASSIGNED_DATE", pd.get("TRANSACTION_DATE")); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("VEHICLE_TYPE",pd.get("ASSIGNED_VEHICLE_MODEL")); + pd.put("NOW_CONTACT_NUMBER",pd.get("NOW_OWNERS_NUMBER")); + assignedManageService.save(pd); + 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(); + pd.put("DELETOR", Jurisdiction.getUSER_ID()); + pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETTIME", DateUtil.date2Str(new Date())); + assignedManageService.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(); + pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id + pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + String expireDate = pd.getString("EXPIRE_DATE"); + String day = DateUtil.getDay(); + boolean flag = DateUtil.compareDate(expireDate, day); + if(flag) { + pd.put("EXPIRE_STATUS","expirestatus_01"); + }else{ + pd.put("EXPIRE_STATUS","expirestatus_02"); + } + assignedManageService.edit(pd); + 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 = assignedManageService.findById(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @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 = assignedManageService.list(page); //列出MajorDangerSource列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/operationvehicleList") + @ResponseBody + public Object operationVehicleList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String corpId = Jurisdiction.getCORPINFO_ID(); + List list = assignedManageService.operationVehicleList(corpId); //列出Question列表 + map.put("list", list); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/eightwork/AppBlindBoardController.java b/src/main/java/com/zcloud/controller/eightwork/AppBlindBoardController.java new file mode 100644 index 0000000..8c7e34f --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/AppBlindBoardController.java @@ -0,0 +1,262 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.BlindBoardInfoService; +import com.zcloud.service.eightwork.BlindBoardService; +import com.zcloud.util.Const; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Smb; +import com.zcloud.util.Tools; +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 org.springframework.web.multipart.MultipartRequest; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：动土作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/blindboard") +public class AppBlindBoardController extends BaseController { + + @Autowired + private BlindBoardService blindboardService; + @Autowired + private BlindBoardInfoService blindboardinfoService; + @Autowired + private Smb smb; + + /** + * 新增 + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "新增") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + blindboardService.save(pd); + map.put("result", errInfo); + return map; + } + + /** + * 修改 + * @param + * @throws Exception + */ + @RequestMapping(value = "/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(); + blindboardService.edit(pd); + map.put("result", errInfo); + return map; + } + /** + * 删除 + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "删除") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + blindboardService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/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()); + page.setPd(pd); + List varList = blindboardService.list(page); //列出blindboard列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = blindboardService.findById(pd); + map.put("result",errInfo); + map.put("pd",pd); + map.put("boardList", blindboardinfoService.listAll(pd)); + return map; + } + + /**上传图 + * @param + * @throws Exception + */ + @RequestMapping(value="/uploadImg") + @ResponseBody + @Transactional + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "上传图片") + public Object uploadImg( + @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 != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + + map.put("result", errInfo); + return map; + } + + @RequestMapping("/listSignFinished") + @ResponseBody + public Object listSignFinished() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData signs = blindboardService.listSignFinished(pd); + map.put("result",errInfo); + map.put("signs",signs); + return map; + } + + @RequestMapping("/nextStep") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "通过") + public Object nextStep(MultipartRequest request) throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List fileList = new ArrayList(); + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + fileList.add(request.getFile("file" + i)); + } + blindboardService.nextStep(pd, fileList.toArray(new MultipartFile[fileList.size()])); + map.put("result",errInfo); + return map; + } + + + @RequestMapping("/checkWorkCount") + @ResponseBody + public Object checkWorkCount() throws Exception{ + Map map = new HashMap<>(); + String errorInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + map.put("count",blindboardService.checkWorkCount(pd)); + map.put("result",errorInfo); + return map; + } + + @RequestMapping("/listAllMeasures") + @ResponseBody + public Object listAllMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresList = blindboardService.listAllMeasures(); + map.put("result",errInfo); + map.put("measuresList",measuresList); + return map; + } + + @RequestMapping("/listAllMeasuresForSign") + @ResponseBody + public Object listAllMeasuresForSign() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresForSignList = blindboardService.listAllMeasuresForSign(pd); + map.put("result",errInfo); + map.put("measuresForSignList",measuresForSignList); + return map; + } + + @RequestMapping("/listSignFinishMeasures") + @ResponseBody + public Object listSignFinishMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List finishMeasuresList = blindboardService.listSignFinishMeasures(pd); + map.put("result",errInfo); + map.put("finishMeasuresList",finishMeasuresList); + return map; + } + + /**获取动土作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取动土作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List flowList = blindboardService.getFlowList(pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/eightwork/AppBreakGroundController.java b/src/main/java/com/zcloud/controller/eightwork/AppBreakGroundController.java new file mode 100644 index 0000000..aae930f --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/AppBreakGroundController.java @@ -0,0 +1,258 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.BreakGroundService; +import com.zcloud.util.Const; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Smb; +import com.zcloud.util.Tools; +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 org.springframework.web.multipart.MultipartRequest; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：动土作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/breakground") +public class AppBreakGroundController extends BaseController { + + @Autowired + private BreakGroundService breakgroundService; + @Autowired + private Smb smb; + + /** + * 新增 + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "新增") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + breakgroundService.save(pd); + map.put("result", errInfo); + return map; + } + + /** + * 修改 + * @param + * @throws Exception + */ + @RequestMapping(value = "/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(); + breakgroundService.edit(pd); + map.put("result", errInfo); + return map; + } + /** + * 删除 + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "删除") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + breakgroundService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/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()); + page.setPd(pd); + List varList = breakgroundService.list(page); //列出breakground列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = breakgroundService.findById(pd); + map.put("result",errInfo); + map.put("pd",pd); + return map; + } + + /**上传图 + * @param + * @throws Exception + */ + @RequestMapping(value="/uploadImg") + @ResponseBody + @Transactional + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "上传图片") + public Object uploadImg( + @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 != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + + map.put("result", errInfo); + return map; + } + + @RequestMapping("/listSignFinished") + @ResponseBody + public Object listSignFinished() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData signs = breakgroundService.listSignFinished(pd); + map.put("result",errInfo); + map.put("signs",signs); + return map; + } + + @RequestMapping("/nextStep") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "通过") + public Object nextStep(MultipartRequest request) throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List fileList = new ArrayList(); + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + fileList.add(request.getFile("file" + i)); + } + breakgroundService.nextStep(pd, fileList.toArray(new MultipartFile[fileList.size()])); + map.put("result",errInfo); + return map; + } + + + @RequestMapping("/checkWorkCount") + @ResponseBody + public Object checkWorkCount() throws Exception{ + Map map = new HashMap<>(); + String errorInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + map.put("count",breakgroundService.checkWorkCount(pd)); + map.put("result",errorInfo); + return map; + } + + @RequestMapping("/listAllMeasures") + @ResponseBody + public Object listAllMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresList = breakgroundService.listAllMeasures(); + map.put("result",errInfo); + map.put("measuresList",measuresList); + return map; + } + + @RequestMapping("/listAllMeasuresForSign") + @ResponseBody + public Object listAllMeasuresForSign() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresForSignList = breakgroundService.listAllMeasuresForSign(pd); + map.put("result",errInfo); + map.put("measuresForSignList",measuresForSignList); + return map; + } + + @RequestMapping("/listSignFinishMeasures") + @ResponseBody + public Object listSignFinishMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List finishMeasuresList = breakgroundService.listSignFinishMeasures(pd); + map.put("result",errInfo); + map.put("finishMeasuresList",finishMeasuresList); + return map; + } + + /**获取动土作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取动土作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List flowList = breakgroundService.getFlowList(pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/eightwork/AppCutRoadController.java b/src/main/java/com/zcloud/controller/eightwork/AppCutRoadController.java new file mode 100644 index 0000000..1c62076 --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/AppCutRoadController.java @@ -0,0 +1,258 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.CutRoadService; +import com.zcloud.util.Const; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Smb; +import com.zcloud.util.Tools; +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 org.springframework.web.multipart.MultipartRequest; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：动土作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/cutroad") +public class AppCutRoadController extends BaseController { + + @Autowired + private CutRoadService cutroadService; + @Autowired + private Smb smb; + + /** + * 新增 + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "新增") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + cutroadService.save(pd); + map.put("result", errInfo); + return map; + } + + /** + * 修改 + * @param + * @throws Exception + */ + @RequestMapping(value = "/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(); + cutroadService.edit(pd); + map.put("result", errInfo); + return map; + } + /** + * 删除 + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "动土作业", instructionsOperate = "动土作业", instructionsType = "删除") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + cutroadService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/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()); + page.setPd(pd); + List varList = cutroadService.list(page); //列出cutroad列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = cutroadService.findById(pd); + map.put("result",errInfo); + map.put("pd",pd); + return map; + } + + /**上传图 + * @param + * @throws Exception + */ + @RequestMapping(value="/uploadImg") + @ResponseBody + @Transactional + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "上传图片") + public Object uploadImg( + @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 != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + + map.put("result", errInfo); + return map; + } + + @RequestMapping("/listSignFinished") + @ResponseBody + public Object listSignFinished() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData signs = cutroadService.listSignFinished(pd); + map.put("result",errInfo); + map.put("signs",signs); + return map; + } + + @RequestMapping("/nextStep") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "通过") + public Object nextStep(MultipartRequest request) throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List fileList = new ArrayList(); + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + fileList.add(request.getFile("file" + i)); + } + cutroadService.nextStep(pd, fileList.toArray(new MultipartFile[fileList.size()])); + map.put("result",errInfo); + return map; + } + + + @RequestMapping("/checkWorkCount") + @ResponseBody + public Object checkWorkCount() throws Exception{ + Map map = new HashMap<>(); + String errorInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + map.put("count",cutroadService.checkWorkCount(pd)); + map.put("result",errorInfo); + return map; + } + + @RequestMapping("/listAllMeasures") + @ResponseBody + public Object listAllMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresList = cutroadService.listAllMeasures(); + map.put("result",errInfo); + map.put("measuresList",measuresList); + return map; + } + + @RequestMapping("/listAllMeasuresForSign") + @ResponseBody + public Object listAllMeasuresForSign() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresForSignList = cutroadService.listAllMeasuresForSign(pd); + map.put("result",errInfo); + map.put("measuresForSignList",measuresForSignList); + return map; + } + + @RequestMapping("/listSignFinishMeasures") + @ResponseBody + public Object listSignFinishMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List finishMeasuresList = cutroadService.listSignFinishMeasures(pd); + map.put("result",errInfo); + map.put("finishMeasuresList",finishMeasuresList); + return map; + } + + /**获取动土作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取动土作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List flowList = cutroadService.getFlowList(pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/eightwork/AppElertricityController.java b/src/main/java/com/zcloud/controller/eightwork/AppElectricityController.java similarity index 99% rename from src/main/java/com/zcloud/controller/eightwork/AppElertricityController.java rename to src/main/java/com/zcloud/controller/eightwork/AppElectricityController.java index 12e454f..1e7845f 100644 --- a/src/main/java/com/zcloud/controller/eightwork/AppElertricityController.java +++ b/src/main/java/com/zcloud/controller/eightwork/AppElectricityController.java @@ -25,7 +25,7 @@ import java.util.Map; */ @Controller @RequestMapping("/app/electricity") -public class AppElertricityController extends BaseController { +public class AppElectricityController extends BaseController { @Autowired private ElectricityService electricityService; diff --git a/src/main/java/com/zcloud/controller/eightwork/AppHoistingController.java b/src/main/java/com/zcloud/controller/eightwork/AppHoistingController.java new file mode 100644 index 0000000..c821e58 --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/AppHoistingController.java @@ -0,0 +1,222 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.HoistingService; +import com.zcloud.util.Tools; +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 org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：吊装作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/hoisting") +public class AppHoistingController extends BaseController { + + @Autowired + private HoistingService hoistingService; + + /** + * 新增 + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "吊装作业", instructionsOperate = "吊装作业", instructionsType = "新增") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hoistingService.save(pd); + map.put("result", errInfo); + return map; + } + + /** + * 修改 + * @param + * @throws Exception + */ + @RequestMapping(value = "/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(); + hoistingService.edit(pd); + map.put("result", errInfo); + return map; + } + /** + * 删除 + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "吊装作业", instructionsOperate = "吊装作业", instructionsType = "删除") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hoistingService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/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()); + page.setPd(pd); + List varList = hoistingService.list(page); //列出hoisting列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = hoistingService.findById(pd); + map.put("result",errInfo); + map.put("pd",pd); + return map; + } + + @RequestMapping("/listSignFinished") + @ResponseBody + public Object listSignFinished() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData signs = hoistingService.listSignFinished(pd); + map.put("result",errInfo); + map.put("signs",signs); + return map; + } + + @RequestMapping("/nextStep") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "通过") + public Object nextStep(MultipartRequest request) throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List fileList = new ArrayList(); + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + fileList.add(request.getFile("file" + i)); + } + hoistingService.nextStep(pd, fileList.toArray(new MultipartFile[fileList.size()])); + map.put("result",errInfo); + return map; + } + + + @RequestMapping("/checkWorkCount") + @ResponseBody + public Object checkWorkCount() throws Exception{ + Map map = new HashMap<>(); + String errorInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + map.put("count",hoistingService.checkWorkCount(pd)); + map.put("result",errorInfo); + return map; + } + + @RequestMapping("/listAllMeasures") + @ResponseBody + public Object listAllMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresList = hoistingService.listAllMeasures(); + map.put("result",errInfo); + map.put("measuresList",measuresList); + return map; + } + + @RequestMapping("/listAllMeasuresForSign") + @ResponseBody + public Object listAllMeasuresForSign() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresForSignList = hoistingService.listAllMeasuresForSign(pd); + map.put("result",errInfo); + map.put("measuresForSignList",measuresForSignList); + return map; + } + + @RequestMapping("/listSignFinishMeasures") + @ResponseBody + public Object listSignFinishMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List finishMeasuresList = hoistingService.listSignFinishMeasures(pd); + map.put("result",errInfo); + map.put("finishMeasuresList",finishMeasuresList); + return map; + } + + /**获取吊装作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "获取吊装作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List flowList = hoistingService.getFlowList(pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/eightwork/BlindBoardController.java b/src/main/java/com/zcloud/controller/eightwork/BlindBoardController.java new file mode 100644 index 0000000..ea24d18 --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/BlindBoardController.java @@ -0,0 +1,95 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.BlindBoardInfoService; +import com.zcloud.service.eightwork.BlindBoardService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +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; + +/** + * 说明：盲板作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/blindboard") +public class BlindBoardController extends BaseController { + + @Autowired + private BlindBoardService blindboardService; + @Autowired + private BlindBoardInfoService blindBoardInfoService; + + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/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()); + page.setPd(pd); + List varList = blindboardService.list(page); //列出blindboard列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + + return map; + } + + /**获取盲板作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "盲板作业",instructionsOperate = "盲板作业",instructionsType = "获取盲板作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List flowList = blindboardService.getFlowList(pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "盲板作业",instructionsOperate = "盲板作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = blindboardService.findById(pd); + PageData signs = blindboardService.listSignFinished(pd); + List finishMeasuresList = blindboardService.listSignFinishMeasures(pd); + map.put("measuresList",finishMeasuresList); + map.put("signs",signs); + map.put("boardList", blindBoardInfoService.listAll(pd)); + map.put("pd",pd); + map.put("result",errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/eightwork/BreakGroundController.java b/src/main/java/com/zcloud/controller/eightwork/BreakGroundController.java new file mode 100644 index 0000000..883f1cb --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/BreakGroundController.java @@ -0,0 +1,91 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.BreakGroundService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +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; + +/** + * 说明：动土作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/breakground") +public class BreakGroundController extends BaseController { + + @Autowired + private BreakGroundService breakgroundService; + + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/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()); + page.setPd(pd); + List varList = breakgroundService.list(page); //列出breakground列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + + return map; + } + + /**获取动土作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取动土作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List flowList = breakgroundService.getFlowList(pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = breakgroundService.findById(pd); + PageData signs = breakgroundService.listSignFinished(pd); + List finishMeasuresList = breakgroundService.listSignFinishMeasures(pd); + map.put("measuresList",finishMeasuresList); + map.put("signs",signs); + map.put("pd",pd); + map.put("result",errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/eightwork/CutRoadController.java b/src/main/java/com/zcloud/controller/eightwork/CutRoadController.java new file mode 100644 index 0000000..a3a89bf --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/CutRoadController.java @@ -0,0 +1,91 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.CutRoadService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +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; + +/** + * 说明：断路作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/cutroad") +public class CutRoadController extends BaseController { + + @Autowired + private CutRoadService cutroadService; + + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/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()); + page.setPd(pd); + List varList = cutroadService.list(page); //列出cutroad列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + + return map; + } + + /**获取断路作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "断路作业",instructionsOperate = "断路作业",instructionsType = "获取断路作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List flowList = cutroadService.getFlowList(pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "断路作业",instructionsOperate = "断路作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = cutroadService.findById(pd); + PageData signs = cutroadService.listSignFinished(pd); + List finishMeasuresList = cutroadService.listSignFinishMeasures(pd); + map.put("measuresList",finishMeasuresList); + map.put("signs",signs); + map.put("pd",pd); + map.put("result",errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/eightwork/EightWorkController.java b/src/main/java/com/zcloud/controller/eightwork/EightWorkController.java index 18f8ce2..fbf293e 100644 --- a/src/main/java/com/zcloud/controller/eightwork/EightWorkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/EightWorkController.java @@ -2,7 +2,9 @@ package com.zcloud.controller.eightwork; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; import com.zcloud.service.corp.CorpInfoService; +import com.zcloud.service.eightwork.EightWorkService; import com.zcloud.util.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -22,6 +24,8 @@ public class EightWorkController extends BaseController { @Autowired private CorpInfoService corpInfoService; + @Autowired + private EightWorkService eightWorkService; /**新增 * @param @@ -40,4 +44,28 @@ public class EightWorkController extends BaseController { map.put("result", errInfo); return map; } + + /**持续改进企业报告 + * @param + * @throws Exception + */ + @RequestMapping(value="/getDiagnosis") + @ResponseBody + public Object getDiagnosis() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + List eightlist = eightWorkService.listAllForDiagnosis(pd); + + map.put("eightlist", eightlist); + if(pd!=null) { + errInfo = "success"; + }else { + errInfo = "faild"; + } + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/eightwork/ElectricityController.java b/src/main/java/com/zcloud/controller/eightwork/ElectricityController.java new file mode 100644 index 0000000..9c7569e --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/ElectricityController.java @@ -0,0 +1,97 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.ElectricityGasService; +import com.zcloud.service.eightwork.ElectricityService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +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; + +/** + * 说明：临时用电作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/electricity") +public class ElectricityController extends BaseController { + + @Autowired + private ElectricityService electricityService; + @Autowired + private ElectricityGasService electricityGasService; + + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/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()); + page.setPd(pd); + List varList = electricityService.list(page); //列出electricity列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + + return map; + } + + /**获取临时用电作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "临时用电作业",instructionsOperate = "临时用电作业",instructionsType = "获取临时用电作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = electricityService.findById(pd); + List flowList = electricityService.getFlowList(pd); + map.put("flowingWork", pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "临时用电作业",instructionsOperate = "临时用电作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = electricityService.findById(pd); + PageData signs = electricityService.listSignFinished(pd); + List finishMeasuresList = electricityService.listSignFinishMeasures(pd); + map.put("measuresList",finishMeasuresList); + map.put("gasList", electricityGasService.listAll(pd)); + map.put("signs",signs); + map.put("pd",pd); + map.put("result",errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/eightwork/HighworkController.java b/src/main/java/com/zcloud/controller/eightwork/HighworkController.java index 9f90022..177a200 100644 --- a/src/main/java/com/zcloud/controller/eightwork/HighworkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/HighworkController.java @@ -64,8 +64,10 @@ public class HighworkController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + pd = highworkService.findById(pd); List flowList = highworkService.getFlowList(pd); map.put("flowList", flowList); + map.put("flowingWork", pd); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/eightwork/HoistingController.java b/src/main/java/com/zcloud/controller/eightwork/HoistingController.java new file mode 100644 index 0000000..9253a4b --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/HoistingController.java @@ -0,0 +1,93 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.HoistingService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +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; + +/** + * 说明：吊装作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/hoisting") +public class HoistingController extends BaseController { + + @Autowired + private HoistingService hoistingService; + + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/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()); + page.setPd(pd); + List varList = hoistingService.list(page); //列出hoisting列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + + return map; + } + + /**获取吊装作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "获取吊装作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = hoistingService.findById(pd); + List flowList = hoistingService.getFlowList(pd); + map.put("flowingWork", pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "吊装作业",instructionsOperate = "吊装作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = hoistingService.findById(pd); + PageData signs = hoistingService.listSignFinished(pd); + List finishMeasuresList = hoistingService.listSignFinishMeasures(pd); + map.put("measuresList",finishMeasuresList); + map.put("signs",signs); + map.put("pd",pd); + map.put("result",errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java new file mode 100644 index 0000000..57dc26f --- /dev/null +++ b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java @@ -0,0 +1,233 @@ +package com.zcloud.controller.freighttrailer; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.freighttrailer.FreightTrailerService; +import com.zcloud.service.system.ImgFilesService; +import com.zcloud.util.*; +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.*; + +/** + * 企业信息管理-货运挂车 + */ +@Controller +@RequestMapping("/freightTrailer") +public class FreighttTrailerController extends BaseController { + + @Autowired + private FreightTrailerService freightTrailerService; + @Autowired + private ImgFilesService imgfilesService; + + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + // @RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR) + @ResponseBody + @LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "新增") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("FREIGHTTRAILER_ID", this.get32UUID()); //主键 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id + pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + + freightTrailerService.save(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + // @RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR) + @ResponseBody + @LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "删除") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id + pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 + freightTrailerService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + // @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR) + @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.getUSER_ID()); //修改人id + pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + freightTrailerService.edit(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + // @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR) + @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(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + page.setPd(pd); + List varList = freightTrailerService.list(page); //列出Question列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + // @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR) + @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 = freightTrailerService.findById(pd); //根据ID读取 + + pd.put("FOREIGN_KEY", pd.getString("FREIGHTTRAILER_ID")); + pd.put("TYPE",120); + List trailerImgs = imgfilesService.listAll(pd);//挂车照片 + pd.put("TYPE",121); + List drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 + pd.put("TYPE",122); + List operCertificateImgs = imgfilesService.listAll(pd);//运营证照片 + pd.put("TYPE",123); + List trailerInfoImgs = imgfilesService.listAll(pd);//挂车资料图片 + + map.put("pd", pd); + map.put("trailerImgs", trailerImgs); + map.put("drivingLicenseImgs", drivingLicenseImgs); + map.put("operCertificateImgs", operCertificateImgs); + map.put("trailerInfoImgs", trailerInfoImgs); + map.put("result", errInfo); + return map; + } + + + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/corpList") + // @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR) + @ResponseBody + @LogAnno(menuType = "基础信息管理", menuServer = "所属企业", instructionsOperate = "所属企业", instructionsType = "列表") + public Object corpList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String corpId = Jurisdiction.getCORPINFO_ID(); + List list = freightTrailerService.corpList(corpId); //列出Question列表 + map.put("list", list); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/trailerList") + // @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR) + @ResponseBody + @LogAnno(menuType = "基础信息管理", menuServer = "货运挂车", instructionsOperate = "货运挂车", instructionsType = "列表") + public Object trailerList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String corpId = Jurisdiction.getCORPINFO_ID(); + List list = freightTrailerService.trailerList(corpId); //列出Question列表 + map.put("list", list); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/vehicleList") + // @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR) + @ResponseBody + @LogAnno(menuType = "基础信息管理", menuServer = "营运车辆", instructionsOperate = "营运车辆", instructionsType = "列表") + public Object vehicleList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + List list = freightTrailerService.vehicleList(pd); //列出Question列表 + if(pd.containsKey("ID")){ + pd.put("FOREIGN_KEY", pd.getString("ID")); + pd.put("TYPE",121); + List drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片 + map.put("drivingLicenseImgs", drivingLicenseImgs); + } + map.put("list", list); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/hidden/HiddenController.java b/src/main/java/com/zcloud/controller/hidden/HiddenController.java index 1b36495..dade7f9 100644 --- a/src/main/java/com/zcloud/controller/hidden/HiddenController.java +++ b/src/main/java/com/zcloud/controller/hidden/HiddenController.java @@ -456,8 +456,8 @@ public class HiddenController extends BaseController { PageData checkUser = new PageData(); checkUser.put("HIDDENCHECK_ID", this.get32UUID()); // 主键 checkUser.put("HIDDEN_ID", pd.get("HIDDEN_ID")); - checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT")); - checkUser.put("USER_ID", pd.get("CHECKOR")); + checkUser.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + checkUser.put("USER_ID", Jurisdiction.getUSER_ID()); checkUser.put("STATUS", "0"); hiddenCheckService.save(checkUser); if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { @@ -924,6 +924,8 @@ public class HiddenController extends BaseController { List hImgs = imgFilesService.listAll(pd2);// 隐患图片 pd2.put("TYPE", 4); List rImgs = imgFilesService.listAll(pd2);// 整改图片 + pd2.put("TYPE", 50); + List yImgs = imgFilesService.listAll(pd2);// 安全环保检查验收图片 /* * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 */ // 查询整改方案 @@ -958,6 +960,7 @@ public class HiddenController extends BaseController { map.put("hs", hs); map.put("hImgs", hImgs); map.put("rImgs", rImgs); + map.put("yImgs", yImgs); // map.put("cImgs", cImgs); map.put("sImgs", sImgs); map.put("pImgs", pImgs); diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java index b51af5f..7b97d5f 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java @@ -292,6 +292,7 @@ public class AppCustomHiddenController extends BaseController { pd.put("RISK_POSITION", item.get("POSITIONNAME")); pd.put("LEVEL", item.get("DNAME5")); } + pd.put("SOURCE", "3"); customHiddenService.save(pd); // 清除同检查记录合格图片 if(pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) { @@ -453,6 +454,7 @@ public class AppCustomHiddenController extends BaseController { } } } + pd.put("SOURCE", "3"); customHiddenService.save(pd); // 发送短信 if(Tools.notEmpty(pd.getString("CONFIRM_USER")) && !pd.getString("STATE").equals("0")){ diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java index 367a5ca..9d0872f 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java @@ -45,475 +45,476 @@ import java.util.*; @RequestMapping("/customHidden") public class CustomHiddenController extends BaseController { - @Autowired - private CustomHiddenService customHiddenService; - @Autowired - private CustomHiddenUserService customHiddenUserService; // 隐患相关人员信息 - @Autowired - private ImgFilesService imgFilesService; - @Autowired - private UsersService usersService; - @Autowired - private DepartmentService departmentService; - @Autowired - private HiddenSchemeService hiddenSchemeService; - @Autowired - private CustomHiddenCheckService customHiddenCheckService; - @Autowired - private CorpInfoService corpinfoService; - @Autowired - private DictionariesService dictionariesService; - @Autowired - private CustomService customService; - @Autowired - private CustomCheckRecordItemService customCheckRecordItemService; - @Autowired - private SendMessageUtil sendMessageUtil; - @Autowired - private Smb smb; - @Autowired - private SafetyEnvironmentalService safetyenvironmentalService; - /** - * 新增 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/add") - // @RequiresPermissions("hidden:add") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单排查",instructionsType = "新增") - public Object add() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("HIDDEN_ID", this.get32UUID()); // 主键 - pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 发现人 - pd.put("HIDDENFINDDEPT", Jurisdiction.getDEPARTMENT_ID()); - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 - pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 - pd.put("ISCONFIRM", "0"); // - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id - if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { - if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { - pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 - pd.put("RECTIFICATIONOR", Jurisdiction.getUSER_ID()); // 整改人 - pd.put("RECTIFICATIONDEPT", Jurisdiction.getDEPARTMENT_ID()); - pd.put("STATE", "4"); - } else { - pd.put("STATE", "1"); + @Autowired + private CustomHiddenService customHiddenService; + @Autowired + private CustomHiddenUserService customHiddenUserService; // 隐患相关人员信息 + @Autowired + private ImgFilesService imgFilesService; + @Autowired + private UsersService usersService; + @Autowired + private DepartmentService departmentService; + @Autowired + private HiddenSchemeService hiddenSchemeService; + @Autowired + private CustomHiddenCheckService customHiddenCheckService; + @Autowired + private CorpInfoService corpinfoService; + @Autowired + private DictionariesService dictionariesService; + @Autowired + private CustomService customService; + @Autowired + private CustomCheckRecordItemService customCheckRecordItemService; + @Autowired + private SendMessageUtil sendMessageUtil; + @Autowired + private Smb smb; + @Autowired + private SafetyEnvironmentalService safetyenvironmentalService; - } - } - if (pd.get("SOURCE").equals("2")) { - pd.put("STATE", "0"); - } - customHiddenService.save(pd); - // 立即整改保存检查数据 - if("4".equals(pd.get("STATE").toString())) { - PageData hc = new PageData(); - hc.put("HIDDENCHECK_ID", this.get32UUID()); - hc.put("HIDDEN_ID", pd.get("HIDDEN_ID")); - hc.put("DEPARTMENT_ID", pd.get("HIDDENFINDDEPT")); - hc.put("USER_ID", pd.get("CREATOR")); - hc.put("STATUS", "1"); - hc.put("CHECK_TIME", pd.get("CREATTIME").toString().substring(0, 10)); - customHiddenCheckService.save(hc); - } + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + // @RequiresPermissions("hidden:add") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单排查", instructionsType = "新增") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HIDDEN_ID", this.get32UUID()); // 主键 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 发现人 + pd.put("HIDDENFINDDEPT", Jurisdiction.getDEPARTMENT_ID()); + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("ISCONFIRM", "0"); // + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id + if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { + if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { + pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 + pd.put("RECTIFICATIONOR", Jurisdiction.getUSER_ID()); // 整改人 + pd.put("RECTIFICATIONDEPT", Jurisdiction.getDEPARTMENT_ID()); + pd.put("STATE", "4"); + } else { + pd.put("STATE", "1"); - if(pd.get("STATE") != null && Tools.notEmpty(pd.get("STATE").toString()) && !"0".equals(pd.get("STATE").toString())) { - // 发短信 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", pd.get("RECTIFICATIONOR"));// 收信人userid - mes.put("templateCode", "SMS_215820677");// 短信模板编码 - mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + } + } + pd.put("STATE", "0"); + pd.put("SOURCE", "3"); + customHiddenService.save(pd); + // 立即整改保存检查数据 + if ("4".equals(pd.get("STATE").toString())) { + PageData hc = new PageData(); + hc.put("HIDDENCHECK_ID", this.get32UUID()); + hc.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + hc.put("DEPARTMENT_ID", pd.get("HIDDENFINDDEPT")); + hc.put("USER_ID", pd.get("CREATOR")); + hc.put("STATUS", "1"); + hc.put("CHECK_TIME", pd.get("CREATTIME").toString().substring(0, 10)); + customHiddenCheckService.save(hc); + } - // 参数集合 - List paramsList = new ArrayList(); - // 第1个参数 - PageData params1 = new PageData(); - params1.put("name", "time");// 存入短信模板中的参数名称 - params1.put("value", pd.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + if (pd.get("STATE") != null && Tools.notEmpty(pd.get("STATE").toString()) && !"0".equals(pd.get("STATE").toString())) { + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("RECTIFICATIONOR"));// 收信人userid + mes.put("templateCode", "SMS_215820677");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id - sendMessageUtil.sendMessages(mes, paramsList); - } + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "time");// 存入短信模板中的参数名称 + params1.put("value", pd.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - map.put("result", errInfo); - map.put("pd", pd); - return map; - } + sendMessageUtil.sendMessages(mes, paramsList); + } - /** - * 列表 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/listForSafetyEnvironmental") - // @RequiresPermissions("hidden:list") - @ResponseBody - public Object listForSafetyEnvironmental(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - pd = Jurisdiction.getUserDataJurisdiction(pd); - page.setPd(pd); - List varList = customHiddenService.listForSafetyEnvironmental(page); // 列出Hidden列表 - varList = customHiddenUserService.getHiddebFind(varList); - for (PageData vector : varList) { - safetyenvironmentalService.departmentUtil(vector); - } - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } - /** - * 新增 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/listAdd") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "新增其他隐患") - public Object listAdd() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("HIDDEN_ID", this.get32UUID()); // 主键 - pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 发现人 - pd.put("HIDDENFINDDEPT", Jurisdiction.getDEPARTMENT_ID()); - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 - pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id - if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { - if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { - pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 - pd.put("RECTIFICATIONOR", Jurisdiction.getUSER_ID()); // 整改人 - pd.put("RECTIFICATIONDEPT", Jurisdiction.getDEPARTMENT_ID()); - } else { + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listForSafetyEnvironmental") + // @RequiresPermissions("hidden:list") + @ResponseBody + public Object listForSafetyEnvironmental(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd = Jurisdiction.getUserDataJurisdiction(pd); + page.setPd(pd); + List varList = customHiddenService.listForSafetyEnvironmental(page); // 列出Hidden列表 + varList = customHiddenUserService.getHiddebFind(varList); + for (PageData vector : varList) { + safetyenvironmentalService.departmentUtil(vector); + } + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - } - } - pd.put("ISCONFIRM", "0"); - customHiddenService.save(pd); - map.put("result", errInfo); - map.put("pd", pd); - return map; - } + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listAdd") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "新增其他隐患") + public Object listAdd() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HIDDEN_ID", this.get32UUID()); // 主键 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 发现人 + pd.put("HIDDENFINDDEPT", Jurisdiction.getDEPARTMENT_ID()); + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id + if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { + if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { + pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 + pd.put("RECTIFICATIONOR", Jurisdiction.getUSER_ID()); // 整改人 + pd.put("RECTIFICATIONDEPT", Jurisdiction.getDEPARTMENT_ID()); + } else { - public String getCode() { - String code = ""; - Random random = new Random(); - for (int i = 0; i < 6; i++) { + } + } + pd.put("ISCONFIRM", "0"); + pd.put("SOURCE", "3"); + customHiddenService.save(pd); + map.put("result", errInfo); + map.put("pd", pd); + return map; + } - int r = random.nextInt(10); // 每次随机出一个数字（0-9） + public String getCode() { + String code = ""; + Random random = new Random(); + for (int i = 0; i < 6; i++) { - code = code + r; // 把每次随机出的数字拼在一起 + int r = random.nextInt(10); // 每次随机出一个数字（0-9） - } - return code; - } + code = code + r; // 把每次随机出的数字拼在一起 - /** - * 删除 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/delete") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "删除") - public Object delete() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); + } + return code; + } - customHiddenService.delete(pd); - pd = customHiddenService.findById(pd); - if (pd.get("SOURCE") != null && Tools.notEmpty(pd.get("SOURCE").toString()) - && "2".equals(pd.get("SOURCE").toString())) { + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查情况", instructionsType = "删除") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); - PageData ri = new PageData(); - ri.put("ISNORMAL", "0"); - ri.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - ri.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - ri.put("CUSTOM_ITEM_ID", pd.get("CUSTOM_ITEM_ID")); - customCheckRecordItemService.editIsnormal(ri); - } - map.put("result", errInfo); // 返回结果 - return map; - } + customHiddenService.delete(pd); + pd = customHiddenService.findById(pd); + if (pd.get("SOURCE") != null && Tools.notEmpty(pd.get("SOURCE").toString()) + && "2".equals(pd.get("SOURCE").toString())) { - /** - * 修改 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/edit") - // @RequiresPermissions("hidden:edit") - @ResponseBody - public Object edit() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - customHiddenService.editInfo(pd); - pd = customHiddenService.findById(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + PageData ri = new PageData(); + ri.put("ISNORMAL", "0"); + ri.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + ri.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + ri.put("CUSTOM_ITEM_ID", pd.get("CUSTOM_ITEM_ID")); + customCheckRecordItemService.editIsnormal(ri); + } + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * 修改 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/editRec") - @ResponseBody - public Object editRec() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - customHiddenService.edit(pd); - pd = this.customHiddenService.findById(pd); - // 发短信 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", pd.get("RECTIFICATIONOR"));// 收信人userid - mes.put("templateCode", "SMS_215820677");// 短信模板编码 - mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + // @RequiresPermissions("hidden:edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customHiddenService.editInfo(pd); + pd = customHiddenService.findById(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - // 参数集合 - List paramsList = new ArrayList(); - // 第1个参数 - PageData params1 = new PageData(); - params1.put("name", "time");// 存入短信模板中的参数名称 - params1.put("value", pd.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editRec") + @ResponseBody + public Object editRec() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customHiddenService.edit(pd); + pd = this.customHiddenService.findById(pd); + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("RECTIFICATIONOR"));// 收信人userid + mes.put("templateCode", "SMS_215820677");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id - sendMessageUtil.sendMessages(mes, paramsList); + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "time");// 存入短信模板中的参数名称 + params1.put("value", pd.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + sendMessageUtil.sendMessages(mes, paramsList); + + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + @RequestMapping(value = "/editHIDDENLEVEL") + @ResponseBody + public Object editHIDDENLEVEL() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customHiddenService.editHIDDENLEVEL(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - @RequestMapping(value = "/editHIDDENLEVEL") - @ResponseBody - public Object editHIDDENLEVEL() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - customHiddenService.editHIDDENLEVEL(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } - @RequestMapping(value = "/editISCONFIRM") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患治理",instructionsOperate = "重大隐患",instructionsType = "确认为重大隐患") - public Object editISCONFIRM() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("ISCONFIRM", '1'); - customHiddenService.editISCONFIRM(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + @RequestMapping(value = "/editISCONFIRM") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患治理", instructionsOperate = "重大隐患", instructionsType = "确认为重大隐患") + public Object editISCONFIRM() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("ISCONFIRM", '1'); + customHiddenService.editISCONFIRM(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /** - * 整改 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/rectify") - @ResponseBody - @Transactional - @LogAnno(menuType= "双重预防",menuServer= "隐患治理",instructionsOperate = "隐患整改",instructionsType = "整改") - public Object rectify(@RequestParam(value = "rectify_files", required = false) MultipartFile[] rectify_files, - @RequestParam(value = "scheme_files", required = false) MultipartFile[] scheme_files, - @RequestParam(value = "plan_files", required = false) MultipartFile[] plan_files) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData corpinfo = new PageData(); - corpinfo.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - corpinfo = corpinfoService.findById(corpinfo); - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // - customHiddenService.rectify(pd); - pd.put("HIDDENSCHEME_ID", this.get32UUID()); // 主键 - hiddenSchemeService.deleteHd(pd); - if (Tools.notEmpty(pd.get("HAVESCHEME").toString())) { - pd.put("CREATOR", Jurisdiction.getUSER_ID()); // - pd.put("CREATTIME", DateUtil.date2Str(new Date())); // - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // - pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id + /** + * 整改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/rectify") + @ResponseBody + @Transactional + @LogAnno(menuType = "双重预防", menuServer = "隐患治理", instructionsOperate = "隐患整改", instructionsType = "整改") + public Object rectify(@RequestParam(value = "rectify_files", required = false) MultipartFile[] rectify_files, + @RequestParam(value = "scheme_files", required = false) MultipartFile[] scheme_files, + @RequestParam(value = "plan_files", required = false) MultipartFile[] plan_files) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData corpinfo = new PageData(); + corpinfo.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + corpinfo = corpinfoService.findById(corpinfo); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // + customHiddenService.rectify(pd); + pd.put("HIDDENSCHEME_ID", this.get32UUID()); // 主键 + hiddenSchemeService.deleteHd(pd); + if (Tools.notEmpty(pd.get("HAVESCHEME").toString())) { + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id // if (null != file && !file.isEmpty()) { // String ffile = DateUtil.getDays(); // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 // pd.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); // } - hiddenSchemeService.save(pd); - } + hiddenSchemeService.save(pd); + } - if (rectify_files != null && rectify_files.length > 0) { - for (int i = 0; i < rectify_files.length; i++) { - MultipartFile file = rectify_files[i]; + if (rectify_files != null && rectify_files.length > 0) { + for (int i = 0; i < rectify_files.length; i++) { + MultipartFile file = rectify_files[i]; // 保存文件 - String ffile = DateUtil.getDays(); - String fileName = ""; //执0行上传 + String ffile = DateUtil.getDays(); + String fileName = ""; //执0行上传 - if (null != file && !file.isEmpty()) { - fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - byte[] bytes = file.getBytes(); - smb.sshSftp(file, fileName,Const.FILEPATHYHTP + ffile); - } - pd.put("IMGFILES_ID", this.get32UUID()); - pd.put("FILEPATH", Const.FILEPATHYHTP + ffile+"/"+fileName); - pd.put("TYPE", 4); - pd.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); - imgFilesService.save(pd); - } - } + if (null != file && !file.isEmpty()) { + fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + byte[] bytes = file.getBytes(); + smb.sshSftp(file, fileName, Const.FILEPATHYHTP + ffile); + } + pd.put("IMGFILES_ID", this.get32UUID()); + pd.put("FILEPATH", Const.FILEPATHYHTP + ffile + "/" + fileName); + pd.put("TYPE", 4); + pd.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + imgFilesService.save(pd); + } + } - if ("1".equals(pd.get("HAVESCHEME")) && scheme_files != null && scheme_files.length > 0) { - for (int i = 0; i < scheme_files.length; i++) { - MultipartFile file = scheme_files[i]; + if ("1".equals(pd.get("HAVESCHEME")) && scheme_files != null && scheme_files.length > 0) { + for (int i = 0; i < scheme_files.length; i++) { + MultipartFile file = scheme_files[i]; // 保存文件 - String ffile = DateUtil.getDays(); - String fileName = ""; //执0行上传 + String ffile = DateUtil.getDays(); + String fileName = ""; //执0行上传 - if (null != file && !file.isEmpty()) { - fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - byte[] bytes = file.getBytes(); - smb.sshSftp(file, fileName,Const.FILEPATHYHTP + ffile); - } - pd.put("IMGFILES_ID", this.get32UUID()); - pd.put("FILEPATH", Const.FILEPATHYHTP + ffile+"/"+fileName); - pd.put("TYPE", 8); - pd.put("FOREIGN_KEY", pd.get("HIDDENSCHEME_ID")); - imgFilesService.save(pd); - } - } + if (null != file && !file.isEmpty()) { + fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + byte[] bytes = file.getBytes(); + smb.sshSftp(file, fileName, Const.FILEPATHYHTP + ffile); + } + pd.put("IMGFILES_ID", this.get32UUID()); + pd.put("FILEPATH", Const.FILEPATHYHTP + ffile + "/" + fileName); + pd.put("TYPE", 8); + pd.put("FOREIGN_KEY", pd.get("HIDDENSCHEME_ID")); + imgFilesService.save(pd); + } + } - if ("1".equals(pd.get("HAVEPLAN")) && plan_files != null && plan_files.length > 0) { - for (int i = 0; i < plan_files.length; i++) { - MultipartFile file = plan_files[i]; + if ("1".equals(pd.get("HAVEPLAN")) && plan_files != null && plan_files.length > 0) { + for (int i = 0; i < plan_files.length; i++) { + MultipartFile file = plan_files[i]; // 保存文件 - String ffile = DateUtil.getDays(); - String fileName = ""; //执0行上传 + String ffile = DateUtil.getDays(); + String fileName = ""; //执0行上传 - if (null != file && !file.isEmpty()) { - fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - byte[] bytes = file.getBytes(); - smb.sshSftp(file, fileName,Const.FILEPATHYHTP + ffile); - } - pd.put("IMGFILES_ID", this.get32UUID()); - pd.put("FILEPATH", Const.FILEPATHYHTP + ffile+"/"+fileName); - pd.put("TYPE", 22); - pd.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); - imgFilesService.save(pd); - } - } + if (null != file && !file.isEmpty()) { + fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + byte[] bytes = file.getBytes(); + smb.sshSftp(file, fileName, Const.FILEPATHYHTP + ffile); + } + pd.put("IMGFILES_ID", this.get32UUID()); + pd.put("FILEPATH", Const.FILEPATHYHTP + ffile + "/" + fileName); + pd.put("TYPE", 22); + pd.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + imgFilesService.save(pd); + } + } - this.customHiddenCheckService.delete(pd); - PageData checkUser = new PageData(); - checkUser.put("HIDDENCHECK_ID", this.get32UUID()); // 主键 - checkUser.put("HIDDEN_ID", pd.get("HIDDEN_ID")); - checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT")); - checkUser.put("USER_ID", pd.get("CHECKOR")); - checkUser.put("STATUS", "0"); - customHiddenCheckService.save(checkUser); - if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { - List list = (List) JSON.parse(pd.get("OTHER").toString()); - for (JSONObject json : list) { - 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("HIDDENCHECK_ID", this.get32UUID()); // 主键 - other.put("HIDDEN_ID", pd.get("HIDDEN_ID")); - other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); - other.put("USER_ID", json.get("USER_ID")); - other.put("STATUS", "0"); - customHiddenCheckService.save(other); + this.customHiddenCheckService.delete(pd); + PageData checkUser = new PageData(); + checkUser.put("HIDDENCHECK_ID", this.get32UUID()); // 主键 + checkUser.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + checkUser.put("DEPARTMENT_ID", pd.get("CHECKDEPT")); + checkUser.put("USER_ID", pd.get("CHECKOR")); + checkUser.put("STATUS", "0"); + customHiddenCheckService.save(checkUser); + if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { + List list = (List) JSON.parse(pd.get("OTHER").toString()); + for (JSONObject json : list) { + 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("HIDDENCHECK_ID", this.get32UUID()); // 主键 + other.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); + other.put("USER_ID", json.get("USER_ID")); + other.put("STATUS", "0"); + customHiddenCheckService.save(other); - // 发短信 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", json.get("USER_ID"));// 收信人userid - mes.put("templateCode", "SMS_215800731");// 短信模板编码 - mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", json.get("USER_ID"));// 收信人userid + mes.put("templateCode", "SMS_215800731");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id - // 参数集合 - List paramsList = new ArrayList(); + // 参数集合 + List paramsList = new ArrayList(); - sendMessageUtil.sendMessages(mes, paramsList); + sendMessageUtil.sendMessages(mes, paramsList); - } - } - } + } + } + } - // 发短信 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", pd.get("CHECKOR"));// 收信人userid - mes.put("templateCode", "SMS_215800731");// 短信模板编码 - mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CHECKOR"));// 收信人userid + mes.put("templateCode", "SMS_215800731");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id - // 参数集合 - List paramsList = new ArrayList(); + // 参数集合 + List paramsList = new ArrayList(); - sendMessageUtil.sendMessages(mes, paramsList); + sendMessageUtil.sendMessages(mes, paramsList); - // 给发现人发送短信，提示其进行复查，暂时先用发验证码代替 + // 给发现人发送短信，提示其进行复查，暂时先用发验证码代替 - map.put("result", errInfo); - map.put("HIDDENSCHEME_ID", pd.get("HIDDENSCHEME_ID")); - return map; - } + map.put("result", errInfo); + map.put("HIDDENSCHEME_ID", pd.get("HIDDENSCHEME_ID")); + return map; + } - /** - * 复查 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/review") - @ResponseBody - public Object review() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - customHiddenService.review(pd); - // 删除整改照片及方案 - if (pd.get("ISPASS") != null && Tools.notEmpty(pd.get("ISPASS").toString())) { - if ("0".equals(pd.get("ISPASS").toString())) { - PageData pic = new PageData(); + /** + * 复查 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/review") + @ResponseBody + public Object review() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customHiddenService.review(pd); + // 删除整改照片及方案 + if (pd.get("ISPASS") != null && Tools.notEmpty(pd.get("ISPASS").toString())) { + if ("0".equals(pd.get("ISPASS").toString())) { + PageData pic = new PageData(); // List picList = new ArrayList(); // pic.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); // pic.put("TYPE", "4"); @@ -524,10 +525,10 @@ public class CustomHiddenController extends BaseController { // file.delete(); // } // } - imgFilesService.deleteList(pic); - List picsList = new ArrayList(); - pic.put("FOREIGN_KEY", pd.get("HIDDENSCHEME_ID")); - pic.put("TYPE", "8"); + imgFilesService.deleteList(pic); + List picsList = new ArrayList(); + pic.put("FOREIGN_KEY", pd.get("HIDDENSCHEME_ID")); + pic.put("TYPE", "8"); // picsList = imgFilesService.listAll(pic); // if (picsList != null && picsList.size() > 0) { // for (PageData deletePic : picsList) { @@ -535,8 +536,8 @@ public class CustomHiddenController extends BaseController { // file.delete(); // } // } - hiddenSchemeService.deleteHd(pd); - imgFilesService.deleteList(pic); + hiddenSchemeService.deleteHd(pd); + imgFilesService.deleteList(pic); // List planPicList = new ArrayList(); // pic.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); @@ -548,843 +549,842 @@ public class CustomHiddenController extends BaseController { // file.delete(); // } // } - imgFilesService.deleteList(pic); - } + imgFilesService.deleteList(pic); + } - } - map.put("result", errInfo); - return map; - } + } + map.put("result", errInfo); + return map; + } - /** - * 验收 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/check") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患治理",instructionsOperate = "隐患验收",instructionsType = "验收") - public Object check() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if (pd.get("ISQUALIFIED").equals("1")) { - pd.put("CHECKOR", Jurisdiction.getUSER_ID()); - PageData pd2 = customHiddenCheckService.findByHidden(pd); - pd.put("STATUS", 1); - pd.put("HIDDENCHECK_ID", pd2.get("HIDDENCHECK_ID")); - pd.put("DEPARTMENT_ID", pd2.get("DEPARTMENT_ID")); - pd.put("USER_ID", pd2.get("USER_ID")); - customHiddenCheckService.edit(pd); + /** + * 验收 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/check") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患治理", instructionsOperate = "隐患验收", instructionsType = "验收") + public Object check() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (pd.get("ISQUALIFIED").equals("1")) { + pd.put("CHECKOR", Jurisdiction.getUSER_ID()); + PageData pd2 = customHiddenCheckService.findByHidden(pd); + pd.put("STATUS", 1); + pd.put("HIDDENCHECK_ID", pd2.get("HIDDENCHECK_ID")); + pd.put("DEPARTMENT_ID", pd2.get("DEPARTMENT_ID")); + pd.put("USER_ID", pd2.get("USER_ID")); + customHiddenCheckService.edit(pd); - List checkList = customHiddenCheckService.listAll(pd); - for (PageData check : checkList) { - if (check.get("STATUS").toString().equals("0")) { - map.put("result", errInfo); - map.put("check", pd); - return map; - } - } - pd.put("CHECKTIME", DateUtil.date2Str(new Date())); - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); - customHiddenService.check(pd); + List checkList = customHiddenCheckService.listAll(pd); + for (PageData check : checkList) { + if (check.get("STATUS").toString().equals("0")) { + map.put("result", errInfo); + map.put("check", pd); + return map; + } + } + pd.put("CHECKTIME", DateUtil.date2Str(new Date())); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + customHiddenService.check(pd); - } else { - PageData hidden = new PageData(); - hidden.put("HIDDEN_ID", pd.get("HIDDEN_ID")); - hidden.put("STATE", 1); - hidden.put("BUHEGE", 1); - hidden.put("OPERATTIME", DateUtil.date2Str(new Date())); - customHiddenService.changeState(hidden); + } else { + PageData hidden = new PageData(); + hidden.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + hidden.put("STATE", 1); + hidden.put("BUHEGE", 1); + hidden.put("OPERATTIME", DateUtil.date2Str(new Date())); + customHiddenService.changeState(hidden); - hidden.put("FOREIGN_KEY",pd.get("HIDDEN_ID")); - hidden.put("TYPE",4); - List zgimgs = imgFilesService.listAll(hidden); - hidden.put("TYPE",5); - List ysimgs = imgFilesService.listAll(hidden); - hidden.put("TYPE",8); - List fsimgs = imgFilesService.listAll(hidden); - hidden.put("TYPE",22); - List jsimgs = imgFilesService.listAll(hidden); - List imgs = new ArrayList(); - imgs.addAll(zgimgs); - imgs.addAll(ysimgs); - imgs.addAll(fsimgs); - imgs.addAll(jsimgs); - for (PageData img : imgs) { - smb.deleteFile(img.getString("FILEPATH")); - imgFilesService.delete(img); - } - } - map.put("check", pd); - map.put("result", errInfo); - return map; - } + hidden.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + hidden.put("TYPE", 4); + List zgimgs = imgFilesService.listAll(hidden); + hidden.put("TYPE", 5); + List ysimgs = imgFilesService.listAll(hidden); + hidden.put("TYPE", 8); + List fsimgs = imgFilesService.listAll(hidden); + hidden.put("TYPE", 22); + List jsimgs = imgFilesService.listAll(hidden); + List imgs = new ArrayList(); + imgs.addAll(zgimgs); + imgs.addAll(ysimgs); + imgs.addAll(fsimgs); + imgs.addAll(jsimgs); + for (PageData img : imgs) { + smb.deleteFile(img.getString("FILEPATH")); + imgFilesService.delete(img); + } + } + map.put("check", pd); + map.put("result", errInfo); + return map; + } - /** - * 列表 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/list") - // @RequiresPermissions("hidden: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(); + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + // @RequiresPermissions("hidden: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 DEPARTMENT_ID = Jurisdiction.getDEPARTMENT_ID(); // String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); // if(ids!=null && Tools.notEmpty(ids)) { // ids = ids.substring(0,ids.lastIndexOf(",")); // pd.put("DEPARTMENT_IDS", ids.split(",")); // } - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id - String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) - pd.put("KEYWORDS", KEYWORDS.trim()); - String CREATORNAME = pd.getString("CREATORNAME"); // 关键词检索条件 - if (Tools.notEmpty(CREATORNAME)) - pd.put("CREATORNAME", CREATORNAME.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + pd.put("KEYWORDS", KEYWORDS.trim()); + String CREATORNAME = pd.getString("CREATORNAME"); // 关键词检索条件 + if (Tools.notEmpty(CREATORNAME)) + pd.put("CREATORNAME", CREATORNAME.trim()); - String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 - if (Tools.notEmpty(ISQUALIFIED)) - pd.put("ISQUALIFIED", ISQUALIFIED.trim()); - String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 - if (Tools.notEmpty(HIDDENLEVELE)) - pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); - String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 - if (Tools.notEmpty(STARTTIME)) - pd.put("STARTTIME", STARTTIME.trim()); - String STATE = pd.getString("STATE"); // 关键词检索条件 - if (Tools.notEmpty(STATE)) - pd.put("STATE", STATE.trim()); - String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 - if (Tools.notEmpty(ENDTIME)) - pd.put("ENDTIME", ENDTIME + " 23:59:59"); - String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 + String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 + if (Tools.notEmpty(ISQUALIFIED)) + pd.put("ISQUALIFIED", ISQUALIFIED.trim()); + String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 + if (Tools.notEmpty(HIDDENLEVELE)) + pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); + String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 + if (Tools.notEmpty(STARTTIME)) + pd.put("STARTTIME", STARTTIME.trim()); + String STATE = pd.getString("STATE"); // 关键词检索条件 + if (Tools.notEmpty(STATE)) + pd.put("STATE", STATE.trim()); + String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 + if (Tools.notEmpty(ENDTIME)) + pd.put("ENDTIME", ENDTIME + " 23:59:59"); + String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 - String BISTATE = pd.getString("BISTATE"); // BI页跳转条件 - if (Tools.notEmpty(BISTATE)) - pd.put("BISTATE", BISTATE.trim()); - String IS_DAY = pd.getString("IS_DAY"); // BI页跳转条件 - if (Tools.notEmpty(IS_DAY)) - pd.put("IS_DAY", IS_DAY.trim()); - String IS_WEEK = pd.getString("IS_WEEK"); // BI页跳转条件 - if (Tools.notEmpty(IS_WEEK)) - pd.put("IS_WEEK", IS_WEEK.trim()); - String IS_XUN = pd.getString("IS_XUN"); // BI页跳转条件 - if (Tools.notEmpty(IS_XUN)) - pd.put("IS_XUN", IS_XUN.trim()); - String IS_MONTH = pd.getString("IS_MONTH"); // BI页跳转条件 - if (Tools.notEmpty(IS_MONTH)) - pd.put("IS_MONTH", IS_MONTH.trim()); - String IS_QUARTER = pd.getString("IS_QUARTER"); // BI页跳转条件 - if (Tools.notEmpty(IS_QUARTER)) - pd.put("IS_QUARTER", IS_QUARTER.trim()); - String IS_YEAR = pd.getString("IS_YEAR"); // BI页跳转条件 - if (Tools.notEmpty(IS_YEAR)) - pd.put("IS_YEAR", IS_YEAR.trim()); - if (Tools.notEmpty(DISPOSESTATE)) { - pd.put("DISPOSESTATE", DISPOSESTATE.trim()); - if("-1".equals(DISPOSESTATE.trim())) { - pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); - pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); - String DEPTIDS = pd.getString("DEPTIDS"); - if(Tools.notEmpty(DEPTIDS)) { - String DEPT_IDS[] = DEPTIDS.split(","); - pd.put("DEPT_IDS", DEPT_IDS); - } - pd.put("USER_ID",Jurisdiction.getUSER_ID()); - PageData cpd = new PageData(); - cpd = usersService.findById(pd); - pd.put("ISLEADER", cpd.getString("ISLEADER")); - if(cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")){ - String DEPARTMENT_ID = pd.getString("DEPARTMENT_ID"); - String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); - ids=pd.getString("DEPARTMENT_ID")+","+ids; //把自己部门插入进去 - if(ids!=null && Tools.notEmpty(ids)&& ids.lastIndexOf(",")>-1) { - ids = ids.substring(0,ids.lastIndexOf(",")); - pd.put("DEPARTMENT_IDS", ids.split(",")); - }else { - pd.put("DEPARTMENT_IDS", DEPARTMENT_ID); - } - } - } - pd.put("SELFUSERID", Jurisdiction.getUSER_ID()); - pd.put("USERDEPT", Jurisdiction.getDEPARTMENT_ID()); - } - pd.put("ISMAIN", Jurisdiction.getIS_MAIN()); - if (Jurisdiction.getIS_MAIN().equals("0")) { - String IS_SELF = pd.getString("IS_SELF"); // 关键词检索条件 - if (IS_SELF != null && IS_SELF.equals("1")) - pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID()); - } - ; - // 旬 - if (pd.get("IS_XUN") != null && Tools.notEmpty(pd.get("IS_XUN").toString())) { - // 1-10 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { - pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); - pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); - } - // 10-20 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { - pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); - pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); - } - // 20-月底 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { - pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); - pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); - } - } - // 季度 - if (pd.get("IS_QUARTER") != null && Tools.notEmpty(pd.get("IS_QUARTER").toString())) { - pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); - pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); - } - page.setPd(pd); + String BISTATE = pd.getString("BISTATE"); // BI页跳转条件 + if (Tools.notEmpty(BISTATE)) + pd.put("BISTATE", BISTATE.trim()); + String IS_DAY = pd.getString("IS_DAY"); // BI页跳转条件 + if (Tools.notEmpty(IS_DAY)) + pd.put("IS_DAY", IS_DAY.trim()); + String IS_WEEK = pd.getString("IS_WEEK"); // BI页跳转条件 + if (Tools.notEmpty(IS_WEEK)) + pd.put("IS_WEEK", IS_WEEK.trim()); + String IS_XUN = pd.getString("IS_XUN"); // BI页跳转条件 + if (Tools.notEmpty(IS_XUN)) + pd.put("IS_XUN", IS_XUN.trim()); + String IS_MONTH = pd.getString("IS_MONTH"); // BI页跳转条件 + if (Tools.notEmpty(IS_MONTH)) + pd.put("IS_MONTH", IS_MONTH.trim()); + String IS_QUARTER = pd.getString("IS_QUARTER"); // BI页跳转条件 + if (Tools.notEmpty(IS_QUARTER)) + pd.put("IS_QUARTER", IS_QUARTER.trim()); + String IS_YEAR = pd.getString("IS_YEAR"); // BI页跳转条件 + if (Tools.notEmpty(IS_YEAR)) + pd.put("IS_YEAR", IS_YEAR.trim()); + if (Tools.notEmpty(DISPOSESTATE)) { + pd.put("DISPOSESTATE", DISPOSESTATE.trim()); + if ("-1".equals(DISPOSESTATE.trim())) { + pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + String DEPTIDS = pd.getString("DEPTIDS"); + if (Tools.notEmpty(DEPTIDS)) { + String DEPT_IDS[] = DEPTIDS.split(","); + pd.put("DEPT_IDS", DEPT_IDS); + } + pd.put("USER_ID", Jurisdiction.getUSER_ID()); + PageData cpd = new PageData(); + cpd = usersService.findById(pd); + pd.put("ISLEADER", cpd.getString("ISLEADER")); + if (cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")) { + String DEPARTMENT_ID = pd.getString("DEPARTMENT_ID"); + String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); + ids = pd.getString("DEPARTMENT_ID") + "," + ids; //把自己部门插入进去 + if (ids != null && Tools.notEmpty(ids) && ids.lastIndexOf(",") > -1) { + ids = ids.substring(0, ids.lastIndexOf(",")); + pd.put("DEPARTMENT_IDS", ids.split(",")); + } else { + pd.put("DEPARTMENT_IDS", DEPARTMENT_ID); + } + } + } + pd.put("SELFUSERID", Jurisdiction.getUSER_ID()); + pd.put("USERDEPT", Jurisdiction.getDEPARTMENT_ID()); + } + pd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + if (Jurisdiction.getIS_MAIN().equals("0")) { + String IS_SELF = pd.getString("IS_SELF"); // 关键词检索条件 + if (IS_SELF != null && IS_SELF.equals("1")) + pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID()); + } + // 旬 + if (pd.get("IS_XUN") != null && Tools.notEmpty(pd.get("IS_XUN").toString())) { + // 1-10 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); + pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); + } + // 10-20 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); + pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); + } + // 20-月底 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); + pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + } + } + // 季度 + if (pd.get("IS_QUARTER") != null && Tools.notEmpty(pd.get("IS_QUARTER").toString())) { + pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); + } + page.setPd(pd); - List varList = customHiddenService.list(page); // 列出Hidden列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + List varList = customHiddenService.list(page); // 列出Hidden列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * 获取清单风险点 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getOtherHidden") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "获取其他隐患信息列表") - public Object getOtherHidden() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("USER_ID", Jurisdiction.getUSER_ID()); - String USER_ID = pd.get("USER_ID").toString(); - pd.put("CUSTOM_ID", pd.get("ID")); - pd = customService.findById(pd); - if (pd.getString("TYPE").equals("listType0005")) { - if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(pd.getString("START_DATE") + " 00:00:00"), - DateUtil.fomatDateTime(pd.getString("END_DATE") + " 23:59:59"))) { - PageData type = new PageData(); - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_XUN", 1);// 查询方法和旬一样,直接借用 - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - type.put("BEGINTIME", pd.getString("START_DATE") + " 00:00:00"); - type.put("ENDTIME", pd.getString("END_DATE") + " 23:59:59"); - List hiddenList = customHiddenService.getOtherHidden(type); - map.put("hiddenList", hiddenList); - } - map.put("result", errInfo); - return map; - } - String cycle = pd.getString("PERIODNAME"); - PageData type = new PageData(); - if (cycle.equals("每日")) { - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_DAY", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("每周")) { - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_WEEK", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("每旬")) { - // 1-10 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_XUN", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); - type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); - } - // 10-20 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_XUN", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); - type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); - } - // 20-月底 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_XUN", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); - type.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); - } + /** + * 获取清单风险点 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getOtherHidden") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "获取其他隐患信息列表") + public Object getOtherHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("USER_ID", Jurisdiction.getUSER_ID()); + String USER_ID = pd.get("USER_ID").toString(); + pd.put("CUSTOM_ID", pd.get("ID")); + pd = customService.findById(pd); + if (pd.getString("TYPE").equals("listType0005")) { + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(pd.getString("START_DATE") + " 00:00:00"), + DateUtil.fomatDateTime(pd.getString("END_DATE") + " 23:59:59"))) { + PageData type = new PageData(); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_XUN", 1);// 查询方法和旬一样,直接借用 + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", pd.getString("START_DATE") + " 00:00:00"); + type.put("ENDTIME", pd.getString("END_DATE") + " 23:59:59"); + List hiddenList = customHiddenService.getOtherHidden(type); + map.put("hiddenList", hiddenList); + } + map.put("result", errInfo); + return map; + } + String cycle = pd.getString("PERIODNAME"); + PageData type = new PageData(); + if (cycle.equals("每日")) { + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_DAY", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每周")) { + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_WEEK", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每旬")) { + // 1-10 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_XUN", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); + type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); + } + // 10-20 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_XUN", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); + type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); + } + // 20-月底 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_XUN", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); + type.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + } - } else if (cycle.equals("每月")) { - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_MONTH", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("每季")) { - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_QUARTER", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("半年")) { - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_HALFYEAR", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } else if (cycle.equals("每年")) { - type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); - type.put("IS_YEAR", 1); - type.put("STATE", "0"); - type.put("USER_ID", USER_ID); - } + } else if (cycle.equals("每月")) { + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_MONTH", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每季")) { + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_QUARTER", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("半年")) { + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_HALFYEAR", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每年")) { + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + type.put("IS_YEAR", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } - List hiddenList = customHiddenService.getOtherHidden(type); - map.put("result", errInfo); - map.put("hiddenList", hiddenList); - return map; - } + List hiddenList = customHiddenService.getOtherHidden(type); + map.put("result", errInfo); + map.put("hiddenList", hiddenList); + return map; + } - /** - * 获取检查记录风险点 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getCheckHidden") - @ResponseBody - @LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单检查记录",instructionsType = "获取检查记录风险点") - public Object getCheckHidden() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - List hiddenList = customHiddenService.getOtherHidden(pd); - map.put("result", errInfo); - map.put("hiddenList", hiddenList); - return map; - } + /** + * 获取检查记录风险点 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getCheckHidden") + @ResponseBody + @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单检查记录", instructionsType = "获取检查记录风险点") + public Object getCheckHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List hiddenList = customHiddenService.getOtherHidden(pd); + map.put("result", errInfo); + map.put("hiddenList", hiddenList); + return map; + } - /** - * 去修改页面获取数据 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/goEdit") - // @RequiresPermissions("hidden:edit") - @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 = customHiddenService.findById(pd); // 根据ID读取 - PageData pd2 = new PageData(); - pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); - pd2.put("TYPE", 3); - List hImgs = imgFilesService.listAll(pd2);// 隐患图片 - pd2.put("TYPE", 4); - List rImgs = imgFilesService.listAll(pd2);// 整改图片 - /* - * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 - */ // 查询整改方案 - PageData hs = hiddenSchemeService.findByHdId(pd); - List sImgs = new ArrayList(); + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + // @RequiresPermissions("hidden:edit") + @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 = customHiddenService.findById(pd); // 根据ID读取 + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd2.put("TYPE", 3); + List hImgs = imgFilesService.listAll(pd2);// 隐患图片 + pd2.put("TYPE", 4); + List rImgs = imgFilesService.listAll(pd2);// 整改图片 + /* + * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 + */ // 查询整改方案 + PageData hs = hiddenSchemeService.findByHdId(pd); + List sImgs = new ArrayList(); - if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { - PageData pd3 = new PageData(); - pd3.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); - pd3.put("TYPE", 8); - sImgs = imgFilesService.listAll(pd3);// 方案图片 - } + if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { + PageData pd3 = new PageData(); + pd3.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); + pd3.put("TYPE", 8); + sImgs = imgFilesService.listAll(pd3);// 方案图片 + } - List pImgs = new ArrayList(); - if("1".equals(pd.get("HAVEPLAN"))) { - PageData pd3 = new PageData(); - pd3.put("FOREIGN_KEY", hs.getString("HIDDEN_ID")); - pd3.put("TYPE",22); - pImgs = imgFilesService.listAll(pd3);//方案图片 - } + List pImgs = new ArrayList(); + if ("1".equals(pd.get("HAVEPLAN"))) { + PageData pd3 = new PageData(); + pd3.put("FOREIGN_KEY", hs.getString("HIDDEN_ID")); + pd3.put("TYPE", 22); + pImgs = imgFilesService.listAll(pd3);//方案图片 + } - List checkList = customHiddenCheckService.listAll(pd); - if (checkList != null && checkList.size() > 0) { - PageData pd3 = new PageData(); - pd3.put("TYPE", 5); - for (PageData check : checkList) { - pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); - check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 - } - } - map.put("pd", pd); - map.put("hs", hs); - map.put("hImgs", hImgs); - map.put("rImgs", rImgs); + List checkList = customHiddenCheckService.listAll(pd); + if (checkList != null && checkList.size() > 0) { + PageData pd3 = new PageData(); + pd3.put("TYPE", 5); + for (PageData check : checkList) { + pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); + check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 + } + } + map.put("pd", pd); + map.put("hs", hs); + map.put("hImgs", hImgs); + map.put("rImgs", rImgs); // map.put("cImgs", cImgs); - map.put("sImgs", sImgs); - map.put("pImgs", pImgs); - map.put("checkList", checkList); - // 获取部门下拉树 - List zdepartmentPdList = new ArrayList(); - PageData dept = new PageData(); - dept.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - dept = this.departmentService.findByCorpId(dept); - String ZDEPARTMENT_ID = dept.getString("DEPARTMENT_ID"); + map.put("sImgs", sImgs); + map.put("pImgs", pImgs); + map.put("checkList", checkList); + // 获取部门下拉树 + List zdepartmentPdList = new ArrayList(); + PageData dept = new PageData(); + dept.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + dept = this.departmentService.findByCorpId(dept); + String ZDEPARTMENT_ID = dept.getString("DEPARTMENT_ID"); - PageData node = new PageData(); - node.put("id", dept.get("DEPARTMENT_ID")); - node.put("parentId", dept.get("PARENT_ID")); - node.put("name", dept.get("NAME")); - node.put("icon", "../../../assets/images/user.gif"); - zdepartmentPdList.add(node); - JSONArray arr = JSONArray - .fromObject(departmentService.listAllDepartmentToSelect(ZDEPARTMENT_ID, zdepartmentPdList)); - map.put("zTreeNodes", (null == arr ? "" : "{\"treeNodes\":" + arr.toString() + "}")); + PageData node = new PageData(); + node.put("id", dept.get("DEPARTMENT_ID")); + node.put("parentId", dept.get("PARENT_ID")); + node.put("name", dept.get("NAME")); + node.put("icon", "../../../assets/images/user.gif"); + zdepartmentPdList.add(node); + JSONArray arr = JSONArray + .fromObject(departmentService.listAllDepartmentToSelect(ZDEPARTMENT_ID, zdepartmentPdList)); + map.put("zTreeNodes", (null == arr ? "" : "{\"treeNodes\":" + arr.toString() + "}")); - map.put("result", errInfo); - return map; - } + map.put("result", errInfo); + return map; + } - /** - * 首页统计 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/statistic") - @ResponseBody - public Object statistic() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式 - Date now = new Date(); - String endDay = sdf.format(now); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(now); - calendar.add(Calendar.DATE, -15); - String startDay = sdf.format(calendar.getTime()); - pd.put("START_DAY", startDay); - pd.put("END_DAY", endDay); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - pd.put("HIDDENLEVEL", "hiddenLevel0001");// 一般隐患 + /** + * 首页统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/statistic") + @ResponseBody + public Object statistic() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式 + Date now = new Date(); + String endDay = sdf.format(now); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(now); + calendar.add(Calendar.DATE, -15); + String startDay = sdf.format(calendar.getTime()); + pd.put("START_DAY", startDay); + pd.put("END_DAY", endDay); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("HIDDENLEVEL", "hiddenLevel0001");// 一般隐患 - if (pd.get("isBI") == null && Jurisdiction.getIS_MAIN().equals("0")) { - pd.put("USER_ID", Jurisdiction.getUSER_ID()); - } - List nhds = customHiddenService.hiddenStatisticsByDay(pd); - pd.put("HIDDENLEVEL", "hiddenLevel0002");// 重大隐患 - List zhds = customHiddenService.hiddenStatisticsByDay(pd); + if (pd.get("isBI") == null && Jurisdiction.getIS_MAIN().equals("0")) { + pd.put("USER_ID", Jurisdiction.getUSER_ID()); + } + List nhds = customHiddenService.hiddenStatisticsByDay(pd); + pd.put("HIDDENLEVEL", "hiddenLevel0002");// 重大隐患 + List zhds = customHiddenService.hiddenStatisticsByDay(pd); - List hdAll = customHiddenService.hiddenStatisticsAll(pd); - map.put("nhds", nhds); - map.put("zhds", zhds); - map.put("hdAll", hdAll); - map.put("result", errInfo); - return map; - } + List hdAll = customHiddenService.hiddenStatisticsAll(pd); + map.put("nhds", nhds); + map.put("zhds", zhds); + map.put("hdAll", hdAll); + map.put("result", errInfo); + return map; + } - /** - * 首页统计 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/getBICount") - @ResponseBody - public Object getBICount() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - // 旬 - if (pd.get("IS_XUN") != null && Tools.notEmpty(pd.get("IS_XUN").toString())) { - // 1-10 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { - pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); - pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); - } - // 10-20 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { - pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); - pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); - } - // 20-月底 - if (DateUtil.timeCalendar(new Date(), - DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), - DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { - pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); - pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); - } - } - // 季度 - if (pd.get("IS_QUARTER") != null && Tools.notEmpty(pd.get("IS_QUARTER").toString())) { - pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); - pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); - } - List varList = customHiddenService.getBICount(pd); - if (varList != null && varList.size() > 0) { - map.put("total", varList.size()); - int checked = 0; - int uncheck = 0; - for (PageData hidden : varList) { - if (hidden.get("STATE").toString().equals("4")) { - checked++; - } else { - uncheck++; - } + /** + * 首页统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getBICount") + @ResponseBody + public Object getBICount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + // 旬 + if (pd.get("IS_XUN") != null && Tools.notEmpty(pd.get("IS_XUN").toString())) { + // 1-10 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); + pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); + } + // 10-20 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); + pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); + } + // 20-月底 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); + pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + } + } + // 季度 + if (pd.get("IS_QUARTER") != null && Tools.notEmpty(pd.get("IS_QUARTER").toString())) { + pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); + } + List varList = customHiddenService.getBICount(pd); + if (varList != null && varList.size() > 0) { + map.put("total", varList.size()); + int checked = 0; + int uncheck = 0; + for (PageData hidden : varList) { + if (hidden.get("STATE").toString().equals("4")) { + checked++; + } else { + uncheck++; + } - } - map.put("checked", checked); - map.put("uncheck", uncheck); - } else { - map.put("total", 0); - map.put("checked", 0); - map.put("uncheck", 0); - } + } + map.put("checked", checked); + map.put("uncheck", uncheck); + } else { + map.put("total", 0); + map.put("checked", 0); + map.put("uncheck", 0); + } - map.put("result", errInfo); - return map; - } + map.put("result", errInfo); + return map; + } - /** - * 批量删除 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/deleteAll") - // @RequiresPermissions("hidden: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(","); - customHiddenService.deleteAll(ArrayDATA_IDS); - errInfo = "success"; - } else { - errInfo = "error"; - } - map.put("result", errInfo); // 返回结果 - return map; - } + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + // @RequiresPermissions("hidden: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(","); + customHiddenService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + } else { + errInfo = "error"; + } + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * * @param - * - * @throws Exception - */ - @RequestMapping(value = "/listAll") - @ResponseBody - public Object listAll() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DATA_IDS = pd.getString("ids"); - if (Tools.notEmpty(DATA_IDS)) { - String ArrayDATA_IDS[] = DATA_IDS.split(","); - pd.put("HIDDEN_IDS", ArrayDATA_IDS); - List varList = customHiddenService.listAll(pd); - errInfo = "success"; - map.put("varList", varList); - } else { - errInfo = "error"; - } - map.put("result", errInfo); // 返回结果 - return map; - } + /** + * * @param + * + * @throws Exception + */ + @RequestMapping(value = "/listAll") + @ResponseBody + public Object listAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("ids"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + pd.put("HIDDEN_IDS", ArrayDATA_IDS); + List varList = customHiddenService.listAll(pd); + errInfo = "success"; + map.put("varList", varList); + } else { + errInfo = "error"; + } + map.put("result", errInfo); // 返回结果 + return map; + } - @RequestMapping(value = "/listAllToPrint") - @ResponseBody - public Object listAllToPrint() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DATA_IDS = pd.getString("ids"); - if (Tools.notEmpty(DATA_IDS)) { - String ArrayDATA_IDS[] = DATA_IDS.split(","); - pd.put("HIDDEN_IDS", ArrayDATA_IDS); - List varList = customHiddenService.listAllToPrint(pd); - errInfo = "success"; - map.put("varList", varList); - } else { - errInfo = "error"; - } - map.put("result", errInfo); // 返回结果 - return map; - } + @RequestMapping(value = "/listAllToPrint") + @ResponseBody + public Object listAllToPrint() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("ids"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + pd.put("HIDDEN_IDS", ArrayDATA_IDS); + List varList = customHiddenService.listAllToPrint(pd); + errInfo = "success"; + map.put("varList", varList); + } else { + errInfo = "error"; + } + map.put("result", errInfo); // 返回结果 + return map; + } - /** - * 导出到excel - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/excel2") - public ModelAndView exportExcel2() throws Exception { - ModelAndView mv = new ModelAndView(); - PageData pd = new PageData(); - pd = this.getPageData(); - Map sourceMap = new HashMap<>(); - sourceMap.put("1", "隐患快报"); - sourceMap.put("2", "隐患排查"); - sourceMap.put("3", "隐患排查"); - String dicParentId = "5e7cf8620ba54ad89719d0be62133c7a"; - List dicList = dictionariesService.listSubDictByParentId(dicParentId); - Map dicMap = new HashMap<>(); - for (Dictionaries pageData : dicList) { - dicMap.put(pageData.getBIANMA(), pageData.getNAME()); - } - Map stateMap = new HashMap<>(); - stateMap.put("-1", "已过期"); - stateMap.put("0", "未提交"); - stateMap.put("1", "未整改"); - stateMap.put("2", "已整改"); - stateMap.put("3", "已复查"); - stateMap.put("4", "已验收"); - Map rectifType = new HashMap<>(); - rectifType.put("1", "立即整改"); - rectifType.put("2", "限期整改"); - PageData corpIdPd = new PageData(); - corpIdPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());// CORPINFO_ID + /** + * 导出到excel + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/excel2") + public ModelAndView exportExcel2() throws Exception { + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map sourceMap = new HashMap<>(); + sourceMap.put("1", "隐患快报"); + sourceMap.put("2", "隐患排查"); + sourceMap.put("3", "隐患排查"); + String dicParentId = "5e7cf8620ba54ad89719d0be62133c7a"; + List dicList = dictionariesService.listSubDictByParentId(dicParentId); + Map dicMap = new HashMap<>(); + for (Dictionaries pageData : dicList) { + dicMap.put(pageData.getBIANMA(), pageData.getNAME()); + } + Map stateMap = new HashMap<>(); + stateMap.put("-1", "已过期"); + stateMap.put("0", "未提交"); + stateMap.put("1", "未整改"); + stateMap.put("2", "已整改"); + stateMap.put("3", "已复查"); + stateMap.put("4", "已验收"); + Map rectifType = new HashMap<>(); + rectifType.put("1", "立即整改"); + rectifType.put("2", "限期整改"); + PageData corpIdPd = new PageData(); + corpIdPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());// CORPINFO_ID - Map userMap = new HashMap<>(); - List userList = usersService.listAllUser(corpIdPd); - for (PageData pageData : userList) { - userMap.put(pageData.getString("USER_ID"), pageData.getString("NAME")); - } - Map deparMap = new HashMap<>(); - List deparList = departmentService.listAll(corpIdPd); - for (PageData pageData : deparList) { - deparMap.put(pageData.getString("DEPARTMENT_ID"), pageData.getString("NAME")); - } + Map userMap = new HashMap<>(); + List userList = usersService.listAllUser(corpIdPd); + for (PageData pageData : userList) { + userMap.put(pageData.getString("USER_ID"), pageData.getString("NAME")); + } + Map deparMap = new HashMap<>(); + List deparList = departmentService.listAll(corpIdPd); + for (PageData pageData : deparList) { + deparMap.put(pageData.getString("DEPARTMENT_ID"), pageData.getString("NAME")); + } - Map dataMap = new HashMap(); - List titles = new ArrayList(); - titles.add("隐患来源"); // 1 - titles.add("风险点（单元）"); // 2 - titles.add("辨识部位"); // 3 - titles.add("存在风险"); // 4 - titles.add("风险分级"); // 6 - titles.add("检查内容"); // 7 - titles.add("隐患级别"); // 16 - titles.add("隐患状态"); // 17= - titles.add("隐患描述"); // 8 - titles.add("隐患部位"); // 9 - titles.add("隐患发现部门"); // 9 ```````` - titles.add("发现人"); // 10 - titles.add("发现时间"); // 11 - titles.add("整改类型"); // 10 - titles.add("整改期限"); // 11 - titles.add("图片"); // 11 - dataMap.put("titles", titles); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id - List varOList = customHiddenService.listAll(pd); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("隐患来源"); // 1 + titles.add("风险点（单元）"); // 2 + titles.add("辨识部位"); // 3 + titles.add("存在风险"); // 4 + titles.add("风险分级"); // 6 + titles.add("检查内容"); // 7 + titles.add("隐患级别"); // 16 + titles.add("隐患状态"); // 17= + titles.add("隐患描述"); // 8 + titles.add("隐患部位"); // 9 + titles.add("隐患发现部门"); // 9 ```````` + titles.add("发现人"); // 10 + titles.add("发现时间"); // 11 + titles.add("整改类型"); // 10 + titles.add("整改期限"); // 11 + titles.add("图片"); // 11 + dataMap.put("titles", titles); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id + List varOList = customHiddenService.listAll(pd); - List varList = new ArrayList(); - for (int i = 0; i < varOList.size(); i++) { - PageData vpd = new PageData(); - vpd.put("var1", sourceMap.get(varOList.get(i).getString("SOURCE"))); // 1 - vpd.put("var2", varOList.get(i).getString("RISK_UNIT")); // 2 - vpd.put("var3", varOList.get(i).getString("IDENTIFICATION")); // 3 - vpd.put("var4", varOList.get(i).getString("RISK_DESCR")); // 4 - vpd.put("var5", varOList.get(i).getString("LEVEL")); // 6 - vpd.put("var6", varOList.get(i).getString("CHECK_CONTENT")); // 7 - vpd.put("var7", dicMap.get(varOList.get(i).getString("HIDDENLEVEL"))); // 16 - vpd.put("var8", stateMap.get(varOList.get(i).getString("STATE"))); // 17 - vpd.put("var9", varOList.get(i).getString("HIDDENDESCR")); // 8 - vpd.put("var10", varOList.get(i).getString("HIDDENPART")); // 9 - vpd.put("var11", deparMap.get(varOList.get(i).getString("HIDDENFINDDEPT"))); // 9```````````` - vpd.put("var12", userMap.get(varOList.get(i).getString("CREATOR"))); // 10 - vpd.put("var13", varOList.get(i).getString("CREATTIME")); // 11 - vpd.put("var14", rectifType.get(varOList.get(i).getString("RECTIFICATIONTYPE"))); // 10 - vpd.put("var15", varOList.get(i).getString("RECTIFICATIONDEADLINE")); // 11 - vpd.put("var16", varOList.get(i).getString("HIDDENFINDDEPT")); // 9```````````` - varList.add(vpd); - } - dataMap.put("varList", varList); - dataMap.put("imgIndex", "16"); + List varList = new ArrayList(); + for (int i = 0; i < varOList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", sourceMap.get(varOList.get(i).getString("SOURCE"))); // 1 + vpd.put("var2", varOList.get(i).getString("RISK_UNIT")); // 2 + vpd.put("var3", varOList.get(i).getString("IDENTIFICATION")); // 3 + vpd.put("var4", varOList.get(i).getString("RISK_DESCR")); // 4 + vpd.put("var5", varOList.get(i).getString("LEVEL")); // 6 + vpd.put("var6", varOList.get(i).getString("CHECK_CONTENT")); // 7 + vpd.put("var7", dicMap.get(varOList.get(i).getString("HIDDENLEVEL"))); // 16 + vpd.put("var8", stateMap.get(varOList.get(i).getString("STATE"))); // 17 + vpd.put("var9", varOList.get(i).getString("HIDDENDESCR")); // 8 + vpd.put("var10", varOList.get(i).getString("HIDDENPART")); // 9 + vpd.put("var11", deparMap.get(varOList.get(i).getString("HIDDENFINDDEPT"))); // 9```````````` + vpd.put("var12", userMap.get(varOList.get(i).getString("CREATOR"))); // 10 + vpd.put("var13", varOList.get(i).getString("CREATTIME")); // 11 + vpd.put("var14", rectifType.get(varOList.get(i).getString("RECTIFICATIONTYPE"))); // 10 + vpd.put("var15", varOList.get(i).getString("RECTIFICATIONDEADLINE")); // 11 + vpd.put("var16", varOList.get(i).getString("HIDDENFINDDEPT")); // 9```````````` + varList.add(vpd); + } + dataMap.put("varList", varList); + dataMap.put("imgIndex", "16"); - ObjectExcelView erv = new ObjectExcelView(); - ObjectExcelImgView erv2 = new ObjectExcelImgView(); - mv = new ModelAndView(erv2, dataMap); - return mv; - } + ObjectExcelView erv = new ObjectExcelView(); + ObjectExcelImgView erv2 = new ObjectExcelImgView(); + mv = new ModelAndView(erv2, dataMap); + return mv; + } - /** - * 导出到excel - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/excelOld") - public ModelAndView exportExcel() throws Exception { - ModelAndView mv = new ModelAndView(); - PageData pd = new PageData(); - pd = this.getPageData(); + /** + * 导出到excel + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/excelOld") + public ModelAndView exportExcel() throws Exception { + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); - String dicParentId = "5e7cf8620ba54ad89719d0be62133c7a"; - List dicList = dictionariesService.listSubDictByParentId(dicParentId);// 字典 - Map dicMap = new HashMap<>(); - for (Dictionaries pageData : dicList) { - dicMap.put(pageData.getBIANMA(), pageData.getNAME()); - } + String dicParentId = "5e7cf8620ba54ad89719d0be62133c7a"; + List dicList = dictionariesService.listSubDictByParentId(dicParentId);// 字典 + Map dicMap = new HashMap<>(); + for (Dictionaries pageData : dicList) { + dicMap.put(pageData.getBIANMA(), pageData.getNAME()); + } - PageData corpIdPd = new PageData(); - corpIdPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());// CORPINFO_ID - Map userMap = new HashMap<>();// 查看企业下的所有用户，根据用户id匹配信息 - List userList = usersService.listAllUser(corpIdPd); - for (PageData pageData : userList) { - userMap.put(pageData.getString("USER_ID"), pageData.getString("NAME")); - } - Map deparMap = new HashMap<>(); - List deparList = departmentService.listAll(corpIdPd);// 查看企业下的所有部门，根据部门id匹配信息 - for (PageData pageData : deparList) { - deparMap.put(pageData.getString("DEPARTMENT_ID"), pageData.getString("NAME")); - } + PageData corpIdPd = new PageData(); + corpIdPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());// CORPINFO_ID + Map userMap = new HashMap<>();// 查看企业下的所有用户，根据用户id匹配信息 + List userList = usersService.listAllUser(corpIdPd); + for (PageData pageData : userList) { + userMap.put(pageData.getString("USER_ID"), pageData.getString("NAME")); + } + Map deparMap = new HashMap<>(); + List deparList = departmentService.listAll(corpIdPd);// 查看企业下的所有部门，根据部门id匹配信息 + for (PageData pageData : deparList) { + deparMap.put(pageData.getString("DEPARTMENT_ID"), pageData.getString("NAME")); + } - Map sourceMap = new HashMap<>(); - sourceMap.put("1", "隐患快报"); - sourceMap.put("2", "隐患排查"); - sourceMap.put("3", "隐患排查"); - Map stateMap = new HashMap<>(); - stateMap.put("-1", "已过期"); - stateMap.put("0", "未提交"); - stateMap.put("1", "未整改"); - stateMap.put("2", "已整改"); - stateMap.put("3", "已复查"); - stateMap.put("4", "已验收"); - Map rectifType = new HashMap<>(); - rectifType.put("1", "立即整改"); - rectifType.put("2", "限期整改"); - Map haveschemeMap = new HashMap<>(); - haveschemeMap.put("0", "无"); - haveschemeMap.put("1", "有"); - Map ysStatusMap = new HashMap<>(); - ysStatusMap.put("0", "否"); - ysStatusMap.put("1", "是"); + Map sourceMap = new HashMap<>(); + sourceMap.put("1", "隐患快报"); + sourceMap.put("2", "隐患排查"); + sourceMap.put("3", "隐患排查"); + Map stateMap = new HashMap<>(); + stateMap.put("-1", "已过期"); + stateMap.put("0", "未提交"); + stateMap.put("1", "未整改"); + stateMap.put("2", "已整改"); + stateMap.put("3", "已复查"); + stateMap.put("4", "已验收"); + Map rectifType = new HashMap<>(); + rectifType.put("1", "立即整改"); + rectifType.put("2", "限期整改"); + Map haveschemeMap = new HashMap<>(); + haveschemeMap.put("0", "无"); + haveschemeMap.put("1", "有"); + Map ysStatusMap = new HashMap<>(); + ysStatusMap.put("0", "否"); + ysStatusMap.put("1", "是"); - Map dataMap = new HashMap();// 传给导出页面的数据 + Map dataMap = new HashMap();// 传给导出页面的数据 // List imgKeyId = new ArrayList<>();// 需要查询图片的id标识信息 - HashSet imgIds = new HashSet(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id - String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) { - pd.put("KEYWORDS", KEYWORDS.trim()); - } - String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 - if (Tools.notEmpty(ISQUALIFIED)) { - pd.put("ISQUALIFIED", ISQUALIFIED.trim()); - } - String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 - if (Tools.notEmpty(HIDDENLEVELE)) { - pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); - } - String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 - if (Tools.notEmpty(STARTTIME)) { - pd.put("STARTTIME", STARTTIME.trim()); - } - String STATE = pd.getString("STATE"); // 关键词检索条件 - if (Tools.notEmpty(STATE)) { - pd.put("STATE", STATE.trim()); - } - String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 - if (Tools.notEmpty(ENDTIME)) { - pd.put("ENDTIME", ENDTIME + " 23:59:59"); - } - String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 - if (Tools.notEmpty(DISPOSESTATE)) { - pd.put("DISPOSESTATE", DISPOSESTATE.trim()); - pd.put("SELFUSERID", Jurisdiction.getUSER_ID()); - pd.put("USERDEPT", Jurisdiction.getDEPARTMENT_ID()); - } - String IS_SELF = pd.getString("IS_SELF"); // 关键词检索条件 - if (IS_SELF != null && IS_SELF.equals("1")) { - pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID()); - } - String DEPTIDS = pd.getString("DEPTIDS"); - if(Tools.notEmpty(DEPTIDS)) { - String DEPT_IDS[] = DEPTIDS.split(","); - pd.put("DEPT_IDS", DEPT_IDS); - } - // 查看隐患信息 - List varOList = customHiddenService.listAll(pd); - for (PageData pageData : varOList) { + HashSet imgIds = new HashSet(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业id + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) { + pd.put("KEYWORDS", KEYWORDS.trim()); + } + String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 + if (Tools.notEmpty(ISQUALIFIED)) { + pd.put("ISQUALIFIED", ISQUALIFIED.trim()); + } + String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 + if (Tools.notEmpty(HIDDENLEVELE)) { + pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); + } + String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 + if (Tools.notEmpty(STARTTIME)) { + pd.put("STARTTIME", STARTTIME.trim()); + } + String STATE = pd.getString("STATE"); // 关键词检索条件 + if (Tools.notEmpty(STATE)) { + pd.put("STATE", STATE.trim()); + } + String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 + if (Tools.notEmpty(ENDTIME)) { + pd.put("ENDTIME", ENDTIME + " 23:59:59"); + } + String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 + if (Tools.notEmpty(DISPOSESTATE)) { + pd.put("DISPOSESTATE", DISPOSESTATE.trim()); + pd.put("SELFUSERID", Jurisdiction.getUSER_ID()); + pd.put("USERDEPT", Jurisdiction.getDEPARTMENT_ID()); + } + String IS_SELF = pd.getString("IS_SELF"); // 关键词检索条件 + if (IS_SELF != null && IS_SELF.equals("1")) { + pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID()); + } + String DEPTIDS = pd.getString("DEPTIDS"); + if (Tools.notEmpty(DEPTIDS)) { + String DEPT_IDS[] = DEPTIDS.split(","); + pd.put("DEPT_IDS", DEPT_IDS); + } + // 查看隐患信息 + List varOList = customHiddenService.listAll(pd); + for (PageData pageData : varOList) { // imgKeyId.add(pageData.getString("HIDDEN_ID")); - imgIds.add(pageData.getString("HIDDEN_ID")); - } + imgIds.add(pageData.getString("HIDDEN_ID")); + } - // 查询整改方案 - List schemeList = hiddenSchemeService.listExport(pd); - Map schemeMap = new HashMap<>(); - for (PageData pageData : schemeList) { - schemeMap.put(pageData.getString("HIDDEN_ID"), pageData); + // 查询整改方案 + List schemeList = hiddenSchemeService.listExport(pd); + Map schemeMap = new HashMap<>(); + for (PageData pageData : schemeList) { + schemeMap.put(pageData.getString("HIDDEN_ID"), pageData); // imgKeyId.add(pageData.getString("HIDDEN_ID")); // imgKeyId.add(pageData.getString("HIDDENSCHEME_ID")); - imgIds.add(pageData.getString("HIDDENSCHEME_ID")); - } - // 验收信息 - List checkList = customHiddenCheckService.listExport(pd); - Map> checkMap = new HashMap<>(); - Integer checkMaxCount = 1; - for (PageData pageData : checkList) { - Integer checkCount = 1; - List vaList = new ArrayList<>(); - if (checkMap.containsKey(pageData.get("HIDDEN_ID"))) { - vaList = checkMap.get(pageData.get("HIDDEN_ID")); - checkCount = vaList.size(); - if (checkMaxCount < checkCount) { - checkMaxCount = checkCount; - } - } - vaList.add(pageData); - checkMap.put(pageData.get("HIDDEN_ID").toString(), vaList); + imgIds.add(pageData.getString("HIDDENSCHEME_ID")); + } + // 验收信息 + List checkList = customHiddenCheckService.listExport(pd); + Map> checkMap = new HashMap<>(); + Integer checkMaxCount = 1; + for (PageData pageData : checkList) { + Integer checkCount = 1; + List vaList = new ArrayList<>(); + if (checkMap.containsKey(pageData.get("HIDDEN_ID"))) { + vaList = checkMap.get(pageData.get("HIDDEN_ID")); + checkCount = vaList.size(); + if (checkMaxCount < checkCount) { + checkMaxCount = checkCount; + } + } + vaList.add(pageData); + checkMap.put(pageData.get("HIDDEN_ID").toString(), vaList); // imgKeyId.add(pageData.getString("HIDDENCHECK_ID")); - imgIds.add(pageData.getString("HIDDENCHECK_ID")); - } + imgIds.add(pageData.getString("HIDDENCHECK_ID")); + } // String[] imgId = new String[imgKeyId.size()]; @@ -1396,525 +1396,526 @@ public class CustomHiddenController extends BaseController { // imgId[i] = imgid; // } // - List imgIdList = new ArrayList<>(); - for(String imgid:imgIds) { - imgIdList.add(imgid); - } - PageData imgpd2 = new PageData(); - String[] imgId =imgIdList.toArray(new String[imgIdList.size()]); - imgpd2.put("ArrayDATA_IDS", imgId); - List imgList = imgFilesService.listAllByIds(imgpd2); + List imgIdList = new ArrayList<>(); + for (String imgid : imgIds) { + imgIdList.add(imgid); + } + PageData imgpd2 = new PageData(); + String[] imgId = imgIdList.toArray(new String[imgIdList.size()]); + imgpd2.put("ArrayDATA_IDS", imgId); + List imgList = imgFilesService.listAllByIds(imgpd2); - Map imgCount = new HashMap<>(); - Integer imgTypeMaxCount1 = 1, imgTypeMaxCount2 = 1, imgTypeMaxCount3 = 1, imgTypeMaxCount4 = 1, - imgTypeMaxCount5 = 1, imgTypeMaxCount6 = 1, imgTypeMaxCount7 = 1, imgTypeMaxCount8 = 1; + Map imgCount = new HashMap<>(); + Integer imgTypeMaxCount1 = 1, imgTypeMaxCount2 = 1, imgTypeMaxCount3 = 1, imgTypeMaxCount4 = 1, + imgTypeMaxCount5 = 1, imgTypeMaxCount6 = 1, imgTypeMaxCount7 = 1, imgTypeMaxCount8 = 1; - Map> imgMap = new HashMap<>(); - for (int i = 0; i < imgList.size(); i++) { - if (Tools.isEmpty(imgList.get(i).get("TYPE"))) { - continue; - } - if (Tools.isEmpty(imgList.get(i).get("FOREIGN_KEY"))) { - continue; - } - List list = new ArrayList<>(); - String key = imgList.get(i).getString("FOREIGN_KEY") + ";" + imgList.get(i).get("TYPE"); - if (imgMap.containsKey(key)) { - list = imgMap.get(key); - } - list.add(imgList.get(i).getString("FILEPATH")); - imgMap.put(key, list); - String imgType = imgList.get(i).get("TYPE").toString(); - Integer count = 1; - if (imgCount.containsKey(key)) { - count = imgCount.get(key) + 1; - } - if ("1".equals(imgType)) { - if (imgTypeMaxCount1 < count) { - imgTypeMaxCount1 = count; - } - } - if ("2".equals(imgType)) { - if (imgTypeMaxCount2 < count) { - imgTypeMaxCount2 = count; - } - } - if ("3".equals(imgType)) { - if (imgTypeMaxCount3 < count) { - imgTypeMaxCount3 = count; - } - } - if ("4".equals(imgType)) { - if (imgTypeMaxCount4 < count) { - imgTypeMaxCount4 = count; - } - } - if ("5".equals(imgType)) { - if (imgTypeMaxCount5 < count) { - imgTypeMaxCount5 = count; - } - } - if ("6".equals(imgType)) { - if (imgTypeMaxCount6 < count) { - imgTypeMaxCount6 = count; - } - } - if ("7".equals(imgType)) { - if (imgTypeMaxCount7 < count) { - imgTypeMaxCount7 = count; - } - } - if ("8".equals(imgType)) { - if (imgTypeMaxCount8 < count) { - imgTypeMaxCount8 = count; - } - } - imgCount.put(key, count); - } - List varList = new ArrayList(); - for (PageData pageData : varOList) { - int count = 0; - PageData vpd = new PageData(); - String hidId = pageData.getString("HIDDEN_ID"); - vpd.put("var" + (1 + count), sourceMap.get(pageData.getString("SOURCE"))); - vpd.put("var" + (2 + count), pageData.getString("RISK_UNIT")); - vpd.put("var" + (3 + count), pageData.getString("IDENTIFICATION")); - vpd.put("var" + (4 + count), pageData.getString("RISK_DESCR")); - vpd.put("var" + (5 + count), pageData.getString("LEVEL")); - vpd.put("var" + (6 + count), pageData.getString("CHECK_CONTENT")); - vpd.put("var" + (7 + count), dicMap.get(pageData.getString("HIDDENLEVEL"))); - vpd.put("var" + (8 + count), stateMap.get(pageData.getString("STATE"))); - vpd.put("var" + (9 + count), pageData.getString("HIDDENDESCR")); - vpd.put("var" + (10 + count), pageData.getString("HIDDENPART")); - vpd.put("var" + (11 + count), deparMap.get(pageData.getString("HIDDENFINDDEPT"))); - vpd.put("var" + (12 + count), userMap.get(pageData.getString("CREATOR"))); - vpd.put("var" + (13 + count), pageData.getString("CREATTIME")); - vpd.put("var" + (14 + count), rectifType.get(pageData.getString("RECTIFICATIONTYPE"))); - vpd.put("var" + (15 + count), pageData.getString("RECTIFICATIONDEADLINE")); - List yhImg = imgMap.get(pageData.getString("HIDDEN_ID") + ";3"); - for (int i = 0; i < imgTypeMaxCount3; i++) { - if (null != yhImg) { - if (i < yhImg.size()) { - vpd.put("img" + (16 + i), yhImg.get(i)); - } else { - vpd.put("img" + (16 + i), ""); - } - } else { - vpd.put("img" + (16 + i), ""); - } + Map> imgMap = new HashMap<>(); + for (int i = 0; i < imgList.size(); i++) { + if (Tools.isEmpty(imgList.get(i).get("TYPE"))) { + continue; + } + if (Tools.isEmpty(imgList.get(i).get("FOREIGN_KEY"))) { + continue; + } + List list = new ArrayList<>(); + String key = imgList.get(i).getString("FOREIGN_KEY") + ";" + imgList.get(i).get("TYPE"); + if (imgMap.containsKey(key)) { + list = imgMap.get(key); + } + list.add(imgList.get(i).getString("FILEPATH")); + imgMap.put(key, list); + String imgType = imgList.get(i).get("TYPE").toString(); + Integer count = 1; + if (imgCount.containsKey(key)) { + count = imgCount.get(key) + 1; + } + if ("1".equals(imgType)) { + if (imgTypeMaxCount1 < count) { + imgTypeMaxCount1 = count; + } + } + if ("2".equals(imgType)) { + if (imgTypeMaxCount2 < count) { + imgTypeMaxCount2 = count; + } + } + if ("3".equals(imgType)) { + if (imgTypeMaxCount3 < count) { + imgTypeMaxCount3 = count; + } + } + if ("4".equals(imgType)) { + if (imgTypeMaxCount4 < count) { + imgTypeMaxCount4 = count; + } + } + if ("5".equals(imgType)) { + if (imgTypeMaxCount5 < count) { + imgTypeMaxCount5 = count; + } + } + if ("6".equals(imgType)) { + if (imgTypeMaxCount6 < count) { + imgTypeMaxCount6 = count; + } + } + if ("7".equals(imgType)) { + if (imgTypeMaxCount7 < count) { + imgTypeMaxCount7 = count; + } + } + if ("8".equals(imgType)) { + if (imgTypeMaxCount8 < count) { + imgTypeMaxCount8 = count; + } + } + imgCount.put(key, count); + } + List varList = new ArrayList(); + for (PageData pageData : varOList) { + int count = 0; + PageData vpd = new PageData(); + String hidId = pageData.getString("HIDDEN_ID"); + vpd.put("var" + (1 + count), sourceMap.get(pageData.getString("SOURCE"))); + vpd.put("var" + (2 + count), pageData.getString("RISK_UNIT")); + vpd.put("var" + (3 + count), pageData.getString("IDENTIFICATION")); + vpd.put("var" + (4 + count), pageData.getString("RISK_DESCR")); + vpd.put("var" + (5 + count), pageData.getString("LEVEL")); + vpd.put("var" + (6 + count), pageData.getString("CHECK_CONTENT")); + vpd.put("var" + (7 + count), dicMap.get(pageData.getString("HIDDENLEVEL"))); + vpd.put("var" + (8 + count), stateMap.get(pageData.getString("STATE"))); + vpd.put("var" + (9 + count), pageData.getString("HIDDENDESCR")); + vpd.put("var" + (10 + count), pageData.getString("HIDDENPART")); + vpd.put("var" + (11 + count), deparMap.get(pageData.getString("HIDDENFINDDEPT"))); + vpd.put("var" + (12 + count), userMap.get(pageData.getString("CREATOR"))); + vpd.put("var" + (13 + count), pageData.getString("CREATTIME")); + vpd.put("var" + (14 + count), rectifType.get(pageData.getString("RECTIFICATIONTYPE"))); + vpd.put("var" + (15 + count), pageData.getString("RECTIFICATIONDEADLINE")); + List yhImg = imgMap.get(pageData.getString("HIDDEN_ID") + ";3"); + for (int i = 0; i < imgTypeMaxCount3; i++) { + if (null != yhImg) { + if (i < yhImg.size()) { + vpd.put("img" + (16 + i), yhImg.get(i)); + } else { + vpd.put("img" + (16 + i), ""); + } + } else { + vpd.put("img" + (16 + i), ""); + } - } - count += imgTypeMaxCount3; - vpd.put("var" + (16 + count), pageData.getString("RECTIFYDESCR"));// 整改描述 - vpd.put("var" + (17 + count), deparMap.get(pageData.getString("RECTIFICATIONDEPT")));// 整改部门 - vpd.put("var" + (18 + count), userMap.get(pageData.getString("RECTIFICATIONOR")));// 整改人 - vpd.put("var" + (19 + count), pageData.getString("RECTIFICATIONTIME"));// 整改时间 - List zgImg = imgMap.get(hidId + ";4");// 整改后图片 - for (int i = 0; i < imgTypeMaxCount4; i++) { - if (null != zgImg) { - if (i < zgImg.size()) { - vpd.put("img" + (20 + count + i), zgImg.get(i)); - } else { - vpd.put("img" + (20 + count + i), ""); - } - } else { - vpd.put("img" + (20 + count + i), ""); - } + } + count += imgTypeMaxCount3; + vpd.put("var" + (16 + count), pageData.getString("RECTIFYDESCR"));// 整改描述 + vpd.put("var" + (17 + count), deparMap.get(pageData.getString("RECTIFICATIONDEPT")));// 整改部门 + vpd.put("var" + (18 + count), userMap.get(pageData.getString("RECTIFICATIONOR")));// 整改人 + vpd.put("var" + (19 + count), pageData.getString("RECTIFICATIONTIME"));// 整改时间 + List zgImg = imgMap.get(hidId + ";4");// 整改后图片 + for (int i = 0; i < imgTypeMaxCount4; i++) { + if (null != zgImg) { + if (i < zgImg.size()) { + vpd.put("img" + (20 + count + i), zgImg.get(i)); + } else { + vpd.put("img" + (20 + count + i), ""); + } + } else { + vpd.put("img" + (20 + count + i), ""); + } - } - count += imgTypeMaxCount4; - vpd.put("var" + (20 + count), haveschemeMap.get(pageData.getString("HAVESCHEME")));// 整改方案 - if (schemeMap.containsKey(hidId)) { - PageData schemePd = schemeMap.get(hidId); - if ("1".equals(pageData.getString("HAVESCHEME"))) { - vpd.put("var" + (21 + count), schemePd.getString("SCREENINGDATE"));// 排查日期 - vpd.put("var" + (22 + count), schemePd.getString("LISTNAME"));// 隐患清单 - vpd.put("var" + (23 + count), schemePd.getString("GOVERNSTANDARDS"));// 治理标准要求 - vpd.put("var" + (24 + count), schemePd.getString("GOVERNMETHOD"));// 治理方法 - vpd.put("var" + (25 + count), schemePd.getString("EXPENDITURE"));// 经费和物资的落实 - vpd.put("var" + (26 + count), schemePd.getString("PRINCIPAL"));// 负责治理人员 - vpd.put("var" + (27 + count), schemePd.getString("PROGRAMMING"));// 工时安排 - vpd.put("var" + (28 + count), schemePd.getString("TIMELIMITFOR"));// 时限要求 - vpd.put("var" + (29 + count), pageData.getString("FILEPATH"));// 应急预案附件 - vpd.put("var" + (30 + count), schemePd.getString("JOBREQUIREMENT"));// 工作要求 - vpd.put("var" + (31 + count), schemePd.getString("OTHERBUSINESS"));// 其他事项 - List ysImg = imgMap.get(schemePd.getString("HIDDENSCHEME_ID") + ";8"); - for (int i = 0; i < imgTypeMaxCount8; i++) { - if (null != ysImg) { - if (i < ysImg.size()) { - vpd.put("img" + (32 + count + i), ysImg.get(i));// 方案图片 - } else { - vpd.put("img" + (32 + count + i), ""); - } - } else { - vpd.put("img" + (32 + count + i), ""); - } - } + } + count += imgTypeMaxCount4; + vpd.put("var" + (20 + count), haveschemeMap.get(pageData.getString("HAVESCHEME")));// 整改方案 + if (schemeMap.containsKey(hidId)) { + PageData schemePd = schemeMap.get(hidId); + if ("1".equals(pageData.getString("HAVESCHEME"))) { + vpd.put("var" + (21 + count), schemePd.getString("SCREENINGDATE"));// 排查日期 + vpd.put("var" + (22 + count), schemePd.getString("LISTNAME"));// 隐患清单 + vpd.put("var" + (23 + count), schemePd.getString("GOVERNSTANDARDS"));// 治理标准要求 + vpd.put("var" + (24 + count), schemePd.getString("GOVERNMETHOD"));// 治理方法 + vpd.put("var" + (25 + count), schemePd.getString("EXPENDITURE"));// 经费和物资的落实 + vpd.put("var" + (26 + count), schemePd.getString("PRINCIPAL"));// 负责治理人员 + vpd.put("var" + (27 + count), schemePd.getString("PROGRAMMING"));// 工时安排 + vpd.put("var" + (28 + count), schemePd.getString("TIMELIMITFOR"));// 时限要求 + vpd.put("var" + (29 + count), pageData.getString("FILEPATH"));// 应急预案附件 + vpd.put("var" + (30 + count), schemePd.getString("JOBREQUIREMENT"));// 工作要求 + vpd.put("var" + (31 + count), schemePd.getString("OTHERBUSINESS"));// 其他事项 + List ysImg = imgMap.get(schemePd.getString("HIDDENSCHEME_ID") + ";8"); + for (int i = 0; i < imgTypeMaxCount8; i++) { + if (null != ysImg) { + if (i < ysImg.size()) { + vpd.put("img" + (32 + count + i), ysImg.get(i));// 方案图片 + } else { + vpd.put("img" + (32 + count + i), ""); + } + } else { + vpd.put("img" + (32 + count + i), ""); + } + } - } - count += imgTypeMaxCount8; - if (checkMap.containsKey(hidId)) { - List check = checkMap.get(hidId); - for (PageData pageData2 : check) { - vpd.put("var" + (32 + count), ysStatusMap.get(pageData2.getString("CHECKDESCR")));// 验收描述 - vpd.put("var" + (33 + count), pageData2.getString("STATUS"));// 是否合格 - vpd.put("var" + (34 + count), pageData2.getString("CHECKDEPTNAME"));// 验收部门 - vpd.put("var" + (35 + count), pageData2.getString("CHECKORNAME"));// 验收人 - vpd.put("var" + (36 + count), pageData2.getString("CHECK_TIME"));// 验收时间 + } + count += imgTypeMaxCount8; + if (checkMap.containsKey(hidId)) { + List check = checkMap.get(hidId); + for (PageData pageData2 : check) { + vpd.put("var" + (32 + count), ysStatusMap.get(pageData2.getString("CHECKDESCR")));// 验收描述 + vpd.put("var" + (33 + count), pageData2.getString("STATUS"));// 是否合格 + vpd.put("var" + (34 + count), pageData2.getString("CHECKDEPTNAME"));// 验收部门 + vpd.put("var" + (35 + count), pageData2.getString("CHECKORNAME"));// 验收人 + vpd.put("var" + (36 + count), pageData2.getString("CHECK_TIME"));// 验收时间 // vpd.put("var"+(37+count),pageData2.getString("HIDDENCHECK_ID"));//验收图片 - List ysImg = imgMap.get(pageData2.getString("HIDDENCHECK_ID") + ";5");// 整改后图片 - for (int i = 0; i < imgTypeMaxCount5; i++) { - if (null != ysImg) { - if (i < ysImg.size()) { - vpd.put("img" + (37 + count + i), ysImg.get(i)); - } else { - vpd.put("img" + (37 + count + i), ""); - } - } else { - vpd.put("img" + (37 + count + i), ""); - } + List ysImg = imgMap.get(pageData2.getString("HIDDENCHECK_ID") + ";5");// 整改后图片 + for (int i = 0; i < imgTypeMaxCount5; i++) { + if (null != ysImg) { + if (i < ysImg.size()) { + vpd.put("img" + (37 + count + i), ysImg.get(i)); + } else { + vpd.put("img" + (37 + count + i), ""); + } + } else { + vpd.put("img" + (37 + count + i), ""); + } - } - } + } + } - } - } + } + } - varList.add(vpd); - } + varList.add(vpd); + } - List titles = new ArrayList(); + List titles = new ArrayList(); - titles.add("隐患来源"); // 1 - titles.add("风险点（单元）"); // 2 - titles.add("辨识部位"); // 3 - titles.add("存在风险"); // 4 - titles.add("风险分级"); // 6 - titles.add("检查内容"); // 7 - titles.add("隐患级别"); // 16 - titles.add("隐患状态"); // 17= - titles.add("隐患描述"); // 8 - titles.add("隐患部位"); // 9 - titles.add("隐患发现部门"); // 9 ```````` - titles.add("发现人"); // 10 - titles.add("发现时间"); // 11 - titles.add("整改类型"); // 10 - titles.add("整改期限"); // 11 - for (int i = 0; i < imgTypeMaxCount3; i++) { - titles.add("隐患图片"); // 11 - } + titles.add("隐患来源"); // 1 + titles.add("风险点（单元）"); // 2 + titles.add("辨识部位"); // 3 + titles.add("存在风险"); // 4 + titles.add("风险分级"); // 6 + titles.add("检查内容"); // 7 + titles.add("隐患级别"); // 16 + titles.add("隐患状态"); // 17= + titles.add("隐患描述"); // 8 + titles.add("隐患部位"); // 9 + titles.add("隐患发现部门"); // 9 ```````` + titles.add("发现人"); // 10 + titles.add("发现时间"); // 11 + titles.add("整改类型"); // 10 + titles.add("整改期限"); // 11 + for (int i = 0; i < imgTypeMaxCount3; i++) { + titles.add("隐患图片"); // 11 + } - titles.add("整改描述"); - titles.add("整改部门"); - titles.add("整改人"); - titles.add("整改时间"); + titles.add("整改描述"); + titles.add("整改部门"); + titles.add("整改人"); + titles.add("整改时间"); - for (int i = 0; i < imgTypeMaxCount4; i++) { - titles.add("整改后图片"); // 11 - } + for (int i = 0; i < imgTypeMaxCount4; i++) { + titles.add("整改后图片"); // 11 + } - titles.add("整改方案"); - titles.add("排查日期"); - titles.add("隐患清单"); - titles.add("治理标准要求"); - titles.add("治理方法"); - titles.add("经费和物资的落实"); - titles.add("负责治理人员"); - titles.add("工时安排"); - titles.add("时限要求"); - titles.add("应急预案附件"); - titles.add("工作要求"); - titles.add("其他事项"); - for (int i = 0; i < imgTypeMaxCount8; i++) { - titles.add("方案图片"); // 11 - } - for (int i = 0; i < checkMaxCount; i++) { - titles.add("验收描述"); - titles.add("是否合格"); - titles.add("验收部门"); - titles.add("验收人"); - titles.add("验收时间"); + titles.add("整改方案"); + titles.add("排查日期"); + titles.add("隐患清单"); + titles.add("治理标准要求"); + titles.add("治理方法"); + titles.add("经费和物资的落实"); + titles.add("负责治理人员"); + titles.add("工时安排"); + titles.add("时限要求"); + titles.add("应急预案附件"); + titles.add("工作要求"); + titles.add("其他事项"); + for (int i = 0; i < imgTypeMaxCount8; i++) { + titles.add("方案图片"); // 11 + } + for (int i = 0; i < checkMaxCount; i++) { + titles.add("验收描述"); + titles.add("是否合格"); + titles.add("验收部门"); + titles.add("验收人"); + titles.add("验收时间"); - for (int j = 0; j < imgTypeMaxCount5; j++) { - titles.add("验收图片"); - } - } - dataMap.put("titles", titles); - dataMap.put("varList", varList); - HiddenExcelCompressImg erv2 = new HiddenExcelCompressImg(); - mv = new ModelAndView(erv2, dataMap); - return mv; - } + for (int j = 0; j < imgTypeMaxCount5; j++) { + titles.add("验收图片"); + } + } + dataMap.put("titles", titles); + dataMap.put("varList", varList); + HiddenExcelCompressImg erv2 = new HiddenExcelCompressImg(); + mv = new ModelAndView(erv2, dataMap); + return mv; + } - @RequestMapping(value = "/excel") - public void exportExcelPro(HttpServletResponse response) throws Exception{ - customHiddenService.createExcel(response,this.getPageData()); - } + @RequestMapping(value = "/excel") + public void exportExcelPro(HttpServletResponse response) throws Exception { + customHiddenService.createExcel(response, this.getPageData()); + } - /** - * app首页获取数量 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/getCountByUserId") - @ResponseBody - @LogAnno(menuType= "首页",menuServer= "首页",instructionsOperate = "首页",instructionsType = "首页获取数量") - public Object getCountByUserId(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - Map hidCount = new HashMap<>(); + /** + * app首页获取数量 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCountByUserId") + @ResponseBody + @LogAnno(menuType = "首页", menuServer = "首页", instructionsOperate = "首页", instructionsType = "首页获取数量") + public Object getCountByUserId(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map hidCount = new HashMap<>(); // String DEPARTMENT_ID = Jurisdiction.getDEPARTMENT_ID(); // String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); // if(ids!=null && Tools.notEmpty(ids)) { // ids = ids.substring(0,ids.lastIndexOf(",")); // pd.put("DEPARTMENT_IDS", ids.split(",")); // } - pd.put("userId", Jurisdiction.getUSER_ID()); // 发现人 - Integer dzg = 0;// 待整改 1 - Integer ycq = 0;// 已超期 5 - Integer dfc = 0;// 待复查 2 - Integer yys = 0;// 已验收 4 - // STATE -- 隐患状态 0-未提交 1- 未整改 2-已整改 3-已复查 4-已验收 5-已过期 - if (Tools.notEmpty(pd.get("userId").toString())) { - if (Jurisdiction.getIS_MAIN().equals("0")) { - pd.put("SELFUSERID", pd.get("userId")); - } else if (Jurisdiction.getIS_MAIN().equals("1")) { - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - } + pd.put("userId", Jurisdiction.getUSER_ID()); // 发现人 + Integer dzg = 0;// 待整改 1 + Integer ycq = 0;// 已超期 5 + Integer dfc = 0;// 待复查 2 + Integer yys = 0;// 已验收 4 + // STATE -- 隐患状态 0-未提交 1- 未整改 2-已整改 3-已复查 4-已验收 5-已过期 + if (Tools.notEmpty(pd.get("userId").toString())) { + if (Jurisdiction.getIS_MAIN().equals("0")) { + pd.put("SELFUSERID", pd.get("userId")); + } else if (Jurisdiction.getIS_MAIN().equals("1")) { + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + } - List rectifiHid = customHiddenService.getCountByRectifiCationorId(pd); // 根据人员id获取整改隐患信息 state 1 5 - for (int i = 0; i < rectifiHid.size(); i++) { - PageData rec = rectifiHid.get(i); - if (null == rec.get("STATE")) { - continue; - } - if (rec.get("STATE").equals("1") || rec.get("STATE").equals("-1")) { - dzg++; - } - } - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - pd.put("ISMAIN", Jurisdiction.getIS_MAIN()); - pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); - pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); - List creatorHid = customHiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 - for (int i = 0; i < creatorHid.size(); i++) { - PageData cre = creatorHid.get(i); - if (null == cre.get("STATE")) { - continue; - } - if (cre.get("STATE").equals("2")) { - dfc++; - } - if (cre.get("STATE").equals("4")) { - yys++; - } - if (cre.get("STATE").equals("-1")) { - ycq++; - } - } - } - hidCount.put("dzg", dzg); - hidCount.put("ycq", ycq); - hidCount.put("dfc", dfc); - hidCount.put("yys", yys); + List rectifiHid = customHiddenService.getCountByRectifiCationorId(pd); // 根据人员id获取整改隐患信息 state 1 5 + for (int i = 0; i < rectifiHid.size(); i++) { + PageData rec = rectifiHid.get(i); + if (null == rec.get("STATE")) { + continue; + } + if (rec.get("STATE").equals("1") || rec.get("STATE").equals("-1")) { + dzg++; + } + } + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + List creatorHid = customHiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 + for (int i = 0; i < creatorHid.size(); i++) { + PageData cre = creatorHid.get(i); + if (null == cre.get("STATE")) { + continue; + } + if (cre.get("STATE").equals("2")) { + dfc++; + } + if (cre.get("STATE").equals("4")) { + yys++; + } + if (cre.get("STATE").equals("-1")) { + ycq++; + } + } + } + hidCount.put("dzg", dzg); + hidCount.put("ycq", ycq); + hidCount.put("dfc", dfc); + hidCount.put("yys", yys); - map.put("hidCount", hidCount); - map.put("page", page); - map.put("result", errInfo); - return map; - } + map.put("hidCount", hidCount); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * app首页获取数量 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/getCountByCorpId") - @ResponseBody - public Object getCountByCorpId(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - Map hidCount = new HashMap<>(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - Integer dzg = 0;// 待整改 1 - Integer ycq = 0;// 已超期 5 - Integer dfc = 0;// 待复查 2 - Integer yys = 0;// 已验收 4 - // STATE -- 隐患状态 0-未提交 1- 未整改 2-已整改 3-已复查 4-已验收 5-已过期 - List rectifiHid = customHiddenService.getCountByRectifiCationorId(pd); // 根据人员id获取整改隐患信息 state 1 5 - for (int i = 0; i < rectifiHid.size(); i++) { - PageData rec = rectifiHid.get(i); - if (null == rec.get("STATE")) { - continue; - } - if (rec.get("STATE").equals("1")) { - dzg++; - } - if (rec.get("STATE").equals("5")) { - ycq++; - } - } - List creatorHid = customHiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 - for (int i = 0; i < creatorHid.size(); i++) { - PageData cre = rectifiHid.get(i); - if (null == cre.get("STATE")) { - continue; - } - if (cre.get("STATE").equals("2")) { - dfc++; - } - if (cre.get("STATE").equals("4")) { - yys++; - } - } - hidCount.put("dzg", dzg); - hidCount.put("ycq", ycq); - hidCount.put("dfc", dfc); - hidCount.put("yys", yys); + /** + * app首页获取数量 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCountByCorpId") + @ResponseBody + public Object getCountByCorpId(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map hidCount = new HashMap<>(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + Integer dzg = 0;// 待整改 1 + Integer ycq = 0;// 已超期 5 + Integer dfc = 0;// 待复查 2 + Integer yys = 0;// 已验收 4 + // STATE -- 隐患状态 0-未提交 1- 未整改 2-已整改 3-已复查 4-已验收 5-已过期 + List rectifiHid = customHiddenService.getCountByRectifiCationorId(pd); // 根据人员id获取整改隐患信息 state 1 5 + for (int i = 0; i < rectifiHid.size(); i++) { + PageData rec = rectifiHid.get(i); + if (null == rec.get("STATE")) { + continue; + } + if (rec.get("STATE").equals("1")) { + dzg++; + } + if (rec.get("STATE").equals("5")) { + ycq++; + } + } + List creatorHid = customHiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 + for (int i = 0; i < creatorHid.size(); i++) { + PageData cre = rectifiHid.get(i); + if (null == cre.get("STATE")) { + continue; + } + if (cre.get("STATE").equals("2")) { + dfc++; + } + if (cre.get("STATE").equals("4")) { + yys++; + } + } + hidCount.put("dzg", dzg); + hidCount.put("ycq", ycq); + hidCount.put("dfc", dfc); + hidCount.put("yys", yys); - map.put("hidCount", hidCount); - map.put("page", page); - map.put("result", errInfo); - return map; - } - /** - * app首页获取数量 - * - * @param page - * @throws Exception - */ - @RequestMapping(value = "/getCountByHiddenType") - @ResponseBody - @LogAnno(menuType= "首页",menuServer= "首页",instructionsOperate = "首页",instructionsType = "首页获取数量") - public Object getCountByHiddenType(Page page) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - pd.put("ISMAIN", Jurisdiction.getIS_MAIN()); - pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); - pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); - String DEPTIDS = pd.getString("DEPTIDS"); - if(Tools.notEmpty(DEPTIDS)) { - String DEPT_IDS[] = DEPTIDS.split(","); - pd.put("DEPT_IDS", DEPT_IDS); - } - List hiddList =customHiddenService.getCountByHiddenType(pd); + map.put("hidCount", hidCount); + map.put("page", page); + map.put("result", errInfo); + return map; + } - Map hiddMap = new HashedMap(); - for (PageData pageData:hiddList){ - if(Tools.isEmpty(pageData.get("HIDDENTYPE"))){ - hiddMap.put("hiddenType0006",pageData.get("count").toString()); - }else{ - hiddMap.put(pageData.get("HIDDENTYPE").toString(),pageData.get("count").toString()); - } - } - List dicList = dictionariesService.listSubDictByParentId("3babc15144444bdc8d763d0af2bdfff6"); - List valList = new ArrayList(); - Map valMap = new HashedMap(); - for (Dictionaries dictionaries:dicList){ - valMap = new HashedMap(); - if(hiddMap.containsKey(dictionaries.getBIANMA())){ - valMap.put("value",hiddMap.get(dictionaries.getBIANMA())); - }else{ - valMap.put("value","0"); - } - valMap.put("name",dictionaries.getNAME()); - valList.add(valMap); - } - map.put("hiddenTypeCount", valList); - map.put("result", errInfo); - return map; - } + /** + * app首页获取数量 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCountByHiddenType") + @ResponseBody + @LogAnno(menuType = "首页", menuServer = "首页", instructionsOperate = "首页", instructionsType = "首页获取数量") + public Object getCountByHiddenType(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("ISMAIN", Jurisdiction.getIS_MAIN()); + pd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + pd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + String DEPTIDS = pd.getString("DEPTIDS"); + if (Tools.notEmpty(DEPTIDS)) { + String DEPT_IDS[] = DEPTIDS.split(","); + pd.put("DEPT_IDS", DEPT_IDS); + } + List hiddList = customHiddenService.getCountByHiddenType(pd); + + Map hiddMap = new HashedMap(); + for (PageData pageData : hiddList) { + if (Tools.isEmpty(pageData.get("HIDDENTYPE"))) { + hiddMap.put("hiddenType0006", pageData.get("count").toString()); + } else { + hiddMap.put(pageData.get("HIDDENTYPE").toString(), pageData.get("count").toString()); + } + } + List dicList = dictionariesService.listSubDictByParentId("3babc15144444bdc8d763d0af2bdfff6"); + List valList = new ArrayList(); + Map valMap = new HashedMap(); + for (Dictionaries dictionaries : dicList) { + valMap = new HashedMap(); + if (hiddMap.containsKey(dictionaries.getBIANMA())) { + valMap.put("value", hiddMap.get(dictionaries.getBIANMA())); + } else { + valMap.put("value", "0"); + } + valMap.put("name", dictionaries.getNAME()); + valList.add(valMap); + } + map.put("hiddenTypeCount", valList); + map.put("result", errInfo); + return map; + } - /** - * 首页统计 - * - * @param - * @throws Exception - */ - @RequestMapping(value = "/hiddenSta") - @ResponseBody - public Object hiddenSta() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List dates = DateUtil.getHalfYearMonth(true); - Map dateMap = new HashMap<>(); - pd.put("TYPE", 1); - pd.put("TIME", dates.get(0)); - List allHidden = customHiddenService.getHiddenNum(pd); + /** + * 首页统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/hiddenSta") + @ResponseBody + public Object hiddenSta() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List dates = DateUtil.getHalfYearMonth(true); + Map dateMap = new HashMap<>(); + pd.put("TYPE", 1); + pd.put("TIME", dates.get(0)); + List allHidden = customHiddenService.getHiddenNum(pd); - Map allMap = new HashMap<>(); - for(int i = 0; i < allHidden.size(); i++) { - allMap.put(allHidden.get(i).getString("TIME"), allHidden.get(i)); - } - pd.put("TYPE", 2); - List wzgHidden = customHiddenService.getHiddenNum(pd); - Map wzgMap = new HashMap<>(); - for(int i = 0; i < wzgHidden.size(); i++) { - wzgMap.put(wzgHidden.get(i).getString("TIME"), wzgHidden.get(i)); - } - pd.put("TYPE", 3); - List yzgHidden = customHiddenService.getHiddenNum(pd); - Map yzgMap = new HashMap<>(); - for(int i = 0; i < yzgHidden.size(); i++) { - yzgMap.put(yzgHidden.get(i).getString("TIME"), yzgHidden.get(i)); - } - pd.put("TYPE", 4); - List yysHidden = customHiddenService.getHiddenNum(pd); - Map yysMap = new HashMap<>(); - for(int i = 0; i < yysHidden.size(); i++) { - yysMap.put(yysHidden.get(i).getString("TIME"), yysHidden.get(i)); - } - List names = new ArrayList(); - List all = new ArrayList(); - List wzg = new ArrayList(); - List yzg = new ArrayList(); - List yys = new ArrayList(); - for(int i = 0; i < dates.size(); i++) { - names.add(dates.get(i).substring(dates.get(i).length()-2, dates.get(i).length())+"月"); - if(allMap.containsKey(dates.get(i))){ - PageData hidden = allMap.get(dates.get(i)); - all.add(hidden.get("NUMBER").toString()); - } else { - all.add("0"); - } - if(wzgMap.containsKey(dates.get(i))){ - PageData hidden = wzgMap.get(dates.get(i)); - wzg.add(hidden.get("NUMBER").toString()); - } else { - wzg.add("0"); - } - if(yzgMap.containsKey(dates.get(i))){ - PageData hidden = yzgMap.get(dates.get(i)); - yzg.add(hidden.get("NUMBER").toString()); - } else { - yzg.add("0"); - } - if(yysMap.containsKey(dates.get(i))){ - PageData hidden = yysMap.get(dates.get(i)); - yys.add(hidden.get("NUMBER").toString()); - } else { - yys.add("0"); - } - } - map.put("result", errInfo); - map.put("names", names); - map.put("all", all); - map.put("wzg", wzg); - map.put("yzg", yzg); - map.put("yys", yys); - return map; - } + Map allMap = new HashMap<>(); + for (int i = 0; i < allHidden.size(); i++) { + allMap.put(allHidden.get(i).getString("TIME"), allHidden.get(i)); + } + pd.put("TYPE", 2); + List wzgHidden = customHiddenService.getHiddenNum(pd); + Map wzgMap = new HashMap<>(); + for (int i = 0; i < wzgHidden.size(); i++) { + wzgMap.put(wzgHidden.get(i).getString("TIME"), wzgHidden.get(i)); + } + pd.put("TYPE", 3); + List yzgHidden = customHiddenService.getHiddenNum(pd); + Map yzgMap = new HashMap<>(); + for (int i = 0; i < yzgHidden.size(); i++) { + yzgMap.put(yzgHidden.get(i).getString("TIME"), yzgHidden.get(i)); + } + pd.put("TYPE", 4); + List yysHidden = customHiddenService.getHiddenNum(pd); + Map yysMap = new HashMap<>(); + for (int i = 0; i < yysHidden.size(); i++) { + yysMap.put(yysHidden.get(i).getString("TIME"), yysHidden.get(i)); + } + List names = new ArrayList(); + List all = new ArrayList(); + List wzg = new ArrayList(); + List yzg = new ArrayList(); + List yys = new ArrayList(); + for (int i = 0; i < dates.size(); i++) { + names.add(dates.get(i).substring(dates.get(i).length() - 2, dates.get(i).length()) + "月"); + if (allMap.containsKey(dates.get(i))) { + PageData hidden = allMap.get(dates.get(i)); + all.add(hidden.get("NUMBER").toString()); + } else { + all.add("0"); + } + if (wzgMap.containsKey(dates.get(i))) { + PageData hidden = wzgMap.get(dates.get(i)); + wzg.add(hidden.get("NUMBER").toString()); + } else { + wzg.add("0"); + } + if (yzgMap.containsKey(dates.get(i))) { + PageData hidden = yzgMap.get(dates.get(i)); + yzg.add(hidden.get("NUMBER").toString()); + } else { + yzg.add("0"); + } + if (yysMap.containsKey(dates.get(i))) { + PageData hidden = yysMap.get(dates.get(i)); + yys.add(hidden.get("NUMBER").toString()); + } else { + yys.add("0"); + } + } + map.put("result", errInfo); + map.put("names", names); + map.put("all", all); + map.put("wzg", wzg); + map.put("yzg", yzg); + map.put("yys", yys); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java new file mode 100644 index 0000000..6f0c0cf --- /dev/null +++ b/src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java @@ -0,0 +1,185 @@ +package com.zcloud.controller.inspectAnnually; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.inspectAnnually.InspectAnnuallyService; +import com.zcloud.service.system.ImgFilesService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +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.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 年检管理 + */ +@Controller +@RequestMapping("/inspectAnnually") +public class InspectAnnuallyController extends BaseController { + + @Autowired + private InspectAnnuallyService inspectAnnuallyService; + @Autowired + private ImgFilesService imgfilesService; + + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + // @RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR) + @ResponseBody + @LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "新增") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("INSPECTANNUALLY_ID", this.get32UUID()); //主键 + pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id + pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + pd.put("ARCHIVES_TYPE", "正常"); //档案状态 + + inspectAnnuallyService.save(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + // @RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR) + @ResponseBody + @LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "删除") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETEOR", Jurisdiction.getUSER_ID()); //删除人id + pd.put("DELETEORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETTIME", DateUtil.date2Str(new Date())); //删除时间 + inspectAnnuallyService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + // @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR) + @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.getUSER_ID()); //修改人id + pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + inspectAnnuallyService.edit(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit2") + // @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR) + @ResponseBody + @LogAnno(menuType = "机务档案", menuServer = "年检管理", instructionsOperate = "年检管理", instructionsType = "修改") + public Object edit2() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + pd.put("OPERATORNAME", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + inspectAnnuallyService.edit2(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + // @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR) + @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(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + page.setPd(pd); + List varList = inspectAnnuallyService.list(page); //列出Question列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + // @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR) + @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 = inspectAnnuallyService.findById(pd); //根据ID读取 + + pd.put("FOREIGN_KEY", pd.getString("INSPECTANNUALLY_ID")); + pd.put("TYPE",124); + List inspectinfoImgs = imgfilesService.listAll(pd);//年检资料图片 + + map.put("pd", pd); + map.put("inspectinfoImgs", inspectinfoImgs); + map.put("result", errInfo); + return map; + } + + +} diff --git a/src/main/java/com/zcloud/controller/mapApi/MapController.java b/src/main/java/com/zcloud/controller/mapApi/MapController.java index 3628b57..ee944fd 100644 --- a/src/main/java/com/zcloud/controller/mapApi/MapController.java +++ b/src/main/java/com/zcloud/controller/mapApi/MapController.java @@ -73,6 +73,7 @@ public class MapController extends BaseController { public ReturnMap getAlarmTypeCount() throws Exception { return ReturnMap.ok().put("data", PLSUtil.getAlarmTypeCount(Jurisdiction.getCORPINFO_ID())); } + /** * @Description: 告警数据 来自人员定位系统 * @Author: dearLin @@ -96,6 +97,7 @@ public class MapController extends BaseController { } return returnMap; } + /** * @Description: 人员定位情况 来自人员定位系统 * @Author: dearLin @@ -118,7 +120,7 @@ public class MapController extends BaseController { @RequestMapping(value = "/getRealTimeList") @ResponseBody public ReturnMap getRealTimeList() throws Exception { - return ReturnMap.ok().put("data", PLSUtil.getRealTimeList(Jurisdiction.getCORPINFO_ID())); + return ReturnMap.ok().put("data", PLSUtil.getRealTimeList(Jurisdiction.getCORPINFO_ID())); } /** @@ -129,7 +131,7 @@ public class MapController extends BaseController { @RequestMapping(value = "/getFenceList") @ResponseBody public ReturnMap getFenceList() throws Exception { - return ReturnMap.ok().put("data", PLSUtil.getAreaRegionList(Jurisdiction.getCORPINFO_ID(),1,999999)); + return ReturnMap.ok().put("data", PLSUtil.getAreaRegionList(Jurisdiction.getCORPINFO_ID(), 1, 999999)); } /** @@ -143,6 +145,19 @@ public class MapController extends BaseController { return eightWorkService.getEightWorks(); } + /** + * @Description: 获取八项作业数 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/getEightWorksByType") + @ResponseBody + public ReturnMap getEightWorksByType() throws Exception { + PageData pageData = this.getPageData(); + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + return ReturnMap.ok().put("varList", eightWorkService.getEightWorksByType(pageData)); + } + /** * @Description: 获取动火作业 * @Param: [] [] @@ -187,6 +202,7 @@ public class MapController extends BaseController { PageData cameraCount = videomanagerService.getCameraTopToShow(pageData); return ReturnMap.ok().put("pd", cameraCount); } + /** * @Description: 摄像头告警数 * @Author: dearLin @@ -202,6 +218,7 @@ public class MapController extends BaseController { List cameraCount = videomanagerService.getCameraAlarmCount(pageData); return ReturnMap.ok().put("CameraAlarmCount", cameraCount); } + /** * @Description: 摄像头报警类型 * @Author: dearLin @@ -260,8 +277,8 @@ public class MapController extends BaseController { @ResponseBody public ReturnMap getCharacterTrajectories() throws Exception { PageData pageData = getPageData(); - return ReturnMap.ok().put("data", PLSUtil.characterTrajectories(Jurisdiction.getCORPINFO_ID(),Integer.parseInt(pageData.getString("id")), - pageData.getString("startTime"),pageData.getString("endTime"),Integer.parseInt(pageData.getString("type")))); + return ReturnMap.ok().put("data", PLSUtil.characterTrajectories(Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("id")), + pageData.getString("startTime"), pageData.getString("endTime"), Integer.parseInt(pageData.getString("type")))); } /** @@ -288,7 +305,7 @@ public class MapController extends BaseController { int year = calendar.get(Calendar.YEAR); int month = calendar.get(Calendar.MONTH) + 1; - String monthString = String.format(year+"-%02d", month); + String monthString = String.format(year + "-%02d", month); String firstDayOfMonth = String.format("%04d-%02d-01 00:00:00", year, month); calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH)); calendar.set(Calendar.HOUR_OF_DAY, 23); @@ -323,6 +340,7 @@ public class MapController extends BaseController { public Object getCameraList() throws Exception { return ReturnMap.ok().put("varList", videomanagerService.getCameraList(getPageData())); } + public static void main(String[] args) { List> timeArray = generateTimeArray(); for (Map monthInfo : timeArray) { diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index 13f9298..7f4c4d1 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -35,9 +35,9 @@ public class OperatingVehiclesController extends BaseController { @RequestMapping(value="/add") @ResponseBody public Object add( - @RequestParam(value="headstockFile",required=false) MultipartFile headstockFile, - @RequestParam(value="drivinglicenseFile",required=false) MultipartFile drivinglicenseFile, - @RequestParam(value="operatingCertificateFile",required=false) MultipartFile operatingCertificateFile + /*@RequestParam(value="headstockphoto",required=false) MultipartFile headstockphoto, + @RequestParam(value="drivinglicensephoto",required=false) MultipartFile drivinglicensephoto, + @RequestParam(value="operatingcertificatephoto",required=false) MultipartFile operatingcertificatephoto*/ ) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -51,36 +51,37 @@ public class OperatingVehiclesController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 - if (null != headstockFile && !headstockFile.isEmpty()) { + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + /*if (null != headstockphoto && !headstockphoto.isEmpty()) { String ffile = DateUtil.getDays(); //本地 // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 //服务器 - String fileName = this.get32UUID()+headstockFile.getOriginalFilename().substring(headstockFile.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(headstockFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + String fileName = this.get32UUID()+headstockphoto.getOriginalFilename().substring(headstockphoto.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(headstockphoto, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("HEADSTOCK_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } - if (null != drivinglicenseFile && !drivinglicenseFile.isEmpty()) { + if (null != drivinglicensephoto && !drivinglicensephoto.isEmpty()) { String ffile = DateUtil.getDays(); //本地 // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 //服务器 - String fileName = this.get32UUID()+drivinglicenseFile.getOriginalFilename().substring(drivinglicenseFile.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(drivinglicenseFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + String fileName = this.get32UUID()+drivinglicensephoto.getOriginalFilename().substring(drivinglicensephoto.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(drivinglicensephoto, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("DRIVINGLICENSE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } - if (null != operatingCertificateFile && !operatingCertificateFile.isEmpty()) { + if (null != operatingcertificatephoto && !operatingcertificatephoto.isEmpty()) { String ffile = DateUtil.getDays(); //本地 // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 //服务器 - String fileName = this.get32UUID()+operatingCertificateFile.getOriginalFilename().substring(operatingCertificateFile.getOriginalFilename().lastIndexOf(".")); - smb.sshSftp(operatingCertificateFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + String fileName = this.get32UUID()+operatingcertificatephoto.getOriginalFilename().substring(operatingcertificatephoto.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(operatingcertificatephoto, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("OPERATING_CERTIFICATE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); - } + }*/ operatingVehiclesService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -98,6 +99,10 @@ public class OperatingVehiclesController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID()); + pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETTIME", DateUtil.date2Str(new Date())); + operatingVehiclesService.delete(pd); map.put("result", errInfo); //返回结果 return map; } @@ -172,20 +177,49 @@ public class OperatingVehiclesController extends BaseController { return map; } - @RequestMapping(value="/list") + @RequestMapping(value = "/list") + // @RequiresPermissions( value = {"question:list" , "courseware:list"}, logical = Logical.OR) @ResponseBody - public Object list(Page page) throws Exception{ - Map map = new HashMap(); + @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()); //企业ID page.setPd(pd); - List varList = operatingVehiclesService.list(page); //列出MajorDangerSource列表 + List varList = operatingVehiclesService.list(page); //列出Question列表 map.put("varList", varList); map.put("page", page); map.put("result", errInfo); return map; } + + @RequestMapping(value = "/operationvehicleList") + @ResponseBody + public Object operationVehicleList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String corpId = Jurisdiction.getCORPINFO_ID(); + List list = operatingVehiclesService.operationVehicleList(corpId); //列出Question列表 + map.put("list", list); + map.put("result", errInfo); + return map; + } + + /*@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(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + page.setPd(pd); + List varList = operatingVehiclesService.list(page); //列出Question列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + }*/ } diff --git a/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java b/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java index c0b58b4..ab91ccd 100644 --- a/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java +++ b/src/main/java/com/zcloud/controller/positioning/PositAlarmController.java @@ -509,4 +509,30 @@ public class PositAlarmController extends BaseController { } return returnMap; } + + @RequestMapping(value = "/alarmRecordgoEdit") + @ResponseBody + public ReturnMap alarmRecordgoEdit(Page page) throws Exception { + PageData pageData = this.getPageData(); + ReturnMap returnMap = new ReturnMap(); + JSONObject body = PLSUtil.GeneralList("/old/gatherAlarms/regAlarmGatherInfoList", pageData); + if (body != null) { + returnMap.putAll(body); + page.setTotalResult(body.getIntValue("total")); + returnMap.put("page", page); + } + return returnMap; + } + @RequestMapping(value = "/getAlarmGatherPsnInfo") + @ResponseBody + public ReturnMap getAlarmGatherPsnInfo() throws Exception { + PageData pageData = this.getPageData(); + ReturnMap returnMap = new ReturnMap(); + JSONObject body = PLSUtil.GeneralGetById("/old/gatherAlarms/getAlarmGatherPsnInfo?id=", pageData.getString("id"),Jurisdiction.getCORPINFO_ID()); + if (body != null) { + returnMap.putAll(body); + } + return returnMap; + } } + diff --git a/src/main/java/com/zcloud/controller/positioning/UserCardController.java b/src/main/java/com/zcloud/controller/positioning/UserCardController.java index ff19b8b..2fc855e 100644 --- a/src/main/java/com/zcloud/controller/positioning/UserCardController.java +++ b/src/main/java/com/zcloud/controller/positioning/UserCardController.java @@ -42,7 +42,7 @@ public class UserCardController extends BaseController { ReturnMap returnMap = new ReturnMap(); page.setPd(pageData); JSONObject body = PLSUtil.getUserCardDataList( - Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("str")); + Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("KEYWORDS")); if (body != null) { List list = body.getJSONArray("rows").toJavaList(JSONObject.class); returnMap.put("varList", list); diff --git a/src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java b/src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java index f21c815..3024383 100644 --- a/src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java @@ -100,6 +100,10 @@ public class IdentificationPartsController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("ISMATCHING", "0"); + if (Tools.isEmpty(pd.getString("ELECTRONIC_FENCE_ID"))) { + pd.put("ELECTRONIC_FENCE_NAME", null); + pd.put("ELECTRONIC_FENCE_ID", null); + } identificationpartsService.save(pd); if (files != null && files.length > 0) { @@ -237,7 +241,7 @@ public class IdentificationPartsController extends BaseController { PageData pageData = this.getPageData(); String KEYWORDS = (String) pageData.getOrDefault("KEYWORDS", ""); - JSONObject body = PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(),KEYWORDS,Integer.parseInt(pageData.getString("currentPage")),Integer.parseInt(pageData.getString("showCount")),0); + JSONObject body = PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(), KEYWORDS, Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), 0); if (body != null) { List list = body.getJSONArray("rows").toJavaList(JSONObject.class); diff --git a/src/main/java/com/zcloud/controller/system/DictionariesController.java b/src/main/java/com/zcloud/controller/system/DictionariesController.java index d41f26a..210d72b 100644 --- a/src/main/java/com/zcloud/controller/system/DictionariesController.java +++ b/src/main/java/com/zcloud/controller/system/DictionariesController.java @@ -1030,4 +1030,27 @@ public class DictionariesController extends BaseController { return map; } + @RequestMapping(value = "/getVehicleType") + @ResponseBody + public Object getVehicleType() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID"); + DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID; + List varList = dictionariesService.listgetVehicleType(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据 + List pdList = new ArrayList(); + for (Dictionaries d : varList) { + PageData pdf = new PageData(); + pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID()); + pdf.put("BIANMA", d.getBIANMA()); + pdf.put("NAME", d.getNAME()); + pdList.add(pdf); + } + map.put("list", pdList); + map.put("result", errInfo); //返回结果 + return map; + } + } diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index 277404a..e862abc 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -149,7 +149,7 @@ public class LoginController extends BaseController { PageData dpd = new PageData(); dpd.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID")); dpd = departmentService.findById(dpd); - if (dpd.getString("FOREIGNPERSONNEL").equals("1")) { + if ("1".equals(dpd.getString("FOREIGNPERSONNEL"))) { return ReturnMap.error("账号密码不正确"); } map.put("DEPARTMENT_NAME", dpd.getString("NAME")); diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 585f6c8..d2d7435 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -445,6 +445,7 @@ public class UsersController extends BaseController { String msg = usersService.changeOrUpdUserCardNo(pd); if (msg.equals(Const.CAN_CHENG_USER)) { if (PLSUtil.editUser(pd)) { + if (Tools.isEmpty(pd.getString("CARDNO"))) {pd.put("CARDNO", null);} usersService.editUser(pd); //执行修改 if ("true".equals(pd.getString("ISSTUDENT"))) { if ("select".equals(pd.getString("letDutiesType"))) { diff --git a/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java new file mode 100644 index 0000000..0b74c88 --- /dev/null +++ b/src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java @@ -0,0 +1,176 @@ +package com.zcloud.controller.taxationManage; + +import com.alibaba.excel.util.DateUtils; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.assignedManage.AssignedManageService; +import com.zcloud.service.system.DictionariesService; +import com.zcloud.service.taxationManage.TaxationManageService; +import com.zcloud.util.*; +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.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; + +@Controller +@RequestMapping("/taxationmanage") +public class TaxationManageController extends BaseController { + + @Autowired + private TaxationManageService taxationManageService; + + @Autowired + private Smb smb; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @ResponseBody + public Object add( + @RequestParam(value="drivinglicenseFile",required=false) MultipartFile drivinglicenseFile + ) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("TAXATION_ID", this.get32UUID()); //车船税主键 + pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id + pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + if("".equals(pd.getString("EXPIRE_STATUS"))) { + String expireDate = pd.getString("EXPIRE_DATE"); + String day = DateUtil.getDay(); + boolean flag = DateUtil.compareDate(expireDate, day); + if(flag) { + pd.put("EXPIRE_STATUS","未到期"); + }else{ + pd.put("EXPIRE_STATUS","已到期"); + } + } + if (null != drivinglicenseFile && !drivinglicenseFile.isEmpty()) { + String ffile = DateUtil.getDays(); + //本地 +// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile; //文件上传路径 +// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 + //服务器 + String fileName = this.get32UUID()+drivinglicenseFile.getOriginalFilename().substring(drivinglicenseFile.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(drivinglicenseFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pd.put("DRIVINGLICENSE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + } + taxationManageService.save(pd); + 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(); + pd.put("DELETOR", Jurisdiction.getUSER_ID()); + pd.put("DELETORNAME", Jurisdiction.getUsername()); + pd.put("DELETTIME", DateUtil.date2Str(new Date())); + taxationManageService.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(); + pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id + pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人id + pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + String expireDate = pd.getString("EXPIRE_DATE"); + String day = DateUtil.getDay(); + boolean flag = DateUtil.compareDate(expireDate, day); + if(flag) { + pd.put("EXPIRE_STATUS","未到期"); + }else{ + pd.put("EXPIRE_STATUS","已到期"); + } + taxationManageService.edit(pd); + 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 = taxationManageService.findById(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @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 = taxationManageService.list(page); //列出MajorDangerSource列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/taxationList") + @ResponseBody + public Object taxationList() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String corpId = Jurisdiction.getCORPINFO_ID(); + List list = taxationManageService.taxationList(corpId); //列出Question列表 + map.put("list", list); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/entity/hotWorkApplication/NodeApp.java b/src/main/java/com/zcloud/entity/hotWorkApplication/NodeApp.java index 5f5b398..368e3ce 100644 --- a/src/main/java/com/zcloud/entity/hotWorkApplication/NodeApp.java +++ b/src/main/java/com/zcloud/entity/hotWorkApplication/NodeApp.java @@ -121,6 +121,8 @@ public class NodeApp { buffer.append("\n"); if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){ buffer.append(inspector.getString("INSPECTION_USER_NAME")); + buffer.append("\n"); + buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME")); // buffer.append("("); // buffer.append(")"); }else { @@ -132,11 +134,11 @@ public class NodeApp { this.title = buffer.toString(); buffer.setLength(0); - for (PageData inspector : inspectors) { - if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){ - buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME")); - } - } +// for (PageData inspector : inspectors) { +// if (StringUtils.isNotBlank(inspector.getString("INSPECTION_USER_SIGN_TIME"))){ +// buffer.append(inspector.getString("INSPECTION_USER_SIGN_TIME")); +// } +// } if (buffer.length() > 0) { this.desc = buffer.toString(); diff --git a/src/main/java/com/zcloud/mapper/datasource/assignedManage/AssignedManageMapper.java b/src/main/java/com/zcloud/mapper/datasource/assignedManage/AssignedManageMapper.java new file mode 100644 index 0000000..96b619e --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/assignedManage/AssignedManageMapper.java @@ -0,0 +1,38 @@ +package com.zcloud.mapper.datasource.assignedManage; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface AssignedManageMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + + List datalistPage(Page page); + + List operationvehicleList(String corpId); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardInfoMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardInfoMapper.java new file mode 100644 index 0000000..f5c2a82 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardInfoMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：盲板信息 + * 作者：luoxiaobao + * 时间：2021-08-23 + * 官网：www.zcloudchina.com + */ +public interface BlindBoardInfoMapper { + + /**新增 + * @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/eightwork/BlindBoardMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardMapper.java new file mode 100644 index 0000000..5996e31 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardMapper.java @@ -0,0 +1,34 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:31 + */ +public interface BlindBoardMapper { + PageData getCode(PageData pd); + PageData findById(PageData pd); + void save(PageData pd); + void delete(PageData pd); + void edit(PageData pd); + void editStep(PageData pd); + void editContent(PageData pd); + + void editVideo(PageData pd); + + List datalistPage(Page page); + + List listAllMeasures(); + + List checkWorkCount(PageData pd); + + List getFlowList(PageData pd); + + void setPosition(PageData pd); + + List getMapList(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardSignMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardSignMapper.java new file mode 100644 index 0000000..2a888f7 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardSignMapper.java @@ -0,0 +1,37 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:31 + */ +public interface BlindBoardSignMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + void saveBatch(List signers); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**根据动火ID查询签字列表 + * @throws Exception + */ + List listById(PageData pd); + + List listAll(PageData sign); + + /**根据动火ID查询未签字列表 + * @throws Exception + */ + List checkUnsigned(PageData sign); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardToMeasuresMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardToMeasuresMapper.java new file mode 100644 index 0000000..7bc8bce --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/BlindBoardToMeasuresMapper.java @@ -0,0 +1,57 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火措施中间表 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface BlindBoardToMeasuresMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + void saveBatch(List signers); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表(全部) + * @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 listAllMeasuresForSign(PageData pd); + + List listSignFinishMeasures(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/BreakGroundMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/BreakGroundMapper.java new file mode 100644 index 0000000..44242b4 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/BreakGroundMapper.java @@ -0,0 +1,34 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:31 + */ +public interface BreakGroundMapper { + PageData getCode(PageData pd); + PageData findById(PageData pd); + void save(PageData pd); + void delete(PageData pd); + void edit(PageData pd); + void editStep(PageData pd); + void editContent(PageData pd); + + void editVideo(PageData pd); + + List datalistPage(Page page); + + List listAllMeasures(); + + List checkWorkCount(PageData pd); + + List getFlowList(PageData pd); + + void setPosition(PageData pd); + + List getMapList(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/BreakGroundSignMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/BreakGroundSignMapper.java new file mode 100644 index 0000000..95e907c --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/BreakGroundSignMapper.java @@ -0,0 +1,37 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:31 + */ +public interface BreakGroundSignMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + void saveBatch(List signers); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**根据动火ID查询签字列表 + * @throws Exception + */ + List listById(PageData pd); + + List listAll(PageData sign); + + /**根据动火ID查询未签字列表 + * @throws Exception + */ + List checkUnsigned(PageData sign); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/BreakGroundToMeasuresMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/BreakGroundToMeasuresMapper.java new file mode 100644 index 0000000..c4884d6 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/BreakGroundToMeasuresMapper.java @@ -0,0 +1,57 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火措施中间表 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface BreakGroundToMeasuresMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + void saveBatch(List signers); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表(全部) + * @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 listAllMeasuresForSign(PageData pd); + + List listSignFinishMeasures(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/ConfinedspaceMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/ConfinedspaceMapper.java index 689b6f7..9ba4a3f 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/ConfinedspaceMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/ConfinedspaceMapper.java @@ -17,6 +17,9 @@ public interface ConfinedspaceMapper { void edit(PageData pd); void editGasTime(PageData pd); void editStep(PageData pd); + + void editVideo(PageData pd); + void setPosition(PageData pd); List datalistPage(Page page); diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/CutRoadMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/CutRoadMapper.java new file mode 100644 index 0000000..4b32df7 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/CutRoadMapper.java @@ -0,0 +1,34 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:31 + */ +public interface CutRoadMapper { + PageData getCode(PageData pd); + PageData findById(PageData pd); + void save(PageData pd); + void delete(PageData pd); + void edit(PageData pd); + void editStep(PageData pd); + void editContent(PageData pd); + + void editVideo(PageData pd); + + List datalistPage(Page page); + + List listAllMeasures(); + + List checkWorkCount(PageData pd); + + List getFlowList(PageData pd); + + void setPosition(PageData pd); + + List getMapList(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/CutRoadSignMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/CutRoadSignMapper.java new file mode 100644 index 0000000..374606c --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/CutRoadSignMapper.java @@ -0,0 +1,37 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:31 + */ +public interface CutRoadSignMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + void saveBatch(List signers); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**根据动火ID查询签字列表 + * @throws Exception + */ + List listById(PageData pd); + + List listAll(PageData sign); + + /**根据动火ID查询未签字列表 + * @throws Exception + */ + List checkUnsigned(PageData sign); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/CutRoadToMeasuresMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/CutRoadToMeasuresMapper.java new file mode 100644 index 0000000..d0b8a1d --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/CutRoadToMeasuresMapper.java @@ -0,0 +1,57 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火措施中间表 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface CutRoadToMeasuresMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + void saveBatch(List signers); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表(全部) + * @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 listAllMeasuresForSign(PageData pd); + + List listSignFinishMeasures(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java index 8e1e6c0..18d4cbe 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java @@ -14,5 +14,9 @@ import java.util.List; public interface EightWorkMapper { List getEightWorks(PageData corp); + + List listAllForDiagnosis(PageData pd); + + List getEightWorksByType(PageData pageData); } diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityMapper.java index dbbc48a..eb2aab9 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/ElectricityMapper.java @@ -20,6 +20,9 @@ public interface ElectricityMapper { void edit(PageData pd); void editGasTime(PageData pd); void editStep(PageData pd); + + void editVideo(PageData pd); + void setPosition(PageData pd); List datalistPage(Page page); diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HighworkMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HighworkMapper.java index b4eec56..abf52a5 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/HighworkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HighworkMapper.java @@ -16,6 +16,9 @@ public interface HighworkMapper { void delete(PageData pd); void edit(PageData pd); void editStep(PageData pd); + + void editVideo(PageData pd); + List datalistPage(Page page); List listAllMeasures(); diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HoistingMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HoistingMapper.java new file mode 100644 index 0000000..229ffea --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HoistingMapper.java @@ -0,0 +1,33 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:31 + */ +public interface HoistingMapper { + PageData getCode(PageData pd); + PageData findById(PageData pd); + void save(PageData pd); + void delete(PageData pd); + void edit(PageData pd); + void editStep(PageData pd); + + void editVideo(PageData pd); + + List datalistPage(Page page); + + List listAllMeasures(); + + List checkWorkCount(PageData pd); + + List getFlowList(PageData pd); + + void setPosition(PageData pd); + + List getMapList(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HoistingSignMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HoistingSignMapper.java new file mode 100644 index 0000000..bfaa6c4 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HoistingSignMapper.java @@ -0,0 +1,37 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:31 + */ +public interface HoistingSignMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + void saveBatch(List signers); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**根据动火ID查询签字列表 + * @throws Exception + */ + List listById(PageData pd); + + List listAll(PageData sign); + + /**根据动火ID查询未签字列表 + * @throws Exception + */ + List checkUnsigned(PageData sign); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HoistingToMeasuresMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HoistingToMeasuresMapper.java new file mode 100644 index 0000000..96839dc --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HoistingToMeasuresMapper.java @@ -0,0 +1,57 @@ +package com.zcloud.mapper.datasource.eightwork; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：动火措施中间表 + * 作者：luoxiaobao + * 时间：2021-09-18 + * 官网：www.zcloudchina.com + */ +public interface HoistingToMeasuresMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + void saveBatch(List signers); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表(全部) + * @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 listAllMeasuresForSign(PageData pd); + + List listSignFinishMeasures(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java new file mode 100644 index 0000000..c467cb5 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java @@ -0,0 +1,78 @@ +package com.zcloud.mapper.datasource.freighttrailer; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +public interface FreightTrailerMapper { + + /** + * 新增 + * + * @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); + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /** + * 列表 + * + * @param + * @throws Exception + */ + List corpList(String corpId); + + /** + * 列表 + * + * @param + * @throws Exception + */ + List trailerList(String corpId); + + /** + * 列表 + * + * @param + * @throws Exception + */ + List vehicleList(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/inspectAnnually/InspectAnnuallyMapper.java b/src/main/java/com/zcloud/mapper/datasource/inspectAnnually/InspectAnnuallyMapper.java new file mode 100644 index 0000000..b6a690b --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/inspectAnnually/InspectAnnuallyMapper.java @@ -0,0 +1,64 @@ +package com.zcloud.mapper.datasource.inspectAnnually; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +public interface InspectAnnuallyMapper { + + /** + * 新增 + * + * @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 pd + * @throws Exception + */ + void edit2(PageData pd); + + /** + * 列表 + * + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java b/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java index 0ec903b..72013e2 100644 --- a/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java @@ -33,4 +33,6 @@ public interface OperatingVehiclesMapper { List datalistPage(Page page); + + List operationVehicleList(String corpId); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java index 883d499..b5dbc9f 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java @@ -154,4 +154,6 @@ public interface DictionariesMapper { List listgetAssignedVehicleModel(String parentId); List listgetAssignedVehicle(String parentId); + + List listgetVehicleType(String parentId); } diff --git a/src/main/java/com/zcloud/mapper/datasource/taxationManage/TaxationManageMapper.java b/src/main/java/com/zcloud/mapper/datasource/taxationManage/TaxationManageMapper.java new file mode 100644 index 0000000..524861b --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/taxationManage/TaxationManageMapper.java @@ -0,0 +1,38 @@ +package com.zcloud.mapper.datasource.taxationManage; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TaxationManageMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + + List datalistPage(Page page); + + List taxationList(String corpId); +} diff --git a/src/main/java/com/zcloud/service/assignedManage/AssignedManageService.java b/src/main/java/com/zcloud/service/assignedManage/AssignedManageService.java new file mode 100644 index 0000000..00ed344 --- /dev/null +++ b/src/main/java/com/zcloud/service/assignedManage/AssignedManageService.java @@ -0,0 +1,38 @@ +package com.zcloud.service.assignedManage; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface AssignedManageService { + + /**新增 + * @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; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + public List list(Page page); + + List operationVehicleList(String corpId); +} diff --git a/src/main/java/com/zcloud/service/assignedManage/impl/AssignedManageServiceImpl.java b/src/main/java/com/zcloud/service/assignedManage/impl/AssignedManageServiceImpl.java new file mode 100644 index 0000000..bd9d779 --- /dev/null +++ b/src/main/java/com/zcloud/service/assignedManage/impl/AssignedManageServiceImpl.java @@ -0,0 +1,51 @@ +package com.zcloud.service.assignedManage.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.assignedManage.AssignedManageMapper; +import com.zcloud.mapper.datasource.taxationManage.TaxationManageMapper; +import com.zcloud.service.assignedManage.AssignedManageService; +import com.zcloud.service.taxationManage.TaxationManageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional //开启事物 +public class AssignedManageServiceImpl implements AssignedManageService { + + @Autowired + private AssignedManageMapper assignedManageMapper; + + @Override + public void save(PageData pd) throws Exception { + assignedManageMapper.save(pd); + } + + @Override + public void delete(PageData pd) throws Exception { + assignedManageMapper.delete(pd); + } + + @Override + public void edit(PageData pd) throws Exception { + assignedManageMapper.edit(pd); + } + + @Override + public PageData findById(PageData pd) throws Exception { + return assignedManageMapper.findById(pd); + } + + @Override + public List list(Page page) { + return assignedManageMapper.datalistPage(page); + } + + @Override + public List operationVehicleList(String corpId) { + return assignedManageMapper.operationvehicleList(corpId); + } +} diff --git a/src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java b/src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java index 09ffbc7..971dea0 100644 --- a/src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java @@ -112,7 +112,6 @@ public class CorpInfoServiceImpl implements CorpInfoService { public PageData eightWorkBI(PageData pd) throws Exception{ return corpinfoMapper.eightWorkBI(pd); } - @Override public void updateEnterpriseId(PageData corpPage) { corpinfoMapper.updateEnterpriseId(corpPage); diff --git a/src/main/java/com/zcloud/service/eightwork/BlindBoardInfoService.java b/src/main/java/com/zcloud/service/eightwork/BlindBoardInfoService.java new file mode 100644 index 0000000..add7798 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/BlindBoardInfoService.java @@ -0,0 +1,59 @@ +package com.zcloud.service.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：盲板信息 + * 作者：luoxiaobao + * 时间：2021-08-23 + * 官网：www.zcloudchina.com + */ +public interface BlindBoardInfoService { + + /**新增 + * @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/eightwork/BlindBoardService.java b/src/main/java/com/zcloud/service/eightwork/BlindBoardService.java new file mode 100644 index 0000000..645a3d8 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/BlindBoardService.java @@ -0,0 +1,44 @@ +package com.zcloud.service.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.ReturnMap; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:29 + */ +public interface BlindBoardService { + void save(PageData pd)throws Exception; + + void edit(PageData pd)throws Exception; + + void delete(PageData pd)throws Exception; + + List list(Page page) throws Exception; + + void nextStep(PageData pd, MultipartFile[] files) throws Exception; + + PageData findById(PageData pd) throws Exception; + + PageData listSignFinished(PageData pd) throws Exception; + + PageData checkWorkCount(PageData pd); + + //获取所有措施(bus_highwork_measures) + List listAllMeasures() throws Exception; +// +// //获取需要签字的措施(bus_highworktomeasures) + List listAllMeasuresForSign(PageData pd) throws Exception; +// +// //获取所有签字完成的措施(bus_highworktomeasures) + List listSignFinishMeasures(PageData pd) throws Exception; + + + List getFlowList(PageData pd)throws Exception; + + ReturnMap getMapList()throws Exception; +} diff --git a/src/main/java/com/zcloud/service/eightwork/BreakGroundService.java b/src/main/java/com/zcloud/service/eightwork/BreakGroundService.java new file mode 100644 index 0000000..5ed5fd6 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/BreakGroundService.java @@ -0,0 +1,44 @@ +package com.zcloud.service.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.ReturnMap; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:29 + */ +public interface BreakGroundService { + void save(PageData pd)throws Exception; + + void edit(PageData pd)throws Exception; + + void delete(PageData pd)throws Exception; + + List list(Page page) throws Exception; + + void nextStep(PageData pd, MultipartFile[] files) throws Exception; + + PageData findById(PageData pd) throws Exception; + + PageData listSignFinished(PageData pd) throws Exception; + + PageData checkWorkCount(PageData pd); + + //获取所有措施(bus_highwork_measures) + List listAllMeasures() throws Exception; +// +// //获取需要签字的措施(bus_highworktomeasures) + List listAllMeasuresForSign(PageData pd) throws Exception; +// +// //获取所有签字完成的措施(bus_highworktomeasures) + List listSignFinishMeasures(PageData pd) throws Exception; + + + List getFlowList(PageData pd)throws Exception; + + ReturnMap getMapList()throws Exception; +} diff --git a/src/main/java/com/zcloud/service/eightwork/CutRoadService.java b/src/main/java/com/zcloud/service/eightwork/CutRoadService.java new file mode 100644 index 0000000..e64d628 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/CutRoadService.java @@ -0,0 +1,44 @@ +package com.zcloud.service.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.ReturnMap; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:29 + */ +public interface CutRoadService { + void save(PageData pd)throws Exception; + + void edit(PageData pd)throws Exception; + + void delete(PageData pd)throws Exception; + + List list(Page page) throws Exception; + + void nextStep(PageData pd, MultipartFile[] files) throws Exception; + + PageData findById(PageData pd) throws Exception; + + PageData listSignFinished(PageData pd) throws Exception; + + PageData checkWorkCount(PageData pd); + + //获取所有措施(bus_highwork_measures) + List listAllMeasures() throws Exception; +// +// //获取需要签字的措施(bus_highworktomeasures) + List listAllMeasuresForSign(PageData pd) throws Exception; +// +// //获取所有签字完成的措施(bus_highworktomeasures) + List listSignFinishMeasures(PageData pd) throws Exception; + + + List getFlowList(PageData pd)throws Exception; + + ReturnMap getMapList()throws Exception; +} diff --git a/src/main/java/com/zcloud/service/eightwork/EightWorkService.java b/src/main/java/com/zcloud/service/eightwork/EightWorkService.java index 64f878a..5f3c11f 100644 --- a/src/main/java/com/zcloud/service/eightwork/EightWorkService.java +++ b/src/main/java/com/zcloud/service/eightwork/EightWorkService.java @@ -17,4 +17,8 @@ public interface EightWorkService { ReturnMap getEightWorks()throws Exception; List list(PageData pd)throws Exception; + + List listAllForDiagnosis(PageData pd)throws Exception; + + List getEightWorksByType(PageData pageData); } diff --git a/src/main/java/com/zcloud/service/eightwork/HoistingService.java b/src/main/java/com/zcloud/service/eightwork/HoistingService.java new file mode 100644 index 0000000..cf27363 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/HoistingService.java @@ -0,0 +1,44 @@ +package com.zcloud.service.eightwork; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.ReturnMap; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * @author fangjiakai + * @date 2024/01/17 11:29 + */ +public interface HoistingService { + void save(PageData pd)throws Exception; + + void edit(PageData pd)throws Exception; + + void delete(PageData pd)throws Exception; + + List list(Page page) throws Exception; + + void nextStep(PageData pd, MultipartFile[] files) throws Exception; + + PageData findById(PageData pd) throws Exception; + + PageData listSignFinished(PageData pd) throws Exception; + + PageData checkWorkCount(PageData pd); + + //获取所有措施(bus_highwork_measures) + List listAllMeasures() throws Exception; +// +// //获取需要签字的措施(bus_highworktomeasures) + List listAllMeasuresForSign(PageData pd) throws Exception; +// +// //获取所有签字完成的措施(bus_highworktomeasures) + List listSignFinishMeasures(PageData pd) throws Exception; + + + List getFlowList(PageData pd)throws Exception; + + ReturnMap getMapList()throws Exception; +} diff --git a/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardInfoServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardInfoServiceImpl.java new file mode 100644 index 0000000..c0306ec --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardInfoServiceImpl.java @@ -0,0 +1,83 @@ +package com.zcloud.service.eightwork.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightwork.BlindBoardInfoMapper; +import com.zcloud.service.eightwork.BlindBoardInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：盲板信息 + * 作者：luoxiaobao + * 时间：2021-08-23 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class BlindBoardInfoServiceImpl implements BlindBoardInfoService { + + @Autowired + private BlindBoardInfoMapper blindboardinfoMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + blindboardinfoMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + blindboardinfoMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + blindboardinfoMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return blindboardinfoMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return blindboardinfoMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return blindboardinfoMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + blindboardinfoMapper.deleteAll(ArrayDATA_IDS); + } + +} + diff --git a/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardServiceImpl.java new file mode 100644 index 0000000..99ca403 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/impl/BlindBoardServiceImpl.java @@ -0,0 +1,439 @@ +package com.zcloud.service.eightwork.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightwork.*; +import com.zcloud.service.eightwork.BlindBoardService; +import com.zcloud.util.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DecimalFormat; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author fangjiakai + * @date 2024/01/17 11:30 + */ +@Service +@Transactional //开启事物 +public class BlindBoardServiceImpl implements BlindBoardService { + + @Autowired + private BlindBoardMapper blindboardMapper; + @Autowired + private BlindBoardInfoMapper blindboardinfoMapper; + @Autowired + private EightWorkTaskFlowMapper eightWorkTaskFlowMapper; + @Autowired + private EightWorkFlowLogMapper eightWorkFlowLogMapper; + @Autowired + private BlindBoardSignMapper blindboardSignMapper; + @Autowired + private BlindBoardToMeasuresMapper blindboardToMeasuresMapper; + @Autowired + private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + @Autowired + private Smb smb; + @Autowired + private SendMessageUtil sendMessageUtil; + + private final String primary_key = "BLINDBOARD_ID"; + private final String work_type = "BLINDBOARD"; + @Override + @Transactional + public void save(PageData pd) throws Exception { + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + pd2 = blindboardMapper.getCode(pd2); //根据ID读取 + String code = "MB" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1)); + pd.put("CHECK_NO", code); + pd.put(primary_key, UuidUtil.get32UUID()); //主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + blindboardMapper.save(pd); + if(pd.get("boardList")!=null){ + blindboardinfoMapper.delete(pd); + List list = (List) JSON.parse(pd.get("boardList").toString()); + for (JSONObject json : list) { + PageData board = new PageData(); + board.put("BLINDBOARDINFO_ID", UuidUtil.get32UUID()); // 主键 + board.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID")); + board.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + board.put("BOARD_MATERIAL", json.get("BOARD_MATERIAL")); + board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION")); + board.put("BOARD_NO", json.get("BOARD_NO")); + board.put("ISDELETE", 0); + blindboardinfoMapper.save(board); + } + } + + if (pd.get("APPLY_STATUS").equals("1")) { + PageData flow = getStep(pd.get("TASK_ID"),"1"); + saveLog(pd,pd.getString("CREATOR"),"1"); + saveNextSigner(pd,flow); + setPosition(pd); + } + } + + @Override + @Transactional + public void edit(PageData pd) throws Exception { + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + blindboardMapper.edit(pd); + + if (pd.get("APPLY_STATUS").equals("1")) { + pd.put("STEP_ID", 1); + blindboardMapper.editStep(pd); + PageData flow = getStep(pd.get("TASK_ID"),"1"); + saveLog(pd,pd.getString("CREATOR"),"1"); + saveNextSigner(pd,flow); + setPosition(pd); + } + } + + @Override + public void delete(PageData pd) throws Exception { + blindboardMapper.delete(pd); + } + + @Override + public List list(Page page) throws Exception { + return blindboardMapper.datalistPage(page); + } + + + /* + * 下一步 + */ + @Override + @Transactional + public void nextStep(PageData pd, MultipartFile[] files) throws Exception { + PageData work = this.findById(pd); + work.putAll(pd); + List filePaths = new ArrayList<>(); + for (int i = 0; i < files.length; i++) { + //保存签名文件 + String ffile = DateUtil.getDays(); + String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile); + filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); + work.put("STEP_ID", flow.get("NEXT_STEP_ID")); + blindboardMapper.editVideo(work); + + //保存签名信息 + PageData sign = new PageData(); + if(work.getString("IMG_PATH") != ""){ + sign.put("IMG_PATH", work.get("IMG_PATH")); + } + sign.put(primary_key, work.get(primary_key)); + sign.put("STEP_ID", work.get("STEP_ID")); + sign.put("SIGN_USER_ID", work.get("USER_ID")); + sign.put("SIGN_TIME", work.getString("SIGNTIME")); + sign.put("SIGN_PATH", String.join(",",filePaths)); + sign.put("DESCR", work.get("DESCR")); + + blindboardSignMapper.edit(sign); + //保存缩略图信息 + if(work.get("CONIMG_PATH") != null && !work.get("CONIMG_PATH").equals("")){ + PageData content = new PageData(); + content.put("BOARD_PATH", work.get("CONIMG_PATH")); + content.put("BLINDBOARD_ID",work.get("BLINDBOARD_ID")); + blindboardMapper.editContent(content); + } + + + if (work.get("MEASURES") != null && !work.get("MEASURES").equals("")) { //安全措施确认步骤 + saveMeasures(work); + } + + List unsignedList = blindboardSignMapper.checkUnsigned(sign);//当前步骤未签名人列表 + if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步 + blindboardMapper.editStep(work); + PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); + + //保存日志 + saveLog(work,work.getString("USER_ID"),"1"); + + if("99".equals(currentflow.getString("NEXT_STEP_ID"))){ + eightworkvideomanagerMapper.editStatus(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); + return; + } + if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤 + savePreparers(work,currentflow); + } + saveNextSigner(work,currentflow); + }else if(pd.getString("APPLY_STATUS").equals("-1")){ + //保存日志 + saveLog(work,work.getString("USER_ID"),"-1"); + eightworkvideomanagerMapper.editStatus(work); + + work.put("STEP_ID",-1); + blindboardMapper.editStep(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO")); + + } + } + + private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", template);// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "盲板作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + @Override + public PageData findById(PageData pd) throws Exception { + PageData pageData = blindboardMapper.findById(pd); + PageData cpd = new PageData(); + if(pageData.getString("BOARD_PATH") != null || "".equals(pageData.getString("BOARD_PATH"))){ + cpd.put("BOARD_PATH", pageData.getString("BOARD_PATH").split(",")); + } + pageData.putAll(cpd); + return pageData; + } + + @Override + public PageData listSignFinished(PageData pd) throws Exception { + Map> rmap = new HashMap<>(); + List varList = blindboardSignMapper.listAll(pd); + if (varList != null && !varList.isEmpty()) { + varList.stream().forEach(item -> { + PageData sign = new PageData(); + sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(",")); + sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(",")); + + sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无"); + if(rmap.containsKey(item.getString("CODE"))){ + rmap.get(item.getString("CODE")).add(sign); + }else{ + List signs = new ArrayList<>(); + signs.add(sign); + rmap.put(item.getString("CODE"),signs); + } + }); + } + PageData rpd = new PageData(); + if (rmap != null && !rmap.isEmpty()) { + rpd.putAll(rmap); + } + return rpd; + } + + @Override + public PageData checkWorkCount(PageData pd) { + PageData rpd = new PageData(); + List varList = blindboardMapper.checkWorkCount(pd); + + if (varList != null && !varList.isEmpty()) { + Map newMap = varList.stream() + .collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT"))); + + rpd.putAll(newMap); + } + return rpd; + } + + @Override + public List listAllMeasures() throws Exception { + return blindboardMapper.listAllMeasures(); + + } + + @Override + public List listAllMeasuresForSign(PageData pd) throws Exception { + return blindboardToMeasuresMapper.listAllMeasuresForSign(pd); + + } + + @Override + public List listSignFinishMeasures(PageData pd) throws Exception { + return blindboardToMeasuresMapper.listSignFinishMeasures(pd); + } + + + @Override + public List getFlowList(PageData pd) throws Exception { + pd=findById(pd); + return blindboardMapper.getFlowList(pd); + } + + @Override + public ReturnMap getMapList() throws Exception { + ReturnMap returnMap = new ReturnMap(); + PageData pd = new PageData(); + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + returnMap.put("varList",blindboardMapper.getMapList(pd)); + return returnMap; + } + private void saveNextSigner(PageData pd,PageData flow) throws Exception { + + pd.put("STEP_ID",flow.get("NEXT_STEP_ID")); + + if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){ + return; + } + //提前保存下一步签字人 + List signers = new ArrayList<>(); + PageData signer = new PageData(); + signer.put("BLINDBOARD_SIGN_ID", UuidUtil.get32UUID()); // 主键 + signer.put(primary_key, pd.get(primary_key)); + signer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD"))); + signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); + signers.add(signer); + blindboardSignMapper.saveBatch(signers); + sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + + } + private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "盲板作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + PageData params3 = new PageData(); + params3.put("name", "flow");// 存入短信模板中的参数名称 + params3.put("value", flow_name);// 存入上面参数名称所传递的值 + paramsList.add(params3); + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + + private void saveMeasures(PageData pd) { + List list = (List) JSON.parse(pd.get("MEASURES").toString()); + for (JSONObject json : list) { + PageData measure = new PageData(); + measure.put("BLINDBOARDTOMEASURES_ID",json.get("BLINDBOARDTOMEASURES_ID")); + measure.put("STATUS", json.get("STATUS")); + measure.put("SIGN_PATH", json.get("SIGN_PATH")); + measure.put("SIGN_TIME", json.get("SIGN_TIME")); + measure.put("IMG_PATH", json.get("IMG_PATH")); + blindboardToMeasuresMapper.edit(measure); + } + } + + private void savePreparers(PageData pd,PageData flow) { + List signers = new ArrayList<>(); + List list = (List) JSON.parse(pd.get("PREPARERS").toString()); + for (JSONObject json : list) { + PageData preparer = new PageData(); + preparer.put("BLINDBOARDTOMEASURES_ID", UuidUtil.get32UUID()); // 主键 + preparer.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID")); + preparer.put("BUS_BLINDBOARD_MEASURES_ID", json.get("BUS_BLINDBOARD_MEASURES_ID")); + preparer.put("CONFIRM_ID", json.get("USER_ID")); + signers.add(preparer); + } + if(signers.size() > 0){ + blindboardToMeasuresMapper.saveBatch(signers); + + //获取所有需要签名人 + List fieldList = signers.stream() + .map(map -> map.getString("CONFIRM_ID")) + .collect(Collectors.toList()); + Set fieldSet = new HashSet<>(fieldList); //去重 + + List uniqueList = new ArrayList<>(fieldSet); + List nextSigners = new ArrayList<>(); + uniqueList.forEach(item -> { // 保存下一步需要签名的人 + PageData signer = new PageData(); + signer.put("BLINDBOARD_SIGN_ID", UuidUtil.get32UUID()); // 主键 + signer.put(primary_key, pd.get(primary_key)); + signer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + signer.put("SIGN_USER_ID", item); + signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); + nextSigners.add(signer); + try { + sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + blindboardSignMapper.saveBatch(nextSigners); + } + } + + private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception { + PageData flow = new PageData(); + flow.put("TASK_ID", TASK_ID); + flow.put("STEP_ID", STEP_ID); + flow = eightWorkTaskFlowMapper.getStep(flow); + return flow; + } + + private void saveLog(PageData pd,String act_user,String status) throws Exception { + PageData log = new PageData(); + log.put("LOG_ID", UuidUtil.get32UUID()); + log.put("WORK_ID", pd.get(primary_key)); + log.put("TASK_ID", pd.get("TASK_ID")); + log.put("STEP_ID", pd.get("STEP_ID")); + log.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + log.put("CHECK_NO", pd.get("CHECK_NO")); + log.put("ACT_USER", act_user); + log.put("ACT_TIME", DateUtil.date2Str(new Date())); + log.put("STATUS", status); + log.put("WORK_TYPE",work_type); + eightWorkFlowLogMapper.save(log); + } + + + private void setPosition(PageData pd) throws Exception { + JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID"))); + List pointList = (List)((Map) body.get("data")).get("list"); + List positions = PLSUtil.getRandomPointInPolygon(pointList); + pd.put("WORK_POSITION", String.join(",",positions)); + blindboardMapper.setPosition(pd); + } + +} diff --git a/src/main/java/com/zcloud/service/eightwork/impl/BreakGroundServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/BreakGroundServiceImpl.java new file mode 100644 index 0000000..909a4ee --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/impl/BreakGroundServiceImpl.java @@ -0,0 +1,422 @@ +package com.zcloud.service.eightwork.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightwork.*; +import com.zcloud.service.eightwork.BreakGroundService; +import com.zcloud.util.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DecimalFormat; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author fangjiakai + * @date 2024/01/17 11:30 + */ +@Service +@Transactional //开启事物 +public class BreakGroundServiceImpl implements BreakGroundService { + + @Autowired + private BreakGroundMapper breakgroundMapper; + @Autowired + private EightWorkTaskFlowMapper eightWorkTaskFlowMapper; + @Autowired + private EightWorkFlowLogMapper eightWorkFlowLogMapper; + @Autowired + private BreakGroundSignMapper breakgroundSignMapper; + @Autowired + private BreakGroundToMeasuresMapper breakgroundToMeasuresMapper; + @Autowired + private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + @Autowired + private Smb smb; + @Autowired + private SendMessageUtil sendMessageUtil; + + private final String primary_key = "BREAKGROUND_ID"; + private final String work_type = "BREAKGROUND"; + @Override + @Transactional + public void save(PageData pd) throws Exception { + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + pd2 = breakgroundMapper.getCode(pd2); //根据ID读取 + String code = "DT" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1)); + pd.put("CHECK_NO", code); + pd.put(primary_key, UuidUtil.get32UUID()); //主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + breakgroundMapper.save(pd); + + if (pd.get("APPLY_STATUS").equals("1")) { + PageData flow = getStep(pd.get("TASK_ID"),"1"); + saveLog(pd,pd.getString("CREATOR"),"1"); + saveNextSigner(pd,flow); + setPosition(pd); + } + } + + @Override + @Transactional + public void edit(PageData pd) throws Exception { + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + breakgroundMapper.edit(pd); + + if (pd.get("APPLY_STATUS").equals("1")) { + pd.put("STEP_ID", 1); + breakgroundMapper.editStep(pd); + PageData flow = getStep(pd.get("TASK_ID"),"1"); + saveLog(pd,pd.getString("CREATOR"),"1"); + saveNextSigner(pd,flow); + setPosition(pd); + } + } + + @Override + public void delete(PageData pd) throws Exception { + breakgroundMapper.delete(pd); + } + + @Override + public List list(Page page) throws Exception { + return breakgroundMapper.datalistPage(page); + } + + + /* + * 下一步 + */ + @Override + @Transactional + public void nextStep(PageData pd, MultipartFile[] files) throws Exception { + PageData work = this.findById(pd); + work.putAll(pd); + List filePaths = new ArrayList<>(); + for (int i = 0; i < files.length; i++) { + //保存签名文件 + String ffile = DateUtil.getDays(); + String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile); + filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); + work.put("STEP_ID", flow.get("NEXT_STEP_ID")); + breakgroundMapper.editVideo(work); + + //保存签名信息 + PageData sign = new PageData(); + if(work.getString("IMG_PATH") != ""){ + sign.put("IMG_PATH", work.get("IMG_PATH")); + } + sign.put(primary_key, work.get(primary_key)); + sign.put("STEP_ID", work.get("STEP_ID")); + sign.put("SIGN_USER_ID", work.get("USER_ID")); + sign.put("SIGN_TIME", work.getString("SIGNTIME")); + sign.put("SIGN_PATH", String.join(",",filePaths)); + sign.put("DESCR", work.get("DESCR")); + + breakgroundSignMapper.edit(sign); + //保存缩略图信息 + if(work.get("CONIMG_PATH") != null && !work.get("CONIMG_PATH").equals("")){ + PageData content = new PageData(); + content.put("CONTENT_IMG_PATH", work.get("CONIMG_PATH")); + content.put("WORK_CONTENT",work.get("WORK_CONTENT")); + content.put("BREAKGROUND_ID",work.get("BREAKGROUND_ID")); + breakgroundMapper.editContent(content); + } + + + if (work.get("MEASURES") != null && !work.get("MEASURES").equals("")) { //安全措施确认步骤 + saveMeasures(work); + } + + List unsignedList = breakgroundSignMapper.checkUnsigned(sign);//当前步骤未签名人列表 + if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步 + breakgroundMapper.editStep(work); + PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); + + //保存日志 + saveLog(work,work.getString("USER_ID"),"1"); + + if("99".equals(currentflow.getString("NEXT_STEP_ID"))){ + eightworkvideomanagerMapper.editStatus(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); + return; + } + if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤 + savePreparers(work,currentflow); + } + saveNextSigner(work,currentflow); + }else if(pd.getString("APPLY_STATUS").equals("-1")){ + //保存日志 + saveLog(work,work.getString("USER_ID"),"-1"); + eightworkvideomanagerMapper.editStatus(work); + + work.put("STEP_ID",-1); + breakgroundMapper.editStep(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); + + } + } + private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", template);// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public PageData findById(PageData pd) throws Exception { + PageData pageData = breakgroundMapper.findById(pd); + PageData cpd = new PageData(); + if(pageData.getString("CONTENT_IMG_PATH") != null || "".equals(pageData.getString("CONTENT_IMG_PATH"))){ + cpd.put("CONTENT_IMG_PATH", pageData.getString("CONTENT_IMG_PATH").split(",")); + } + pageData.putAll(cpd); + return pageData; + } + + @Override + public PageData listSignFinished(PageData pd) throws Exception { + Map> rmap = new HashMap<>(); + List varList = breakgroundSignMapper.listAll(pd); + if (varList != null && !varList.isEmpty()) { + varList.stream().forEach(item -> { + PageData sign = new PageData(); + sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(",")); + sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(",")); + + sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无"); + if(rmap.containsKey(item.getString("CODE"))){ + rmap.get(item.getString("CODE")).add(sign); + }else{ + List signs = new ArrayList<>(); + signs.add(sign); + rmap.put(item.getString("CODE"),signs); + } + }); + } + PageData rpd = new PageData(); + if (rmap != null && !rmap.isEmpty()) { + rpd.putAll(rmap); + } + return rpd; + } + + @Override + public PageData checkWorkCount(PageData pd) { + PageData rpd = new PageData(); + List varList = breakgroundMapper.checkWorkCount(pd); + + if (varList != null && !varList.isEmpty()) { + Map newMap = varList.stream() + .collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT"))); + + rpd.putAll(newMap); + } + return rpd; + } + + @Override + public List listAllMeasures() throws Exception { + return breakgroundMapper.listAllMeasures(); + + } + + @Override + public List listAllMeasuresForSign(PageData pd) throws Exception { + return breakgroundToMeasuresMapper.listAllMeasuresForSign(pd); + + } + + @Override + public List listSignFinishMeasures(PageData pd) throws Exception { + return breakgroundToMeasuresMapper.listSignFinishMeasures(pd); + } + + + @Override + public List getFlowList(PageData pd) throws Exception { + pd=findById(pd); + return breakgroundMapper.getFlowList(pd); + } + + @Override + public ReturnMap getMapList() throws Exception { + ReturnMap returnMap = new ReturnMap(); + PageData pd = new PageData(); + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + returnMap.put("varList",breakgroundMapper.getMapList(pd)); + return returnMap; + } + private void saveNextSigner(PageData pd,PageData flow) throws Exception { + + pd.put("STEP_ID",flow.get("NEXT_STEP_ID")); + + if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){ + return; + } + //提前保存下一步签字人 + List signers = new ArrayList<>(); + PageData signer = new PageData(); + signer.put("BREAKGROUND_SIGN_ID", UuidUtil.get32UUID()); // 主键 + signer.put(primary_key, pd.get(primary_key)); + signer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD"))); + signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); + signers.add(signer); + breakgroundSignMapper.saveBatch(signers); + sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + + } + private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + PageData params3 = new PageData(); + params3.put("name", "flow");// 存入短信模板中的参数名称 + params3.put("value", flow_name);// 存入上面参数名称所传递的值 + paramsList.add(params3); + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private void saveMeasures(PageData pd) { + List list = (List) JSON.parse(pd.get("MEASURES").toString()); + for (JSONObject json : list) { + PageData measure = new PageData(); + measure.put("BREAKGROUNDTOMEASURES_ID",json.get("BREAKGROUNDTOMEASURES_ID")); + measure.put("STATUS", json.get("STATUS")); + measure.put("SIGN_PATH", json.get("SIGN_PATH")); + measure.put("SIGN_TIME", json.get("SIGN_TIME")); + measure.put("IMG_PATH", json.get("IMG_PATH")); + breakgroundToMeasuresMapper.edit(measure); + } + } + + private void savePreparers(PageData pd,PageData flow) { + List signers = new ArrayList<>(); + List list = (List) JSON.parse(pd.get("PREPARERS").toString()); + for (JSONObject json : list) { + PageData preparer = new PageData(); + preparer.put("BREAKGROUNDTOMEASURES_ID", UuidUtil.get32UUID()); // 主键 + preparer.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID")); + preparer.put("BUS_BREAKGROUND_MEASURES_ID", json.get("BUS_BREAKGROUND_MEASURES_ID")); + preparer.put("CONFIRM_ID", json.get("USER_ID")); + signers.add(preparer); + } + if(signers.size() > 0){ + breakgroundToMeasuresMapper.saveBatch(signers); + + //获取所有需要签名人 + List fieldList = signers.stream() + .map(map -> map.getString("CONFIRM_ID")) + .collect(Collectors.toList()); + Set fieldSet = new HashSet<>(fieldList); //去重 + + List uniqueList = new ArrayList<>(fieldSet); + List nextSigners = new ArrayList<>(); + uniqueList.forEach(item -> { // 保存下一步需要签名的人 + PageData signer = new PageData(); + signer.put("BREAKGROUND_SIGN_ID", UuidUtil.get32UUID()); // 主键 + signer.put(primary_key, pd.get(primary_key)); + signer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + signer.put("SIGN_USER_ID", item); + signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); + nextSigners.add(signer); + try { + sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + breakgroundSignMapper.saveBatch(nextSigners); + } + } + + private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception { + PageData flow = new PageData(); + flow.put("TASK_ID", TASK_ID); + flow.put("STEP_ID", STEP_ID); + flow = eightWorkTaskFlowMapper.getStep(flow); + return flow; + } + + private void saveLog(PageData pd,String act_user,String status) throws Exception { + PageData log = new PageData(); + log.put("LOG_ID", UuidUtil.get32UUID()); + log.put("WORK_ID", pd.get(primary_key)); + log.put("TASK_ID", pd.get("TASK_ID")); + log.put("STEP_ID", pd.get("STEP_ID")); + log.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + log.put("CHECK_NO", pd.get("CHECK_NO")); + log.put("ACT_USER", act_user); + log.put("ACT_TIME", DateUtil.date2Str(new Date())); + log.put("STATUS", status); + log.put("WORK_TYPE",work_type); + eightWorkFlowLogMapper.save(log); + } + + + private void setPosition(PageData pd) throws Exception { + JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID"))); + List pointList = (List)((Map) body.get("data")).get("list"); + List positions = PLSUtil.getRandomPointInPolygon(pointList); + pd.put("WORK_POSITION", String.join(",",positions)); + breakgroundMapper.setPosition(pd); + } + +} diff --git a/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java index 0dfe872..fff5c41 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java @@ -40,6 +40,8 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService { private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; + @Autowired + private SendMessageUtil sendMessageUtil; private final String primary_key = "CONFINEDSPACE_ID"; private final String work_type = "CONFINEDSPACE"; @@ -116,7 +118,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService { } PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); work.put("STEP_ID", flow.get("NEXT_STEP_ID")); - + confinedspaceMapper.editVideo(work); //保存签名信息 PageData sign = new PageData(); @@ -146,6 +148,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService { if("99".equals(currentflow.getString("NEXT_STEP_ID"))){ eightworkvideomanagerMapper.editStatus(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); return; } @@ -160,6 +163,33 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService { work.put("STEP_ID",-1); confinedspaceMapper.editStep(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); + + } + } + private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", template);// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "受限作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); } } @@ -285,7 +315,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService { saveLog(work,pd.getString("USER_ID"),"-2"); work.put("STEP_ID",-1); confinedspaceMapper.editStep(work); - + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO")); } } @@ -321,6 +351,37 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService { signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); signers.add(signer); confinedspaceSignMapper.saveBatch(signers); + sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + + } + private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "受限作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + PageData params3 = new PageData(); + params3.put("name", "flow");// 存入短信模板中的参数名称 + params3.put("value", flow_name);// 存入上面参数名称所传递的值 + paramsList.add(params3); + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } } private void saveMeasures(PageData pd) { @@ -369,6 +430,11 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService { signer.put("SIGN_USER_ID", item); signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); nextSigners.add(signer); + try { + sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + } catch (Exception e) { + throw new RuntimeException(e); + } }); confinedspaceSignMapper.saveBatch(nextSigners); diff --git a/src/main/java/com/zcloud/service/eightwork/impl/CutRoadServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/CutRoadServiceImpl.java new file mode 100644 index 0000000..d1ae346 --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/impl/CutRoadServiceImpl.java @@ -0,0 +1,423 @@ +package com.zcloud.service.eightwork.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightwork.*; +import com.zcloud.service.eightwork.CutRoadService; +import com.zcloud.util.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DecimalFormat; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author fangjiakai + * @date 2024/01/17 11:30 + */ +@Service +@Transactional //开启事物 +public class CutRoadServiceImpl implements CutRoadService { + + @Autowired + private CutRoadMapper cutroadMapper; + @Autowired + private EightWorkTaskFlowMapper eightWorkTaskFlowMapper; + @Autowired + private EightWorkFlowLogMapper eightWorkFlowLogMapper; + @Autowired + private CutRoadSignMapper cutroadSignMapper; + @Autowired + private CutRoadToMeasuresMapper cutroadToMeasuresMapper; + @Autowired + private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + @Autowired + private Smb smb; + @Autowired + private SendMessageUtil sendMessageUtil; + + private final String primary_key = "CUTROAD_ID"; + private final String work_type = "CUTROAD"; + @Override + @Transactional + public void save(PageData pd) throws Exception { + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + pd2 = cutroadMapper.getCode(pd2); //根据ID读取 + String code = "DL" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1)); + pd.put("CHECK_NO", code); + pd.put(primary_key, UuidUtil.get32UUID()); //主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + cutroadMapper.save(pd); + + if (pd.get("APPLY_STATUS").equals("1")) { + PageData flow = getStep(pd.get("TASK_ID"),"1"); + saveLog(pd,pd.getString("CREATOR"),"1"); + saveNextSigner(pd,flow); + setPosition(pd); + } + } + + @Override + @Transactional + public void edit(PageData pd) throws Exception { + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + cutroadMapper.edit(pd); + + if (pd.get("APPLY_STATUS").equals("1")) { + pd.put("STEP_ID", 1); + cutroadMapper.editStep(pd); + PageData flow = getStep(pd.get("TASK_ID"),"1"); + saveLog(pd,pd.getString("CREATOR"),"1"); + saveNextSigner(pd,flow); + setPosition(pd); + } + } + + @Override + public void delete(PageData pd) throws Exception { + cutroadMapper.delete(pd); + } + + @Override + public List list(Page page) throws Exception { + return cutroadMapper.datalistPage(page); + } + + + /* + * 下一步 + */ + @Override + @Transactional + public void nextStep(PageData pd, MultipartFile[] files) throws Exception { + PageData work = this.findById(pd); + work.putAll(pd); + List filePaths = new ArrayList<>(); + for (int i = 0; i < files.length; i++) { + //保存签名文件 + String ffile = DateUtil.getDays(); + String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile); + filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); + work.put("STEP_ID", flow.get("NEXT_STEP_ID")); + cutroadMapper.editVideo(work); + + //保存签名信息 + PageData sign = new PageData(); + if(work.getString("IMG_PATH") != ""){ + sign.put("IMG_PATH", work.get("IMG_PATH")); + } + sign.put(primary_key, work.get(primary_key)); + sign.put("STEP_ID", work.get("STEP_ID")); + sign.put("SIGN_USER_ID", work.get("USER_ID")); + sign.put("SIGN_TIME", work.getString("SIGNTIME")); + sign.put("SIGN_PATH", String.join(",",filePaths)); + sign.put("DESCR", work.get("DESCR")); + + cutroadSignMapper.edit(sign); + //保存缩略图信息 + if(work.get("CONIMG_PATH") != null && !work.get("CONIMG_PATH").equals("")){ + PageData content = new PageData(); + content.put("CONTENT_IMG_PATH", work.get("CONIMG_PATH")); + content.put("WORK_CONTENT",work.get("WORK_CONTENT")); + content.put("CUTROAD_ID",work.get("CUTROAD_ID")); + cutroadMapper.editContent(content); + } + + + if (work.get("MEASURES") != null && !work.get("MEASURES").equals("")) { //安全措施确认步骤 + saveMeasures(work); + } + + List unsignedList = cutroadSignMapper.checkUnsigned(sign);//当前步骤未签名人列表 + if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步 + cutroadMapper.editStep(work); + PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); + + //保存日志 + saveLog(work,work.getString("USER_ID"),"1"); + + if("99".equals(currentflow.getString("NEXT_STEP_ID"))){ + eightworkvideomanagerMapper.editStatus(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO")); + + return; + } + if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤 + savePreparers(work,currentflow); + } + saveNextSigner(work,currentflow); + }else if(pd.getString("APPLY_STATUS").equals("-1")){ + //保存日志 + saveLog(work,work.getString("USER_ID"),"-1"); + eightworkvideomanagerMapper.editStatus(work); + + work.put("STEP_ID",-1); + cutroadMapper.editStep(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO")); + + } + } + + @Override + public PageData findById(PageData pd) throws Exception { + PageData pageData = cutroadMapper.findById(pd); + PageData cpd = new PageData(); + if(pageData.getString("CONTENT_IMG_PATH") != null || "".equals(pageData.getString("CONTENT_IMG_PATH"))){ + cpd.put("CONTENT_IMG_PATH", pageData.getString("CONTENT_IMG_PATH").split(",")); + } + pageData.putAll(cpd); + return pageData; + } + + @Override + public PageData listSignFinished(PageData pd) throws Exception { + Map> rmap = new HashMap<>(); + List varList = cutroadSignMapper.listAll(pd); + if (varList != null && !varList.isEmpty()) { + varList.stream().forEach(item -> { + PageData sign = new PageData(); + sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(",")); + sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(",")); + + sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无"); + if(rmap.containsKey(item.getString("CODE"))){ + rmap.get(item.getString("CODE")).add(sign); + }else{ + List signs = new ArrayList<>(); + signs.add(sign); + rmap.put(item.getString("CODE"),signs); + } + }); + } + PageData rpd = new PageData(); + if (rmap != null && !rmap.isEmpty()) { + rpd.putAll(rmap); + } + return rpd; + } + + @Override + public PageData checkWorkCount(PageData pd) { + PageData rpd = new PageData(); + List varList = cutroadMapper.checkWorkCount(pd); + + if (varList != null && !varList.isEmpty()) { + Map newMap = varList.stream() + .collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT"))); + + rpd.putAll(newMap); + } + return rpd; + } + + @Override + public List listAllMeasures() throws Exception { + return cutroadMapper.listAllMeasures(); + + } + + @Override + public List listAllMeasuresForSign(PageData pd) throws Exception { + return cutroadToMeasuresMapper.listAllMeasuresForSign(pd); + + } + + @Override + public List listSignFinishMeasures(PageData pd) throws Exception { + return cutroadToMeasuresMapper.listSignFinishMeasures(pd); + } + + + @Override + public List getFlowList(PageData pd) throws Exception { + pd=findById(pd); + return cutroadMapper.getFlowList(pd); + } + + @Override + public ReturnMap getMapList() throws Exception { + ReturnMap returnMap = new ReturnMap(); + PageData pd = new PageData(); + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + returnMap.put("varList",cutroadMapper.getMapList(pd)); + return returnMap; + } + private void saveNextSigner(PageData pd,PageData flow) throws Exception { + + pd.put("STEP_ID",flow.get("NEXT_STEP_ID")); + + if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){ + return; + } + //提前保存下一步签字人 + List signers = new ArrayList<>(); + PageData signer = new PageData(); + signer.put("CUTROAD_SIGN_ID", UuidUtil.get32UUID()); // 主键 + signer.put(primary_key, pd.get(primary_key)); + signer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD"))); + signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); + signers.add(signer); + cutroadSignMapper.saveBatch(signers); + sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + + } + + private void saveMeasures(PageData pd) { + List list = (List) JSON.parse(pd.get("MEASURES").toString()); + for (JSONObject json : list) { + PageData measure = new PageData(); + measure.put("CUTROADTOMEASURES_ID",json.get("CUTROADTOMEASURES_ID")); + measure.put("STATUS", json.get("STATUS")); + measure.put("SIGN_PATH", json.get("SIGN_PATH")); + measure.put("SIGN_TIME", json.get("SIGN_TIME")); + measure.put("IMG_PATH", json.get("IMG_PATH")); + cutroadToMeasuresMapper.edit(measure); + } + } + + private void savePreparers(PageData pd,PageData flow) { + List signers = new ArrayList<>(); + List list = (List) JSON.parse(pd.get("PREPARERS").toString()); + for (JSONObject json : list) { + PageData preparer = new PageData(); + preparer.put("CUTROADTOMEASURES_ID", UuidUtil.get32UUID()); // 主键 + preparer.put("CUTROAD_ID", pd.get("CUTROAD_ID")); + preparer.put("BUS_CUTROAD_MEASURES_ID", json.get("BUS_CUTROAD_MEASURES_ID")); + preparer.put("CONFIRM_ID", json.get("USER_ID")); + signers.add(preparer); + } + if(signers.size() > 0){ + cutroadToMeasuresMapper.saveBatch(signers); + + //获取所有需要签名人 + List fieldList = signers.stream() + .map(map -> map.getString("CONFIRM_ID")) + .collect(Collectors.toList()); + Set fieldSet = new HashSet<>(fieldList); //去重 + + List uniqueList = new ArrayList<>(fieldSet); + List nextSigners = new ArrayList<>(); + uniqueList.forEach(item -> { // 保存下一步需要签名的人 + PageData signer = new PageData(); + signer.put("CUTROAD_SIGN_ID", UuidUtil.get32UUID()); // 主键 + signer.put(primary_key, pd.get(primary_key)); + signer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + signer.put("SIGN_USER_ID", item); + signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); + nextSigners.add(signer); + try { + sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + cutroadSignMapper.saveBatch(nextSigners); + } + } + + private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception { + PageData flow = new PageData(); + flow.put("TASK_ID", TASK_ID); + flow.put("STEP_ID", STEP_ID); + flow = eightWorkTaskFlowMapper.getStep(flow); + return flow; + } + + private void saveLog(PageData pd,String act_user,String status) throws Exception { + PageData log = new PageData(); + log.put("LOG_ID", UuidUtil.get32UUID()); + log.put("WORK_ID", pd.get(primary_key)); + log.put("TASK_ID", pd.get("TASK_ID")); + log.put("STEP_ID", pd.get("STEP_ID")); + log.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + log.put("CHECK_NO", pd.get("CHECK_NO")); + log.put("ACT_USER", act_user); + log.put("ACT_TIME", DateUtil.date2Str(new Date())); + log.put("STATUS", status); + log.put("WORK_TYPE",work_type); + eightWorkFlowLogMapper.save(log); + } + + + private void setPosition(PageData pd) throws Exception { + JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID"))); + List pointList = (List)((Map) body.get("data")).get("list"); + List positions = PLSUtil.getRandomPointInPolygon(pointList); + pd.put("WORK_POSITION", String.join(",",positions)); + cutroadMapper.setPosition(pd); + } + private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + PageData params3 = new PageData(); + params3.put("name", "flow");// 存入短信模板中的参数名称 + params3.put("value", flow_name);// 存入上面参数名称所传递的值 + paramsList.add(params3); + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", template);// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java index 372f617..f4820c0 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java @@ -66,9 +66,10 @@ public class EightWorkServiceImpl implements EightWorkService { if(eightworks != null && eightworks.size() > 0){ eightworks.stream().forEach(e -> { staMap.get("total").add(e); - if(e.getString("NEXT_STEP_ID").equals("99")){ + if("99".equals(e.getString("NEXT_STEP_ID"))){ staMap.get("finished").add(e); - }else if(!e.getString("STATUS").equals("-1") && Integer.parseInt(e.getString("NEXT_STEP_ID")) > 1){ + // 被打回 也统计 被删除与暂存 不计入 申请中 + }else if(Integer.parseInt(e.getString("NEXT_STEP_ID")) > 1){ staMap.get("flowing").add(e); } @@ -106,6 +107,14 @@ public class EightWorkServiceImpl implements EightWorkService { }).collect(Collectors.toList()); return returnList; } + public List listAllForDiagnosis(PageData pd)throws Exception{ + return eightworkMapper.listAllForDiagnosis(pd); + } + @Override + public List getEightWorksByType(PageData pageData) { + return eightworkMapper.getEightWorksByType(pageData); + + } } diff --git a/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java index cf7de02..dd7ce2d 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/ElectricityServiceImpl.java @@ -40,6 +40,8 @@ public class ElectricityServiceImpl implements ElectricityService { private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; + @Autowired + private SendMessageUtil sendMessageUtil; private final String primary_key = "ELECTRICITY_ID"; private final String work_type = "ELECTRICITY"; @@ -121,7 +123,7 @@ public class ElectricityServiceImpl implements ElectricityService { } PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); work.put("STEP_ID", flow.get("NEXT_STEP_ID")); - + electricityMapper.editVideo(work); //保存签名信息 PageData sign = new PageData(); @@ -151,7 +153,7 @@ public class ElectricityServiceImpl implements ElectricityService { if("99".equals(currentflow.getString("NEXT_STEP_ID"))){ eightworkvideomanagerMapper.editStatus(work); - + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); return; } if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤 @@ -165,6 +167,8 @@ public class ElectricityServiceImpl implements ElectricityService { work.put("STEP_ID",-1); electricityMapper.editStep(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); + } } @@ -290,6 +294,7 @@ public class ElectricityServiceImpl implements ElectricityService { saveLog(work,pd.getString("USER_ID"),"-2"); work.put("STEP_ID",-1); electricityMapper.editStep(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO")); } } @@ -326,6 +331,8 @@ public class ElectricityServiceImpl implements ElectricityService { signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); signers.add(signer); electricitySignMapper.saveBatch(signers); + sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + } private void saveMeasures(PageData pd) { @@ -374,6 +381,12 @@ public class ElectricityServiceImpl implements ElectricityService { signer.put("SIGN_USER_ID", item); signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); nextSigners.add(signer); + + try { + sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + } catch (Exception e) { + throw new RuntimeException(e); + } }); electricitySignMapper.saveBatch(nextSigners); @@ -424,5 +437,59 @@ public class ElectricityServiceImpl implements ElectricityService { pd.put("WORK_POSITION", String.join(",",positions)); electricityMapper.setPosition(pd); } + private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "临时用电作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + PageData params3 = new PageData(); + params3.put("name", "flow");// 存入短信模板中的参数名称 + params3.put("value", flow_name);// 存入上面参数名称所传递的值 + paramsList.add(params3); + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", template);// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "临时用电作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } } diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java index 4f8cb4e..bc0a3da 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java @@ -39,6 +39,8 @@ public class HighworkServiceImpl implements HighworkService { private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; @Autowired private Smb smb; + @Autowired + private SendMessageUtil sendMessageUtil; private final String primary_key = "HIGHWORK_ID"; private final String work_type = "HIGHWORK"; @@ -115,6 +117,7 @@ public class HighworkServiceImpl implements HighworkService { } PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); work.put("STEP_ID", flow.get("NEXT_STEP_ID")); + highworkMapper.editVideo(work); //保存签名信息 PageData sign = new PageData(); @@ -141,6 +144,7 @@ public class HighworkServiceImpl implements HighworkService { if("99".equals(currentflow.getString("NEXT_STEP_ID"))){ eightworkvideomanagerMapper.editStatus(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); return; } @@ -155,6 +159,8 @@ public class HighworkServiceImpl implements HighworkService { work.put("STEP_ID",-1); highworkMapper.editStep(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); + } } @@ -254,6 +260,8 @@ public class HighworkServiceImpl implements HighworkService { signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); signers.add(signer); highworkSignMapper.saveBatch(signers); + sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + } private void saveMeasures(PageData pd) { @@ -299,6 +307,11 @@ public class HighworkServiceImpl implements HighworkService { signer.put("SIGN_USER_ID", item); signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); nextSigners.add(signer); + try { + sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + } catch (Exception e) { + throw new RuntimeException(e); + } }); highworkSignMapper.saveBatch(nextSigners); @@ -336,5 +349,59 @@ public class HighworkServiceImpl implements HighworkService { pd.put("WORK_POSITION", String.join(",",positions)); highworkMapper.setPosition(pd); } + private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "高处作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + PageData params3 = new PageData(); + params3.put("name", "flow");// 存入短信模板中的参数名称 + params3.put("value", flow_name);// 存入上面参数名称所传递的值 + paramsList.add(params3); + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", template);// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "高处作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } } diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java new file mode 100644 index 0000000..245553a --- /dev/null +++ b/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java @@ -0,0 +1,407 @@ +package com.zcloud.service.eightwork.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightwork.*; +import com.zcloud.service.eightwork.HoistingService; +import com.zcloud.util.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.text.DecimalFormat; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author fangjiakai + * @date 2024/01/17 11:30 + */ +@Service +@Transactional //开启事物 +public class HoistingServiceImpl implements HoistingService { + + @Autowired + private HoistingMapper hoistingMapper; + @Autowired + private EightWorkTaskFlowMapper eightWorkTaskFlowMapper; + @Autowired + private EightWorkFlowLogMapper eightWorkFlowLogMapper; + @Autowired + private HoistingSignMapper hoistingSignMapper; + @Autowired + private HoistingToMeasuresMapper hoistingToMeasuresMapper; + @Autowired + private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper; + @Autowired + private Smb smb; + @Autowired + private SendMessageUtil sendMessageUtil; + + private final String primary_key = "HOISTING_ID"; + private final String work_type = "HOISTING"; + @Override + @Transactional + public void save(PageData pd) throws Exception { + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + pd2 = hoistingMapper.getCode(pd2); //根据ID读取 + String code = "DZ" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1)); + pd.put("CHECK_NO", code); + pd.put(primary_key, UuidUtil.get32UUID()); //主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + hoistingMapper.save(pd); + + if (pd.get("APPLY_STATUS").equals("1")) { + PageData flow = getStep(pd.get("TASK_ID"),"1"); + saveLog(pd,pd.getString("CREATOR"),"1"); + saveNextSigner(pd,flow); + setPosition(pd); + } + } + + @Override + @Transactional + public void edit(PageData pd) throws Exception { + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + hoistingMapper.edit(pd); + + if (pd.get("APPLY_STATUS").equals("1")) { + pd.put("STEP_ID", 1); + hoistingMapper.editStep(pd); + PageData flow = getStep(pd.get("TASK_ID"),"1"); + saveLog(pd,pd.getString("CREATOR"),"1"); + saveNextSigner(pd,flow); + setPosition(pd); + } + } + + @Override + public void delete(PageData pd) throws Exception { + hoistingMapper.delete(pd); + } + + @Override + public List list(Page page) throws Exception { + return hoistingMapper.datalistPage(page); + } + + + /* + * 下一步 + */ + @Override + @Transactional + public void nextStep(PageData pd, MultipartFile[] files) throws Exception { + PageData work = this.findById(pd); + work.putAll(pd); + List filePaths = new ArrayList<>(); + for (int i = 0; i < files.length; i++) { + //保存签名文件 + String ffile = DateUtil.getDays(); + String fileName = UuidUtil.get32UUID() + files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(files[i], fileName, Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile); + filePaths.add(Const.FILEPATHFILE + work.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); + work.put("STEP_ID", flow.get("NEXT_STEP_ID")); + hoistingMapper.editVideo(work); + + //保存签名信息 + PageData sign = new PageData(); + sign.put(primary_key, work.get(primary_key)); + sign.put("STEP_ID", work.get("STEP_ID")); + sign.put("SIGN_USER_ID", work.get("USER_ID")); + sign.put("SIGN_TIME", work.getString("SIGNTIME")); + sign.put("SIGN_PATH", String.join(",",filePaths)); + sign.put("DESCR", work.get("DESCR")); + + hoistingSignMapper.edit(sign); + + if (work.get("MEASURES") != null && !work.get("MEASURES").equals("")) { //安全措施确认步骤 + saveMeasures(work); + } + + List unsignedList = hoistingSignMapper.checkUnsigned(sign);//当前步骤未签名人列表 + if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步 + hoistingMapper.editStep(work); + PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); + + //保存日志 + saveLog(work,work.getString("USER_ID"),"1"); + + if("99".equals(currentflow.getString("NEXT_STEP_ID"))){ + eightworkvideomanagerMapper.editStatus(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO")); + + return; + } + if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤 + savePreparers(work,currentflow); + } + saveNextSigner(work,currentflow); + }else if(pd.getString("APPLY_STATUS").equals("-1")){ + //保存日志 + saveLog(work,work.getString("USER_ID"),"-1"); + eightworkvideomanagerMapper.editStatus(work); + + work.put("STEP_ID",-1); + hoistingMapper.editStep(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO")); + + } + } + + @Override + public PageData findById(PageData pd) throws Exception { + PageData pageData = hoistingMapper.findById(pd); + return pageData; + } + + @Override + public PageData listSignFinished(PageData pd) throws Exception { + Map> rmap = new HashMap<>(); + List varList = hoistingSignMapper.listAll(pd); + if (varList != null && !varList.isEmpty()) { + varList.stream().forEach(item -> { + PageData sign = new PageData(); + sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(",")); + sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(",")); + + sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无"); + if(rmap.containsKey(item.getString("CODE"))){ + rmap.get(item.getString("CODE")).add(sign); + }else{ + List signs = new ArrayList<>(); + signs.add(sign); + rmap.put(item.getString("CODE"),signs); + } + }); + } + PageData rpd = new PageData(); + if (rmap != null && !rmap.isEmpty()) { + rpd.putAll(rmap); + } + return rpd; + } + + @Override + public PageData checkWorkCount(PageData pd) { + PageData rpd = new PageData(); + List varList = hoistingMapper.checkWorkCount(pd); + + if (varList != null && !varList.isEmpty()) { + Map newMap = varList.stream() + .collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT"))); + + rpd.putAll(newMap); + } + return rpd; + } + + @Override + public List listAllMeasures() throws Exception { + return hoistingMapper.listAllMeasures(); + + } + + @Override + public List listAllMeasuresForSign(PageData pd) throws Exception { + return hoistingToMeasuresMapper.listAllMeasuresForSign(pd); + + } + + @Override + public List listSignFinishMeasures(PageData pd) throws Exception { + return hoistingToMeasuresMapper.listSignFinishMeasures(pd); + } + + + @Override + public List getFlowList(PageData pd) throws Exception { + pd=findById(pd); + return hoistingMapper.getFlowList(pd); + } + + @Override + public ReturnMap getMapList() throws Exception { + ReturnMap returnMap = new ReturnMap(); + PageData pd = new PageData(); + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + returnMap.put("varList",hoistingMapper.getMapList(pd)); + return returnMap; + } + private void saveNextSigner(PageData pd,PageData flow) throws Exception { + + pd.put("STEP_ID",flow.get("NEXT_STEP_ID")); + + if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){ + return; + } + //提前保存下一步签字人 + List signers = new ArrayList<>(); + PageData signer = new PageData(); + signer.put("HOISTING_SIGN_ID", UuidUtil.get32UUID()); // 主键 + signer.put(primary_key, pd.get(primary_key)); + signer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD"))); + signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); + signers.add(signer); + hoistingSignMapper.saveBatch(signers); + sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + + } + + private void saveMeasures(PageData pd) { + List list = (List) JSON.parse(pd.get("MEASURES").toString()); + for (JSONObject json : list) { + PageData measure = new PageData(); + measure.put("HOISTINGTOMEASURES_ID",json.get("HOISTINGTOMEASURES_ID")); + measure.put("STATUS", json.get("STATUS")); + measure.put("SIGN_PATH", json.get("SIGN_PATH")); + measure.put("SIGN_TIME", json.get("SIGN_TIME")); + measure.put("ANSWER1", json.get("ANSWER1")); + measure.put("IMG_PATH", json.get("IMG_PATH")); + hoistingToMeasuresMapper.edit(measure); + } + } + + private void savePreparers(PageData pd,PageData flow) { + List signers = new ArrayList<>(); + List list = (List) JSON.parse(pd.get("PREPARERS").toString()); + for (JSONObject json : list) { + PageData preparer = new PageData(); + preparer.put("HOISTINGTOMEASURES_ID", UuidUtil.get32UUID()); // 主键 + preparer.put("HOISTING_ID", pd.get("HOISTING_ID")); + preparer.put("BUS_HOISTING_MEASURES_ID", json.get("BUS_HOISTING_MEASURES_ID")); + preparer.put("CONFIRM_ID", json.get("USER_ID")); + signers.add(preparer); + } + if(signers.size() > 0){ + hoistingToMeasuresMapper.saveBatch(signers); + + //获取所有需要签名人 + List fieldList = signers.stream() + .map(map -> map.getString("CONFIRM_ID")) + .collect(Collectors.toList()); + Set fieldSet = new HashSet<>(fieldList); //去重 + + List uniqueList = new ArrayList<>(fieldSet); + List nextSigners = new ArrayList<>(); + uniqueList.forEach(item -> { // 保存下一步需要签名的人 + PageData signer = new PageData(); + signer.put("HOISTING_SIGN_ID", UuidUtil.get32UUID()); // 主键 + signer.put(primary_key, pd.get(primary_key)); + signer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + signer.put("SIGN_USER_ID", item); + signer.put("STEP_ID", flow.get("NEXT_STEP_ID")); + nextSigners.add(signer); + try { + sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME")); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + hoistingSignMapper.saveBatch(nextSigners); + } + } + + private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception { + PageData flow = new PageData(); + flow.put("TASK_ID", TASK_ID); + flow.put("STEP_ID", STEP_ID); + flow = eightWorkTaskFlowMapper.getStep(flow); + return flow; + } + + private void saveLog(PageData pd,String act_user,String status) throws Exception { + PageData log = new PageData(); + log.put("LOG_ID", UuidUtil.get32UUID()); + log.put("WORK_ID", pd.get(primary_key)); + log.put("TASK_ID", pd.get("TASK_ID")); + log.put("STEP_ID", pd.get("STEP_ID")); + log.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + log.put("CHECK_NO", pd.get("CHECK_NO")); + log.put("ACT_USER", act_user); + log.put("ACT_TIME", DateUtil.date2Str(new Date())); + log.put("STATUS", status); + log.put("WORK_TYPE",work_type); + eightWorkFlowLogMapper.save(log); + } + + + private void setPosition(PageData pd) throws Exception { + JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID"))); + List pointList = (List)((Map) body.get("data")).get("list"); + List positions = PLSUtil.getRandomPointInPolygon(pointList); + pd.put("WORK_POSITION", String.join(",",positions)); + hoistingMapper.setPosition(pd); + } + private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + PageData params3 = new PageData(); + params3.put("name", "flow");// 存入短信模板中的参数名称 + params3.put("value", flow_name);// 存入上面参数名称所传递的值 + paramsList.add(params3); + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception { + PageData mes = new PageData(); + mes.put("RECEIVER_ID", userId);// 收信人userid + mes.put("templateCode", template);// 短信模板编码 + mes.put("CORPINFO_ID", corpinfo_id);// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", number);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + try { + sendMessageUtil.sendMessages(mes, paramsList); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java index 87ca29a..d3c3af6 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java @@ -155,6 +155,7 @@ public class HotworkServiceImpl implements HotworkService { if("99".equals(currentflow.getString("NEXT_STEP_ID"))){ eightworkvideomanagerMapper.editStatus(work); + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO")); return; } if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤 @@ -292,7 +293,7 @@ public class HotworkServiceImpl implements HotworkService { saveLog(work,pd.getString("USER_ID"),"-2"); work.put("STEP_ID",-1); hotworkMapper.editStep(work); - + sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO")); } } @@ -315,10 +316,6 @@ public class HotworkServiceImpl implements HotworkService { pd.put("STEP_ID",flow.get("NEXT_STEP_ID")); if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){ - if(flow.get("NEXT_STEP_ID").equals("99")){ - sendMessageForFinished(pd.getString("CORPINFO_ID"),pd.getString("CREATOR"),"EIGHTWORK_ACCEPT",pd.getString("CHECK_NO")); - - } return; } //提前保存下一步签字人 diff --git a/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java new file mode 100644 index 0000000..be1428d --- /dev/null +++ b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java @@ -0,0 +1,79 @@ +package com.zcloud.service.freighttrailer; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +public interface FreightTrailerService { + + /** + * 新增 + * + * @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; + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception; + + /** + * 列表 + * + * @param + * @throws Exception + */ + public List corpList(String corpId) throws Exception; + + /** + * 列表 + * + * @param + * @throws Exception + */ + public List trailerList(String corpId) throws Exception; + + /** + * 列表 + * + * @param + * @throws Exception + */ + public List vehicleList(PageData pd) throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java new file mode 100644 index 0000000..3d0d7bb --- /dev/null +++ b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java @@ -0,0 +1,107 @@ +package com.zcloud.service.freighttrailer.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.freighttrailer.FreightTrailerMapper; +import com.zcloud.service.freighttrailer.FreightTrailerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +@Service +@Transactional +public class FreightTrailerServiceImpl implements FreightTrailerService { + + @Autowired + private FreightTrailerMapper freightTrailerMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + freightTrailerMapper.save(pd); + } + + /** + * 删除 + *e + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + freightTrailerMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + freightTrailerMapper.edit(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return freightTrailerMapper.datalistPage(page); + } + + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return freightTrailerMapper.findById(pd); + } + + + /** + * 列表 + * + * @param + * @throws Exception + */ + public List corpList(String corpId) throws Exception { + return freightTrailerMapper.corpList(corpId); + } + + /** + * 列表 + * + * @param + * @throws Exception + */ + public List trailerList(String corpId) throws Exception { + return freightTrailerMapper.trailerList(corpId); + } + + /** + * 列表 + * + * @param + * @throws Exception + */ + public List vehicleList(PageData pd) throws Exception { + return freightTrailerMapper.vehicleList(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/inspectAnnually/InspectAnnuallyService.java b/src/main/java/com/zcloud/service/inspectAnnually/InspectAnnuallyService.java new file mode 100644 index 0000000..fdce75b --- /dev/null +++ b/src/main/java/com/zcloud/service/inspectAnnually/InspectAnnuallyService.java @@ -0,0 +1,64 @@ +package com.zcloud.service.inspectAnnually; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +public interface InspectAnnuallyService { + + /** + * 新增 + * + * @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 pd + * @throws Exception + */ + public void edit2(PageData pd) throws Exception; + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception; + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception; + + +} + diff --git a/src/main/java/com/zcloud/service/inspectAnnually/impl/InspectAnnuallyServiceImpl.java b/src/main/java/com/zcloud/service/inspectAnnually/impl/InspectAnnuallyServiceImpl.java new file mode 100644 index 0000000..3ef2669 --- /dev/null +++ b/src/main/java/com/zcloud/service/inspectAnnually/impl/InspectAnnuallyServiceImpl.java @@ -0,0 +1,88 @@ +package com.zcloud.service.inspectAnnually.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.inspectAnnually.InspectAnnuallyMapper; +import com.zcloud.service.inspectAnnually.InspectAnnuallyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 企业信息管理-货运挂车 + */ +@Service +@Transactional +public class InspectAnnuallyServiceImpl implements InspectAnnuallyService { + + @Autowired + private InspectAnnuallyMapper inspectAnnuallyMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + inspectAnnuallyMapper.save(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + inspectAnnuallyMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + inspectAnnuallyMapper.edit(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit2(PageData pd) throws Exception { + inspectAnnuallyMapper.edit2(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return inspectAnnuallyMapper.datalistPage(page); + } + + + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return inspectAnnuallyMapper.findById(pd); + } + + + +} + diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java index 4edeeed..91b45d6 100644 --- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java +++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java @@ -409,7 +409,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic hidden.put("HIDDENTYPE2", lists.get(1)); //隐患类型2 hidden.put("HIDDENTYPE3", lists.get(2)); //隐患类型3 } - hidden.put("HIDDENTYPE_NAME", json.getString("HIDDENTYPE_NAME"));//隐患类型名称 + hidden.put("HIDDENTYPE_NAME", StringUtils.isNotBlank(json.getString("HIDDENTYPENAME")) ? json.getString("HIDDENTYPENAME") : json.getString("HIDDENTYPE_NAME"));//隐患类型名称 hidden.put("LONGITUDE", json.getString("LONGITUDE")); //隐患位置经度 hidden.put("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度 hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间 diff --git a/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java b/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java index a17e9ce..e6dfd33 100644 --- a/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java +++ b/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java @@ -32,4 +32,8 @@ public interface OperatingVehiclesService { public PageData findById(PageData pd)throws Exception; public List list(Page page); + + List operationVehicleList(String corpId); + + } diff --git a/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java b/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java index 5cdcbd9..7c23ac8 100644 --- a/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java +++ b/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java @@ -41,4 +41,9 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService { public List list(Page page) { return operatingVehiclesMapper.datalistPage(page); } + + @Override + public List operationVehicleList(String corpId) { + return operatingVehiclesMapper.operationVehicleList(corpId); + } } diff --git a/src/main/java/com/zcloud/service/system/DictionariesService.java b/src/main/java/com/zcloud/service/system/DictionariesService.java index 3ccc20c..9a3275e 100644 --- a/src/main/java/com/zcloud/service/system/DictionariesService.java +++ b/src/main/java/com/zcloud/service/system/DictionariesService.java @@ -199,4 +199,6 @@ public interface DictionariesService { List listgetAssignedVehicleModel(String parentId); List listgetAssignedVehicle(String parentId); + + List listgetVehicleType(String parentId); } diff --git a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java index 3ba93cb..829cd05 100644 --- a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java @@ -496,4 +496,9 @@ public class DictionariesServiceImpl implements DictionariesService { public List listgetAssignedVehicle(String parentId) { return dictionariesMapper.listgetAssignedVehicle(parentId); } + + @Override + public List listgetVehicleType(String parentId) { + return dictionariesMapper.listgetVehicleType(parentId); + } } diff --git a/src/main/java/com/zcloud/service/taxationManage/TaxationManageService.java b/src/main/java/com/zcloud/service/taxationManage/TaxationManageService.java new file mode 100644 index 0000000..62116e7 --- /dev/null +++ b/src/main/java/com/zcloud/service/taxationManage/TaxationManageService.java @@ -0,0 +1,37 @@ +package com.zcloud.service.taxationManage; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TaxationManageService { + + /**新增 + * @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; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + public List list(Page page); + + public List taxationList(String corpId) throws Exception; +} diff --git a/src/main/java/com/zcloud/service/taxationManage/impl/TaxationManageServiceImpl.java b/src/main/java/com/zcloud/service/taxationManage/impl/TaxationManageServiceImpl.java new file mode 100644 index 0000000..740ae05 --- /dev/null +++ b/src/main/java/com/zcloud/service/taxationManage/impl/TaxationManageServiceImpl.java @@ -0,0 +1,51 @@ +package com.zcloud.service.taxationManage.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.operatingvehicles.OperatingVehiclesMapper; +import com.zcloud.mapper.datasource.taxationManage.TaxationManageMapper; +import com.zcloud.service.operatingvehicles.OperatingVehiclesService; +import com.zcloud.service.taxationManage.TaxationManageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional //开启事物 +public class TaxationManageServiceImpl implements TaxationManageService { + + @Autowired + private TaxationManageMapper taxationManageMapper; + + @Override + public void save(PageData pd) throws Exception { + taxationManageMapper.save(pd); + } + + @Override + public void delete(PageData pd) throws Exception { + taxationManageMapper.delete(pd); + } + + @Override + public void edit(PageData pd) throws Exception { + taxationManageMapper.edit(pd); + } + + @Override + public PageData findById(PageData pd) throws Exception { + return taxationManageMapper.findById(pd); + } + + @Override + public List list(Page page) { + return taxationManageMapper.datalistPage(page); + } + + @Override + public List taxationList(String corpId) throws Exception { + return taxationManageMapper.taxationList(corpId); + } +} diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index 4700ce4..3d99cc7 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -27,19 +27,19 @@ public class Const { public static final String SYSNAME = "sysName"; //系统名称 public static final String SHOWCOUNT = "showCount"; //每页条数 - public static final String FILEPATHFILE = "/uploadFiles/file/"; //文件上传路径 - public static final String BIFILEPATHFILE = "/uploadFiles/Bfile/"; //文件上传路径 - public static final String FILEPATHIMG = "/uploadFiles/imgs/"; //图片上传路径 - public static final String FILEPATHIMGSPECIAL = "/uploadFiles/imgs/special/"; //图片上传路径(特种装备) - public static final String FILEPATHDZJM = "/uploadFiles/dzjm/"; //图片上传路径 - public static final String FILEPATHYHTP = "/uploadFiles/yhtp/"; //图片上传路径 - public static final String FILEPATHFXSST = "/uploadFiles/fxsst/"; //图片上传路径 风险四色图 - public static final String FILEPATHPHOTO = "/uploadFiles/photo/"; //图片上传路径 风险四色图 - public static final String FILEPATH_USER_SIGN = "/uploadFiles/userSign/"; //图片上传路径 用户签字信息 + public static final String FILEPATHFILE = "/TrafficFile/uploadFiles/file/"; //文件上传路径 + public static final String BIFILEPATHFILE = "/TrafficFile/uploadFiles/Bfile/"; //文件上传路径 + public static final String FILEPATHIMG = "/TrafficFile/uploadFiles/imgs/"; //图片上传路径 + public static final String FILEPATHIMGSPECIAL = "/TrafficFile/uploadFiles/imgs/special/"; //图片上传路径(特种装备) + public static final String FILEPATHDZJM = "/TrafficFile/uploadFiles/dzjm/"; //图片上传路径 + public static final String FILEPATHYHTP = "/TrafficFile/uploadFiles/yhtp/"; //图片上传路径 + public static final String FILEPATHFXSST = "/TrafficFile/uploadFiles/fxsst/"; //图片上传路径 风险四色图 + public static final String FILEPATHPHOTO = "/TrafficFile/uploadFiles/photo/"; //图片上传路径 风险四色图 + public static final String FILEPATH_USER_SIGN = "/TrafficFile/uploadFiles/userSign/"; //图片上传路径 用户签字信息 - public static final String FILEPATHFXGFGL = "/uploadFiles/xgfgl/"; //上传路径 相关方管理 + public static final String FILEPATHFXGFGL = "/TrafficFile/uploadFiles/xgfgl/"; //上传路径 相关方管理 - public static final String FILEACTIVITI = "/uploadFiles/activitiFile/"; //工作流生成XML和PNG目录 + public static final String FILEACTIVITI = "/TrafficFile/uploadFiles/activitiFile/"; //工作流生成XML和PNG目录 public static final String DEPARTMENT_IDS = "DEPARTMENT_IDS"; //当前用户拥有的最高部门权限集合 public static final String DEPARTMENT_ID = "DEPARTMENT_ID"; //当前用户拥有的最高部门权限 diff --git a/src/main/java/com/zcloud/util/PLSUtil.java b/src/main/java/com/zcloud/util/PLSUtil.java index 420c5ca..19de32a 100644 --- a/src/main/java/com/zcloud/util/PLSUtil.java +++ b/src/main/java/com/zcloud/util/PLSUtil.java @@ -39,7 +39,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); ResponseEntity exchange = restTemplate.exchange( - PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/deploy/card/list?sortThePowerLevel=1&pageNum=" + + getBakeAddr(CORPINFO_ID) + "/deploy/card/list?sortThePowerLevel=1&pageNum=" + currentPage + "&pageSize=" + showCount, HttpMethod.GET, httpEntity, @@ -52,7 +52,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); ResponseEntity exchange = restTemplate.exchange( - PLSUtil.BAKEADDR.get(CORPINFO_ID) + url, + getBakeAddr(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); @@ -77,7 +77,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); ResponseEntity exchange = restTemplate.exchange( - PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/alarm/alarmStatistics?type=day", + getBakeAddr(CORPINFO_ID) + "/region/alarm/alarmStatistics?type=day", HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); @@ -88,7 +88,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url, HttpMethod.POST, httpEntity, JSONObject.class); @@ -99,7 +99,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url + id, HttpMethod.GET, httpEntity, JSONObject.class); @@ -112,7 +112,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + params, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url + params, HttpMethod.GET, httpEntity, JSONObject.class); @@ -124,7 +124,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url, HttpMethod.PUT, httpEntity, JSONObject.class); @@ -135,7 +135,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url + id, HttpMethod.DELETE, httpEntity, JSONObject.class); @@ -158,7 +158,7 @@ public class PLSUtil { if (Tools.notEmpty(keywords)) { url = url + keywords; } - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + url , HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -177,7 +177,7 @@ public class PLSUtil { // "/region/alarm/list?pageNum=" + // currentPage + "&pageSize=" + showCount +"&str=" + "&eleType="+eleType+ "&status="+status HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/alarm/list?eleType=" + eleType + "+&status=" + status + "&pageNum=" + currentPage + "&pageSize=" + showCount + "&str=" , HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); @@ -200,7 +200,7 @@ public class PLSUtil { url = url + keywords; } HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + url , HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -217,7 +217,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera/list?pageNum=1&pageSize=100000&str=", HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -246,11 +246,11 @@ public class PLSUtil { uriVariables.put("alt", ""); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); // HttpEntity httpEntity = new HttpEntity<>(uriVariables,headers); -// ResponseEntity jsonObjectResponseEntity = restTemplate.postForEntity(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera", +// ResponseEntity jsonObjectResponseEntity = restTemplate.postForEntity(getBakeAddr(CORPINFO_ID) + "/device/camera", // httpEntity, JSONObject.class); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera", + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera", HttpMethod.POST, httpEntity, JSONObject.class); @@ -273,7 +273,7 @@ public class PLSUtil { uriVariables.put("camName", camera.getString("VIDEONAME")); uriVariables.put("camId", camera.getString("PLS_ID")); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera", + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera", HttpMethod.PUT, httpEntity, JSONObject.class, uriVariables); return exchange.getBody(); @@ -290,7 +290,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera/" + Integer.parseInt(camera.getString("PLS_ID")), HttpMethod.DELETE, httpEntity, JSONObject.class); + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera/" + Integer.parseInt(camera.getString("PLS_ID")), HttpMethod.DELETE, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -311,7 +311,7 @@ public class PLSUtil { if (Tools.notEmpty(keywords)) url += keywords; headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class); + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -325,7 +325,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/region/list?pageNum=" + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/region/list?pageNum=" + currentPage + "&pageSize=" + showCount, HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); @@ -341,7 +341,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/region/" + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/region/" + id, HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -355,7 +355,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/location/loca/personnelTrajectories",HttpMethod.GET, httpEntity, JSONObject.class); + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/location/loca/personnelTrajectories",HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -375,7 +375,7 @@ public class PLSUtil { uriVariables.put("type", type); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/location/loca/characterTrajectories", + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/location/loca/characterTrajectories", HttpMethod.POST, httpEntity, JSONObject.class); @@ -393,7 +393,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/api/prod-api/coordinate/realTime/data", HttpMethod.GET, httpEntity, JSONObject.class); + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/location/loca", HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -408,21 +408,30 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/api/electronicFence/determineWhetherThePersonIsInTheElectronicFence2?psn=" + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/api/electronicFence/determineWhetherThePersonIsInTheElectronicFence2?psn=" + PLS_ID + "&id=" + ELECTRONIC_FENCE_ID, HttpMethod.GET, httpEntity, Boolean.class); return exchange.getBody(); } - @PostConstruct - private void initBakeAddr() throws Exception { - List dataList = corpplsinfoService.listAll(new PageData()); + private static void initBakeAddr(){ + List dataList = null; + try { + dataList = corpplsinfoService.listAll(new PageData()); + } catch (Exception e) { + throw new RuntimeException(e); + } dataList.forEach(item -> { BAKEADDR.put(item.getString("CORPINFO_ID"), item.getString("POST_URL")); }); } - + private static String getBakeAddr(String CORPINFO_ID) throws Exception { + return BAKEADDR.computeIfAbsent(CORPINFO_ID, key -> { + initBakeAddr(); + return BAKEADDR.get(CORPINFO_ID); + }); + } /** * @Description: 获取token * @Author: dearLin @@ -449,7 +458,7 @@ public class PLSUtil { if (response != null) { PageData valueData = JSONObject.parseObject(response.getString("data"), PageData.class); token = valueData.getString("access_token"); - String newExpireTime = DateUtil.getAfterHourDate("12"); + String newExpireTime = DateUtil.getAfterHourDate("24"); pd.put("TOKEN", token); pd.put("EXPIRE_TIME", newExpireTime); corpplsinfoService.edit(pd); @@ -472,7 +481,7 @@ public class PLSUtil { public static boolean hasCardNumber(PageData user) throws Exception { if (Tools.isEmpty(user.getString("CARDNO"))) {return true;} // 根据 定位卡号获取对应的人 - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO"); + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO"); PageData response = sendGetHttpRequest(url, null, getToken(Jurisdiction.getCORPINFO_ID())); if (response != null) { if (!"200".equals(response.getString("code"))) { @@ -493,7 +502,7 @@ public class PLSUtil { */ public static PageData getCardNumberPeople(PageData user) throws Exception { // 根据 定位卡号获取对应的人 - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO"); + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO"); PageData response = sendGetHttpRequest(url, null, getToken(Jurisdiction.getCORPINFO_ID())); if (response != null) { if (!"200".equals(response.getString("code"))) { @@ -513,7 +522,7 @@ public class PLSUtil { * @Return: void */ public static PageData saveUser(PageData user) throws Exception { - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/insertPsnIfon"; + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/insertPsnIfon"; JSONObject loginPayload = new JSONObject(); loginPayload.put("name", user.getString("NAME")); loginPayload.put("cardNo", user.getString("CARDNO")); @@ -555,7 +564,7 @@ public class PLSUtil { } return false; } - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/updPsnInfoById"; + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/updPsnInfoById"; JSONObject loginPayload = new JSONObject(); loginPayload.put("name", user.getString("NAME")); loginPayload.put("psnId", user.getString("PLS_ID")); @@ -582,7 +591,7 @@ public class PLSUtil { } public static boolean removeUser(PageData user) throws Exception { - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt"; + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt"; PageData removeUser = usersService.findById(user); PageData response = sendDeleteHttpRequest(url, Long.parseLong(removeUser.getString("PLS_ID")), getToken(Jurisdiction.getCORPINFO_ID())); return "200".equals(response.getString("code")); diff --git a/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml b/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml new file mode 100644 index 0000000..bfab614 --- /dev/null +++ b/src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml @@ -0,0 +1,472 @@ + + + + + + + BUS_TRAFFIC_ASSIGNED + + + + + SYS_DICTIONARIES + + + + + f.ASSIGNED_ID, + f.RECORD_NUMBER, + f.CORPINFO_ID, + f.ASSIGNED_TYPE, + f.RAW_PLATE_NUMBER, + f.NOW_PLATE_NUMBER, + f.RAW_OWNERS, + f.NOW_OWNERS, + f.ASSIGNED_DATE, + f.REGISTRANT, + f.RAW_TRANSPORT_ENTERPRISES, + f.ASSIGNED_VEHICLE_MODEL, + f.ASSIGNED_VEHICLE, + f.RAW_OWNERS_NUMBER, + f.RAW_VEHICLE_OPERATION_CERTIFICATE, + f.FRAMES_NUMBER, + f.RAW_DRIVINGLICENSE_IMG, + f.ASSIGNED_WAY, + f.TRANSACTION_DATE, + f.NOW_OWNERS_NUMBER, + f.NOW_DRIVINGLICENSE_IMG, + f.NOW_VEHICLE_OPERATION_CERTIFICATE, + f.ASSIGNED_MATERIAL, + f.REMARK, + f.VEHICLE_TYPE, + f.VEHICLE_BRAND, + f.VEHICLE_MODEL, + f.ENGINE_NUMBER, + f.POWER_TYPE, + f.EMISSION_STANDARD, + f.RAW_CONTACT_NUMBER, + f.NOW_CONTACT_NUMBER, + f.RAW_OPERATION_CERTIFICATE, + f.NOW_OPERATION_CERTIFICATE, + f.TRANSPORT_ENTERPRISES, + f.ISDELETE, + f.CREATOR, + f.CREATORNAME, + f.CREATTIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME, + f.DELETOR, + f.DELETORNAME, + f.DELETTIME + + + + + ASSIGNED_ID, + RECORD_NUMBER, + CORPINFO_ID, + ASSIGNED_TYPE, + RAW_PLATE_NUMBER, + NOW_PLATE_NUMBER, + RAW_OWNERS, + NOW_OWNERS, + ASSIGNED_DATE, + REGISTRANT, + RAW_TRANSPORT_ENTERPRISES, + ASSIGNED_VEHICLE_MODEL, + ASSIGNED_VEHICLE, + RAW_OWNERS_NUMBER, + RAW_VEHICLE_OPERATION_CERTIFICATE, + FRAMES_NUMBER, + RAW_DRIVINGLICENSE_IMG, + ASSIGNED_WAY, + TRANSACTION_DATE, + NOW_OWNERS_NUMBER, + NOW_DRIVINGLICENSE_IMG, + NOW_VEHICLE_OPERATION_CERTIFICATE, + ASSIGNED_MATERIAL, + REMARK, + VEHICLE_TYPE, + VEHICLE_BRAND, + VEHICLE_MODEL, + ENGINE_NUMBER, + POWER_TYPE, + EMISSION_STANDARD, + RAW_CONTACT_NUMBER, + NOW_CONTACT_NUMBER, + RAW_OPERATION_CERTIFICATE, + NOW_OPERATION_CERTIFICATE, + TRANSPORT_ENTERPRISES, + ISDELETE, + CREATOR, + CREATORNAME, + CREATTIME, + OPERATOR, + OPERATORNAME, + OPERATTIME, + DELETOR, + DELETORNAME, + DELETTIME + + + + + #{ASSIGNED_ID}, + #{RECORD_NUMBER}, + #{CORPINFO_ID}, + #{ASSIGNED_TYPE}, + #{RAW_PLATE_NUMBER}, + #{NOW_PLATE_NUMBER}, + #{RAW_OWNERS}, + #{NOW_OWNERS}, + #{ASSIGNED_DATE}, + #{REGISTRANT}, + #{RAW_TRANSPORT_ENTERPRISES}, + #{ASSIGNED_VEHICLE_MODEL}, + #{ASSIGNED_VEHICLE}, + #{RAW_OWNERS_NUMBER}, + #{RAW_VEHICLE_OPERATION_CERTIFICATE}, + #{FRAMES_NUMBER}, + #{RAW_DRIVINGLICENSE_IMG}, + #{ASSIGNED_WAY}, + #{TRANSACTION_DATE}, + #{NOW_OWNERS_NUMBER}, + #{NOW_DRIVINGLICENSE_IMG}, + #{NOW_VEHICLE_OPERATION_CERTIFICATE}, + #{ASSIGNED_MATERIAL}, + #{REMARK}, + #{VEHICLE_TYPE}, + #{VEHICLE_BRAND}, + #{VEHICLE_MODEL}, + #{ENGINE_NUMBER}, + #{POWER_TYPE}, + #{EMISSION_STANDARD}, + #{RAW_CONTACT_NUMBER}, + #{NOW_CONTACT_NUMBER}, + #{RAW_OPERATION_CERTIFICATE}, + #{NOW_OPERATION_CERTIFICATE}, + #{TRANSPORT_ENTERPRISES}, + #{ISDELETE}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + ASSIGNED_ID = #{ASSIGNED_ID} + + + + + update + + set + ASSIGNED_ID = #{ASSIGNED_ID}, + RECORD_NUMBER = #{RECORD_NUMBER}, + CORPINFO_ID = #{CORPINFO_ID}, + ASSIGNED_TYPE = #{ASSIGNED_TYPE}, + RAW_PLATE_NUMBER = #{RAW_PLATE_NUMBER}, + NOW_PLATE_NUMBER = #{NOW_PLATE_NUMBER}, + RAW_OWNERS = #{RAW_OWNERS}, + NOW_OWNERS = #{NOW_OWNERS}, + ASSIGNED_DATE = #{ASSIGNED_DATE}, + REGISTRANT = #{REGISTRANT}, + REGISTRANT = #{REGISTRANT}, + ASSIGNED_VEHICLE_MODEL = #{ASSIGNED_VEHICLE_MODEL}, + ASSIGNED_VEHICLE = #{ASSIGNED_VEHICLE}, + RAW_OWNERS_NUMBER = #{RAW_OWNERS_NUMBER}, + RAW_VEHICLE_OPERATION_CERTIFICATE = #{RAW_VEHICLE_OPERATION_CERTIFICATE}, + FRAMES_NUMBER = #{FRAMES_NUMBER}, + RAW_DRIVINGLICENSE_IMG = #{RAW_DRIVINGLICENSE_IMG}, + ASSIGNED_WAY = #{ASSIGNED_WAY}, + TRANSACTION_DATE = #{TRANSACTION_DATE}, + NOW_OWNERS_NUMBER = #{NOW_OWNERS_NUMBER}, + NOW_DRIVINGLICENSE_IMG = #{NOW_DRIVINGLICENSE_IMG}, + NOW_VEHICLE_OPERATION_CERTIFICATE = #{NOW_VEHICLE_OPERATION_CERTIFICATE}, + ASSIGNED_MATERIAL = #{ASSIGNED_MATERIAL}, + REMARK = #{REMARK}, + VEHICLE_TYPE = #{VEHICLE_TYPE}, + VEHICLE_BRAND = #{VEHICLE_BRAND}, + VEHICLE_MODEL = #{VEHICLE_MODEL}, + ENGINE_NUMBER = #{ENGINE_NUMBER}, + POWER_TYPE = #{POWER_TYPE}, + EMISSION_STANDARD = #{EMISSION_STANDARD}, + RAW_CONTACT_NUMBER = #{RAW_CONTACT_NUMBER}, + NOW_CONTACT_NUMBER = #{NOW_CONTACT_NUMBER}, + RAW_OPERATION_CERTIFICATE = #{RAW_OPERATION_CERTIFICATE}, + NOW_OPERATION_CERTIFICATE = #{NOW_OPERATION_CERTIFICATE}, + TRANSPORT_ENTERPRISES = #{TRANSPORT_ENTERPRISES}, + ISDELETE = #{ISDELETE}, + CREATOR = #{CREATOR}, + CREATORNAME = #{CREATORNAME}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME}, + DELETOR = #{DELETOR}, + DELETORNAME = #{DELETORNAME}, + DELETTIME = #{DELETTIME} + where + ASSIGNED_ID = #{ASSIGNED_ID} + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml index 7dd6c94..a392491 100644 --- a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml +++ b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml @@ -144,6 +144,7 @@ f left join sys_user su on f.UPLOAD_USER = su.USER_ID left join bus_corp_info bci on bci.CORPINFO_ID = su.CORPINFO_ID + left join bus_library_labels b ON b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID where f.ISDELETE = '0' and f.REMARKS LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') @@ -166,12 +167,10 @@ ) - and (exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.CATEGORY_ID}) - or exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.TYPE_ONE})) + and b.CATEGORY_ID in (#{pd.CATEGORY_ID}, #{pd.TYPE_ONE}) - and (exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.plan}) - and exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.TYPE_ONE})) + and b.CATEGORY_ID in ( #{pd.plan}, #{pd.TYPE_ONE}) and f.CORPINFO_ID = #{pd.CORPINFO_ID} diff --git a/src/main/resources/mybatis/datasource/eightwork/BlindBoardInfoMapper.xml b/src/main/resources/mybatis/datasource/eightwork/BlindBoardInfoMapper.xml new file mode 100644 index 0000000..b8234ca --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/BlindBoardInfoMapper.xml @@ -0,0 +1,183 @@ + + + + + + + BUS_BLINDBOARDINFO + + + + + SYS_DICTIONARIES + + + + + f.ISDELETE, + f.CREATTIME, + f.CREATOR, + f.OPERATTIME, + f.OPERATOR, + f.BOARD_MATERIAL, + f.BOARD_SPECIFICATION, + f.BOARD_NO, + f.BOARD_INSTALL_TIME, + f.BOARD_DISASSEMBLE_TIME, + f.BOARD_INSTALL_USER, + f.BOARD_DISASSEMBLE_USER, + f.BOARD_PATH, + f.BOARD_HARM, + f.BOARD_MEASURES, + f.BOARD_SIGNER_PATH, + f.BOARD_SIGNER_TIME, + f.BLINDBOARD_ID, + f.BLINDBOARDINFO_ID + + + + + ISDELETE, + CREATTIME, + CREATOR, + OPERATTIME, + OPERATOR, + BOARD_MATERIAL, + BOARD_SPECIFICATION, + BOARD_NO, + BOARD_INSTALL_TIME, + BOARD_DISASSEMBLE_TIME, + BOARD_INSTALL_USER, + BOARD_DISASSEMBLE_USER, + BOARD_PATH, + BOARD_HARM, + BOARD_MEASURES, + BOARD_SIGNER_PATH, + BOARD_SIGNER_TIME, + BLINDBOARD_ID, + BLINDBOARDINFO_ID + + + + + #{ISDELETE}, + #{CREATTIME}, + #{CREATOR}, + #{OPERATTIME}, + #{OPERATOR}, + #{BOARD_MATERIAL}, + #{BOARD_SPECIFICATION}, + #{BOARD_NO}, + #{BOARD_INSTALL_TIME}, + #{BOARD_DISASSEMBLE_TIME}, + #{BOARD_INSTALL_USER}, + #{BOARD_DISASSEMBLE_USER}, + #{BOARD_PATH}, + #{BOARD_HARM}, + #{BOARD_MEASURES}, + #{BOARD_SIGNER_PATH}, + #{BOARD_SIGNER_TIME}, + #{BLINDBOARD_ID}, + #{BLINDBOARDINFO_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + BLINDBOARD_ID = #{BLINDBOARD_ID} + + + + + update + + set + ISDELETE = #{ISDELETE}, + CREATTIME = #{CREATTIME}, + CREATOR = #{CREATOR}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + BOARD_MATERIAL = #{BOARD_MATERIAL}, + BOARD_SPECIFICATION = #{BOARD_SPECIFICATION}, + BOARD_NO = #{BOARD_NO}, + BOARD_INSTALL_TIME = #{BOARD_INSTALL_TIME}, + BOARD_DISASSEMBLE_TIME = #{BOARD_DISASSEMBLE_TIME}, + BOARD_INSTALL_USER = #{BOARD_INSTALL_USER}, + BOARD_DISASSEMBLE_USER = #{BOARD_DISASSEMBLE_USER}, + BOARD_PATH = #{BOARD_PATH}, + BOARD_HARM = #{BOARD_HARM}, + BOARD_MEASURES = #{BOARD_MEASURES}, + BOARD_SIGNER_PATH = #{BOARD_SIGNER_PATH}, + BOARD_SIGNER_TIME = #{BOARD_SIGNER_TIME}, + BLINDBOARD_ID = #{BLINDBOARD_ID}, + BLINDBOARDINFO_ID = BLINDBOARDINFO_ID + where + BLINDBOARDINFO_ID = #{BLINDBOARDINFO_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + BLINDBOARDINFO_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/BlindBoardMapper.xml b/src/main/resources/mybatis/datasource/eightwork/BlindBoardMapper.xml new file mode 100644 index 0000000..a06f6ac --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/BlindBoardMapper.xml @@ -0,0 +1,497 @@ + + + + + + BUS_BLINDBOARD + + + + + f.BLINDBOARD_ID, + f.CORPINFO_ID, + f.TASK_ID, + f.STEP_ID, + f.ISDELETE, + f.CREATTIME, + f.CREATOR, + f.OPERATTIME, + f.OPERATOR, + f.CHECK_NO, + f.WORK_TYPE, + f.NAME, + f.APPLY_DEPARTMENT_ID, + f.APPLY_USER_ID, + f.WORK_START_DATE, + f.MEDIUM, + f.TEMPERATURE, + f.PRESSURE, + f.SPECIAL_WORK, + f.RISK_IDENTIFICATION, + f.CONFESS_DEPARTMENT_ID, + f.CONFESS_USER_ID, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.GUARDIAN_DEPARTMENT_ID, + f.GUARDIAN_USER_ID, + f.WORK_USER_DEPARTMENT_ID, + f.WORK_USER_ID, + f.CONFIRM_DEPARTMENT_ID, + f.CONFIRM_USER_ID, + f.LEADER_DEPARTMENT_ID, + f.LEADER_USER_ID, + f.ACCEPT_DEPARTMENT_ID, + f.ACCEPT_USER_ID, + f.WORK_START_DEPARTMENT_ID, + f.WORK_START_USER_ID, + f.ACCEPT_TIME, + f.PLS_ID, + f.PLS_NAME, + f.WORK_POSITION, + f.VIDEO_PATH, + f.BOARD_PATH, + f.WORKSHOP_DEPARTMENT_ID, + f.WORKSHOP_USER_ID + + + + + BLINDBOARD_ID, + CORPINFO_ID, + TASK_ID, + STEP_ID, + ISDELETE, + CREATTIME, + CREATOR, + OPERATTIME, + OPERATOR, + CHECK_NO, + WORK_TYPE, + NAME, + APPLY_DEPARTMENT_ID, + APPLY_USER_ID, + WORK_START_DATE, + MEDIUM, + TEMPERATURE, + PRESSURE, + SPECIAL_WORK, + RISK_IDENTIFICATION, + CONFESS_DEPARTMENT_ID, + CONFESS_USER_ID, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + GUARDIAN_DEPARTMENT_ID, + GUARDIAN_USER_ID, + WORK_USER_DEPARTMENT_ID, + WORK_USER_ID, + CONFIRM_DEPARTMENT_ID, + CONFIRM_USER_ID, + LEADER_DEPARTMENT_ID, + LEADER_USER_ID, + ACCEPT_DEPARTMENT_ID, + ACCEPT_USER_ID, + WORK_START_DEPARTMENT_ID, + WORK_START_USER_ID, + ACCEPT_TIME, + PLS_ID, + PLS_NAME, + WORK_POSITION, + VIDEO_PATH, + BOARD_PATH, + WORKSHOP_DEPARTMENT_ID, + WORKSHOP_USER_ID + + + + + #{BLINDBOARD_ID}, + #{CORPINFO_ID}, + #{TASK_ID}, + #{STEP_ID}, + #{ISDELETE}, + #{CREATTIME}, + #{CREATOR}, + #{OPERATTIME}, + #{OPERATOR}, + #{CHECK_NO}, + #{WORK_TYPE}, + #{NAME}, + #{APPLY_DEPARTMENT_ID}, + #{APPLY_USER_ID}, + #{WORK_START_DATE}, + #{MEDIUM}, + #{TEMPERATURE}, + #{PRESSURE}, + #{SPECIAL_WORK}, + #{RISK_IDENTIFICATION}, + #{CONFESS_DEPARTMENT_ID}, + #{CONFESS_USER_ID}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{GUARDIAN_DEPARTMENT_ID}, + #{GUARDIAN_USER_ID}, + #{WORK_USER_DEPARTMENT_ID}, + #{WORK_USER_ID}, + #{CONFIRM_DEPARTMENT_ID}, + #{CONFIRM_USER_ID}, + #{LEADER_DEPARTMENT_ID}, + #{LEADER_USER_ID}, + #{ACCEPT_DEPARTMENT_ID}, + #{ACCEPT_USER_ID}, + #{WORK_START_DEPARTMENT_ID}, + #{WORK_START_USER_ID}, + #{ACCEPT_TIME}, + #{PLS_ID}, + #{PLS_NAME}, + #{WORK_POSITION}, + #{VIDEO_PATH}, + #{BOARD_PATH}, + #{WORKSHOP_DEPARTMENT_ID}, + #{WORKSHOP_USER_ID} + + + + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + BLINDBOARD_ID = #{BLINDBOARD_ID} + + + + + update + + set + BLINDBOARD_ID = #{BLINDBOARD_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + TASK_ID = #{TASK_ID}, + STEP_ID = #{STEP_ID}, + ISDELETE = #{ISDELETE}, + CREATTIME = #{CREATTIME}, + CREATOR = #{CREATOR}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + CHECK_NO = #{CHECK_NO}, + WORK_TYPE = #{WORK_TYPE}, + NAME = #{NAME}, + APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID}, + APPLY_USER_ID = #{APPLY_USER_ID}, + WORK_START_DATE = #{WORK_START_DATE}, + MEDIUM = #{MEDIUM}, + TEMPERATURE = #{TEMPERATURE}, + PRESSURE = #{PRESSURE}, + SPECIAL_WORK = #{SPECIAL_WORK}, + RISK_IDENTIFICATION = #{RISK_IDENTIFICATION}, + CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID}, + CONFESS_USER_ID = #{CONFESS_USER_ID}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID}, + GUARDIAN_USER_ID = #{GUARDIAN_USER_ID}, + WORK_USER_DEPARTMENT_ID = #{WORK_USER_DEPARTMENT_ID}, + WORK_USER_ID = #{WORK_USER_ID}, + CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID}, + CONFIRM_USER_ID = #{CONFIRM_USER_ID}, + LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID}, + LEADER_USER_ID = #{LEADER_USER_ID}, + ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID}, + ACCEPT_USER_ID = #{ACCEPT_USER_ID}, + WORK_START_DEPARTMENT_ID = #{WORK_START_DEPARTMENT_ID}, + WORK_START_USER_ID = #{WORK_START_USER_ID}, + ACCEPT_TIME = #{ACCEPT_TIME}, + PLS_ID = #{PLS_ID}, + PLS_NAME = #{PLS_NAME}, + WORK_POSITION = #{WORK_POSITION}, + VIDEO_PATH = #{VIDEO_PATH}, + WORKSHOP_DEPARTMENT_ID = #{WORKSHOP_DEPARTMENT_ID}, + WORKSHOP_USER_ID = #{WORKSHOP_USER_ID} + where + BLINDBOARD_ID = #{BLINDBOARD_ID} + + + + + + + + update + + set + + WORK_START_DATE = #{WORK_START_DATE}, + + + + ACCEPT_TIME = #{ACCEPT_TIME}, + + STEP_ID = #{STEP_ID} + where + BLINDBOARD_ID = #{BLINDBOARD_ID} + + + + + update + + set + BOARD_PATH = #{BOARD_PATH} + where + BLINDBOARD_ID = #{BLINDBOARD_ID} + + + + update + + set + VIDEO_PATH = #{VIDEO_PATH} + where + BLINDBOARD_ID = #{BLINDBOARD_ID} + + + + + + + + + + + + + + + update + + set + WORK_POSITION = #{WORK_POSITION} + where + BLINDBOARD_ID = #{BLINDBOARD_ID} + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/BlindBoardSignMapper.xml b/src/main/resources/mybatis/datasource/eightwork/BlindBoardSignMapper.xml new file mode 100644 index 0000000..5e22d46 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/BlindBoardSignMapper.xml @@ -0,0 +1,140 @@ + + + + + + + BUS_BLINDBOARD_SIGN + + + + + SYS_DICTIONARIES + + + + + f.BLINDBOARD_SIGN_ID, + f.BLINDBOARD_ID, + f.CORPINFO_ID, + f.SIGN_USER_ID, + f.SIGN_PATH, + f.SIGN_TIME, + f.DESCR, + f.STEP_ID, + f.IMG_PATH + + + + + BLINDBOARD_SIGN_ID, + BLINDBOARD_ID, + CORPINFO_ID, + SIGN_USER_ID, + SIGN_PATH, + SIGN_TIME, + DESCR, + STEP_ID, + IMG_PATH + + + + + #{BLINDBOARD_SIGN_ID}, + #{BLINDBOARD_ID}, + #{CORPINFO_ID}, + #{SIGN_USER_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{DESCR}, + #{STEP_ID}, + #{IMG_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + BLINDBOARD_SIGN_ID, + BLINDBOARD_ID, + CORPINFO_ID, + SIGN_USER_ID, + STEP_ID + ) values + + (#{item.BLINDBOARD_SIGN_ID}, + #{item.BLINDBOARD_ID}, + #{item.CORPINFO_ID}, + #{item.SIGN_USER_ID}, + #{item.STEP_ID}) + + + + + + update + + set + DESCR = #{DESCR}, + SIGN_PATH = #{SIGN_PATH}, + SIGN_TIME= #{SIGN_TIME}, + IMG_PATH = #{IMG_PATH} + where + BLINDBOARD_ID = #{BLINDBOARD_ID} and SIGN_USER_ID = #{SIGN_USER_ID} and STEP_ID = #{STEP_ID} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/BlindBoardToMeasuresMapper.xml b/src/main/resources/mybatis/datasource/eightwork/BlindBoardToMeasuresMapper.xml new file mode 100644 index 0000000..48e432c --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/BlindBoardToMeasuresMapper.xml @@ -0,0 +1,156 @@ + + + + + + + BUS_BLINDBOARDTOMEASURES + + + + + SYS_DICTIONARIES + + + + + f.BLINDBOARD_ID, + f.BUS_BLINDBOARD_MEASURES_ID, + f.STATUS, + f.BLINDBOARDTOMEASURES_ID, + f.CONFIRM_ID, + f.SIGN_PATH, + f.SIGN_TIME, + f.IMG_PATH + + + + + BLINDBOARD_ID, + BUS_BLINDBOARD_MEASURES_ID, + STATUS, + BLINDBOARDTOMEASURES_ID, + CONFIRM_ID, + SIGN_PATH, + SIGN_TIME, + IMG_PATH + + + + + #{BLINDBOARD_ID}, + #{BUS_BLINDBOARD_MEASURES_ID}, + #{STATUS}, + #{BLINDBOARDTOMEASURES_ID}, + #{CONFIRM_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{IMG_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + BLINDBOARD_ID, + BUS_BLINDBOARD_MEASURES_ID, + BLINDBOARDTOMEASURES_ID, + CONFIRM_ID + ) values + + ( + #{item.BLINDBOARD_ID}, + #{item.BUS_BLINDBOARD_MEASURES_ID}, + #{item.BLINDBOARDTOMEASURES_ID}, + #{item.CONFIRM_ID} + ) + + + + + + delete from + + where + BLINDBOARD_ID = #{BLINDBOARD_ID} + + + + + update + + set + STATUS = #{STATUS}, + SIGN_PATH = #{SIGN_PATH}, + IMG_PATH = #{IMG_PATH}, + SIGN_TIME = #{SIGN_TIME} + where + BLINDBOARDTOMEASURES_ID = #{BLINDBOARDTOMEASURES_ID} + + + + + + + + + + + update + + set + ISDELETE = '1' + where + BLINDBOARDTOMEASURES_ID in + + #{item} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/BreakGroundMapper.xml b/src/main/resources/mybatis/datasource/eightwork/BreakGroundMapper.xml new file mode 100644 index 0000000..209411e --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/BreakGroundMapper.xml @@ -0,0 +1,532 @@ + + + + + + BUS_BREAKGROUND + + + + + f.BREAKGROUND_ID, + f.CORPINFO_ID, + f.TASK_ID, + f.STEP_ID, + f.ISDELETE, + f.CREATTIME, + f.CREATOR, + f.OPERATTIME, + f.OPERATOR, + f.CHECK_NO, + f.WORK_CONTENT, + f.WORK_PLACE, + f.JOB_CONTENT, + f.APPLY_DEPARTMENT_ID, + f.APPLY_USER_ID, + f.WORK_START_DATE, + f.WORK_END_DATE, + f.SPECIAL_WORK, + f.RISK_IDENTIFICATION, + f.CONFESS_DEPARTMENT_ID, + f.CONFESS_USER_ID, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.GUARDIAN_DEPARTMENT_ID, + f.GUARDIAN_USER_ID, + f.WORK_USER_DEPARTMENT_ID, + f.WORK_USER_ID, + f.CONFIRM_DEPARTMENT_ID, + f.CONFIRM_USER_ID, + f.LEADER_DEPARTMENT_ID, + f.LEADER_USER_ID, + f.SAFETY_DEPARTMENT_ID, + f.SAFETY_USER_ID, + f.APPROVE_DEPARTMENT_ID, + f.APPROVE_USER_ID, + f.ACCEPT_DEPARTMENT_ID, + f.ACCEPT_USER_ID, + f.WORK_START_DEPARTMENT_ID, + f.WORK_START_USER_ID, + f.WORK_END_DEPARTMENT_ID, + f.WORK_END_USER_ID, + f.ACCEPT_TIME, + f.PLS_ID, + f.PLS_NAME, + f.WORK_POSITION, + f.VIDEO_PATH, + f.CONTENT_IMG_PATH + + + + + BREAKGROUND_ID, + CORPINFO_ID, + TASK_ID, + STEP_ID, + ISDELETE, + CREATTIME, + CREATOR, + OPERATTIME, + OPERATOR, + CHECK_NO, + WORK_CONTENT, + WORK_PLACE, + JOB_CONTENT, + APPLY_DEPARTMENT_ID, + APPLY_USER_ID, + WORK_START_DATE, + WORK_END_DATE, + SPECIAL_WORK, + RISK_IDENTIFICATION, + CONFESS_DEPARTMENT_ID, + CONFESS_USER_ID, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + GUARDIAN_DEPARTMENT_ID, + GUARDIAN_USER_ID, + WORK_USER_DEPARTMENT_ID, + WORK_USER_ID, + CONFIRM_DEPARTMENT_ID, + CONFIRM_USER_ID, + LEADER_DEPARTMENT_ID, + LEADER_USER_ID, + SAFETY_DEPARTMENT_ID, + SAFETY_USER_ID, + APPROVE_DEPARTMENT_ID, + APPROVE_USER_ID, + ACCEPT_DEPARTMENT_ID, + ACCEPT_USER_ID, + WORK_START_DEPARTMENT_ID, + WORK_START_USER_ID, + WORK_END_DEPARTMENT_ID, + WORK_END_USER_ID, + ACCEPT_TIME, + PLS_ID, + PLS_NAME, + WORK_POSITION, + VIDEO_PATH, + CONTENT_IMG_PATH + + + + + #{BREAKGROUND_ID}, + #{CORPINFO_ID}, + #{TASK_ID}, + #{STEP_ID}, + #{ISDELETE}, + #{CREATTIME}, + #{CREATOR}, + #{OPERATTIME}, + #{OPERATOR}, + #{CHECK_NO}, + #{WORK_CONTENT}, + #{WORK_PLACE}, + #{JOB_CONTENT}, + #{APPLY_DEPARTMENT_ID}, + #{APPLY_USER_ID}, + #{WORK_START_DATE}, + #{WORK_END_DATE}, + #{SPECIAL_WORK}, + #{RISK_IDENTIFICATION}, + #{CONFESS_DEPARTMENT_ID}, + #{CONFESS_USER_ID}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{GUARDIAN_DEPARTMENT_ID}, + #{GUARDIAN_USER_ID}, + #{WORK_USER_DEPARTMENT_ID}, + #{WORK_USER_ID}, + #{CONFIRM_DEPARTMENT_ID}, + #{CONFIRM_USER_ID}, + #{LEADER_DEPARTMENT_ID}, + #{LEADER_USER_ID}, + #{SAFETY_DEPARTMENT_ID}, + #{SAFETY_USER_ID}, + #{APPROVE_DEPARTMENT_ID}, + #{APPROVE_USER_ID}, + #{ACCEPT_DEPARTMENT_ID}, + #{ACCEPT_USER_ID}, + #{WORK_START_DEPARTMENT_ID}, + #{WORK_START_USER_ID}, + #{WORK_END_DEPARTMENT_ID}, + #{WORK_END_USER_ID}, + #{ACCEPT_TIME}, + #{PLS_ID}, + #{PLS_NAME}, + #{WORK_POSITION}, + #{VIDEO_PATH}, + #{CONTENT_IMG_PATH} + + + + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + BREAKGROUND_ID = #{BREAKGROUND_ID} + + + + + update + + set + BREAKGROUND_ID = #{BREAKGROUND_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + TASK_ID = #{TASK_ID}, + STEP_ID = #{STEP_ID}, + ISDELETE = #{ISDELETE}, + CREATTIME = #{CREATTIME}, + CREATOR = #{CREATOR}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + CHECK_NO = #{CHECK_NO}, + WORK_CONTENT = #{WORK_CONTENT}, + WORK_PLACE = #{WORK_PLACE}, + JOB_CONTENT = #{JOB_CONTENT}, + APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID}, + APPLY_USER_ID = #{APPLY_USER_ID}, + WORK_START_DATE = #{WORK_START_DATE}, + WORK_END_DATE = #{WORK_END_DATE}, + SPECIAL_WORK = #{SPECIAL_WORK}, + RISK_IDENTIFICATION = #{RISK_IDENTIFICATION}, + CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID}, + CONFESS_USER_ID = #{CONFESS_USER_ID}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID}, + GUARDIAN_USER_ID = #{GUARDIAN_USER_ID}, + WORK_USER_DEPARTMENT_ID = #{WORK_USER_DEPARTMENT_ID}, + WORK_USER_ID = #{WORK_USER_ID}, + CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID}, + CONFIRM_USER_ID = #{CONFIRM_USER_ID}, + LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID}, + LEADER_USER_ID = #{LEADER_USER_ID}, + SAFETY_DEPARTMENT_ID = #{SAFETY_DEPARTMENT_ID}, + SAFETY_USER_ID = #{SAFETY_USER_ID}, + APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID}, + APPROVE_USER_ID = #{APPROVE_USER_ID}, + ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID}, + ACCEPT_USER_ID = #{ACCEPT_USER_ID}, + WORK_START_DEPARTMENT_ID = #{WORK_START_DEPARTMENT_ID}, + WORK_START_USER_ID = #{WORK_START_USER_ID}, + WORK_END_DEPARTMENT_ID = #{WORK_END_DEPARTMENT_ID}, + WORK_END_USER_ID = #{WORK_END_USER_ID}, + ACCEPT_TIME = #{ACCEPT_TIME}, + PLS_ID = #{PLS_ID}, + PLS_NAME = #{PLS_NAME}, + WORK_POSITION = #{WORK_POSITION}, + VIDEO_PATH = #{VIDEO_PATH} + where + BREAKGROUND_ID = #{BREAKGROUND_ID} + + + + + + + + update + + set + + WORK_START_DATE = #{WORK_START_DATE}, + + + WORK_END_DATE = #{WORK_END_DATE}, + + + ACCEPT_TIME = #{ACCEPT_TIME}, + + STEP_ID = #{STEP_ID} + where + BREAKGROUND_ID = #{BREAKGROUND_ID} + + + + + update + + set + CONTENT_IMG_PATH = #{CONTENT_IMG_PATH}, + WORK_CONTENT = #{WORK_CONTENT} + where + BREAKGROUND_ID = #{BREAKGROUND_ID} + + + update + + set + VIDEO_PATH = #{VIDEO_PATH} + where + BREAKGROUND_ID = #{BREAKGROUND_ID} + + + + + + + + + + + + + + + update + + set + WORK_POSITION = #{WORK_POSITION} + where + BREAKGROUND_ID = #{BREAKGROUND_ID} + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/BreakGroundSignMapper.xml b/src/main/resources/mybatis/datasource/eightwork/BreakGroundSignMapper.xml new file mode 100644 index 0000000..54df91e --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/BreakGroundSignMapper.xml @@ -0,0 +1,140 @@ + + + + + + + BUS_BREAKGROUND_SIGN + + + + + SYS_DICTIONARIES + + + + + f.BREAKGROUND_SIGN_ID, + f.BREAKGROUND_ID, + f.CORPINFO_ID, + f.SIGN_USER_ID, + f.SIGN_PATH, + f.SIGN_TIME, + f.DESCR, + f.STEP_ID, + f.IMG_PATH + + + + + BREAKGROUND_SIGN_ID, + BREAKGROUND_ID, + CORPINFO_ID, + SIGN_USER_ID, + SIGN_PATH, + SIGN_TIME, + DESCR, + STEP_ID, + IMG_PATH + + + + + #{BREAKGROUND_SIGN_ID}, + #{BREAKGROUND_ID}, + #{CORPINFO_ID}, + #{SIGN_USER_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{DESCR}, + #{STEP_ID}, + #{IMG_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + BREAKGROUND_SIGN_ID, + BREAKGROUND_ID, + CORPINFO_ID, + SIGN_USER_ID, + STEP_ID + ) values + + (#{item.BREAKGROUND_SIGN_ID}, + #{item.BREAKGROUND_ID}, + #{item.CORPINFO_ID}, + #{item.SIGN_USER_ID}, + #{item.STEP_ID}) + + + + + + update + + set + DESCR = #{DESCR}, + SIGN_PATH = #{SIGN_PATH}, + SIGN_TIME= #{SIGN_TIME}, + IMG_PATH = #{IMG_PATH} + where + BREAKGROUND_ID = #{BREAKGROUND_ID} and SIGN_USER_ID = #{SIGN_USER_ID} and STEP_ID = #{STEP_ID} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/BreakGroundToMeasuresMapper.xml b/src/main/resources/mybatis/datasource/eightwork/BreakGroundToMeasuresMapper.xml new file mode 100644 index 0000000..aaa11db --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/BreakGroundToMeasuresMapper.xml @@ -0,0 +1,156 @@ + + + + + + + BUS_BREAKGROUNDTOMEASURES + + + + + SYS_DICTIONARIES + + + + + f.BREAKGROUND_ID, + f.BUS_BREAKGROUND_MEASURES_ID, + f.STATUS, + f.BREAKGROUNDTOMEASURES_ID, + f.CONFIRM_ID, + f.SIGN_PATH, + f.SIGN_TIME, + f.IMG_PATH + + + + + BREAKGROUND_ID, + BUS_BREAKGROUND_MEASURES_ID, + STATUS, + BREAKGROUNDTOMEASURES_ID, + CONFIRM_ID, + SIGN_PATH, + SIGN_TIME, + IMG_PATH + + + + + #{BREAKGROUND_ID}, + #{BUS_BREAKGROUND_MEASURES_ID}, + #{STATUS}, + #{BREAKGROUNDTOMEASURES_ID}, + #{CONFIRM_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{IMG_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + BREAKGROUND_ID, + BUS_BREAKGROUND_MEASURES_ID, + BREAKGROUNDTOMEASURES_ID, + CONFIRM_ID + ) values + + ( + #{item.BREAKGROUND_ID}, + #{item.BUS_BREAKGROUND_MEASURES_ID}, + #{item.BREAKGROUNDTOMEASURES_ID}, + #{item.CONFIRM_ID} + ) + + + + + + delete from + + where + BREAKGROUND_ID = #{BREAKGROUND_ID} + + + + + update + + set + STATUS = #{STATUS}, + SIGN_PATH = #{SIGN_PATH}, + IMG_PATH = #{IMG_PATH}, + SIGN_TIME = #{SIGN_TIME} + where + BREAKGROUNDTOMEASURES_ID = #{BREAKGROUNDTOMEASURES_ID} + + + + + + + + + + + update + + set + ISDELETE = '1' + where + BREAKGROUNDTOMEASURES_ID in + + #{item} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml index e416530..9bbe15f 100644 --- a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml @@ -227,8 +227,7 @@ MEDIUM_NAME = #{MEDIUM_NAME}, LIMITSPACE_ID = #{LIMITSPACE_ID}, WORK_USER_DEPARTMENT_ID =#{WORK_USER_DEPARTMENT_ID}, - LONGITUDE =#{LONGITUDE}, - LATITUDE =#{LATITUDE}, + WORK_POSITION =#{WORK_POSITION}, VIDEO_PATH = #{VIDEO_PATH} where CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} @@ -254,7 +253,7 @@ f.SPECIAL_WORK, f.RISK_IDENTIFICATION, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, anao.`NAME` as ANALYZE_DEPARTMENT_NAME, anau.`NAME` as ANALYZE_USER_NAME, cono.`NAME` as CONFESS_DEPARTMENT_NAME, @@ -315,7 +314,14 @@ WHERE f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} - + + update + + set + VIDEO_PATH = #{VIDEO_PATH} + where + CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} + update @@ -350,7 +356,7 @@ select , woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, appo.`NAME` as APPLY_DEPARTMENT_NAME, appu.`NAME` as APPLY_USER_NAME, anao.`NAME` as ANALYZE_DEPARTMENT_NAME, @@ -436,7 +442,7 @@ and f.STEP_ID > 0 and f.STEP_ID != 15 and f.ANALYZE_USER_ID = #{pd.GASCHECK} - order by f.STEP_ID,f.CREATTIME + order by f.STEP_ID,f.CREATTIME desc + SELECT + COUNT(1) as code + FROM f + WHERE f.CORPINFO_ID = #{CORPINFO_ID} + and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%') + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + CUTROAD_ID = #{CUTROAD_ID} + + + + + update + + set + CUTROAD_ID = #{CUTROAD_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + TASK_ID = #{TASK_ID}, + STEP_ID = #{STEP_ID}, + ISDELETE = #{ISDELETE}, + CREATTIME = #{CREATTIME}, + CREATOR = #{CREATOR}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + CHECK_NO = #{CHECK_NO}, + APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID}, + APPLY_USER_ID = #{APPLY_USER_ID}, + OTHER_DEPT = #{OTHER_DEPT}, + WORK_REASON = #{WORK_REASON}, + WORK_CONTENT = #{WORK_CONTENT}, + WORK_START_DATE = #{WORK_START_DATE}, + WORK_END_DATE = #{WORK_END_DATE}, + SPECIAL_WORK = #{SPECIAL_WORK}, + RISK_IDENTIFICATION = #{RISK_IDENTIFICATION}, + PROJECT_MANAGER_USER_ID = #{PROJECT_MANAGER_USER_ID}, + PROJECT_MANAGER_DEPARTMENT_ID = #{PROJECT_MANAGER_DEPARTMENT_ID}, + CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID}, + CONFESS_USER_ID = #{CONFESS_USER_ID}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID}, + GUARDIAN_USER_ID = #{GUARDIAN_USER_ID}, + CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID}, + CONFIRM_USER_ID = #{CONFIRM_USER_ID}, + LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID}, + LEADER_USER_ID = #{LEADER_USER_ID}, + AUDIT_DEPARTMENT_ID = #{AUDIT_DEPARTMENT_ID}, + AUDIT_USER_ID = #{AUDIT_USER_ID}, + APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID}, + APPROVE_USER_ID = #{APPROVE_USER_ID}, + ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID}, + ACCEPT_USER_ID = #{ACCEPT_USER_ID}, + WORK_START_DEPARTMENT_ID = #{WORK_START_DEPARTMENT_ID}, + WORK_START_USER_ID = #{WORK_START_USER_ID}, + WORK_END_DEPARTMENT_ID = #{WORK_END_DEPARTMENT_ID}, + WORK_END_USER_ID = #{WORK_END_USER_ID}, + ACCEPT_TIME = #{ACCEPT_TIME}, + PLS_ID = #{PLS_ID}, + PLS_NAME = #{PLS_NAME}, + WORK_POSITION = #{WORK_POSITION}, + VIDEO_PATH = #{VIDEO_PATH} + where + CUTROAD_ID = #{CUTROAD_ID} + + + + + + + + update + + set + + WORK_START_DATE = #{WORK_START_DATE}, + + + WORK_END_DATE = #{WORK_END_DATE}, + + + ACCEPT_TIME = #{ACCEPT_TIME}, + + STEP_ID = #{STEP_ID} + where + CUTROAD_ID = #{CUTROAD_ID} + + + + + update + + set + CONTENT_IMG_PATH = #{CONTENT_IMG_PATH}, + WORK_CONTENT = #{WORK_CONTENT} + where + CUTROAD_ID = #{CUTROAD_ID} + + + + update + + set + VIDEO_PATH = #{VIDEO_PATH} + where + CUTROAD_ID = #{CUTROAD_ID} + + + + + + + + + + + + + + + update + + set + WORK_POSITION = #{WORK_POSITION} + where + CUTROAD_ID = #{CUTROAD_ID} + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/CutRoadSignMapper.xml b/src/main/resources/mybatis/datasource/eightwork/CutRoadSignMapper.xml new file mode 100644 index 0000000..9272725 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/CutRoadSignMapper.xml @@ -0,0 +1,140 @@ + + + + + + + BUS_CUTROAD_SIGN + + + + + SYS_DICTIONARIES + + + + + f.CUTROAD_SIGN_ID, + f.CUTROAD_ID, + f.CORPINFO_ID, + f.SIGN_USER_ID, + f.SIGN_PATH, + f.SIGN_TIME, + f.DESCR, + f.STEP_ID, + f.IMG_PATH + + + + + CUTROAD_SIGN_ID, + CUTROAD_ID, + CORPINFO_ID, + SIGN_USER_ID, + SIGN_PATH, + SIGN_TIME, + DESCR, + STEP_ID, + IMG_PATH + + + + + #{CUTROAD_SIGN_ID}, + #{CUTROAD_ID}, + #{CORPINFO_ID}, + #{SIGN_USER_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{DESCR}, + #{STEP_ID}, + #{IMG_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + CUTROAD_SIGN_ID, + CUTROAD_ID, + CORPINFO_ID, + SIGN_USER_ID, + STEP_ID + ) values + + (#{item.CUTROAD_SIGN_ID}, + #{item.CUTROAD_ID}, + #{item.CORPINFO_ID}, + #{item.SIGN_USER_ID}, + #{item.STEP_ID}) + + + + + + update + + set + DESCR = #{DESCR}, + SIGN_PATH = #{SIGN_PATH}, + SIGN_TIME= #{SIGN_TIME}, + IMG_PATH = #{IMG_PATH} + where + CUTROAD_ID = #{CUTROAD_ID} and SIGN_USER_ID = #{SIGN_USER_ID} and STEP_ID = #{STEP_ID} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/CutRoadToMeasuresMapper.xml b/src/main/resources/mybatis/datasource/eightwork/CutRoadToMeasuresMapper.xml new file mode 100644 index 0000000..c2e2824 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/CutRoadToMeasuresMapper.xml @@ -0,0 +1,156 @@ + + + + + + + BUS_CUTROADTOMEASURES + + + + + SYS_DICTIONARIES + + + + + f.CUTROAD_ID, + f.BUS_CUTROAD_MEASURES_ID, + f.STATUS, + f.CUTROADTOMEASURES_ID, + f.CONFIRM_ID, + f.SIGN_PATH, + f.SIGN_TIME, + f.IMG_PATH + + + + + CUTROAD_ID, + BUS_CUTROAD_MEASURES_ID, + STATUS, + CUTROADTOMEASURES_ID, + CONFIRM_ID, + SIGN_PATH, + SIGN_TIME, + IMG_PATH + + + + + #{CUTROAD_ID}, + #{BUS_CUTROAD_MEASURES_ID}, + #{STATUS}, + #{CUTROADTOMEASURES_ID}, + #{CONFIRM_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{IMG_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + CUTROAD_ID, + BUS_CUTROAD_MEASURES_ID, + CUTROADTOMEASURES_ID, + CONFIRM_ID + ) values + + ( + #{item.CUTROAD_ID}, + #{item.BUS_CUTROAD_MEASURES_ID}, + #{item.CUTROADTOMEASURES_ID}, + #{item.CONFIRM_ID} + ) + + + + + + delete from + + where + CUTROAD_ID = #{CUTROAD_ID} + + + + + update + + set + STATUS = #{STATUS}, + SIGN_PATH = #{SIGN_PATH}, + IMG_PATH = #{IMG_PATH}, + SIGN_TIME = #{SIGN_TIME} + where + CUTROADTOMEASURES_ID = #{CUTROADTOMEASURES_ID} + + + + + + + + + + + update + + set + ISDELETE = '1' + where + CUTROADTOMEASURES_ID in + + #{item} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml index 66350ac..755f332 100644 --- a/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml @@ -8,10 +8,96 @@ DATE_FORMAT(tmp.ACT_TIME,'%Y-%m') WORK_MONTH FROM ( SELECT * FROM vi_eightwork_flow_log log - where log.CORPINFO_ID=#{CORPINFO_ID} HAVING 1 ORDER BY log.ACT_TIME DESC ) tmp + where log.CORPINFO_ID=#{CORPINFO_ID} and log.WORK_ID IN ( + SELECT + f.BLINDBOARD_ID id + FROM + BUS_BLINDBOARD f + WHERE + ISDELETE = 0 + AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL + SELECT + f.BREAKGROUND_ID id + FROM + BUS_BREAKGROUND f + WHERE + ISDELETE = 0 + AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL + SELECT + f.CONFINEDSPACE_ID id + FROM + BUS_CONFINEDSPACE f + WHERE + ISDELETE = 0 + AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL + SELECT + f.ELECTRICITY_ID id + FROM + BUS_ELECTRICITY f + WHERE + ISDELETE = 0 + AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL + SELECT + f.CUTROAD_ID id + FROM + BUS_CUTROAD f + WHERE + ISDELETE = 0 + AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL + SELECT + f.HIGHWORK_ID id + FROM + BUS_HIGHWORK f + WHERE + ISDELETE = 0 + AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL + SELECT + f.HOISTING_ID id + FROM + BUS_HOISTING f + WHERE + ISDELETE = 0 + AND CORPINFO_ID = #{CORPINFO_ID} UNION ALL + SELECT + f.HOTWORK_ID id + FROM + BUS_HOTWORK f + WHERE + ISDELETE = 0 + AND CORPINFO_ID = #{CORPINFO_ID}) HAVING 1 ORDER BY log.ACT_TIME DESC ) tmp GROUP BY tmp.WORK_ID order by tmp.ACT_TIME DESC + + diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml index 0362c40..97c606f 100644 --- a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml @@ -53,7 +53,19 @@ where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HIGHWORK_COUNT, (select count(1) COUNT from bus_electricity_sign sign left join bus_electricity work on work.ELECTRICITY_ID = sign.ELECTRICITY_ID - where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') ELECTRICITY_COUNT + where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') ELECTRICITY_COUNT, + (select count(1) COUNT from bus_breakground_sign sign + left join bus_breakground work on work.BREAKGROUND_ID = sign.BREAKGROUND_ID + where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') BREAKGROUND_COUNT, + (select count(1) COUNT from bus_hoisting_sign sign + left join bus_hoisting work on work.HOISTING_ID = sign.HOISTING_ID + where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HOISTING_COUNT, + (select count(1) COUNT from bus_cutroad_sign sign + left join bus_cutroad work on work.CUTROAD_ID = sign.CUTROAD_ID + where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') OPEN_CIRCUIT_COUNT, + (select count(1) COUNT from bus_blindboard_sign sign + left join bus_blindboard work on work.BLINDBOARD_ID = sign.BLINDBOARD_ID + where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') BLIND_BOARD_COUNT diff --git a/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml index b08e5d3..708a33c 100644 --- a/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml @@ -321,7 +321,7 @@ bcu.NAME as GUARDIAN_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, stao.`NAME` as WORK_START_DEPARTMENT_NAME, stau.`NAME` as WORK_START_USER_NAME, @@ -376,6 +376,14 @@ f.ELECTRICITY_ID = #{ELECTRICITY_ID} + + update + + set + VIDEO_PATH = #{VIDEO_PATH} + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + @@ -440,7 +448,7 @@ bcu.NAME as GUARDIAN_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, stao.`NAME` as WORK_START_DEPARTMENT_NAME, stau.`NAME` as WORK_START_USER_NAME, diff --git a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml index e796fdf..434a4e6 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml @@ -252,6 +252,8 @@ f.WORK_END_DATE, f.SPECIAL_WORK, f.RISK_IDENTIFICATION, + woro.`NAME` as WORK_USER_DEPARTMENT_NAME, + woru.`NAME` as WORK_USER_USER_NAME, cono.`NAME` as CONFESS_DEPARTMENT_NAME, conu.`NAME` as CONFESS_USER_NAME, acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME, @@ -277,6 +279,8 @@ left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID + left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID + left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID left join oa_department as cono on f.CONFESS_DEPARTMENT_ID = cono.DEPARTMENT_ID left join sys_user as conu on f.CONFESS_USER_ID = conu.USER_ID @@ -310,7 +314,14 @@ WHERE f.HIGHWORK_ID = #{HIGHWORK_ID} - + + update + + set + VIDEO_PATH = #{VIDEO_PATH} + where + HIGHWORK_ID = #{HIGHWORK_ID} + update @@ -351,11 +362,13 @@ appro.`NAME` as APPROVE_DEPARTMENT_NAME, appru.`NAME` as APPROVE_USER_NAME, acceo.`NAME` as ACCEPT_DEPARTMENT_NAME, - acceu.`NAME` as ACCEPT_USER_NAME, + acceu.`NAME` as WORK_USER_USER_NAME, stao.`NAME` as WORK_START_DEPARTMENT_NAME, stau.`NAME` as WORK_START_USER_NAME, endo.`NAME` as WORK_END_DEPARTMENT_NAME, endu.`NAME` as WORK_END_USER_NAME, + woro.`NAME` as WORK_USER_DEPARTMENT_NAME, + woru.`NAME` as WORK_USER_USER_NAME, log.STEP_NAME, log.NEXT_STEP_ID, log.NEXT_STEP_NAME, @@ -365,6 +378,9 @@ left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID + left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID + left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID + left join oa_department as cono on f.CONFESS_DEPARTMENT_ID = cono.DEPARTMENT_ID left join sys_user as conu on f.CONFESS_USER_ID = conu.USER_ID @@ -418,7 +434,7 @@ and f.CREATOR = #{pd.CREATOR} - order by f.STEP_ID,f.CREATTIME + order by f.STEP_ID,f.CREATTIME desc diff --git a/src/main/resources/mybatis/datasource/eightwork/HoistingMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HoistingMapper.xml new file mode 100644 index 0000000..18315d5 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/HoistingMapper.xml @@ -0,0 +1,564 @@ + + + + + + BUS_HOISTING + + + + + f.HOISTING_ID, + f.CORPINFO_ID, + f.TASK_ID, + f.STEP_ID, + f.ISDELETE, + f.CREATTIME, + f.CREATOR, + f.OPERATTIME, + f.OPERATOR, + f.CHECK_NO, + f.WORK_PLACE, + f.TOOL_NAME, + f.WORK_USER_DEPARTMENT_ID, + f.WORK_USER_ID, + f.SISUO_USER_ID, + f.SISUO_DEPARTMENT_ID, + f.PROJECT_MANAGER_USER_ID, + f.PROJECT_MANAGER_DEPARTMENT_ID, + f.PART_WEIGHT, + f.WORK_LEVEL, + f.WORK_CONTENT, + f.SPECIAL_WORK, + f.RISK_IDENTIFICATION, + f.WORK_START_DATE, + f.WORK_END_DATE, + f.CONFESS_DEPARTMENT_ID, + f.CONFESS_USER_ID, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.GUARDIAN_DEPARTMENT_ID, + f.GUARDIAN_USER_ID, + f.CONFIRM_DEPARTMENT_ID, + f.CONFIRM_USER_ID, + f.LEADER_DEPARTMENT_ID, + f.LEADER_USER_ID, + f.AUDIT_DEPARTMENT_ID, + f.AUDIT_USER_ID, + f.APPROVE_DEPARTMENT_ID, + f.APPROVE_USER_ID, + f.ACCEPT_DEPARTMENT_ID, + f.ACCEPT_USER_ID, + f.WORK_START_DEPARTMENT_ID, + f.WORK_START_USER_ID, + f.WORK_END_DEPARTMENT_ID, + f.WORK_END_USER_ID, + f.ACCEPT_TIME, + f.PLS_ID, + f.PLS_NAME, + f.WORK_POSITION, + f.VIDEO_PATH, + f.APPLY_DEPARTMENT_ID, + f.APPLY_USER_ID + + + + + HOISTING_ID, + CORPINFO_ID, + TASK_ID, + STEP_ID, + ISDELETE, + CREATTIME, + CREATOR, + OPERATTIME, + OPERATOR, + CHECK_NO, + WORK_PLACE, + TOOL_NAME, + WORK_USER_DEPARTMENT_ID, + WORK_USER_ID, + SISUO_USER_ID, + SISUO_DEPARTMENT_ID, + PROJECT_MANAGER_USER_ID, + PROJECT_MANAGER_DEPARTMENT_ID, + PART_WEIGHT, + WORK_LEVEL, + WORK_CONTENT, + SPECIAL_WORK, + RISK_IDENTIFICATION, + WORK_START_DATE, + WORK_END_DATE, + CONFESS_DEPARTMENT_ID, + CONFESS_USER_ID, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + GUARDIAN_DEPARTMENT_ID, + GUARDIAN_USER_ID, + CONFIRM_DEPARTMENT_ID, + CONFIRM_USER_ID, + LEADER_DEPARTMENT_ID, + LEADER_USER_ID, + AUDIT_DEPARTMENT_ID, + AUDIT_USER_ID, + APPROVE_DEPARTMENT_ID, + APPROVE_USER_ID, + ACCEPT_DEPARTMENT_ID, + ACCEPT_USER_ID, + WORK_START_DEPARTMENT_ID, + WORK_START_USER_ID, + WORK_END_DEPARTMENT_ID, + WORK_END_USER_ID, + ACCEPT_TIME, + PLS_ID, + PLS_NAME, + WORK_POSITION, + VIDEO_PATH, + APPLY_DEPARTMENT_ID, + APPLY_USER_ID + + + + + #{HOISTING_ID}, + #{CORPINFO_ID}, + #{TASK_ID}, + #{STEP_ID}, + #{ISDELETE}, + #{CREATTIME}, + #{CREATOR}, + #{OPERATTIME}, + #{OPERATOR}, + #{CHECK_NO}, + #{WORK_PLACE}, + #{TOOL_NAME}, + #{WORK_USER_DEPARTMENT_ID}, + #{WORK_USER_ID}, + #{SISUO_USER_ID}, + #{SISUO_DEPARTMENT_ID}, + #{PROJECT_MANAGER_USER_ID}, + #{PROJECT_MANAGER_DEPARTMENT_ID}, + #{PART_WEIGHT}, + #{WORK_LEVEL}, + #{WORK_CONTENT}, + #{SPECIAL_WORK}, + #{RISK_IDENTIFICATION}, + #{WORK_START_DATE}, + #{WORK_END_DATE}, + #{CONFESS_DEPARTMENT_ID}, + #{CONFESS_USER_ID}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{GUARDIAN_DEPARTMENT_ID}, + #{GUARDIAN_USER_ID}, + #{CONFIRM_DEPARTMENT_ID}, + #{CONFIRM_USER_ID}, + #{LEADER_DEPARTMENT_ID}, + #{LEADER_USER_ID}, + #{AUDIT_DEPARTMENT_ID}, + #{AUDIT_USER_ID}, + #{APPROVE_DEPARTMENT_ID}, + #{APPROVE_USER_ID}, + #{ACCEPT_DEPARTMENT_ID}, + #{ACCEPT_USER_ID}, + #{WORK_START_DEPARTMENT_ID}, + #{WORK_START_USER_ID}, + #{WORK_END_DEPARTMENT_ID}, + #{WORK_END_USER_ID}, + #{ACCEPT_TIME}, + #{PLS_ID}, + #{PLS_NAME}, + #{WORK_POSITION}, + #{VIDEO_PATH}, + #{APPLY_DEPARTMENT_ID}, + #{APPLY_USER_ID} + + + + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HOISTING_ID = #{HOISTING_ID} + + + + + update + + set + HOISTING_ID = #{HOISTING_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + TASK_ID = #{TASK_ID}, + STEP_ID = #{STEP_ID}, + ISDELETE = #{ISDELETE}, + CREATTIME = #{CREATTIME}, + CREATOR = #{CREATOR}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + CHECK_NO = #{CHECK_NO}, + WORK_PLACE = #{WORK_PLACE}, + TOOL_NAME = #{TOOL_NAME}, + WORK_USER_DEPARTMENT_ID = #{WORK_USER_DEPARTMENT_ID}, + WORK_USER_ID = #{WORK_USER_ID}, + SISUO_USER_ID = #{SISUO_USER_ID}, + SISUO_DEPARTMENT_ID = #{SISUO_DEPARTMENT_ID}, + PROJECT_MANAGER_USER_ID = #{PROJECT_MANAGER_USER_ID}, + PROJECT_MANAGER_DEPARTMENT_ID = #{PROJECT_MANAGER_DEPARTMENT_ID}, + PART_WEIGHT = #{PART_WEIGHT}, + WORK_LEVEL = #{WORK_LEVEL}, + WORK_CONTENT = #{WORK_CONTENT}, + SPECIAL_WORK = #{SPECIAL_WORK}, + RISK_IDENTIFICATION = #{RISK_IDENTIFICATION}, + WORK_START_DATE = #{WORK_START_DATE}, + WORK_END_DATE = #{WORK_END_DATE}, + CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID}, + CONFESS_USER_ID = #{CONFESS_USER_ID}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID}, + GUARDIAN_USER_ID = #{GUARDIAN_USER_ID}, + CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID}, + CONFIRM_USER_ID = #{CONFIRM_USER_ID}, + LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID}, + LEADER_USER_ID = #{LEADER_USER_ID}, + AUDIT_DEPARTMENT_ID = #{AUDIT_DEPARTMENT_ID}, + AUDIT_USER_ID = #{AUDIT_USER_ID}, + APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID}, + APPROVE_USER_ID = #{APPROVE_USER_ID}, + ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID}, + ACCEPT_USER_ID = #{ACCEPT_USER_ID}, + WORK_START_DEPARTMENT_ID = #{WORK_START_DEPARTMENT_ID}, + WORK_START_USER_ID = #{WORK_START_USER_ID}, + WORK_END_DEPARTMENT_ID = #{WORK_END_DEPARTMENT_ID}, + WORK_END_USER_ID = #{WORK_END_USER_ID}, + ACCEPT_TIME = #{ACCEPT_TIME}, + PLS_ID = #{PLS_ID}, + PLS_NAME = #{PLS_NAME}, + WORK_POSITION = #{WORK_POSITION}, + VIDEO_PATH = #{VIDEO_PATH}, + APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID}, + APPLY_USER_ID = #{APPLY_USER_ID} + where + HOISTING_ID = #{HOISTING_ID} + + + + + + + update + + set + VIDEO_PATH = #{VIDEO_PATH} + where + HOISTING_ID = #{HOISTING_ID} + + + + + update + + set + + WORK_START_DATE = #{WORK_START_DATE}, + + + WORK_END_DATE = #{WORK_END_DATE}, + + + ACCEPT_TIME = #{ACCEPT_TIME}, + + STEP_ID = #{STEP_ID} + where + HOISTING_ID = #{HOISTING_ID} + + + + + + + + + + + + + + + update + + set + WORK_POSITION = #{WORK_POSITION} + where + HOISTING_ID = #{HOISTING_ID} + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/HoistingSignMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HoistingSignMapper.xml new file mode 100644 index 0000000..a046e64 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/HoistingSignMapper.xml @@ -0,0 +1,140 @@ + + + + + + + BUS_HOISTING_SIGN + + + + + SYS_DICTIONARIES + + + + + f.HOISTING_SIGN_ID, + f.HOISTING_ID, + f.CORPINFO_ID, + f.SIGN_USER_ID, + f.SIGN_PATH, + f.SIGN_TIME, + f.DESCR, + f.STEP_ID, + f.IMG_PATH + + + + + HOISTING_SIGN_ID, + HOISTING_ID, + CORPINFO_ID, + SIGN_USER_ID, + SIGN_PATH, + SIGN_TIME, + DESCR, + STEP_ID, + IMG_PATH + + + + + #{HOISTING_SIGN_ID}, + #{HOISTING_ID}, + #{CORPINFO_ID}, + #{SIGN_USER_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{DESCR}, + #{STEP_ID}, + #{IMG_PATH} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + HOISTING_SIGN_ID, + HOISTING_ID, + CORPINFO_ID, + SIGN_USER_ID, + STEP_ID + ) values + + (#{item.HOISTING_SIGN_ID}, + #{item.HOISTING_ID}, + #{item.CORPINFO_ID}, + #{item.SIGN_USER_ID}, + #{item.STEP_ID}) + + + + + + update + + set + DESCR = #{DESCR}, + SIGN_PATH = #{SIGN_PATH}, + SIGN_TIME= #{SIGN_TIME}, + IMG_PATH = #{IMG_PATH} + where + HOISTING_ID = #{HOISTING_ID} and SIGN_USER_ID = #{SIGN_USER_ID} and STEP_ID = #{STEP_ID} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/HoistingToMeasuresMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HoistingToMeasuresMapper.xml new file mode 100644 index 0000000..8708f13 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/HoistingToMeasuresMapper.xml @@ -0,0 +1,160 @@ + + + + + + + BUS_HOISTINGTOMEASURES + + + + + SYS_DICTIONARIES + + + + + f.HOISTING_ID, + f.BUS_HOISTING_MEASURES_ID, + f.STATUS, + f.HOISTINGTOMEASURES_ID, + f.CONFIRM_ID, + f.SIGN_PATH, + f.SIGN_TIME, + f.IMG_PATH, + f.ANSWER1 + + + + + HOISTING_ID, + BUS_HOISTING_MEASURES_ID, + STATUS, + HOISTINGTOMEASURES_ID, + CONFIRM_ID, + SIGN_PATH, + SIGN_TIME, + IMG_PATH, + ANSWER1 + + + + + #{HOISTING_ID}, + #{BUS_HOISTING_MEASURES_ID}, + #{STATUS}, + #{HOISTINGTOMEASURES_ID}, + #{CONFIRM_ID}, + #{SIGN_PATH}, + #{SIGN_TIME}, + #{IMG_PATH}, + #{ANSWER1} + + + + + insert into + + ( + + ) values ( + + ) + + + + insert into + + ( + HOISTING_ID, + BUS_HOISTING_MEASURES_ID, + HOISTINGTOMEASURES_ID, + CONFIRM_ID + ) values + + ( + #{item.HOISTING_ID}, + #{item.BUS_HOISTING_MEASURES_ID}, + #{item.HOISTINGTOMEASURES_ID}, + #{item.CONFIRM_ID} + ) + + + + + + delete from + + where + HOISTING_ID = #{HOISTING_ID} + + + + + update + + set + STATUS = #{STATUS}, + SIGN_PATH = #{SIGN_PATH}, + IMG_PATH = #{IMG_PATH}, + SIGN_TIME = #{SIGN_TIME}, + ANSWER1 = #{ANSWER1} + where + HOISTINGTOMEASURES_ID = #{HOISTINGTOMEASURES_ID} + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HOISTINGTOMEASURES_ID in + + #{item} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml index 0911ed3..b69ba17 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml @@ -258,8 +258,7 @@ ACCEPT_TIME = #{ACCEPT_TIME}, PLS_ID = #{PLS_ID}, PLS_NAME = #{PLS_NAME}, - LONGITUDE =#{LONGITUDE}, - LATITUDE =#{LATITUDE}, + WORK_POSITION =#{WORK_POSITION}, VIDEO_PATH = #{VIDEO_PATH} where HOTWORK_ID = #{HOTWORK_ID} diff --git a/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml b/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml index b4b28e1..7431f19 100644 --- a/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml +++ b/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml @@ -231,9 +231,6 @@ from f where 1 =1 - - and f.CORPINFO_ID = #{CORPINFO_ID} - and f.PARENT_ID = #{PARENT_ID} diff --git a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml new file mode 100644 index 0000000..700f454 --- /dev/null +++ b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml @@ -0,0 +1,243 @@ + + + + + + + bus_traffic_mechanical_freighttrailer + + + + + + FREIGHTTRAILER_ID, + CORPINFO_ID, + NUM, + PLATE_NUMBER, + VIN, + VEHICLE_BODY_NUMBER, + TRAILER_TYPE, + OPER_CERTIFICATE_NUM, + BELONGING_DEPT, + CAR_OWNERS, + CAR_OWNERS_TEL, + CONTACTS, + CONTACT_PHONE, + INITIAL_REGISTRATION_DATE, + CERTIFICATE_DATE, + DUE_DATE, + TRAILER_BRAND, + TRAILER_MODEL, + APPROVED_TOTAL_MASS, + APPROVED_LOAD_CAPACITY, + VOLUME, + NOTES, + TRAILER_IMG, + DRIVING_LICENSE_IMG, + OPER_CERTIFICATE_IMG, + TRAILER_INFO, + CREATOR, + CREATORNAME, + CREATTIME, + ISDELETE + + + + + #{FREIGHTTRAILER_ID}, + #{CORPINFO_ID}, + #{NUM}, + #{PLATE_NUMBER}, + #{VIN}, + #{VEHICLE_BODY_NUMBER}, + #{TRAILER_TYPE}, + #{OPER_CERTIFICATE_NUM}, + #{BELONGING_DEPT}, + #{CAR_OWNERS}, + #{CAR_OWNERS_TEL}, + #{CONTACTS}, + #{CONTACT_PHONE}, + #{INITIAL_REGISTRATION_DATE}, + #{CERTIFICATE_DATE}, + #{DUE_DATE}, + #{TRAILER_BRAND}, + #{TRAILER_MODEL}, + #{APPROVED_TOTAL_MASS}, + #{APPROVED_LOAD_CAPACITY}, + #{VOLUME}, + #{NOTES}, + #{TRAILER_IMG}, + #{DRIVING_LICENSE_IMG}, + #{OPER_CERTIFICATE_IMG}, + #{TRAILER_INFO}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1', + DELETEOR = #{DELETEOR}, + DELETEORNAME = #{DELETEORNAME}, + DELETTIME = #{DELETTIME} + where + FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID} + + + + + update + + set + NUM = #{NUM}, + PLATE_NUMBER = #{PLATE_NUMBER}, + VIN = #{VIN}, + VEHICLE_BODY_NUMBER = #{VEHICLE_BODY_NUMBER}, + TRAILER_TYPE = #{TRAILER_TYPE}, + OPER_CERTIFICATE_NUM = #{OPER_CERTIFICATE_NUM}, + BELONGING_DEPT = #{BELONGING_DEPT}, + CAR_OWNERS = #{CAR_OWNERS}, + CAR_OWNERS_TEL = #{CAR_OWNERS_TEL}, + CONTACTS = #{CONTACTS}, + CONTACT_PHONE = #{CONTACT_PHONE}, + INITIAL_REGISTRATION_DATE = #{INITIAL_REGISTRATION_DATE}, + CERTIFICATE_DATE = #{CERTIFICATE_DATE}, + DUE_DATE = #{DUE_DATE}, + TRAILER_BRAND = #{TRAILER_BRAND}, + TRAILER_MODEL = #{TRAILER_MODEL}, + APPROVED_TOTAL_MASS = #{APPROVED_TOTAL_MASS}, + APPROVED_LOAD_CAPACITY = #{APPROVED_LOAD_CAPACITY}, + VOLUME = #{VOLUME}, + NOTES = #{NOTES}, + TRAILER_IMG = #{TRAILER_IMG}, + DRIVING_LICENSE_IMG = #{DRIVING_LICENSE_IMG}, + OPER_CERTIFICATE_IMG = #{OPER_CERTIFICATE_IMG}, + TRAILER_INFO = #{TRAILER_INFO}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME} + where + FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID} + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml index 38e94e3..11d654e 100644 --- a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml @@ -433,6 +433,9 @@ SELECT - f.CREATOR,f.STATE,f.CREATOR + f.CREATOR,f.STATE,f.HIDDEN_ID,'H' as TYPE FROM BUS_HIDDEN f WHERE f.ISDELETE = '0' and f.STATE != '0' @@ -3866,7 +3871,7 @@ union all SELECT - f.CREATOR,f.STATE,f.CREATOR + f.CREATOR,f.STATE,f.HIDDEN_ID,'D' as TYPE FROM BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN f WHERE f.ISDELETE = '0' and f.STATE != '0' @@ -4170,9 +4175,12 @@ and f.CREATTIME <= #{pd.ENDTIME} - + and f.STATE = #{pd.STATE} + + and f.STATE != '100' and f.STATE != '101' + and f.STATE in ('1','-1') @@ -4360,7 +4368,7 @@ - + and f.STATE = #{pd.STATE} diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml new file mode 100644 index 0000000..f063279 --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -0,0 +1,652 @@ + + + + + + + BUS_HIDDEN + + + + + SYS_DICTIONARIES + + + + + f.SOURCE, + f.RISK_UNIT, + f.IDENTIFICATION, + f.RISK_DESCR, + f.RISK_POSITION, + f.LEVEL, + f.CHECK_CONTENT, + f.HIDDENDESCR, + f.HIDDENPART, + f.CREATOR, + f.CREATTIME, + f.RECTIFYDESCR, + f.RECTIFICATIONTYPE, + f.RECTIFICATIONOR, + f.RECTIFICATIONTIME, + f.HIDDENLEVEL, + f.STATE, + f.CHECKDEPT, + f.CHECKOR, + f.CHECKTIME, + f.CHECKDESCR, + f.ISQUALIFIED, + f.ISDELETE, + f.CORPINFO_ID, + f.HIDDENFINDDEPT, + f.RECTIFICATIONDEADLINE, + f.RECTIFICATIONDEPT, + f.HIDDEN_ID, + f.CHECKRECORD_ID, + f.RECORDITEM_ID, + f.RISKITEM_ID, + f.REVIEWOR, + f.REVIEWTIME, + f.REVIEWDEPT, + f.LONGITUDE, + f.LATITUDE, + f.HAVESCHEME, + f.HIDDENTYPE, + f.ISCONFIRM, + f.CONFIRM_USER, + f.DISCOVERYTIME, + f.CONFIRM_TIME, + f.HIDDENTYPE2, + f.INVESTMENT_FUNDS, + f.LISTMANAGER_ID, + f.FOREIGN_ID, + f.FINAL_CHECK, + f.FINAL_CHECKOR, + f.FINAL_CHECKTIME, + f.FINAL_CHECKDESCR, + f.POSITIONDESC, + f.ISRELEVANT + + + + + + SOURCE, + RISK_UNIT, + IDENTIFICATION, + RISK_DESCR, + RISK_POSITION, + LEVEL, + CHECK_CONTENT, + HIDDENDESCR, + HIDDENPART, + CREATOR, + CREATTIME, + RECTIFYDESCR, + RECTIFICATIONTYPE, + RECTIFICATIONOR, + RECTIFICATIONTIME, + HIDDENLEVEL, + STATE, + CHECKDEPT, + CHECKOR, + CHECKTIME, + CHECKDESCR, + ISQUALIFIED, + ISDELETE, + CORPINFO_ID, + HIDDENFINDDEPT, + RECTIFICATIONDEADLINE, + RECTIFICATIONDEPT, + HIDDEN_ID, + CHECKRECORD_ID, + RECORDITEM_ID, + RISKITEM_ID, + REVIEWOR, + REVIEWTIME, + REVIEWDEPT, + LONGITUDE, + LATITUDE, + HAVESCHEME, + HIDDENTYPE, + ISCONFIRM, + CONFIRM_USER, + DISCOVERYTIME, + HIDDENTYPE2, + INVESTMENT_FUNDS, + LISTMANAGER_ID, + FOREIGN_ID, + FINAL_CHECK, + FINAL_CHECKOR, + FINAL_CHECKTIME, + FINAL_CHECKDESCR, + POSITIONDESC, + ISRELEVANT + + + + + #{SOURCE}, + #{RISK_UNIT}, + #{IDENTIFICATION}, + #{RISK_DESCR}, + #{RISK_POSITION}, + #{LEVEL}, + #{CHECK_CONTENT}, + #{HIDDENDESCR}, + #{HIDDENPART}, + #{CREATOR}, + #{CREATTIME}, + #{RECTIFYDESCR}, + #{RECTIFICATIONTYPE}, + #{RECTIFICATIONOR}, + #{RECTIFICATIONTIME}, + #{HIDDENLEVEL}, + #{STATE}, + #{CHECKDEPT}, + #{CHECKOR}, + #{CHECKTIME}, + #{CHECKDESCR}, + #{ISQUALIFIED}, + #{ISDELETE}, + #{CORPINFO_ID}, + #{HIDDENFINDDEPT}, + #{RECTIFICATIONDEADLINE}, + #{RECTIFICATIONDEPT}, + #{HIDDEN_ID}, + #{CHECKRECORD_ID}, + #{RECORDITEM_ID}, + #{RISKITEM_ID}, + #{REVIEWOR}, + #{REVIEWTIME}, + #{REVIEWDEPT}, + #{LONGITUDE}, + #{LATITUDE}, + #{HAVESCHEME}, + #{HIDDENTYPE}, + #{ISCONFIRM}, + #{CONFIRM_USER}, + #{DISCOVERYTIME}, + getHiddenType(#{HIDDENTYPE}), + #{INVESTMENT_FUNDS}, + #{LISTMANAGER_ID}, + #{FOREIGN_ID}, + #{FINAL_CHECK}, + #{FINAL_CHECKOR}, + #{FINAL_CHECKTIME}, + #{FINAL_CHECKDESCR}, + #{POSITIONDESC}, + #{ISRELEVANT} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HIDDEN_ID = #{HIDDEN_ID} + + + + update + + set + STATE = #{STATE}, + CONFIRM_USER = #{CONFIRM_USER}, + CONFIRM_TIME = #{CONFIRM_TIME}, + RECTIFICATIONDEPT = #{RECTIFICATIONDEPT}, + RECTIFICATIONOR = #{RECTIFICATIONOR}, + RECTIFICATIONDEADLINE = #{RECTIFICATIONDEADLINE}, + HIDDENLEVEL = #{HIDDENLEVEL} + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + set + RECTIFYDESCR = #{RECTIFYDESCR}, + RECTIFICATIONTIME = #{RECTIFICATIONTIME}, + HAVESCHEME = #{HAVESCHEME}, + INVESTMENT_FUNDS = #{INVESTMENT_FUNDS}, + STATE = #{STATE}, + ISEXPIREREPAIR = #{ISEXPIREREPAIR} + where + HIDDEN_ID = #{HIDDEN_ID} + + + + update + + set + CHECKTIME = #{CHECKTIME}, + STATE = '4' + where + HIDDEN_ID = #{HIDDEN_ID} + + + + update + + set + STATE = '1' + where + HIDDEN_ID = #{HIDDEN_ID} + + + INSERT INTO bus_hidden_emis( + HIDDEN_ID,SOURCE,RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR, + CREATTIME,RECTIFYDESCR,RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE, + RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME,CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID, + HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,RISKITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT,HAVESCHEME, + LONGITUDE,LATITUDE,LISTMANAGER_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS, + HIDDENTYPE2,POSITIONDESC,ISRELEVANT,EMIS_RES + ) SELECT + HIDDEN_ID,SOURCE,RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR,CREATTIME,RECTIFYDESCR, + RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE,RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME, + CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID,HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,RISKITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT, + HAVESCHEME,LONGITUDE,LATITUDE,LISTMANAGER_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS,HIDDENTYPE2, + POSITIONDESC,ISRELEVANT,#{resXML} + FROM bus_hidden where + HIDDEN_ID = #{HIDDEN_ID} + + + delete from + + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + set + STATE = '16' + where + HIDDEN_ID = #{HIDDEN_ID} + + + + update + + set + STATE = '7' + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenCheckApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenCheckApiMapper.xml new file mode 100644 index 0000000..ac43550 --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenCheckApiMapper.xml @@ -0,0 +1,191 @@ + + + + + + + BUS_HIDDENCHECK + + + + + SYS_DICTIONARIES + + + + + f.HIDDEN_ID, + f.DEPARTMENT_ID, + f.USER_ID, + f.STATUS, + f.CHECK_TIME, + f.CHECKDESCR, + f.HIDDENCHECK_ID + + + + + HIDDEN_ID, + DEPARTMENT_ID, + USER_ID, + STATUS, + CHECK_TIME, + CHECKDESCR, + HIDDENCHECK_ID + + + + + #{HIDDEN_ID}, + #{DEPARTMENT_ID}, + #{USER_ID}, + #{STATUS}, + #{CHECK_TIME}, + #{CHECKDESCR}, + #{HIDDENCHECK_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + set + HIDDEN_ID = #{HIDDEN_ID}, + DEPARTMENT_ID = #{DEPARTMENT_ID}, + USER_ID = #{USER_ID}, + STATUS = #{STATUS}, + CHECK_TIME = #{CHECK_TIME}, + CHECKDESCR = #{CHECKDESCR}, + HIDDENCHECK_ID = HIDDENCHECK_ID + where + HIDDENCHECK_ID = #{HIDDENCHECK_ID} + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HIDDENCHECK_ID in + + #{item} + + + + + + + + update + + set + DEPARTMENT_ID = #{DEPARTMENT_ID}, + USER_ID = #{USER_ID}, + STATUS = #{STATUS}, + CHECK_TIME = #{CHECK_TIME}, + CHECKDESCR = #{CHECKDESCR}, + HIDDENCHECK_ID = HIDDENCHECK_ID + where + HIDDENCHECK_ID = #{HIDDENCHECK_ID} + + + + delete from + + where + HIDDEN_ID = #{HIDDEN_ID} + + diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenExamineMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenExamineMapper.xml new file mode 100644 index 0000000..8c114cb --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenExamineMapper.xml @@ -0,0 +1,421 @@ + + + + + + + BUS_HIDDENEXAMINE + + + + + SYS_DICTIONARIES + + + + + f.HIDDEN_ID, + f.EXAMINE, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.STATE, + f.TYPE, + f.DISPOSAL_PLAN, + f.DISPOSAL_FILE, + f.DELAY_TIME, + f.spare1, + f.spare2, + f.spare3, + f.spare4, + f.spare5, + f.HIDDENEXAMINE_ID, + f.REPULSE_CAUSE + + + + + HIDDEN_ID, + EXAMINE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + STATE, + TYPE, + DISPOSAL_PLAN, + DISPOSAL_FILE, + DELAY_TIME, + spare1, + spare2, + spare3, + spare4, + spare5, + HIDDENEXAMINE_ID, + REPULSE_CAUSE + + + + + #{HIDDEN_ID}, + #{EXAMINE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{STATE}, + #{TYPE}, + #{DISPOSAL_PLAN}, + #{DISPOSAL_FILE}, + #{DELAY_TIME}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{HIDDENEXAMINE_ID}, + #{REPULSE_CAUSE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID} + + + + delete from + + where + HIDDEN_ID = #{HIDDEN_ID} + + + delete from + + where + HIDDEN_ID = #{HIDDEN_ID} + and TYPE = '4' + and STATE = '2' + + + + update + + set + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + STATE = #{STATE} + where + HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID} + + + + + update + f + set + f.spare5 = 1 + where + HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID} + + + + + + + + + + + + + + + + + update + set + ISDELETE = '1' + where + HIDDENEXAMINE_ID in + + #{item} + + + + update + + set + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + STATE = #{STATE}, + DISPOSAL_PLAN = #{DISPOSAL_PLAN}, + DISPOSAL_FILE = #{DISPOSAL_FILE} + + , spare1 = #{spare1} + + + , spare2 = #{spare2} + + + , spare3 = #{spare3} + + + , spare4 = #{spare4} + + + , NEW_RECTIFICATIONOR = #{NEW_RECTIFICATIONOR} + + where + HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID} + + + + + + + + + update + + set + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + STATE = #{STATE} + where + HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID} + + + diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenSchemeApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenSchemeApiMapper.xml new file mode 100644 index 0000000..37e97b0 --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenSchemeApiMapper.xml @@ -0,0 +1,193 @@ + + + + + + + BUS_HIDDENSCHEME + + + + + SYS_DICTIONARIES + + + + + f.HIDDEN_ID, + f.SCREENINGDATE, + f.LISTNAME, + f.GOVERNSTANDARDS, + f.GOVERNMETHOD, + f.EXPENDITURE, + f.PRINCIPAL, + f.PROGRAMMING, + f.TIMELIMITFOR, + f.FILEPATH, + f.JOBREQUIREMENT, + f.OTHERBUSINESS, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, + f.HIDDENSCHEME_ID + + + + + HIDDEN_ID, + SCREENINGDATE, + LISTNAME, + GOVERNSTANDARDS, + GOVERNMETHOD, + EXPENDITURE, + PRINCIPAL, + PROGRAMMING, + TIMELIMITFOR, + FILEPATH, + JOBREQUIREMENT, + OTHERBUSINESS, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, + HIDDENSCHEME_ID + + + + + #{HIDDEN_ID}, + #{SCREENINGDATE}, + #{LISTNAME}, + #{GOVERNSTANDARDS}, + #{GOVERNMETHOD}, + #{EXPENDITURE}, + #{PRINCIPAL}, + #{PROGRAMMING}, + #{TIMELIMITFOR}, + #{FILEPATH}, + #{JOBREQUIREMENT}, + #{OTHERBUSINESS}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, + #{HIDDENSCHEME_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HIDDENSCHEME_ID = #{HIDDENSCHEME_ID} + + + + + update + + set + ISDELETE = '1' + where + HIDDEN_ID = #{HIDDEN_ID} + and ISDELETE = '0' + + + + + update + + set + FILEPATH = #{FILEPATH}, + ISDELETE = #{ISDELETE}, + HIDDENSCHEME_ID = HIDDENSCHEME_ID + where + HIDDENSCHEME_ID = #{HIDDENSCHEME_ID} + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HIDDENSCHEME_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenUserApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenUserApiMapper.xml new file mode 100644 index 0000000..962fe07 --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenUserApiMapper.xml @@ -0,0 +1,184 @@ + + + + + + + BUS_HIDDEN_USER + + + + + SYS_DICTIONARIES + + + + + f.HIDDEN_ID, + f.USER_ID, + f.TYPE, + f.IS_MAIN, + f.HIDDENUSER_ID + + + + + HIDDEN_ID, + USER_ID, + TYPE, + IS_MAIN, + HIDDENUSER_ID + + + + + #{HIDDEN_ID}, + #{USER_ID}, + #{TYPE}, + #{IS_MAIN}, + #{HIDDENUSER_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from where HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + set + HIDDEN_ID = #{HIDDEN_ID}, + USER_ID = #{USER_ID}, + TYPE = #{TYPE}, + IS_MAIN = #{IS_MAIN}, + HIDDENUSER_ID = HIDDENUSER_ID + where + HIDDENUSER_ID = #{HIDDENUSER_ID} + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HIDDENUSER_ID in + + #{item} + + + + + delete + from + + where HIDDEN_ID = #{HIDDEN_ID} + + + + + diff --git a/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml new file mode 100644 index 0000000..5a5d0d2 --- /dev/null +++ b/src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml @@ -0,0 +1,216 @@ + + + + + + + bus_traffic_mechanical_inspect_annually + + + + + +INSPECTANNUALLY_ID, +CORPINFO_ID, +NUM, +VEHICLE_MODEL, +VEHICLE, +CAR_OWNERS, +TELEPHONE, +REGISTRANT, +PROCESSING_DATE, +ANNUAL_INSPECTION_CYCLE, +DUE_DATE, +INSPECTFEES, +ACTUAL_COLLECTION, +ADDRESS, +REMINDER_DAYS, +REMINDER_DATE, +REMINDER_STATUS, +INSPECTINFO, +NOTES, +ARCHIVES_TYPE, +ISDELETE, +CREATOR, +CREATORNAME, +CREATTIME + + + + +#{INSPECTANNUALLY_ID}, +#{CORPINFO_ID}, +#{NUM}, +#{VEHICLE_MODEL}, +#{VEHICLE}, +#{CAR_OWNERS}, +#{TELEPHONE}, +#{REGISTRANT}, +#{PROCESSING_DATE}, +#{ANNUAL_INSPECTION_CYCLE}, +#{DUE_DATE}, +#{INSPECTFEES}, +#{ACTUAL_COLLECTION}, +#{ADDRESS}, +#{REMINDER_DAYS}, +#{REMINDER_DATE}, +#{REMINDER_STATUS}, +#{INSPECTINFO}, +#{NOTES}, +#{ARCHIVES_TYPE}, +#{ISDELETE}, +#{CREATOR}, +#{CREATORNAME}, +#{CREATTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1', + DELETEOR = #{DELETEOR}, + DELETEORNAME = #{DELETEORNAME}, + DELETTIME = #{DELETTIME} + where + INSPECTANNUALLY_ID = #{INSPECTANNUALLY_ID} + + + + + update + + set + NUM = #{NUM}, + VEHICLE_MODEL = #{VEHICLE_MODEL}, + VEHICLE = #{VEHICLE}, + CAR_OWNERS = #{CAR_OWNERS}, + TELEPHONE = #{TELEPHONE}, + REGISTRANT = #{REGISTRANT}, + PROCESSING_DATE = #{PROCESSING_DATE}, + ANNUAL_INSPECTION_CYCLE = #{ANNUAL_INSPECTION_CYCLE}, + DUE_DATE = #{DUE_DATE}, + INSPECTFEES = #{INSPECTFEES}, + ACTUAL_COLLECTION = #{ACTUAL_COLLECTION}, + ADDRESS = #{ADDRESS}, + REMINDER_DAYS = #{REMINDER_DAYS}, + REMINDER_DATE = #{REMINDER_DATE}, + REMINDER_STATUS = #{REMINDER_STATUS}, + INSPECTINFO = #{INSPECTINFO}, + NOTES = #{NOTES}, + ARCHIVES_TYPE = #{ARCHIVES_TYPE}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + INSPECTANNUALLY_ID = #{INSPECTANNUALLY_ID} + + + + + update + + set + + REMINDER_STATUS = #{REMINDER_STATUS}, + + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME} + where + INSPECTANNUALLY_ID = #{INSPECTANNUALLY_ID} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml index 0b68af8..6753c3f 100644 --- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml +++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml @@ -16,6 +16,7 @@ f.OPERATING_ID, f.GOODSSELFNUMBER, + f.CORPINFO_ID, f.PLATE_NUMBER, f.VEHICLE_COLOR, f.FRAMES_NUMBER, @@ -24,6 +25,7 @@ f.VEHICLE_TYPE, f.FIRSTSHOW_DATE, f.EXPIRE_DATE, + f.VEHICLE_EQUIPMENT, f.BELONGING_DEPARTMENT, f.TRANSPORT_ENTERPRISES, f.TRANSPORT_TYPE, @@ -48,6 +50,7 @@ f.VOUCH_NUMBERLOAD, f.VOUCH_PAYLOAD, f.RACTIONMASS_QUALITY, + f.HOME_TERRITORY, f.REMARK, f.HEADSTOCK_PHOTO, f.DRIVINGLICENSE_PHOTO, @@ -71,6 +74,7 @@ OPERATING_ID, GOODSSELFNUMBER, + CORPINFO_ID, PLATE_NUMBER, VEHICLE_COLOR, FRAMES_NUMBER, @@ -79,6 +83,7 @@ VEHICLE_TYPE, FIRSTSHOW_DATE, EXPIRE_DATE, + VEHICLE_EQUIPMENT, BELONGING_DEPARTMENT, TRANSPORT_ENTERPRISES, TRANSPORT_TYPE, @@ -103,6 +108,7 @@ VOUCH_NUMBERLOAD, VOUCH_PAYLOAD, RACTIONMASS_QUALITY, + HOME_TERRITORY, REMARK, HEADSTOCK_PHOTO, DRIVINGLICENSE_PHOTO, @@ -126,6 +132,7 @@ #{OPERATING_ID}, #{GOODSSELFNUMBER}, + #{CORPINFO_ID}, #{PLATE_NUMBER}, #{VEHICLE_COLOR}, #{FRAMES_NUMBER}, @@ -134,6 +141,7 @@ #{VEHICLE_TYPE}, #{FIRSTSHOW_DATE}, #{EXPIRE_DATE}, + #{VEHICLE_EQUIPMENT}, #{BELONGING_DEPARTMENT}, #{TRANSPORT_ENTERPRISES}, #{TRANSPORT_TYPE}, @@ -158,6 +166,7 @@ #{VOUCH_NUMBERLOAD}, #{VOUCH_PAYLOAD}, #{RACTIONMASS_QUALITY}, + #{HOME_TERRITORY}, #{REMARK}, #{HEADSTOCK_PHOTO}, #{DRIVINGLICENSE_PHOTO}, @@ -213,6 +222,7 @@ VEHICLE_TYPE = #{VEHICLE_TYPE}, FIRSTSHOW_DATE = #{FIRSTSHOW_DATE}, EXPIRE_DATE = #{EXPIRE_DATE}, + VEHICLE_EQUIPMENT = #{VEHICLE_EQUIPMENT}, BELONGING_DEPARTMENT = #{BELONGING_DEPARTMENT}, TRANSPORT_ENTERPRISES = #{TRANSPORT_ENTERPRISES}, TRANSPORT_TYPE = #{TRANSPORT_TYPE}, @@ -236,6 +246,7 @@ VOUCH_TOTALMASS = #{VOUCH_TOTALMASS}, VOUCH_NUMBERLOAD = #{VOUCH_NUMBERLOAD}, VOUCH_PAYLOAD = #{VOUCH_PAYLOAD}, + HOME_TERRITORY = #{HOME_TERRITORY}, RACTIONMASS_QUALITY = #{RACTIONMASS_QUALITY}, REMARK = #{REMARK}, HEADSTOCK_PHOTO = #{HEADSTOCK_PHOTO}, @@ -253,7 +264,8 @@ OPERATTIME = #{OPERATTIME}, DELETOR = #{DELETOR}, DELETORNAME = #{DELETORNAME}, - DELETTIME = #{DELETTIME} + DELETTIME = #{DELETTIME}, + CORPINFO_ID = #{CORPINFO_ID} where OPERATING_ID = #{OPERATING_ID} @@ -446,12 +458,12 @@ from f - where f.ISDELETE = '0' + where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%') - and f.VEHICLE_COLOR = #{pd.VEHICLE_COLOR} + and f.VEHICLE_COLOR LIKE CONCAT(CONCAT('%', #{pd.VEHICLE_COLOR}),'%') and f.FRAMES_NUMBER LIKE CONCAT(CONCAT('%', #{pd.FRAMES_NUMBER}),'%') @@ -462,8 +474,8 @@ and f.BELONGING_DEPARTMENT LIKE CONCAT(CONCAT('%', #{pd.BELONGING_DEPARTMENT}),'%') - - and f.TRANSPORT_ENTERPRISES = #{pd.TRANSPORT_ENTERPRISES} + + and f.TRANSPORT_TYPE = #{pd.TRANSPORT_TYPE} and f.NETWORK_STATUS = #{pd.NETWORK_STATUS} @@ -487,5 +499,15 @@ where f.ISDELETE = '0' + + diff --git a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml index cea65e9..067021c 100644 --- a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml @@ -437,5 +437,14 @@ PARENT_ID = #{parentId} order by ORDER_BY + + diff --git a/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml b/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml new file mode 100644 index 0000000..6e7844a --- /dev/null +++ b/src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml @@ -0,0 +1,446 @@ + + + + + + + BUS_TRAFFIC_TAXATION_MANAGE + + + + + SYS_DICTIONARIES + + + + + f.TAXATION_ID, + f.RECORD_NUMBER, + f.CORPINFO_ID, + f.PLATE_NUMBER, + f.VEHICLEOWNER, + f.CONTACT_NUMBER, + f.TRANSACTION_DATA, + f.TAXESDUES_PERIOD, + f.EXPIRE_DATE, + f.REGISTRANT, + f.TRANSPORT_ENTERPRISES, + f.REMINDER_STATUS, + f.EXPIRE_STATUS, + f.RECORD_STATUS, + f.TRAILER_VEHICLE, + f.FRAMES_NUMBER, + f.VEHICLE_TYPE, + f.VEHICLEOWNER_NUMBER, + f.FIRSTSHOW_DATE, + f.PROVINCE, + f.CITY, + f.COUNTY, + f.REMINDER_DAY, + f.REMINDER_DATA, + f.TAXESDUES_MATERIAL, + f.REMARK, + f.REGISTER_NUMBER, + f.VEHICLE_MODEL, + f.VEHICLE_BRAND, + f.DRIVINGLICENSE_PHOTO, + f.ISDELETE, + f.CREATOR, + f.CREATORNAME, + f.CREATTIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME, + f.DELETOR, + f.DELETORNAME, + f.DELETTIME + + + + + TAXATION_ID, + RECORD_NUMBER, + CORPINFO_ID, + PLATE_NUMBER, + VEHICLEOWNER, + CONTACT_NUMBER, + TRANSACTION_DATA, + TAXESDUES_PERIOD, + EXPIRE_DATE, + REGISTRANT, + TRANSPORT_ENTERPRISES, + REMINDER_STATUS, + EXPIRE_STATUS, + RECORD_STATUS, + TRAILER_VEHICLE, + FRAMES_NUMBER, + VEHICLE_TYPE, + VEHICLEOWNER_NUMBER, + FIRSTSHOW_DATE, + PROVINCE, + CITY, + COUNTY, + REMINDER_DAY, + REMINDER_DATA, + TAXESDUES_MATERIAL, + REMARK, + REGISTER_NUMBER, + VEHICLE_MODEL, + VEHICLE_BRAND, + DRIVINGLICENSE_PHOTO, + ISDELETE, + CREATOR, + CREATORNAME, + CREATTIME, + OPERATOR, + OPERATORNAME, + OPERATTIME, + DELETOR, + DELETORNAME, + DELETTIME + + + + + #{TAXATION_ID}, + #{RECORD_NUMBER}, + #{CORPINFO_ID,}, + #{PLATE_NUMBER}, + #{VEHICLEOWNER}, + #{CONTACT_NUMBER}, + #{TRANSACTION_DATA}, + #{TAXESDUES_PERIOD}, + #{EXPIRE_DATE}, + #{REGISTRANT}, + #{TRANSPORT_ENTERPRISES}, + #{REMINDER_STATUS}, + #{EXPIRE_STATUS}, + #{RECORD_STATUS}, + #{TRAILER_VEHICLE}, + #{FRAMES_NUMBER}, + #{VEHICLE_TYPE}, + #{VEHICLEOWNER_NUMBER}, + #{FIRSTSHOW_DATE}, + #{PROVINCE}, + #{CITY}, + #{COUNTY}, + #{REMINDER_DAY}, + #{REMINDER_DATA}, + #{TAXESDUES_MATERIAL}, + #{REMARK}, + #{REGISTER_NUMBER}, + #{VEHICLE_MODEL}, + #{VEHICLE_BRAND}, + #{DRIVINGLICENSE_PHOTO}, + #{ISDELETE}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + TAXATION_ID = #{TAXATION_ID} + + + + + update + + set + TAXATION_ID = #{TAXATION_ID}, + RECORD_NUMBER = #{RECORD_NUMBER}, + CORPINFO_ID = #{CORPINFO_ID}, + PLATE_NUMBER = #{PLATE_NUMBER}, + VEHICLEOWNER = #{VEHICLEOWNER}, + CONTACT_NUMBER = #{CONTACT_NUMBER}, + TRANSACTION_DATA = #{TRANSACTION_DATA}, + TAXESDUES_PERIOD = #{TAXESDUES_PERIOD}, + EXPIRE_DATE = #{EXPIRE_DATE}, + REGISTRANT = #{REGISTRANT}, + TRANSPORT_ENTERPRISES = #{TRANSPORT_ENTERPRISES}, + REMINDER_STATUS = #{REMINDER_STATUS}, + EXPIRE_STATUS = #{EXPIRE_STATUS}, + RECORD_STATUS = #{RECORD_STATUS}, + TRAILER_VEHICLE = #{TRAILER_VEHICLE}, + FRAMES_NUMBER = #{FRAMES_NUMBER}, + VEHICLE_TYPE = #{VEHICLE_TYPE}, + VEHICLEOWNER_NUMBER = #{VEHICLEOWNER_NUMBER}, + FIRSTSHOW_DATE = #{FIRSTSHOW_DATE}, + PROVINCE = #{PROVINCE}, + CITY = #{CITY}, + COUNTY = #{COUNTY}, + REMINDER_DAY = #{REMINDER_DAY}, + REMINDER_DATA = #{REMINDER_DATA}, + TAXESDUES_MATERIAL = #{TAXESDUES_MATERIAL}, + REMARK = #{REMARK}, + REGISTER_NUMBER = #{REGISTER_NUMBER}, + VEHICLE_MODEL = #{VEHICLE_MODEL}, + VEHICLE_BRAND = #{VEHICLE_BRAND}, + DRIVINGLICENSE_PHOTO = #{DRIVINGLICENSE_PHOTO}, + ISDELETE = #{ISDELETE}, + CREATOR = #{CREATOR}, + CREATORNAME = #{CREATORNAME}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME}, + DELETOR = #{DELETOR}, + DELETORNAME = #{DELETORNAME}, + DELETTIME = #{DELETTIME} + where + TAXATION_ID = #{TAXATION_ID} + + + + + + + + + + + + + + + + +