功能优化

src/main/java/com/minpay/common/service/impl/DianwangServiceImpl.java

@@ -201,8 +201,7 @@ public class DianwangServiceImpl implements IDianwangService {
 			List<DwFileDetail17> resList = db.selectByExample(DwFileDetail17Mapper.class, fileDetail17Example, rows);
 			return resList;
 		}else if (Constant.FILE_DETAIL_TYPE_21.equals(fileType) ) {//
-			List<DwFileDetail21> list = new ArrayList<>();
-			list = db.getMybatisMapper(IYtsqkhzReportMapper.class).selectYtsqkhz(fileId,rows);
+			List<DwFileDetail21> list = db.getMybatisMapper(IYtsqkhzReportMapper.class).selectYtsqkhz(fileId,rows);
 			return list;
 		}else if (Constant.FILE_DETAIL_TYPE_22.equals(fileType) ) {//
 			DwFileDetail18Example fileDetail18Example = new DwFileDetail18Example();
@@ -230,10 +229,8 @@ public class DianwangServiceImpl implements IDianwangService {
 				Constant.FILE_DETAIL_TYPE_29.equals(fileType) ||
 				Constant.FILE_DETAIL_TYPE_30.equals(fileType) ||
 				Constant.FILE_DETAIL_TYPE_31.equals(fileType) ||
-				Constant.FILE_DETAIL_TYPE_32.equals(fileType)
-		) {//
-			List<DwFileDetail27> list = new ArrayList<>();
-			list = db.getMybatisMapper(IGlxgdslqktjReportMapper.class).selectGlxgdslqktj(fileId,fileType,rows);
+				Constant.FILE_DETAIL_TYPE_32.equals(fileType)) {//
+			List<DwFileDetail27> list = db.getMybatisMapper(IGlxgdslqktjReportMapper.class).selectGlxgdslqktj(fileId,fileType,rows);
 			return list;
 		}else if (Constant.FILE_DETAIL_TYPE_33.equals(fileType) ) {//
 			DwFileDetail33Example fileDetail33Example = new DwFileDetail33Example();
@@ -241,12 +238,10 @@ public class DianwangServiceImpl implements IDianwangService {
 			List<DwFileDetail33> resList = db.selectByExample(DwFileDetail33Mapper.class, fileDetail33Example, rows);
 			return resList;
 		}else if (Constant.FILE_DETAIL_TYPE_34.equals(fileType) ) {//
-			List<DwFileDetail34> list = new ArrayList<>();
-			list = db.getMybatisMapper(IQxbzgdtjReportMapper.class).selectQxbzgdtj(fileId,rows);
+			List<DwFileDetail34> list = db.getMybatisMapper(IQxbzgdtjReportMapper.class).selectQxbzgdtj(fileId,rows);
 			return list;
 		}else if (Constant.FILE_DETAIL_TYPE_35.equals(fileType) ) {//
-			List<DwFileDetail35> list = new ArrayList<>();
-			list = db.getMybatisMapper(IQsgzxfsjtjReportMapper.class).selectQsgzxfsjtj(fileId,null,null,rows);
+			List<DwFileDetail35> list = db.getMybatisMapper(IQsgzxfsjtjReportMapper.class).selectQsgzxfsjtj(fileId,null,null,rows);
 			return list;
 		}else if (Constant.FILE_DETAIL_TYPE_98.equals(fileType) ) {//
 			DwFileDetail98Example fileDetail98Example = new DwFileDetail98Example();

src/main/java/com/minpay/common/service/impl/Report95598ServiceImpl.java

@@ -7,10 +7,7 @@ import com.minpay.common.service.IReportService;
 import com.minpay.common.util.*;
 import com.minpay.db.table.mapper.*;
 import com.minpay.db.table.model.*;
-import com.minpay.db.table.own.mapper.ICommMapper;
-import com.minpay.db.table.own.mapper.IReportBatchMapper;
-import com.minpay.db.table.own.mapper.IZb95598ReportMapper;
-import com.minpay.db.table.own.mapper.ReportServiceMapper;
+import com.minpay.db.table.own.mapper.*;
 import com.minpay.reportManage.action.r95598.Util95598zb;
 import com.startup.minpay.frame.business.MINHttpServletRequestContext;
 import com.startup.minpay.frame.exception.MINBusinessException;
@@ -43,12 +40,19 @@ public class Report95598ServiceImpl implements IReport95598Service {
 		String range2 = (String)param.get("range2");
 		String timeRange = (String)param.get("timeRange");
 		String reportTypeId = (String)param.get("reportTypeId");
+		String method =  (String) param.get("method");
+		String page = StringUtil.ObjectToString(param.get("page"));
+		String limit = StringUtil.ObjectToString(param.get("limit"));
 		MINHttpServletRequestContext request = (MINHttpServletRequestContext)param.get("request");
-		Map<String,Object> mm = new HashMap<String,Object>();
+		Map<String,String> mm = new HashMap<String,String>();
 		mm.put("range",range);
 		mm.put("range2",range2);
 		mm.put("timeRange",timeRange);
 		mm.put("reportTypeId",reportTypeId);
+		mm.put("method",method);
+		mm.put("page",page);
+		mm.put("limit",limit);
+
 		Map<String, Object> resMap = new HashMap<String, Object>();
 		if(Constant.REPORT_TYPE_20.equals(reportTypeId)){//95598日报
 			Map<String,Object> resList = reportType95598Zb(mm, request);
@@ -72,177 +76,174 @@ public class Report95598ServiceImpl implements IReport95598Service {
 	 * @param request
 	 * @return
 	 */
-	private Map<String, Object> reportType95598Zb(Map<String, Object> mm, MINHttpServletRequestContext request) throws MINBusinessException {
+	private Map<String, Object> reportType95598Zb(Map<String, String> mm, MINHttpServletRequestContext request) throws MINBusinessException {
 		IMINDataBaseService db = Service.lookup(IMINDataBaseService.class);
 		String range = StringUtil.ObjectToString(mm.get("range"));
 		String range2 = StringUtil.ObjectToString(mm.get("range2"));
 		String timeRange = StringUtil.ObjectToString(mm.get("timeRange"));
+		String method = StringUtil.ObjectToString(mm.get("method"));
 		//本周
-		String start = StringUtil.getStartAndEndDatetime(range,timeRange,"1");
-		String end = StringUtil.getStartAndEndDatetime(range,timeRange,"2");
+		String start = StringUtil.getStartAndEndDatetime(range, timeRange, "1");
+		String end = StringUtil.getStartAndEndDatetime(range, timeRange, "2");
 		//上周
-		String start2 = StringUtil.getStartAndEndDatetime(range2,timeRange,"1");
-		String end2 = StringUtil.getStartAndEndDatetime(range2,timeRange,"2");
+		String start2 = StringUtil.getStartAndEndDatetime(range2, timeRange, "1");
+		String end2 = StringUtil.getStartAndEndDatetime(range2, timeRange, "2");
 		//当年时间范围
-		Calendar calendar =  Calendar.getInstance();
+		Calendar calendar = Calendar.getInstance();
 		Integer year = calendar.get(Calendar.YEAR);
 		String range3 = year + "-01-01~" + year + "-12-31";
 
-		String start3 = StringUtil.getStartAndEndDatetime(range3,timeRange,"1");
-		String end3 = StringUtil.getStartAndEndDatetime(range3,timeRange,"2");
-		mm.put("start",start);
-		mm.put("end",end);
-		mm.put("start2",start2);
-		mm.put("end2",end2);
-		mm.put("start3",start3);
-		mm.put("end3",end3);
-		//单位别名翻译
-		List<Map<String,String>> unitMapp = db.getMybatisMapper(ICommMapper.class).selectUnitMapps(mm);
-		//查询工单业务类型
-		mm.put("DICT_GCODE","95598GDLX");
-		List<Map<String,String>> gdMapp = db.getMybatisMapper(ICommMapper.class).selectGdType(mm);
-		//查询意见工单提及类型
-		mm.put("DICT_GCODE","95598TJLX");
-		List<Map<String,String>> gdMapp2 = db.getMybatisMapper(ICommMapper.class).selectGdType(mm);
-		//***********************************************95598业务受理情况********************************************//
-		//单位维度数据
-		List<Map<String,String>> list = db.getMybatisMapper(IZb95598ReportMapper.class).selectBeforeIndex(mm);
-		List<Map<String,String>> list22 = db.getMybatisMapper(IZb95598ReportMapper.class).selectBeforeIndex(mm);
-		List<Map<String,String>> indexList6 = db.getMybatisMapper(IZb95598ReportMapper.class).selectBeforeIndex(mm);
-
-//		List<Map<String,String>> list22 = new ArrayList<>();
-//		CollectionUtils.addAll(list22, new Object[list.size()]);
-//		Collections.copy(list22, list);
-		//分类明细汇总数据
-		List<Map<String,String>> list2 = db.getMybatisMapper(IZb95598ReportMapper.class).selectFltjYwsl(mm);
-		Map<String,String> temp;
-		Map<String,String> descMap1 = new HashMap<>();
-		//统计报表展示-受理情况
-		if(list != null){
-			for (int i = 0; i < list.size(); i++) {
-				temp = list.get(i);
-				Util95598zb.operateData(temp,list2,unitMapp,gdMapp);//按单位统计
-			}
-			Map<String,String> mapHjSlqk = new HashMap<>();
-			Map<String,String> mapHjSlqkTemp;
-			//追加合计行
-			for (int j = 0; j < list.size(); j++) {
-				mapHjSlqkTemp = list.get(j);
-				mapHjSlqk.put("ORZ_NAME","合计");
-				for (int i = 0; i < gdMapp.size(); i++) {
-					String key = gdMapp.get(i).get("DICT_CODE");
-					mapHjSlqk.put(key,ArithUtils.addToInt(mapHjSlqk.get(key),mapHjSlqkTemp.get(key)) + "");
+		String start3 = StringUtil.getStartAndEndDatetime(range3, timeRange, "1");
+		String end3 = StringUtil.getStartAndEndDatetime(range3, timeRange, "2");
+		mm.put("start", start);
+		mm.put("end", end);
+		mm.put("start2", start2);
+		mm.put("end2", end2);
+		mm.put("start3", start3);
+		mm.put("end3", end3);
+		Map<String, Object> rstMap = new HashMap<>();
+
+		if ("".equals(method) || "".equals(StringUtil.ObjectToString(method))) {
+			//单位别名翻译
+			List<Map<String, String>> unitMapp = db.getMybatisMapper(ICommMapper.class).selectUnitMapps(mm);
+			//查询工单业务类型
+			mm.put("DICT_GCODE", "95598GDLX");
+			List<Map<String, String>> gdMapp = db.getMybatisMapper(ICommMapper.class).selectGdType(mm);
+			//查询意见工单提及类型
+			mm.put("DICT_GCODE", "95598TJLX");
+			List<Map<String, String>> gdMapp2 = db.getMybatisMapper(ICommMapper.class).selectGdType(mm);
+			//***********************************************95598业务受理情况********************************************//
+			//单位维度数据
+			List<Map<String, String>> list = db.getMybatisMapper(IZb95598ReportMapper.class).selectBeforeIndex(mm);
+			List<Map<String, String>> list22 = db.getMybatisMapper(IZb95598ReportMapper.class).selectBeforeIndex(mm);
+			List<Map<String, String>> indexList6 = db.getMybatisMapper(IZb95598ReportMapper.class).selectBeforeIndex(mm);
+
+	//		List<Map<String,String>> list22 = new ArrayList<>();
+	//		CollectionUtils.addAll(list22, new Object[list.size()]);
+	//		Collections.copy(list22, list);
+			//分类明细汇总数据
+			List<Map<String, String>> list2 = db.getMybatisMapper(IZb95598ReportMapper.class).selectFltjYwsl(mm);
+			Map<String, String> temp;
+			Map<String, String> descMap1 = new HashMap<>();
+			//统计报表展示-受理情况
+			if (list != null) {
+				for (int i = 0; i < list.size(); i++) {
+					temp = list.get(i);
+					Util95598zb.operateData(temp, list2, unitMapp, gdMapp);//按单位统计
 				}
-				mapHjSlqk.put("TOTAL",ArithUtils.addToInt(mapHjSlqk.get("TOTAL"),mapHjSlqkTemp.get("TOTAL")) + "");
-				mapHjSlqk.put("HS_NUM",ArithUtils.addToInt(mapHjSlqk.get("HS_NUM"),mapHjSlqkTemp.get("HS_NUM")) + "");
-			}
-			list.add(mapHjSlqk);
-			//描述信息-受理情况
-			Util95598zb.operateYwslDescData(descMap1,list,list2,unitMapp,gdMapp);//按单位统计
-		}
-		Map<String,Object> rstMap = new HashMap<>();
-		rstMap.put("list1",list);
-		rstMap.put("desc1",descMap1.get("desc1"));
-		//***********************************************投诉受理情况-暂无********************************************//
-
-		//***********************************************意见敏感督办情况********************************************//
-		List<Map<String,String>> yjgdList = db.getMybatisMapper(IZb95598ReportMapper.class).selectFltjYjgd(mm);
-		Map<String,String> temp3;
-		Map<String,String> descMap3 = new HashMap<>();
-
-		if(yjgdList != null){
-			for (int i = 0; i < list22.size(); i++) {
-				temp3 = list22.get(i);
-				Util95598zb.operateYjData(temp3,yjgdList,unitMapp,gdMapp2);//按单位统计
-			}
-			//追加合计行
-			Map<String,String> mapHjSlqk = new HashMap<>();
-			Map<String,String> mapHjSlqkTemp;
-			for (int j = 0; j < list22.size(); j++) {
-				mapHjSlqkTemp = list22.get(j);
-				mapHjSlqk.put("ORZ_NAME","合计");
-				for (int i = 0; i < gdMapp2.size(); i++) {
-					String key = gdMapp2.get(i).get("DICT_CODE");
-					if("A000105".equals(key)) {
-						mapHjSlqk.put("ND_"+key,ArithUtils.addToInt(mapHjSlqk.get("ND_"+key),mapHjSlqkTemp.get("ND_"+key)) + "");
-						mapHjSlqk.put("ZD_"+key,ArithUtils.addToInt(mapHjSlqk.get("ZD_"+key),mapHjSlqkTemp.get("ZD_"+key)) + "");
-						mapHjSlqk.put("SZD_"+key,ArithUtils.addToInt(mapHjSlqk.get("SZD_"+key),mapHjSlqkTemp.get("SZD_"+key)) + "");
-					}else{
-						mapHjSlqk.put("ND_"+key,ArithUtils.addToInt(mapHjSlqk.get("ND_"+key),mapHjSlqkTemp.get("ND_"+key)) + "");
-						mapHjSlqk.put("ZD_"+key,ArithUtils.addToInt(mapHjSlqk.get("ZD_"+key),mapHjSlqkTemp.get("ZD_"+key)) + "");
+				Map<String, String> mapHjSlqk = new HashMap<>();
+				Map<String, String> mapHjSlqkTemp;
+				//追加合计行
+				for (int j = 0; j < list.size(); j++) {
+					mapHjSlqkTemp = list.get(j);
+					mapHjSlqk.put("ORZ_NAME", "合计");
+					for (int i = 0; i < gdMapp.size(); i++) {
+						String key = gdMapp.get(i).get("DICT_CODE");
+						mapHjSlqk.put(key, ArithUtils.addToInt(mapHjSlqk.get(key), mapHjSlqkTemp.get(key)) + "");
 					}
+					mapHjSlqk.put("TOTAL", ArithUtils.addToInt(mapHjSlqk.get("TOTAL"), mapHjSlqkTemp.get("TOTAL")) + "");
+					mapHjSlqk.put("HS_NUM", ArithUtils.addToInt(mapHjSlqk.get("HS_NUM"), mapHjSlqkTemp.get("HS_NUM")) + "");
 				}
-				//追加户数统计
-				mapHjSlqk.put("HS_NUM",ArithUtils.addToInt(mapHjSlqk.get("HS_NUM"),mapHjSlqkTemp.get("HS_NUM")) + "");
-				//追加万户量统计
-				mapHjSlqk.put("WHSYJ",ArithUtils.div(ArithUtils.mul(mapHjSlqk.get("ND_A000105"),"1000"),mapHjSlqk.get("HS_NUM"))+"");
+				list.add(mapHjSlqk);
+				//描述信息-受理情况
+				Util95598zb.operateYwslDescData(descMap1, list, list2, unitMapp, gdMapp);//按单位统计
 			}
-			list22.add(mapHjSlqk);
-			//描述信息-受理情况
-			Util95598zb.operateYjDescData(descMap3,list22,null,unitMapp,gdMapp2);//按单位统计
-		}
-		rstMap.put("list3",list22);
-		rstMap.put("desc3",descMap3.get("desc3"));
-		//***********************************************12398受理情况-暂无********************************************//
-		//***********************************************客户常态走访情况-暂无********************************************//
-		//***********************************************95598业务处理满意度********************************************//
-		List<Map<String,String>> mydList = db.getMybatisMapper(IZb95598ReportMapper.class).selectMydgdk(mm);
-		Map<String,String> temp6;
-		Map<String,String> tempDesc6 = new HashMap<>();
-		String tempOrz = "";
-		if(mydList != null){
-			for (int i = 0; i < indexList6.size(); i++) {
-				temp6 = indexList6.get(i);
-				tempOrz = temp6.get("ORZ_ID");
-				if(MAP.containsKey(tempOrz)){
-					indexList6.remove(i);
-					i --;
-					continue;
+			rstMap.put("list1", list);
+			rstMap.put("desc1", descMap1.get("desc1"));
+			//***********************************************投诉受理情况-暂无********************************************//
+
+			//***********************************************意见敏感督办情况********************************************//
+			List<Map<String, String>> yjgdList = db.getMybatisMapper(IZb95598ReportMapper.class).selectFltjYjgd(mm);
+			Map<String, String> temp3;
+			Map<String, String> descMap3 = new HashMap<>();
+
+			if (yjgdList != null) {
+				for (int i = 0; i < list22.size(); i++) {
+					temp3 = list22.get(i);
+					Util95598zb.operateYjData(temp3, yjgdList, unitMapp, gdMapp2);//按单位统计
 				}
-				Util95598zb.operateMydData(temp6,mydList,unitMapp,gdMapp);
+				//追加合计行
+				Map<String, String> mapHjSlqk = new HashMap<>();
+				Map<String, String> mapHjSlqkTemp;
+				for (int j = 0; j < list22.size(); j++) {
+					mapHjSlqkTemp = list22.get(j);
+					mapHjSlqk.put("ORZ_NAME", "合计");
+					for (int i = 0; i < gdMapp2.size(); i++) {
+						String key = gdMapp2.get(i).get("DICT_CODE");
+						if ("A000105".equals(key)) {
+							mapHjSlqk.put("ND_" + key, ArithUtils.addToInt(mapHjSlqk.get("ND_" + key), mapHjSlqkTemp.get("ND_" + key)) + "");
+							mapHjSlqk.put("ZD_" + key, ArithUtils.addToInt(mapHjSlqk.get("ZD_" + key), mapHjSlqkTemp.get("ZD_" + key)) + "");
+							mapHjSlqk.put("SZD_" + key, ArithUtils.addToInt(mapHjSlqk.get("SZD_" + key), mapHjSlqkTemp.get("SZD_" + key)) + "");
+						} else {
+							mapHjSlqk.put("ND_" + key, ArithUtils.addToInt(mapHjSlqk.get("ND_" + key), mapHjSlqkTemp.get("ND_" + key)) + "");
+							mapHjSlqk.put("ZD_" + key, ArithUtils.addToInt(mapHjSlqk.get("ZD_" + key), mapHjSlqkTemp.get("ZD_" + key)) + "");
+						}
+					}
+					//追加户数统计
+					mapHjSlqk.put("HS_NUM", ArithUtils.addToInt(mapHjSlqk.get("HS_NUM"), mapHjSlqkTemp.get("HS_NUM")) + "");
+					//追加万户量统计
+					mapHjSlqk.put("WHSYJ", ArithUtils.div(ArithUtils.mul(mapHjSlqk.get("ND_A000105"), "1000"), mapHjSlqk.get("HS_NUM")) + "");
+				}
+				list22.add(mapHjSlqk);
+				//描述信息-受理情况
+				Util95598zb.operateYjDescData(descMap3, list22, null, unitMapp, gdMapp2);//按单位统计
 			}
-			//追加合计行
-			Map<String,String> mapHjMyd = new HashMap<>();
-			Map<String,String> mapHjMydTemp;
-			for (int j = 0; j < indexList6.size(); j++) {
-				mapHjMydTemp = indexList6.get(j);
-				mapHjMyd.put("ORZ_NAME","合计");
-				mapHjMyd.put("BDWHZ",ArithUtils.addToInt(mapHjMydTemp.get("BDWHZ"),mapHjMyd.get("BDWHZ")).toString());
-				mapHjMyd.put("CPGDS",ArithUtils.addToInt(mapHjMydTemp.get("CPGDS"),mapHjMyd.get("CPGDS")).toString());
-
-				mapHjMyd.put("QXLSL",ArithUtils.addToInt(mapHjMydTemp.get("QXLSL"),mapHjMyd.get("QXLSL")) + "");
-				mapHjMyd.put("FQXLSL",ArithUtils.addToInt(mapHjMydTemp.get("FQXLSL"),mapHjMyd.get("FQXLSL")) + "");
-
-				mapHjMyd.put("QXLZB",ArithUtils.div3(mapHjMyd.get("QXLSL"),mapHjMyd.get("BDWHZ")) + "");
-				mapHjMyd.put("FQXLZB",ArithUtils.div3(mapHjMyd.get("FQXLSL"),mapHjMyd.get("BDWHZ")) + "");
-
-				mapHjMyd.put("CPLHJ",ArithUtils.div3(mapHjMyd.get("CPGDS"),mapHjMyd.get("BDWHZ")));
-				mapHjMyd.put("BDWBMYHZ",ArithUtils.addToInt(mapHjMydTemp.get("BDWBMYHZ"),mapHjMyd.get("BDWBMYHZ")) + "");
-
-				mapHjMyd.put("QXMYS",ArithUtils.addToInt(mapHjMydTemp.get("QXMYS"),mapHjMyd.get("QXMYS")) + "");
-				mapHjMyd.put("QXBMYS",ArithUtils.addToInt(mapHjMydTemp.get("QXBMYS"),mapHjMyd.get("QXBMYS")) + "");
-				mapHjMyd.put("FQXMYS",ArithUtils.addToInt(mapHjMydTemp.get("FQXMYS"),mapHjMyd.get("FQXMYS")) + "");
-				mapHjMyd.put("FQXBMYS",ArithUtils.addToInt(mapHjMydTemp.get("FQXBMYS"),mapHjMyd.get("FQXBMYS")) + "");
-
-				mapHjMyd.put("QXLMYD",ArithUtils.div3(mapHjMyd.get("QXMYS"),ArithUtils.addToInt(mapHjMyd.get("QXMYS"),mapHjMyd.get("QXBMYS"))));
-				mapHjMyd.put("FQXLMYD",ArithUtils.div3(mapHjMyd.get("FQXMYS"),ArithUtils.addToInt(mapHjMyd.get("FQXMYS"),mapHjMyd.get("FQXBMYS"))));
-				mapHjMyd.put("BDWBMYHZHJ",ArithUtils.div3(ArithUtils.add(mapHjMyd.get("QXMYS"),mapHjMyd.get("FQXMYS")),mapHjMyd.get("CPGDS")));
+			rstMap.put("list3", list22);
+			rstMap.put("desc3", descMap3.get("desc3"));
+			//***********************************************12398受理情况-暂无********************************************//
+			//***********************************************客户常态走访情况-暂无********************************************//
+			//***********************************************95598业务处理满意度********************************************//
+			List<Map<String, String>> mydList = db.getMybatisMapper(IZb95598ReportMapper.class).selectMydgdk(mm);
+			Map<String, String> temp6;
+			Map<String, String> tempDesc6 = new HashMap<>();
+			String tempOrz = "";
+			if (mydList != null) {
+				for (int i = 0; i < indexList6.size(); i++) {
+					temp6 = indexList6.get(i);
+					tempOrz = temp6.get("ORZ_ID");
+					if (MAP.containsKey(tempOrz)) {
+						indexList6.remove(i);
+						i--;
+						continue;
+					}
+					Util95598zb.operateMydData(temp6, mydList, unitMapp, gdMapp);
+				}
+				//追加合计行
+				Map<String, String> mapHjMyd = new HashMap<>();
+				Map<String, String> mapHjMydTemp;
+				for (int j = 0; j < indexList6.size(); j++) {
+					mapHjMydTemp = indexList6.get(j);
+					mapHjMyd.put("ORZ_NAME", "合计");
+					mapHjMyd.put("BDWHZ", ArithUtils.addToInt(mapHjMydTemp.get("BDWHZ"), mapHjMyd.get("BDWHZ")).toString());
+					mapHjMyd.put("CPGDS", ArithUtils.addToInt(mapHjMydTemp.get("CPGDS"), mapHjMyd.get("CPGDS")).toString());
+
+					mapHjMyd.put("QXLSL", ArithUtils.addToInt(mapHjMydTemp.get("QXLSL"), mapHjMyd.get("QXLSL")) + "");
+					mapHjMyd.put("FQXLSL", ArithUtils.addToInt(mapHjMydTemp.get("FQXLSL"), mapHjMyd.get("FQXLSL")) + "");
+
+					mapHjMyd.put("QXLZB", ArithUtils.div3(mapHjMyd.get("QXLSL"), mapHjMyd.get("BDWHZ")) + "");
+					mapHjMyd.put("FQXLZB", ArithUtils.div3(mapHjMyd.get("FQXLSL"), mapHjMyd.get("BDWHZ")) + "");
+
+					mapHjMyd.put("CPLHJ", ArithUtils.div3(mapHjMyd.get("CPGDS"), mapHjMyd.get("BDWHZ")));
+					mapHjMyd.put("BDWBMYHZ", ArithUtils.addToInt(mapHjMydTemp.get("BDWBMYHZ"), mapHjMyd.get("BDWBMYHZ")) + "");
+
+					mapHjMyd.put("QXMYS", ArithUtils.addToInt(mapHjMydTemp.get("QXMYS"), mapHjMyd.get("QXMYS")) + "");
+					mapHjMyd.put("QXBMYS", ArithUtils.addToInt(mapHjMydTemp.get("QXBMYS"), mapHjMyd.get("QXBMYS")) + "");
+					mapHjMyd.put("FQXMYS", ArithUtils.addToInt(mapHjMydTemp.get("FQXMYS"), mapHjMyd.get("FQXMYS")) + "");
+					mapHjMyd.put("FQXBMYS", ArithUtils.addToInt(mapHjMydTemp.get("FQXBMYS"), mapHjMyd.get("FQXBMYS")) + "");
+
+					mapHjMyd.put("QXLMYD", ArithUtils.div3(mapHjMyd.get("QXMYS"), ArithUtils.addToInt(mapHjMyd.get("QXMYS"), mapHjMyd.get("QXBMYS"))));
+					mapHjMyd.put("FQXLMYD", ArithUtils.div3(mapHjMyd.get("FQXMYS"), ArithUtils.addToInt(mapHjMyd.get("FQXMYS"), mapHjMyd.get("FQXBMYS"))));
+					mapHjMyd.put("BDWBMYHZHJ", ArithUtils.div3(ArithUtils.add(mapHjMyd.get("QXMYS"), mapHjMyd.get("FQXMYS")), mapHjMyd.get("CPGDS")));
+				}
+				indexList6.add(mapHjMyd);
+				//描述信息-满意度
+				Util95598zb.operateMydDescData(tempDesc6, indexList6, null, unitMapp, gdMapp);//按单位统计
 			}
-			indexList6.add(mapHjMyd);
-			//描述信息-满意度
-			Util95598zb.operateMydDescData(tempDesc6,indexList6,null,unitMapp,gdMapp);//按单位统计
+			rstMap.put("list6", indexList6);
+			rstMap.put("desc6", tempDesc6.get("desc6"));
+			return rstMap;
 		}
-		rstMap.put("list6",indexList6);
-		rstMap.put("desc6",tempDesc6.get("desc6"));
-		//***********************************************本周意见工单重复督办明细********************************************//
-		mm.put("cfdbindex","1");
-		List<Map<String,String>> cfdbList = db.getMybatisMapper(IZb95598ReportMapper.class).selectCfdbmx(mm);
-		rstMap.put("list7",cfdbList);
-		//***********************************************本周不满意工单明细********************************************//
-		mm.put("bmyd","1");
-		List<Map<String,String>> bmyList = db.getMybatisMapper(IZb95598ReportMapper.class).selectBmymx(mm);
-		rstMap.put("list8",bmyList);
-		return rstMap;
+		return new HashMap<>();
 	}
 
 	@Override

src/main/java/com/minpay/db/table/own/mapper/ICommMapper.java

@@ -13,7 +13,7 @@ public interface ICommMapper extends IMINMybatisMapper {
      * @param mm
      * @return
      */
-    List<Map<String, String>> selectUnitMapps(Map<String, Object> mm);
+    List<Map<String, String>> selectUnitMapps(Map<String, String> mm);
 
-    List<Map<String, String>> selectGdType(Map<String, Object> mm);
+    List<Map<String, String>> selectGdType(Map<String, String> mm);
 }

src/main/java/com/minpay/db/table/own/mapper/IGdgdhzReportMapper.java

@@ -2,10 +2,14 @@ package com.minpay.db.table.own.mapper;
 import com.minpay.db.table.model.DwFileDetail20;
 import com.startup.minpay.frame.jdbc.IMINMybatisMapper;
 import com.startup.minpay.frame.jdbc.MINRowBounds;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IGdgdhzReportMapper extends IMINMybatisMapper {
 
-    List<DwFileDetail20> selectYtsqkhz(String fileId, MINRowBounds rows);
+
+    List<DwFileDetail20> selectGdgdmx(@Param("param")Map<String, String> mm, MINRowBounds rows);
+
 }

src/main/java/com/minpay/db/table/own/mapper/IQqdkhsqtjgdtzReportMapper.java

@@ -2,10 +2,13 @@ package com.minpay.db.table.own.mapper;
 import com.minpay.db.table.model.DwFileDetail18;
 import com.startup.minpay.frame.jdbc.IMINMybatisMapper;
 import com.startup.minpay.frame.jdbc.MINRowBounds;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IQqdkhsqtjgdtzReportMapper extends IMINMybatisMapper {
 
-    List<DwFileDetail18> selectYtsqkhz(String fileId, MINRowBounds rows);
+
+    List<DwFileDetail18> selectQqdkhsqtjgdtz(@Param("param") Map<String,String> param, MINRowBounds rows);
 }

src/main/java/com/minpay/db/table/own/mapper/IYtsqkhzReportMapper.java

@@ -3,12 +3,13 @@ import com.minpay.db.table.model.DwFileDetail21;
 import com.minpay.db.table.model.DwFileDetail34;
 import com.startup.minpay.frame.jdbc.IMINMybatisMapper;
 import com.startup.minpay.frame.jdbc.MINRowBounds;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
 public interface IYtsqkhzReportMapper extends IMINMybatisMapper {
 
-    List<DwFileDetail21> selectYtsqkhz(String fileId, MINRowBounds rows);
+    List<DwFileDetail21> selectYtsqkhz(@Param("fileId")String fileId, MINRowBounds rows);
 
 }

src/main/java/com/minpay/db/table/own/mapper/IZb95598ReportMapper.java

@@ -1,5 +1,7 @@
 package com.minpay.db.table.own.mapper;
 import com.startup.minpay.frame.jdbc.IMINMybatisMapper;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -10,40 +12,26 @@ public interface IZb95598ReportMapper extends IMINMybatisMapper {
      * @param mm
      * @return
      */
-    List<Map<String, String>> selectBeforeIndex(Map<String, Object> mm);
+    List<Map<String, String>> selectBeforeIndex(Map<String, String> mm);
 
     /**
      * 分类统计-业务受理
      * @param mm
      * @return
      */
-    List<Map<String, String>> selectFltjYwsl(Map<String, Object> mm);
+    List<Map<String, String>> selectFltjYwsl(Map<String, String> mm);
 
     /**
      * 分类统计-意见工单
      * @param mm
      * @return
      */
-    List<Map<String, String>> selectFltjYjgd(Map<String, Object> mm);
+    List<Map<String, String>> selectFltjYjgd(Map<String, String> mm);
 
     /**
      * 业务处理满意度
      * @param mm
      * @return
      */
-    List<Map<String, String>> selectMydgdk(Map<String, Object> mm);
-
-    /**
-     * 重复督办明细
-     * @param mm
-     * @return
-     */
-    List<Map<String, String>> selectCfdbmx(Map<String, Object> mm);
-
-    /**
-     * 不满意明细
-     * @param mm
-     * @return
-     */
-    List<Map<String, String>> selectBmymx(Map<String, Object> mm);
+    List<Map<String, String>> selectMydgdk(Map<String, String> mm);
 }

src/main/java/com/minpay/reportManage/action/DataWareManageAction.java

@@ -2004,7 +2004,9 @@ public class DataWareManageAction implements IMINAction {
 			List<DwFileDetail18> list = new ArrayList<>();
 			MINRowBounds rows = new MINRowBounds();
 			rows.setSeparateSql(false);
-			list = db.getMybatisMapper(IQqdkhsqtjgdtzReportMapper.class).selectYtsqkhz(fileId,rows);
+			Map<String,String> param = new HashMap<>();
+			param.put("fileId",fileId);
+			list = db.getMybatisMapper(IQqdkhsqtjgdtzReportMapper.class).selectQqdkhsqtjgdtz(param,rows);
 			String title = "全渠道客户诉求提级工单台账";
 			ExportExcelUtil<DwFileDetail18> util = new ExportExcelUtil<DwFileDetail18>();
 			String[] header = {"系统编号", "原EXCEL编号 ", "国网工单编号 ", "提级类型 ", "业务类型 ", "受理时间 ", "受理内容 ",
@@ -2033,7 +2035,9 @@ public class DataWareManageAction implements IMINAction {
 			List<DwFileDetail20> list = new ArrayList<>();
 			MINRowBounds rows = new MINRowBounds();
 			rows.setSeparateSql(false);
-			list = db.getMybatisMapper(IGdgdhzReportMapper.class).selectYtsqkhz(fileId,rows);
+			Map<String,String> param = new HashMap<>();
+			param.put("fileId",fileId);
+			list = db.getMybatisMapper(IGdgdhzReportMapper.class).selectGdgdmx(param,rows);
 			String title = "归档工单汇总";
 			ExportExcelUtil<DwFileDetail20> util = new ExportExcelUtil<DwFileDetail20>();
 			String[] header = {"系统编号","申请编号", "当前环节", "单位名称（省）", "单位名称（地市）", "供电单位", "旧单位",

src/main/java/com/minpay/reportManage/action/r95598/Zb95598ReportAction.java

@@ -9,10 +9,10 @@ import com.minpay.common.util.DateUtil;
 import com.minpay.common.util.ExportUtils;
 import com.minpay.common.util.StringUtil;
 import com.minpay.db.table.mapper.DwReportInfMapper;
+import com.minpay.db.table.model.DwFileDetail18;
+import com.minpay.db.table.model.DwFileDetail20;
 import com.minpay.db.table.model.DwReportInf;
-import com.minpay.db.table.own.mapper.IReportBatchMapper;
-import com.minpay.db.table.own.mapper.ReportManageMapper;
-import com.minpay.db.table.own.mapper.SequenceMapper;
+import com.minpay.db.table.own.mapper.*;
 import com.startup.minpay.frame.business.IMINAction;
 import com.startup.minpay.frame.business.res.MINActionResult;
 import com.startup.minpay.frame.constant.IMINBusinessConstant;
@@ -25,6 +25,7 @@ import com.startup.minpay.frame.session.MINSession;
 import com.startup.minpay.frame.target.MINAction;
 import com.startup.minpay.frame.target.MINComponent;
 import com.startup.minpay.frame.target.MINParam;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
@@ -113,8 +114,11 @@ public class Zb95598ReportAction implements IMINAction {
     @MINAction(value = REPORT_NEED_DATA_DETAIL2)
     public MINActionResult reportNeedDataDetail2(
             @MINParam(key = "reportId") String reportId,
-            @MINParam(key = "reportType") String reportType
-    ) throws MINBusinessException, ParseException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InvalidFormatException, IOException {
+            @MINParam(key = "reportType") String reportType,
+            @MINParam(key = "method") String method,
+            @MINParam(key = "page", defaultValue = "1") int page,
+            @MINParam(key = "limit", defaultValue = "100") int limit
+            ) throws MINBusinessException, SecurityException, IllegalArgumentException {
         MINActionResult res = new MINActionResult();
         db = Service.lookup(IMINDataBaseService.class);
 
@@ -122,6 +126,9 @@ public class Zb95598ReportAction implements IMINAction {
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("reportId", reportId);
         param.put("reportTypeId",reportType);
+        param.put("method",method);
+        param.put("page",page);
+        param.put("limit",limit);
         if("N95598RB".equals(reportType) || "N95598RHB".equals(reportType)){
             param.put("timeType","00");
         }else{
@@ -141,9 +148,39 @@ public class Zb95598ReportAction implements IMINAction {
             param.put("range2","1900-01-01~1900-01-01") ;
             param.put("timeRange","00:00:00~23：59：59");
         }
-        Map<String, Object> resMap = Service.lookup(IReport95598Service.class).reportNeedDetail(param);
-        resMap.put("fileName",fileName);
-        res.set(IMINBusinessConstant.F_PAGING_LAY, resMap);
+        if ("cfdbmx".equals(method)) {//重复督办明细
+            //***********************************************本周意见工单重复督办明细********************************************//
+            //本周
+            String start = StringUtil.getStartAndEndDatetime(param.get("range"), param.get("timeRange"), "1");
+            String end = StringUtil.getStartAndEndDatetime(param.get("range"), param.get("timeRange"), "2");
+            Map<String,String> mm = new HashedMap();
+            MINRowBounds rows = new MINRowBounds(page, limit);
+            rows.setSeparateSql(true);
+            mm.put("start",start);
+            mm.put("end",end);
+            mm.put("cfdbindex", "1");
+            List<DwFileDetail18> cfdbList = db.getMybatisMapper(IQqdkhsqtjgdtzReportMapper.class).selectQqdkhsqtjgdtz(mm,rows);
+            res.set(IMINBusinessConstant.F_PAGING_LAY, cfdbList);
+            res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+        } else if ("bzbmy".equals(method)) {//不满意
+            //***********************************************本周不满意工单明细********************************************//
+            //本周
+            String start = StringUtil.getStartAndEndDatetime(param.get("range"), param.get("timeRange"), "1");
+            String end = StringUtil.getStartAndEndDatetime(param.get("range"), param.get("timeRange"), "2");
+            MINRowBounds rows = new MINRowBounds(page, limit);
+            rows.setSeparateSql(true);
+            Map<String,String> mm = new HashedMap();
+            mm.put("start",start);
+            mm.put("end",end);
+            mm.put("bmydindex", "1");
+            List<DwFileDetail20> bmyList = db.getMybatisMapper(IGdgdhzReportMapper.class).selectGdgdmx(mm,rows);
+            res.set(IMINBusinessConstant.F_PAGING_LAY, bmyList);
+            res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+        }else{
+            Map<String, Object> resMap = Service.lookup(IReport95598Service.class).reportNeedDetail(param);
+            resMap.put("fileName",fileName);
+            res.set(IMINBusinessConstant.F_PAGING_LAY, resMap);
+        }
         return res;
     }
 

src/main/resources/com/minpay/db/table/own/mapper/IGdgdhzReportMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.minpay.db.table.own.mapper.IGdgdhzReportMapper">
-	<select id="selectYtsqkhz" parameterType="map" resultType="com.minpay.db.table.model.DwFileDetail20">
+	<select id="selectGdgdmx" parameterType="map" resultType="com.minpay.db.table.model.DwFileDetail20">
 		SELECT  DFD20_ID       id      ,
 		DFD20_SQBH     sqbh    ,
 		DFD20_DQHJ     dqhj    ,
@@ -46,11 +46,20 @@
 		DFD20_SLNR2    slnr2   ,
 		DFD20_CLMYD    clmyd   ,
 		DFD20_BMYYY    bmyyy   FROM dw_file_detail_20 where 1=1
-		<if test="start != null and start != ''">
 
+	</select>
+	<sql id="sqlWhere">
+		<if test="param.start != null and param.start != ''">
+			AND DFD20_SLSJ &gt;= #{start}
 		</if>
-		<if test="end != null and end != ''">
-
+		<if test="param.end != null and param.end != ''">
+			AND DFD20_SLSJ &lt;= #{end}
 		</if>
-	</select>
+		<if test="param.fileId != null and param.fileId != ''">
+			AND DFD20_FILEID = #{param.fileId}
+		</if>
+		<if test="param.bmydindex != null and param.bmydindex != ''">
+			AND  IFNULL(DFD20_CLMYD,'') IN ( '非常不满意', '不满意','一般')
+		</if>
+	</sql>
 </mapper>

src/main/resources/com/minpay/db/table/own/mapper/IQqdkhsqtjgdtzReportMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.minpay.db.table.own.mapper.IQqdkhsqtjgdtzReportMapper">
-	<select id="selectYtsqkhz" parameterType="map" resultType="com.minpay.db.table.model.DwFileDetail18">
+	<select id="selectQqdkhsqtjgdtz" parameterType="map" resultType="com.minpay.db.table.model.DwFileDetail18">
 		SELECT  DFD18_ID		id		,
 				DFD18_SEQU      sequ    ,
 				DFD18_GWGDBH    gwgdbh  ,
@@ -24,7 +24,23 @@
 				DFD18_SFHF      sfhf    ,
 				DFD18_SFCB      sfcb    ,
 				DFD18_SCHFQK    schfqk  ,
-				DFD18_KHMYQK    khmyqk     FROM DW_FILE_DETAIL_18  ORDER BY DFD18_SEQU * 1
+				DFD18_KHMYQK    khmyqk     FROM DW_FILE_DETAIL_18 where 1=1
+				  <include refid="sqlWhere"></include>
+				  ORDER BY DFD18_SEQU * 1
 
 	</select>
+	<sql id="sqlWhere">
+		<if test="param.start != null and param.start != ''">
+			AND DFD18_SLSJ &gt;= #{param.start}
+		</if>
+		<if test="param.end != null and param.end != ''">
+			AND DFD18_SLSJ &lt;= #{param.end}
+		</if>
+		<if test="param.fileId != null and param.fileId != ''">
+			AND DFD18_FILEID = #{param.fileId}
+		</if>
+		<if test="param.cfdbindex != null and param.cfdbindex != ''">
+			AND DFD18_TJLX = '重复督办'
+		</if>
+	</sql>
 </mapper>

src/main/resources/com/minpay/db/table/own/mapper/IYtsqkhzReportMapper.xml

@@ -14,10 +14,7 @@
 				DFD21_YF      yf    ,
 				DFD21_XH      xh  FROM DW_FILE_DETAIL_21   where 1 = 1
 				<if test="fileId != null  and fileId != ''">
-					and DFD27_FILEID = #{fileId}
-				</if>
-				<if test="fileType != null  and fileType != ''">
-					and DFD27_BBLX = #{fileType}
+					and DFD21_FILEID = #{fileId}
 				</if>
 				ORDER BY DFD21_XH * 1
 	</select>

src/main/resources/com/minpay/db/table/own/mapper/IZb95598ReportMapper.xml

@@ -85,83 +85,6 @@
 		GROUP BY DFD20_DWXZ
 		) D ON A.DFD20_DWXZ = D.DFD20_DWXZ
 	</select>
-	<!--不满意清单-->
-	<select id="selectBmymx" parameterType="map" resultType="map">
-		SELECT  DFD20_ID       id      ,
-			DFD20_SQBH     sqbh    ,
-			DFD20_DQHJ     dqhj    ,
-			DFD20_DWMCS    dwmcs   ,
-			DFD20_DWMCDS   dwmcds  ,
-			DFD20_GDDW     gddw    ,
-			DFD20_JDW      jdw     ,
-			DFD20_DWXZ     dwxz    ,
-			DFD20_YWLX     ywlx    ,
-			DFD20_SLSJ     slsj    ,
-			DFD20_YJLX     yjlx    ,
-			DFD20_EJLX     ejlx    ,
-			DFD20_SJLX     sjlx    ,
-			DFD20_SLRY     slry    ,
-			DFD20_SLNR     slnr    ,
-			DFD20_KHBH     khbh    ,
-			DFD20_KHMC     khmc    ,
-			DFD20_LXR      lxr     ,
-			DFD20_LXDZ     lxdz    ,
-			DFD20_LXDH     lxdh    ,
-			DFD20_XCDZ     xcdz    ,
-			DFD20_XCDZCZW  xcdzczw ,
-			DFD20_GDXFSJ   gdxfsj  ,
-			DFD20_GDSJ     gdsj    ,
-			DFD20_SJDRY    sjdry   ,
-			DFD20_SCLRY    sclry   ,
-			DFD20_SHDQRRY  shdqrry ,
-			DFD20_CLJG     cljg    ,
-			DFD20_CLQK     clqk    ,
-			DFD20_FWYZ     fwyz    ,
-			DFD20_KHYJ     khyj    ,
-			DFD20_SFSS     sfss    ,
-			DFD20_SFDLGSZR sfdlgszr,
-			DFD20_SFYWCLCS sfywclcs,
-			DFD20_SFZZDF   sfzzdf  ,
-			DFD20_SFHFTD   sfhftd  ,
-			DFD20_HFTDYY   hftdyy  ,
-			DFD20_FSFCB    fsfcb   ,
-			DFD20_GLGD     glgd    ,
-			DFD20_GLTDXX   gltdxx  ,
-			DFD20_LXDH2    lxdh2   ,
-			DFD20_SLNR2    slnr2   ,
-			DFD20_CLMYD    clmyd   ,
-			DFD20_BMYYY    bmyyy   FROM dw_file_detail_20 where 1=1
-		<include refid="sqlWhere6"></include>
-	</select>
-	<!--重复督办-->
-	<select id="selectCfdbmx" parameterType="map" resultType="map">
-		SELECT  DFD18_ID		id		,
-			DFD18_SEQU      sequ    ,
-			DFD18_GWGDBH    gwgdbh  ,
-			DFD18_TJLX      tjlx    ,
-			DFD18_YWLX      ywlx    ,
-			DFD18_SLSJ      slsj    ,
-			DFD18_SLNR      slnr    ,
-			DFD18_YHBH      yhbh    ,
-			DFD18_YHMC      yhmc    ,
-			DFD18_LXDZ      lxdz    ,
-			DFD18_LXDH      lxdh    ,
-			DFD18_YJFL      yjfl    ,
-			DFD18_EJFL      ejfl    ,
-			DFD18_YWZL      ywzl    ,
-			DFD18_GDDW      gddw    ,
-			DFD18_CLJG      cljg    ,
-			DFD18_ZRBS      zrbs    ,
-			DFD18_KHSZTQBH  khsztqbh,
-			DFD18_KHSSZXQ   khsszxq ,
-			DFD18_SFHF      sfhf    ,
-			DFD18_SFCB      sfcb    ,
-			DFD18_SCHFQK    schfqk  ,
-			DFD18_KHMYQK    khmyqk     FROM DW_FILE_DETAIL_18  where 1=1
-			<include refid="sqlWhere3"></include>
-
-			ORDER BY DFD18_SEQU * 1
-	</select>
 	<sql id="sqlWhere">
 		<if test="start != null and start != ''">
 			AND DFD33_SLSJ &gt;= #{start}
@@ -186,9 +109,6 @@
 		<if test="end != null and end != ''">
 			AND DFD18_SLSJ &lt;= #{end}
 		</if>
-		<if test="cfdbindex != null and cfdbindex != ''">
-			AND DFD18_TJLX = '重复督办'
-		</if>
 	</sql>
 	<!--上周时间范围-->
 	<sql id="sqlWhere4">

src/main/webapp/admin/95598/zb/reportDetail95598.html

@@ -177,88 +177,7 @@
 							],
 							data:data.data.resList.list6
 						});
-						// 重复督办明细
-						$table.render({
-							elem: '#demo7'
-							,limit:100
-							,cols: [
-								[   {field:'sequ',title:'编号',width:120},
-									{field:'gwgdbh',title:'国网工单编号',width:120},
-									{field:'tjlx',title:'提级类型',width:120},
-									{field:'ywlx',title:'业务类型',width:120},
-									{field:'slsj',title:'受理时间',width:120},
-									{field:'slnr',title:'受理内容',width:120},
-									{field:'yhbh',title:'用户编号',width:120},
-									{field:'yhmc',title:'用户名称',width:120},
-									{field:'lxdz',title:'联系地址',width:120},
-									{field:'lxdh',title:'联系电话',width:120},
-									{field:'yjfl',title:'一级分类',width:120},
-									{field:'ejfl',title:'二级分类',width:120},
-									{field:'ywzl',title:'业务子类',width:120},
-									{field:'gddw',title:'供电单位',width:120},
-									{field:'cljg',title:'处理结果',width:120},
-									{field:'zrbs',title:'责任班所',width:120},
-									{field:'khsztqbh',title:'客户所在台区编号',width:120},
-									{field:'khsszxq',title:'客户所在小区/行政村',width:120},
-									{field:'sfhf',title:'是否回复',width:120},
-									{field:'sfcb',title:'是否催办',width:120},
-									{field:'schfqk',title:'首次回访情况',width:120},
-									{field:'khmyqk',title:'客户满意情况',width:120},
-									{field:'bbfl',title:'报表类型',width:120}]
-							],
-							data:data.data.resList.list7
-						});
-						//
-						$table.render({
-							elem: '#demo8'
-							,limit:100
-							,cols: [
-								{field:'sqbh',title:'申请编号',width:120},
-								{field:'dqhj',title:'当前环节',width:120},
-								{field:'dwmcs',title:'单位名称（省）',width:120},
-								{field:'dwmcds',title:'单位名称（地市）',width:120},
-								{field:'gddw',title:'供电单位',width:120},
-								{field:'jdw',title:'旧单位',width:120},
-								{field:'dwxz',title:'单位修正',width:120},
-								{field:'ywlx',title:'业务类型',width:120},
-								{field:'slsj',title:'受理时间',width:120},
-								{field:'yjlx',title:'一级类型',width:120},
-								{field:'ejlx',title:'二级类型',width:120},
-								{field:'sjlx',title:'三级类型',width:120},
-								{field:'slry',title:'受理人员',width:120},
-								{field:'slnr',title:'受理内容',width:120},
-								{field:'khbh',title:'客户编号',width:120},
-								{field:'khmc',title:'客户名称',width:120},
-								{field:'lxr',title:'联系人',width:120},
-								{field:'lxdz',title:'联系地址',width:120},
-								{field:'lxdh',title:'联系电话',width:120},
-								{field:'xcdz',title:'现场地址',width:120},
-								{field:'xcdzczw',title:'现场地址参照物',width:120},
-								{field:'gdxfsj',title:'工单下发时间',width:120},
-								{field:'gdsj',title:'归档时间',width:120},
-								{field:'sjdry',title:'省接单人员',width:120},
-								{field:'sclry',title:'省处理人员',width:120},
-								{field:'shdqrry',title:'省回单确认人员',width:120},
-								{field:'cljg',title:'处理结果',width:120},
-								{field:'clqk',title:'处理情况',width:120},
-								{field:'fwyz',title:'服务语种',width:120},
-								{field:'khyj',title:'客户意见',width:120},
-								{field:'sfss',title:'是否属实',width:120},
-								{field:'sfdlgszr',title:'是否电力公司责任',width:120},
-								{field:'sfywclcs',title:'是否业务处理超时',width:120},
-								{field:'sfzzdf',title:'是否最终答复',width:120},
-								{field:'sfhftd',title:'是否回访退单',width:120},
-								{field:'hftdyy',title:'回访退单原因',width:120},
-								{field:'fsfcb',title:'是否催办',width:120},
-								{field:'glgd',title:'关联工单',width:120},
-								{field:'gltdxx',title:'关联停电信息',width:120},
-								{field:'lxdh2',title:'联系电话2',width:120},
-								{field:'slnr2',title:'受理内容2',width:120},
-								{field:'clmyd',title:'处理满意度',width:120},
-								{field:'bmyyy',title:'不满意原因',width:120}
-							],
-							data:data.data.resList.list8
-						});
+
 						$("#desc1").html("   "+data.data.resList.desc1)
 						$("#desc2").html("   本周，受理95598客户投诉X件，为YYYY投诉。\n" +
 								"截至A月B日，A月受理投诉C件，万户投诉数全省排名第D。全年累计受理投诉E件，万户投诉数F，全省排名第G。")
@@ -276,6 +195,103 @@
 					$.ErrorAlert(data2.MINErrorMessage);
 				}
 			});
+			// 重复督办明细
+			$table.render({
+				elem: '#demo7'
+				,cols: [
+					[   {field:'sequ',title:'编号',width:120},
+						{field:'gwgdbh',title:'国网工单编号',width:120},
+						{field:'tjlx',title:'提级类型',width:120},
+						{field:'ywlx',title:'业务类型',width:120},
+						{field:'slsj',title:'受理时间',width:120},
+						{field:'slnr',title:'受理内容',width:120},
+						{field:'yhbh',title:'用户编号',width:120},
+						{field:'yhmc',title:'用户名称',width:120},
+						{field:'lxdz',title:'联系地址',width:120},
+						{field:'lxdh',title:'联系电话',width:120},
+						{field:'yjfl',title:'一级分类',width:120},
+						{field:'ejfl',title:'二级分类',width:120},
+						{field:'ywzl',title:'业务子类',width:120},
+						{field:'gddw',title:'供电单位',width:120},
+						{field:'cljg',title:'处理结果',width:120},
+						{field:'zrbs',title:'责任班所',width:120},
+						{field:'khsztqbh',title:'客户所在台区编号',width:120},
+						{field:'khsszxq',title:'客户所在小区/行政村',width:120},
+						{field:'sfhf',title:'是否回复',width:120},
+						{field:'sfcb',title:'是否催办',width:120},
+						{field:'schfqk',title:'首次回访情况',width:120},
+						{field:'khmyqk',title:'客户满意情况',width:120},
+						{field:'bbfl',title:'报表类型',width:120}]
+				]
+				,limit : 15
+				,limits : [15,30,50,100]
+				,page : true
+				,url: 'Zb95598ReportAction/reportNeedDataDetail2' //数据接口
+				,method: 'post'
+				,where:{MINView:"JSON",reportId : reportId, reportType:reportType, method:"cfdbmx"}
+				,done: function(res, curr, count){
+					debugger
+				}
+			});
+			//本周不满意明细
+			$table.render({
+				elem: '#demo8'
+				,limit:100
+				,cols: [[
+					{field:'sqbh',title:'申请编号',width:120},
+					{field:'dqhj',title:'当前环节',width:120},
+					{field:'dwmcs',title:'单位名称（省）',width:120},
+					{field:'dwmcds',title:'单位名称（地市）',width:120},
+					{field:'gddw',title:'供电单位',width:120},
+					{field:'jdw',title:'旧单位',width:120},
+					{field:'dwxz',title:'单位修正',width:120},
+					{field:'ywlx',title:'业务类型',width:120},
+					{field:'slsj',title:'受理时间',width:120},
+					{field:'yjlx',title:'一级类型',width:120},
+					{field:'ejlx',title:'二级类型',width:120},
+					{field:'sjlx',title:'三级类型',width:120},
+					{field:'slry',title:'受理人员',width:120},
+					{field:'slnr',title:'受理内容',width:120},
+					{field:'khbh',title:'客户编号',width:120},
+					{field:'khmc',title:'客户名称',width:120},
+					{field:'lxr',title:'联系人',width:120},
+					{field:'lxdz',title:'联系地址',width:120},
+					{field:'lxdh',title:'联系电话',width:120},
+					{field:'xcdz',title:'现场地址',width:120},
+					{field:'xcdzczw',title:'现场地址参照物',width:120},
+					{field:'gdxfsj',title:'工单下发时间',width:120},
+					{field:'gdsj',title:'归档时间',width:120},
+					{field:'sjdry',title:'省接单人员',width:120},
+					{field:'sclry',title:'省处理人员',width:120},
+					{field:'shdqrry',title:'省回单确认人员',width:120},
+					{field:'cljg',title:'处理结果',width:120},
+					{field:'clqk',title:'处理情况',width:120},
+					{field:'fwyz',title:'服务语种',width:120},
+					{field:'khyj',title:'客户意见',width:120},
+					{field:'sfss',title:'是否属实',width:120},
+					{field:'sfdlgszr',title:'是否电力公司责任',width:120},
+					{field:'sfywclcs',title:'是否业务处理超时',width:120},
+					{field:'sfzzdf',title:'是否最终答复',width:120},
+					{field:'sfhftd',title:'是否回访退单',width:120},
+					{field:'hftdyy',title:'回访退单原因',width:120},
+					{field:'fsfcb',title:'是否催办',width:120},
+					{field:'glgd',title:'关联工单',width:120},
+					{field:'gltdxx',title:'关联停电信息',width:120},
+					{field:'lxdh2',title:'联系电话2',width:120},
+					{field:'slnr2',title:'受理内容2',width:120},
+					{field:'clmyd',title:'处理满意度',width:120},
+					{field:'bmyyy',title:'不满意原因',width:120}
+				]
+				]
+				,limit : 15
+				,limits : [15,30,50,100]
+				,page : true
+				,url: 'Zb95598ReportAction/reportNeedDataDetail2' //数据接口
+				,method: 'post'
+				,where:{MINView:"JSON",reportId : reportId, reportType:reportType, method:"bzbmy"}
+				,done: function(res, curr, count){
+				}
+			});
 		}
 	})
 

src/main/webapp/admin/reprotManage/dataWareDetail.html

@@ -416,7 +416,7 @@
         ]]
     }else if("1000021" == fileType
         ||"1000027" == fileType || "1000028" == fileType||"1000029" == fileType || "1000030" == fileType
-        ||"1000031" == fileType || "1000031" == fileType){
+        ||"1000031" == fileType || "1000032" == fileType){
         cols = [[
             {field:'xh',title:'序号',width:120},
             {field:'dw',title:'单位',width:120},