95598工单周报

src/main/java/com/minpay/common/constant/Constant.java

@@ -509,6 +509,22 @@ public class Constant implements IMINBusinessConstant{
 	 * 报表类型 重过载-周报
 	 */
 	public static final String REPORT_TYPE_18 = "XLGZZZB";
+	/**
+	 * 95598日报
+	 */
+	public static final String REPORT_TYPE_20 = "N95598RB";
+	/**
+	 * 95598日汇报
+	 */
+	public static final String REPORT_TYPE_21 = "N95598RHB";
+	/**
+	 * 95598周报
+	 */
+	public static final String REPORT_TYPE_22 = "N95598ZB";
+	/**
+	 * 95598周汇报
+	 */
+	public static final String REPORT_TYPE_23 = "N95598ZHB";
 
 	/**
 	 * 报表类型 95598工单-周报管理

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

@@ -39,7 +39,28 @@ public class Report95598ServiceImpl implements IReport95598Service {
 		MINHttpServletRequestContext request = (MINHttpServletRequestContext)param.get("request");
 
 		Map<String, Object> resMap = new HashMap<String, Object>();
-		if(Constant.REPORT_TYPE_18.equals(reportTypeId)){//重过载周报
+		if(Constant.REPORT_TYPE_20.equals(reportTypeId)){//95598日报
+			Map<String,Object> mm = new HashMap<String,Object>();
+			mm.put("range",range);
+			mm.put("timeRange",timeRange);
+			mm.put("reportTypeId",reportTypeId);
+			Map<String,Object> resList = reportType95598Zb(mm, request);
+			resMap.put("resList", resList);
+		}else if(Constant.REPORT_TYPE_21.equals(reportTypeId)){//95598日汇报
+			Map<String,Object> mm = new HashMap<String,Object>();
+			mm.put("range",range);
+			mm.put("timeRange",timeRange);
+			mm.put("reportTypeId",reportTypeId);
+			Map<String,Object> resList = reportType95598Zb(mm, request);
+			resMap.put("resList", resList);
+		}else if(Constant.REPORT_TYPE_22.equals(reportTypeId)){//95598周报
+			Map<String,Object> mm = new HashMap<String,Object>();
+			mm.put("range",range);
+			mm.put("timeRange",timeRange);
+			mm.put("reportTypeId",reportTypeId);
+			Map<String,Object> resList = reportType95598Zb(mm, request);
+			resMap.put("resList", resList);
+		}else if(Constant.REPORT_TYPE_23.equals(reportTypeId)){//95598日汇报
 			Map<String,Object> mm = new HashMap<String,Object>();
 			mm.put("range",range);
 			mm.put("timeRange",timeRange);
@@ -58,7 +79,12 @@ public class Report95598ServiceImpl implements IReport95598Service {
 	 */
 	private Map<String, Object> reportType95598Zb(Map<String, Object> mm, MINHttpServletRequestContext request) throws MINBusinessException {
 		IMINDataBaseService db = Service.lookup(IMINDataBaseService.class);
-		String start = "";
+		String range = StringUtil.ObjectToString(mm.get("range"));
+		String timeRange = StringUtil.ObjectToString(mm.get("timeRange"));
+		String start = StringUtil.getStartAndEndDatetime(range,timeRange,"1");
+		String end = StringUtil.getStartAndEndDatetime(range,timeRange,"2");
+		mm.put("start",start);
+		mm.put("end",end);
 		//95598业务受理情况
 		//户数数据
 		List<Map<String,String>> list = db.getMybatisMapper(IZb95598ReportMapper.class).selectBeforeIndex(mm);

src/main/java/com/minpay/common/util/StringUtil.java

@@ -231,14 +231,15 @@ public class StringUtil extends StringUtils {
      * @param timeRange = 000000 - 235959
      * @return
      */
-    public static Map<String,String> getStartAndEndDatetime(Object range, Object timeRange){
-        try {
-
-
-        }catch (Exception ee){
-
-        }
-        return null;
+    public static String getStartAndEndDatetime(Object range, Object timeRange,String type){
+        String str1 =  StringUtil.ObjectToString(range);
+        String str2 =  StringUtil.ObjectToString(timeRange);
+        if("1".equals(type)){
+            return str1.split("~")[0]+" "+str2.split("~")[0];
+        }else if("2".equals(type)){
+            return str1.split("~")[1]+" "+str2.split("~")[1];
+        }
+        return "";
     }
 
     public static void main(String[] args) {

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

@@ -34,7 +34,6 @@
 			WHERE 1=1
 			<include refid="sqlWhere"></include>
 			GROUP BY DFD33_GDDW ) B ON A.DFD33_GDDW = B.DFD33_GDDW
-			WHERE
 		ORDER BY
 			A.DFD33_GDDW
 	</select>