From 425675051e544cf29b2132615cfbf7a93dc5e51f Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期三, 22 六月 2022 15:50:59 +0800 Subject: [PATCH] fix(dm): MySQL=》DMSQL --- src/cn/ksource/web/controller/business/pages/question/QuestionController.java | 523 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 262 insertions(+), 261 deletions(-) diff --git a/src/cn/ksource/web/controller/business/pages/question/QuestionController.java b/src/cn/ksource/web/controller/business/pages/question/QuestionController.java index 815ce6a..5a0f4f1 100644 --- a/src/cn/ksource/web/controller/business/pages/question/QuestionController.java +++ b/src/cn/ksource/web/controller/business/pages/question/QuestionController.java @@ -47,31 +47,31 @@ @Controller @RequestMapping("/business/pages/question") public class QuestionController { - + @Autowired private QuestionFacade questionFacade; - + @Autowired private IncidentFacade incidentFacade; - + @Autowired private DataDictionaryService dataDictionaryService; - + @Autowired private FileService fileService; - + @Autowired private OrderService orderService; - + @Autowired private DeviceService deviceService; - + @Autowired private OrderFacade orderFacade; - + @Resource private CustomerManageFacade customerFacade; - + @Autowired private MessageService messageService; @@ -129,40 +129,40 @@ @RequestMapping(value="questionList.html", method=RequestMethod.GET) public ModelAndView questionList(HttpServletRequest request, HttpServletResponse response) { ModelAndView view = new ModelAndView("/business/pages/question/questionList"); - + //鏌ヨ宸ュ崟鏁伴噺锛岄�氳繃绫诲瀷鍒ゆ柇鏌ヨ閭g绫诲瀷鐨勬暟閲� Map msgCount = questionFacade.queryQuestionCount(request); - + System.out.println(JsonUtil.map2Json(msgCount)); - + view.addObject("c", msgCount); //鏌ヨ闂绫诲瀷鏁版嵁瀛楀吀 List sources = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - + view.addObject("sources", sources); - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); view.addObject("eventPri", eventPri); //鏌ヨ浜嬩欢褰卞搷搴︽暟鎹瓧鍏� List<Map> eventDg = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_EFFECT_DG); view.addObject("eventDg", eventDg); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("userId", WebUtil.getLoginedUserId(request)); params.put("type","1"); Map map = questionFacade.getOrderNum(params); view.addObject("data", map); - + return view; } - - + + /** * 鏌ヨ闂宸ュ崟鍒楄〃鏁版嵁 */ @@ -175,9 +175,9 @@ modelAndView.addObject("orderList", list); return modelAndView; } - - - + + + /** * 鏌ヨ闂宸ュ崟鎬绘暟閲� */ @@ -188,24 +188,24 @@ int count = questionFacade.queryQuestionOrderCount(params); WebUtil.write(response, String.valueOf(count)); } - - - - + + + + /** * 璺宠浆鍒版垜鐨勯棶棰樺伐鍗曞垪琛� */ @RequestMapping("myQuestion.html") public ModelAndView myIncident(HttpServletRequest request) { ModelAndView view = new ModelAndView("/business/pages/question/myQuestion"); - + Map num = orderFacade.queryOrderCountByCate(request, Constants.WORKFLOW_BASE_BUSINESS_TYPE_QUESTION.toString()); - + view.addObject("num", num); - + //鏌ヨ闂绫诲瀷鏁版嵁瀛楀吀 List sources = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - + view.addObject("sources", sources); //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); @@ -213,11 +213,11 @@ //鏌ヨ浜嬩欢褰卞搷搴︽暟鎹瓧鍏� List<Map> eventDg = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_EFFECT_DG); view.addObject("eventDg", eventDg); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("userId", WebUtil.getLoginedUserId(request)); @@ -226,8 +226,8 @@ view.addObject("data", map); return view; } - - + + /** * 鏌ヨ鎴戠殑闂鍒楄〃 */ @@ -241,7 +241,7 @@ modelAndView.addObject("orders", question); return modelAndView; } - + /** * 鏌ヨ鎴戠殑闂鏁伴噺 */ @@ -253,7 +253,7 @@ int count = questionFacade.queryMyQuestionCount(params); WebUtil.write(response, String.valueOf(count)); } - + /** * 鏈嶅姟鍙板垱寤洪棶棰橀〉闈� * @param request @@ -265,8 +265,8 @@ ModelAndView view = new ModelAndView("/business/pages/question/addquestion"); //鏉ユ簮浜庝簨浠跺崌绾� Map questionMsg = questionFacade.getQuestionMsgByOrderId(request); - - + + //鏌ヨ闂鏉ユ簮鏁版嵁瀛楀吀 List<Map> froms = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); //鍙栧緱闂鏉ユ簮鐨勭涓�鏉℃暟鎹� @@ -275,21 +275,21 @@ view.addObject("fromId", from.get("DATAKEY")); view.addObject("fromName", from.get("DATAVALUE")); } - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); view.addObject("eventPri", eventPri); //鏌ヨ浜嬩欢褰卞搷搴︽暟鎹瓧鍏� List<Map> eventDg = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_EFFECT_DG); view.addObject("eventDg", eventDg); - + view.addObject("froms", froms); view.addObject("questionMsg", questionMsg); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("userId", WebUtil.getLoginedUserId(request)); @@ -299,7 +299,7 @@ view.addObject("gnmark", GnConstants.ADDWT); return view; } - + /** * 鏈嶅姟鍙板垱寤洪棶棰橀〉闈� * @param request @@ -311,8 +311,8 @@ ModelAndView view = new ModelAndView("/business/pages/question/addquestion"); //鏉ユ簮浜庝簨浠跺崌绾� Map questionMsg = questionFacade.getQuestionMsgByOrderId(request); - - + + //鏌ヨ闂鏉ユ簮鏁版嵁瀛楀吀 List<Map> froms = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); //鍙栧緱闂鏉ユ簮鐨勭涓�鏉℃暟鎹� @@ -321,21 +321,21 @@ view.addObject("fromId", from.get("DATAKEY")); view.addObject("fromName", from.get("DATAVALUE")); } - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); view.addObject("eventPri", eventPri); //鏌ヨ浜嬩欢褰卞搷搴︽暟鎹瓧鍏� List<Map> eventDg = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_EFFECT_DG); view.addObject("eventDg", eventDg); - + view.addObject("froms", froms); view.addObject("questionMsg", questionMsg); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("userId", WebUtil.getLoginedUserId(request)); @@ -345,7 +345,7 @@ view.addObject("gnmark", GnConstants.FWTADDWT); return view; } - + /** * 鏈嶅姟鍙板垱寤洪棶棰橀〉闈� * @param request @@ -357,29 +357,29 @@ ModelAndView view = new ModelAndView("/business/pages/question/addchangequestion"); //鏉ユ簮浜庝簨浠跺崌绾� Map questionMsg = questionFacade.getQuestionMsgByOrderId(request); - - - + + + //鏌ヨ闂鏉ユ簮鏁版嵁瀛楀吀 List froms = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - - + + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); view.addObject("eventPri", eventPri); //鏌ヨ浜嬩欢褰卞搷搴︽暟鎹瓧鍏� List<Map> eventDg = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_EFFECT_DG); view.addObject("eventDg", eventDg); - + view.addObject("froms", froms); view.addObject("questionMsg", questionMsg); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); return view; } - + /** * 鍒涘缓闂鎻愪氦 * @param request @@ -406,10 +406,10 @@ "", SysInfo.Error,""); } - + } } - + /** * 閫氳繃浼樺厛绾у拰褰卞搷搴︽煡璇㈠搴旂殑绾у埆 */ @@ -419,10 +419,10 @@ String influence_id = request.getParameter("influence_id"); String customerId = request.getParameter("customer_id"); Map levelMap = questionFacade.queryLevel(priority_id,influence_id,customerId); - + WebUtil.write(response, JsonUtil.map2Json(levelMap)); } - + /** * 鍒嗛厤浜哄憳 */ @@ -436,7 +436,7 @@ modelAndView.addObject("curnodeId", curnodeId); return modelAndView; } - + /** * 鏌ヨ鎵�鏈夌殑鍒嗛厤浜哄憳 */ @@ -447,7 +447,7 @@ modelAndView.addObject("groupList", groupList); return modelAndView; } - + /** * 鏌ヨ鎵�鏈夌殑鍒嗛厤浜哄憳 */ @@ -458,7 +458,7 @@ modelAndView.addObject("groupList", groupList); return modelAndView; } - + /** * 鏌ヨ瑙掕壊 */ @@ -469,7 +469,7 @@ modelAndView.addObject("groupList", groupList); return modelAndView; } - + /** * 鏌ヨ瀹㈡埛鑷畾涔夌粍 */ @@ -480,7 +480,7 @@ modelAndView.addObject("groupList", groupList); return modelAndView; } - + /** * 鏌ヨ瀹㈡埛鑷畾涔夌粍 */ @@ -491,7 +491,7 @@ modelAndView.addObject("groupList", groupList); return modelAndView; } - + /** * 娣诲姞瀹㈡埛鑷畾涔夌粍涓嬬殑浜哄憳 */ @@ -500,21 +500,21 @@ ModelAndView modelAndView = new ModelAndView("/business/pages/question/addzdyGroupUser"); String groupId = request.getParameter("groupId"); if(!StringUtil.isEmpty(groupId)){ - + modelAndView.addObject("group", new CUSTOM_GROUP(groupId).getBeanMapById()); }else{ modelAndView.addObject("group", new HashMap()); } - + Map users = questionFacade.usersbyGroup(request); - + modelAndView.addObject("users", users.get("resList")); modelAndView.addObject("groupuser", users.get("groupuser")); modelAndView.addObject("main", users); - + return modelAndView; } - + /** * 娣诲姞瀹㈡埛鑷畾涔夌粍涓嬬殑浜哄憳 */ @@ -523,12 +523,12 @@ String groupId = request.getParameter("groupId"); String customerId = request.getParameter("customerId"); questionFacade.addGroupUser(request); - + return WebUtil.sysInfoPage(request, "鎿嶄綔鎴愬姛锛�", "window.top.hideDialog('zdyadd');window.top.document.getElementById('dialogIframedealer').contentWindow.loadGroup();", SysInfo.Success,""); } - + /** * 鍒犻櫎瀹㈡埛鑷畾涔夊垎缁� */ @@ -539,7 +539,7 @@ group.setId(id).deleteById(); WebUtil.write(response, "1"); } - + /** * 璺宠浆鍒板伐鍗曞鐞嗛〉闈� * @param request @@ -548,7 +548,7 @@ @RequestMapping("questionDeal.html") public ModelAndView questionDeal(HttpServletRequest request) { ModelAndView modelAndView = new ModelAndView("/business/pages/question/questionDeal"); - + //鏌ヨ闂鍩烘湰淇℃伅 String orderId = request.getParameter("orderId"); String flowId = request.getParameter("flowId"); @@ -569,20 +569,20 @@ //鏌ヨ闂鏉ユ簮鏁版嵁瀛楀吀 List froms = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); - + //鏌ヨ浜嬩欢褰卞搷搴︽暟鎹瓧鍏� List<Map> eventDg = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_EFFECT_DG); WORKFLOW_BASE base = new WORKFLOW_BASE(flowId).getInstanceById(); - + Map node = questionFacade.getFlowMsg(flowId, WebUtil.getLoginedUserId(request)); //node涓虹┖锛屽垯涓哄垎娲惧埌缁� if(StringUtil.isEmpty(ConvertUtil.obj2StrBlank(node.get("ID")))){ node = new WORKFLOW_NODE(base.getCurrent_node_id()).getBeanMapById(); } - + String isclose = ""; List<Map> closejd = JsonUtil.json2List(ConvertUtil.obj2Str(questionMap.get("closejd"))); for(Map map:closejd){ @@ -624,7 +624,7 @@ modelAndView.addObject("repeat_mark", questionMap.get("REPEAT_MARK")); return modelAndView; } - + @RequestMapping("anwer.html") public ModelAndView anwer(HttpServletRequest request, HttpServletResponse response) { ModelAndView view = new ModelAndView("/business/pages/question/anwer"); @@ -647,22 +647,22 @@ }else{ view.addObject("nodeMsg", question); } - + view.addObject("flowId", flowId); view.addObject("nodeId", nodeId); view.addObject("orderId", orderId); - - + + return view; } - - + + @RequestMapping(value="answer.html", method=RequestMethod.POST) public void anwerSubmit(HttpServletRequest request, HttpServletResponse response) { String result = questionFacade.anwerSubmit(request); WebUtil.write(response, result); } - + /** * 鏌ヨ闂鍩烘湰淇℃伅 */ @@ -675,7 +675,7 @@ modelAndView.addObject("baseMsg", baseMsg); return modelAndView; } - + /** * 闂淇敼椤甸潰 * @param request @@ -691,25 +691,25 @@ List<Map> fileList = fileService.getFileList(flowId); questionMap.put("fileList", fileList); view.addObject("question", questionMap); - + //鏌ヨ闂鏉ユ簮鏁版嵁瀛楀吀 List froms = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); - + //鏌ヨ浜嬩欢褰卞搷搴︽暟鎹瓧鍏� List<Map> eventDg = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_EFFECT_DG); view.addObject("eventDg", eventDg); view.addObject("eventPri", eventPri); view.addObject("froms", froms); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); return view; } - + /** * 淇敼闂鎻愪氦 * @param request @@ -719,12 +719,12 @@ @RequestMapping(value="editQuestion.html", method=RequestMethod.POST) public ModelAndView editQuestionSubmit(HttpServletRequest request, HttpServletResponse response,SC_WORKFLOW_QUESTION sc_workflow_question) { questionFacade.updateQuestion(request,sc_workflow_question); - + return WebUtil.sysInfoPage(request, "鎿嶄綔鎴愬姛锛�", "window.top.location.reload(true);", SysInfo.Success,"",null); } - + /** * 璇婃柇鎶ュ憡鍘嗗彶 */ @@ -737,10 +737,10 @@ Map baseMsg = new SC_WORKFLOW_QUESTION(orderId).getBeanMapById(); modelAndView.addObject("curnodeId", curnodeId); modelAndView.addObject("baseMsg", baseMsg); - + return modelAndView; } - + /** * 璇婃柇鎶ュ憡鍘嗗彶鏁版嵁 */ @@ -755,7 +755,7 @@ modelAndView.addObject("orderMsg", new SC_WORKFLOW_QUESTION(orderId).getBeanMapById()); return modelAndView; } - + /** * 璇婃柇鎶ュ憡鍘嗗彶 */ @@ -772,7 +772,7 @@ modelAndView.addObject("orderMsg", new SC_WORKFLOW_QUESTION(orderId).getBeanMapById()); return modelAndView; } - + /** * 璺宠浆鍒板~鍐欑粨灞�鏂规椤甸潰 */ @@ -784,23 +784,23 @@ Map zdMsg = questionFacade.getzdmsgbyId(request); List<Map> fileList = new ArrayList<Map>(); if(!StringUtil.isEmpty(type)){ - + if("1".equals(type)){ fileList=fileService.getFileList(ConvertUtil.obj2StrBlank(zdMsg.get("ZDID"))); - + }else{ fileList=fileService.getFileList(ConvertUtil.obj2StrBlank(zdMsg.get("ID"))); } - + } - + modelAndView.addObject("zdMsg", zdMsg); modelAndView.addObject("type", type); modelAndView.addObject("fileList", fileList); - + return modelAndView; } - + /** * 缁撴灉鏂规鎻愪氦 */ @@ -810,9 +810,9 @@ return WebUtil.sysInfoPage(request, "鎿嶄綔鎴愬姛锛�", "window.top.document.getElementById('zdReportIframe').contentWindow.queryRecord();window.top.hideDialog('2');", SysInfo.Success,"",null); - + } - + /** * 璇婃柇鎶ュ憡鍘嗗彶鏁版嵁 */ @@ -823,7 +823,7 @@ zd.deleteById(); WebUtil.write(response, "1"); } - + /** * 鏌ヨ鏄惁鍙互杩涘叆涓嬩竴涓妭鐐� */ @@ -832,7 +832,7 @@ String issave = questionFacade.issave(request); WebUtil.write(response, issave); } - + /** * 鍒嗛厤浜哄憳 */ @@ -863,7 +863,7 @@ modelAndView.addObject("tempMsg", tempMsg); return modelAndView; } - + /** * 鍒嗘淳浜哄憳 */ @@ -886,12 +886,12 @@ return WebUtil.sysInfoPage(request, "鎿嶄綔澶辫触锛�", "", SysInfo.Error,""); - + } } - + } - + /** * 娴佽浆澶囨敞 */ @@ -900,7 +900,7 @@ ModelAndView modelAndView = new ModelAndView("/business/pages/question/lzbz"); return modelAndView; } - + /** * 娴佽浆澶囨敞 */ @@ -911,7 +911,7 @@ "window.top.hideDialog('2');", SysInfo.Success,"/business/pages/question/myQuestion.html"); } - + /** * 宸ュ崟瀹℃牳涓洖閫� */ @@ -925,7 +925,7 @@ modelAndView.addObject("nodeMap", nodeMap); return modelAndView; } - + /** * 宸ュ崟瀹℃牳涓洖閫� */ @@ -937,17 +937,17 @@ "window.top.hideDialog('2');", SysInfo.Success,"/business/pages/question/myQuestion.html",msg); } - + /** * 璺宠浆鍒板~鍐欑敵璇峰伐鍗曠粨鏉熸柟妗堥〉闈� */ @RequestMapping(value="adminEndQuestion.html",method=RequestMethod.GET) public ModelAndView adminEndQuestion(HttpServletRequest request,HttpServletResponse response) { ModelAndView modelAndView = new ModelAndView("/business/pages/question/adminEndQuestion"); - + return modelAndView; } - + /** * 鐢宠宸ュ崟缁撴潫鏂规鎻愪氦 */ @@ -959,7 +959,7 @@ "window.top.hideDialog('10');", SysInfo.Success,"/business/pages/question/myQuestion.html",msg); } - + /** * 璺宠浆鍒板~鍐欑粨灞�鏂规椤甸潰 */ @@ -977,10 +977,10 @@ modelAndView.addObject("ways", ways); modelAndView.addObject("endMsg", endMsg); modelAndView.addObject("question", question); - + return modelAndView; } - + /** * 缁撴灉鏂规鎻愪氦 */ @@ -988,24 +988,24 @@ public ModelAndView endQuestionsubmit(HttpServletRequest request,HttpServletResponse response) { questionFacade.updateEndQuestion(request); String orderId = request.getParameter("orderId"); - + ModelAndView modelAndView = new ModelAndView("/business/pages/question/rechange"); modelAndView.addObject("orderId", orderId); modelAndView.addObject("bustype", Constants.WORKFLOW_BASE_BUSINESS_TYPE_QUESTION); return modelAndView; - + } - + /** * 鏌ヨ閲嶅闂宸ュ崟 */ @RequestMapping("linkwtOrder.html") public ModelAndView linkwtOrder(HttpServletRequest request) { ModelAndView modelAndView = new ModelAndView("/business/pages/question/linkwtOrder"); - + return modelAndView; } - + /** * 鏌ヨ鍏宠仈宸ュ崟 */ @@ -1016,7 +1016,7 @@ modelAndView.addObject("orders", orders); return modelAndView; } - + /** * 闂鍥為��淇℃伅鎻愪氦 * @param request @@ -1032,7 +1032,7 @@ "", SysInfo.Success,"/business/pages/question/myQuestion.html",msg); } - + /** * 宸ュ崟瀹℃牳涓叧闂� */ @@ -1047,30 +1047,30 @@ modelAndView.addObject("question", question); return modelAndView; } - + /** * 宸ュ崟瀹℃牳涓叧闂� */ @RequestMapping(value="closequestion.html", method=RequestMethod.POST) public ModelAndView closequestionsubmit(HttpServletRequest request,HttpServletResponse response) { - + questionFacade.updateResolveType(request); return WebUtil.sysInfoPage(request, "鎿嶄綔鎴愬姛锛�", "window.top.hideDialog('3');", SysInfo.Success,"/business/pages/question/myQuestion.html",null); } - + /** * 璺宠浆鍒拌鍗曟煡鐪嬮〉闈� */ @RequestMapping("questionDetail.html") public ModelAndView incidentDetail(HttpServletRequest request,HttpServletResponse response) { ModelAndView modelAndView = new ModelAndView("/business/pages/question/questionDetail"); - + //鏌ヨ闂鍩烘湰淇℃伅 String orderId = request.getParameter("orderId"); String flowId = request.getParameter("flowId"); - + //閫氳繃宸ュ崟缂栧彿鏌ヨ宸ュ崟鍩烘湰淇℃伅 Map baseMsg = questionFacade.queryQuestionBaseMsg(orderId); String isopen = questionFacade.getIsOpenQuestion(request); @@ -1079,10 +1079,10 @@ modelAndView.addObject("orderId", orderId); modelAndView.addObject("flowId", flowId); modelAndView.addObject("isopen", isopen); - + return modelAndView; } - + /** * 闂澶勭悊鏈嶅姟鎶ュ憡 * @param request @@ -1098,6 +1098,7 @@ String CUSTOMER_ID =ConvertUtil.obj2Str(report.get("CUSTOMER_ID")); if(StringUtil.notEmpty(CUSTOMER_ID)){ SC_PARTNER_CUSTOMER_INFO customer_INFO=new SC_PARTNER_CUSTOMER_INFO(CUSTOMER_ID).getInstanceById(); + if (customer_INFO !=null) report.put("customer_code", customer_INFO.getCustomer_code()); } String FIRST_CATEGORY_ID=ConvertUtil.obj2Str(report.get("FIRST_CATEGORY_ID")); @@ -1122,7 +1123,7 @@ view.addObject("fileList", map.get("fileList")); return view; } - + /** * 閫�鍥炰俊鎭� */ @@ -1133,13 +1134,13 @@ String nodeId = request.getParameter("nodeId"); Map question = new SC_WORKFLOW_QUESTION(orderId).getBeanMapById(); WORKFLOW_NODE node = new WORKFLOW_NODE(nodeId).getInstanceById(); - + Map nodeMsgMap = new WORKFLOW_NODE(node.getSource_node_instance_id()).getBeanMapById(); nodeMsgMap.put("NAME", question.get("NAME")); modelAndView.addObject("nodeMsg", nodeMsgMap); return modelAndView; } - + /** * 宸ュ崟鎸傝捣 */ @@ -1151,29 +1152,29 @@ modelAndView.addObject("ways", ways); return modelAndView; } - + /** * 宸ュ崟鎸傝捣 */ @RequestMapping(value="questiongq.html", method=RequestMethod.POST) public ModelAndView questiongqsubmit(HttpServletRequest request,HttpServletResponse response) { - + questionFacade.updateQuestiongq(request); return WebUtil.sysInfoPage(request, "鎿嶄綔鎴愬姛锛�", "window.top.hideDialog('3');", SysInfo.Success,"/business/pages/question/myQuestion.html",null); } - + /** * 鏌ヨ鎸傝捣鍘嗗彶 */ @RequestMapping("gqhistoryList.html") public ModelAndView gqhistoryList(HttpServletRequest request) { ModelAndView modelAndView = new ModelAndView("/business/pages/question/gqhistoryList"); - + return modelAndView; } - + /** * 鏌ヨ鎸傝捣鍘嗗彶鏁版嵁 */ @@ -1184,7 +1185,7 @@ modelAndView.addObject("gqList", gqList); return modelAndView; } - + /** * 宸ュ崟寮�鍚� */ @@ -1193,7 +1194,7 @@ ModelAndView modelAndView = new ModelAndView("/business/pages/question/questionopen"); return modelAndView; } - + /** * 宸ュ崟寮�鍚� */ @@ -1204,7 +1205,7 @@ "window.top.hideDialog('5');", SysInfo.Success,"/business/pages/question/myQuestion.html",null); } - + /** * 璺宠浆鍒版垜鐨勫伐鍗曟睜椤甸潰 */ @@ -1214,14 +1215,14 @@ String type = request.getParameter("type"); //鏌ヨ宸ュ崟鏁伴噺锛岄�氳繃绫诲瀷鍒ゆ柇鏌ヨ閭g绫诲瀷鐨勬暟閲� Map msgCount = questionFacade.querymyQuestionpoolCount(request); - + System.out.println(JsonUtil.map2Json(msgCount)); - + modelAndView.addObject("c", msgCount); //鏌ヨ宸ュ崟绫诲瀷 Map<String, String> state = Constants.mapWORKFLOW_BASE_BUSINESS_TYPE; List ways = new ArrayList(); - for (Map.Entry<String, String> entry : state.entrySet()) { + for (Map.Entry<String, String> entry : state.entrySet()) { String key = entry.getKey(); String value = entry.getValue(); Map map = new HashMap(); @@ -1235,11 +1236,11 @@ ways.add(map); } modelAndView.addObject("types", ways); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); modelAndView.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("userId", WebUtil.getLoginedUserId(request)); @@ -1248,7 +1249,7 @@ modelAndView.addObject("data", map); return modelAndView; } - + /** * 鏌ヨ鎴戠殑宸ュ崟姹犳暟鎹� */ @@ -1259,11 +1260,11 @@ Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("userId", WebUtil.getLoginedUserId(request)); PageInfo orderList = questionFacade.myquestionpoolData(pageInfo,params); - + modelAndView.addObject("orders", orderList); return modelAndView; } - + /** * 鏌ヨ鎴戠殑宸ュ崟姹犳暟鎹� */ @@ -1275,8 +1276,8 @@ int count = questionFacade.myquestionpoolCount(params); WebUtil.write(response, String.valueOf(count)); } - - + + /** * 浜嬩欢鏈嶅姟鍙伴椤�(鎴戠殑) * @param model @@ -1297,32 +1298,32 @@ model.addAttribute("data", map); return "/business/pages/question/myQuestionIndex"; } - - + + @RequestMapping(value="myQuestionIndexLoad.html") public String myQuestionIndexLoad(Model model,HttpServletRequest request,HttpServletResponse response){ Map<String, String> params = ParamsMapUtil.getParameterMap(request); params.put("userId", WebUtil.getUserId(request)); - + //宸ュ崟姹犻棶棰樻暟閲� - int poolCount = questionFacade.myquestionpoolCount(params); + int poolCount = questionFacade.myquestionpoolCount(params); //寰呭鐞嗛棶棰樻暟閲� params.put("type","1"); - int pendingCount = questionFacade.querymyQuestionOrderNodeCount(params); + int pendingCount = questionFacade.querymyQuestionOrderNodeCount(params); //杩涜涓棶棰樻暟閲� params.put("type","2"); - int inHandCount = questionFacade.querymyQuestionOrderNodeCount(params); + int inHandCount = questionFacade.querymyQuestionOrderNodeCount(params); //宸插鐞� params.put("type","3"); - int processedCount = questionFacade.querymyQuestionOrderNodeCount (params); - + int processedCount = questionFacade.querymyQuestionOrderNodeCount (params); + model.addAttribute("poolCount",poolCount); model.addAttribute("pendingCount",pendingCount); model.addAttribute("inHandCount",inHandCount); model.addAttribute("processedCount",processedCount); return "/business/pages/question/myQuestionIndexLoad"; } - + /** * 鏌ヨ鏈�杩戜竴鏈堥棶棰樻暟閲� * @param request @@ -1344,8 +1345,8 @@ Map<String, String> params = ParamsMapUtil.getParameterMap(request); Map info = questionFacade.getLastMonthQuestionLv(params); WebUtil.write(response, JsonUtil.map2Json(info)); - } - + } + /** * 鏌ヨ鏈�杩戜竴鏈堥棶棰樹紭鍏堢骇鍒嗘瀽 * @param request @@ -1356,8 +1357,8 @@ Map<String, String> params = ParamsMapUtil.getParameterMap(request); Map info = questionFacade.getLastMonthQuestionPri(params); WebUtil.write(response, JsonUtil.map2Json(info)); - } - + } + /** * 鏌ヨ鏈�杩戜竴鏈堥棶棰樺奖鍝嶅害鍒嗘瀽 * @param request @@ -1369,8 +1370,8 @@ Map info = questionFacade.getLastMonthQuestionEffect(params); //System.out.println("json--------------------------"+JsonUtil.map2Json(info)); WebUtil.write(response, JsonUtil.map2Json(info)); - } - + } + /** * 鏌ヨ鏈�杩戜竴鏈堟湇鍔$洰褰曢棶棰樻暟閲� * @param request @@ -1382,8 +1383,8 @@ Map info = questionFacade.getLastMonthQuestionServer(params); WebUtil.write(response, JsonUtil.map2Json(info)); } - - + + /** * 闂寰呭搷搴斿垪琛ㄩ〉闈� * @param request @@ -1399,15 +1400,15 @@ params.put("type", type); //鏌ヨ宸ュ崟鏁伴噺锛岄�氳繃绫诲瀷鍒ゆ柇鏌ヨ閭g绫诲瀷鐨勬暟閲� Map msgCount = questionFacade.querymyQuestionNodeCount(params); - + System.out.println(JsonUtil.map2Json(msgCount)); - + view.addObject("c", msgCount); //鏌ヨ闂绫诲瀷鏁版嵁瀛楀吀 List sources = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - + view.addObject("sources", sources); - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); view.addObject("eventPri", eventPri); @@ -1418,17 +1419,17 @@ //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); - - - + + + params.put("type","2"); Map map = questionFacade.getOrderNum(params); view.addObject("data", map); return view; } - - - + + + /** * 鏌ヨ闂宸ュ崟鍒楄〃鏁版嵁 */ @@ -1443,9 +1444,9 @@ modelAndView.addObject("type", params.get("type")); return modelAndView; } - - - + + + /** * 鏌ヨ闂宸ュ崟鎬绘暟閲� */ @@ -1457,7 +1458,7 @@ int count = questionFacade.querymyQuestionOrderNodeCount(params); WebUtil.write(response, String.valueOf(count)); } - + /** * 闂寰呭搷搴斿垪琛ㄩ〉闈� * @param request @@ -1469,9 +1470,9 @@ ModelAndView view = new ModelAndView("/business/pages/question/myquestionEndList"); //鏌ヨ闂绫诲瀷鏁版嵁瀛楀吀 List sources = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - + view.addObject("sources", sources); - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); view.addObject("eventPri", eventPri); @@ -1479,23 +1480,23 @@ List<Map> eventDg = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_EFFECT_DG); view.addObject("eventDg", eventDg); view.addObject("type", type); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("userId", WebUtil.getLoginedUserId(request)); params.put("type","2"); Map map = questionFacade.getOrderNum(params); view.addObject("data", map); - + return view; } - - - + + + /** * 鏌ヨ闂宸ュ崟鍒楄〃鏁版嵁 */ @@ -1510,9 +1511,9 @@ modelAndView.addObject("type", params.get("type")); return modelAndView; } - - - + + + /** * 鏌ヨ闂宸ュ崟鎬绘暟閲� */ @@ -1524,7 +1525,7 @@ int count = questionFacade.querymyQuestionEndCount(params); WebUtil.write(response, String.valueOf(count)); } - + /** * 闂鍌姙 * @return @@ -1533,7 +1534,7 @@ public String questionRemind(HttpServletRequest request,HttpServletResponse response){ return "/business/pages/question/questionRemind"; } - + @RequestMapping(value="questionRemind.html",method=RequestMethod.POST) public ModelAndView doQuestionRemind(HttpServletRequest request,HttpServletResponse response){ String reminder = WebUtil.getLoginUser(request).getLoginUser().get("ZSXM").toString(); @@ -1544,7 +1545,7 @@ "window.top.hideDialog('0');", SysInfo.Success,""); } - + /** * 鎵�鏈夊伐鍗曟睜 */ @@ -1553,14 +1554,14 @@ ModelAndView modelAndView = new ModelAndView("/business/pages/question/questionpool"); //鏌ヨ宸ュ崟鏁伴噺锛岄�氳繃绫诲瀷鍒ゆ柇鏌ヨ閭g绫诲瀷鐨勬暟閲� Map msgCount = questionFacade.queryQuestionpoolCount(request); - + System.out.println(JsonUtil.map2Json(msgCount)); - + modelAndView.addObject("c", msgCount); //鏌ヨ宸ュ崟绫诲瀷 Map<String, String> state = Constants.mapWORKFLOW_BASE_BUSINESS_TYPE; List ways = new ArrayList(); - for (Map.Entry<String, String> entry : state.entrySet()) { + for (Map.Entry<String, String> entry : state.entrySet()) { String key = entry.getKey(); String value = entry.getValue(); Map map = new HashMap(); @@ -1569,21 +1570,21 @@ ways.add(map); } modelAndView.addObject("types", ways); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); modelAndView.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("type","1"); Map map = questionFacade.getOrderNum(params); modelAndView.addObject("data", map); - - + + return modelAndView; } - + /** * 鏌ヨ鎴戠殑宸ュ崟姹犳暟鎹� */ @@ -1593,11 +1594,11 @@ //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); PageInfo orderList = questionFacade.questionpoolData(pageInfo,params); - + modelAndView.addObject("orders", orderList); return modelAndView; } - + /** * 鏌ヨ鎴戠殑宸ュ崟姹犳暟鎹� */ @@ -1608,7 +1609,7 @@ int count = questionFacade.questionpoolCount(params); WebUtil.write(response, String.valueOf(count)); } - + /** * 闂寰呭搷搴斿垪琛ㄩ〉闈� * @param request @@ -1620,37 +1621,37 @@ ModelAndView view = new ModelAndView("/business/pages/question/questionNodeList"); //鏌ヨ宸ュ崟鏁伴噺锛岄�氳繃绫诲瀷鍒ゆ柇鏌ヨ閭g绫诲瀷鐨勬暟閲� Map msgCount = questionFacade.queryQuestionNodeCount(request); - + System.out.println(JsonUtil.map2Json(msgCount)); - + view.addObject("c", msgCount); //鏌ヨ闂绫诲瀷鏁版嵁瀛楀吀 List sources = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - + view.addObject("sources", sources); - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); view.addObject("eventPri", eventPri); //鏌ヨ浜嬩欢褰卞搷搴︽暟鎹瓧鍏� List<Map> eventDg = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_EFFECT_DG); view.addObject("eventDg", eventDg); - + //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("type","1"); Map map = questionFacade.getOrderNum(params); view.addObject("data", map); - + return view; } - - - + + + /** * 鏌ヨ闂宸ュ崟寰呭搷搴斿垪琛ㄦ暟鎹� */ @@ -1663,9 +1664,9 @@ modelAndView.addObject("orderList", list); return modelAndView; } - - - + + + /** * 鏌ヨ闂宸ュ崟寰呭搷搴旀�绘暟閲� */ @@ -1676,7 +1677,7 @@ int count = questionFacade.queryQuestionOrderNodeCount(params); WebUtil.write(response, String.valueOf(count)); } - + /** * 闂杩涜涓垪琛ㄩ〉闈� * @param request @@ -1688,15 +1689,15 @@ ModelAndView view = new ModelAndView("/business/pages/question/questionJxzList"); //鏌ヨ宸ュ崟鏁伴噺锛岄�氳繃绫诲瀷鍒ゆ柇鏌ヨ閭g绫诲瀷鐨勬暟閲� Map msgCount = questionFacade.queryQuestionJxzNodeCount(request); - + System.out.println(JsonUtil.map2Json(msgCount)); - + view.addObject("c", msgCount); //鏌ヨ闂绫诲瀷鏁版嵁瀛楀吀 List sources = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - + view.addObject("sources", sources); - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); view.addObject("eventPri", eventPri); @@ -1706,7 +1707,7 @@ //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("type","1"); @@ -1714,9 +1715,9 @@ view.addObject("data", map); return view; } - - - + + + /** * 鏌ヨ闂宸ュ崟杩涜涓垪琛ㄦ暟鎹� */ @@ -1729,9 +1730,9 @@ modelAndView.addObject("orderList", list); return modelAndView; } - - - + + + /** * 鏌ヨ闂宸ュ崟杩涜涓�绘暟閲� */ @@ -1742,7 +1743,7 @@ int count = questionFacade.queryQuestionJxzCount(params); WebUtil.write(response, String.valueOf(count)); } - + /** * 闂寰呭搷搴斿垪琛ㄩ〉闈� * @param request @@ -1754,9 +1755,9 @@ ModelAndView view = new ModelAndView("/business/pages/question/questionEndList"); //鏌ヨ闂绫诲瀷鏁版嵁瀛楀吀 List sources = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.QUESTION_SOURCE); - + view.addObject("sources", sources); - + //鏌ヨ璇ュ姞鐩熷晢鐨勪簨浠朵紭鍏堢骇 List<Map> eventPri = dataDictionaryService.getDataDictionaryByCategoryKey(Constants.EVENT_PRI); view.addObject("eventPri", eventPri); @@ -1767,7 +1768,7 @@ //瀹㈡埛鍒楄〃 List<Map> cusList = incidentFacade.getCustomerList(); view.addObject("customers", cusList); - + //瀹氫箟鍙傛暟Map Map<String,String> params = ParamsMapUtil.getParameterMap(request); params.put("type","1"); @@ -1775,9 +1776,9 @@ view.addObject("data", map); return view; } - - - + + + /** * 鏌ヨ闂宸ュ崟鍒楄〃鏁版嵁 */ @@ -1791,9 +1792,9 @@ modelAndView.addObject("type", params.get("type")); return modelAndView; } - - - + + + /** * 鏌ヨ闂宸ュ崟鎬绘暟閲� */ @@ -1804,8 +1805,8 @@ int count = questionFacade.queryQuestionEndCount(params); WebUtil.write(response, String.valueOf(count)); } - - + + /** * 闂棣栭〉 * @param model @@ -1825,23 +1826,23 @@ model.addAttribute("data", map); return "/business/pages/question/questionIndex"; } - - + + @RequestMapping(value="questionIndexLoad.html") public String questionIndexLoad(Model model,HttpServletRequest request,HttpServletResponse response){ Map<String, String> params = ParamsMapUtil.getParameterMap(request); params.put("userId", WebUtil.getUserId(request)); - + //宸ュ崟姹犻棶棰樻暟閲� - int poolCount = questionFacade.questionpoolCount(params); + int poolCount = questionFacade.questionpoolCount(params); //寰呭鐞嗛棶棰樻暟閲� - int pendingCount = questionFacade.queryQuestionOrderNodeCount(params); + int pendingCount = questionFacade.queryQuestionOrderNodeCount(params); //杩涜涓棶棰樻暟閲� - int inHandCount = questionFacade.queryQuestionJxzCount(params); + int inHandCount = questionFacade.queryQuestionJxzCount(params); //宸叉寕璧� params.put("type", "6"); - int sleepCount = questionFacade.queryQuestionEndCount(params); - + int sleepCount = questionFacade.queryQuestionEndCount(params); + model.addAttribute("poolCount",poolCount); model.addAttribute("pendingCount",pendingCount); model.addAttribute("inHandCount",inHandCount); @@ -1856,7 +1857,7 @@ String user = questionFacade.queryQuestionDealer(request); WebUtil.write(response, user); } - + /** * 鏌ヨ闂宸ュ崟澶勭悊浜� */ @@ -1865,5 +1866,5 @@ String user = questionFacade.queryQuestionGroupDealer(request); WebUtil.write(response, user); } - + } -- Gitblit v1.9.1