Merge branch 'master' of http://git.minpay.cc/dianwang/dianwangAdm

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

@@ -326,6 +326,10 @@ public class Constant implements IMINBusinessConstant{
 	 * 报表类型 FADZBB:FA动作正确率
 	 */
 	public static final String REPORT_TYPE_04 = "FADZBB";
+	/**
+	 * 报表类型  DDYZLFXB 低电压成效分析表
+	 */
+	public static final String REPORT_TYPE_05 = "DDYZLFXB";
 	
 	/**
 	 * 原始文件状态 0正常

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

@@ -12,10 +12,15 @@ import com.minpay.common.constant.Constant;
 import com.minpay.common.service.IReportService;
 import com.minpay.common.util.CommonUtil;
 import com.minpay.common.util.DateUtil;
+import com.minpay.db.table.mapper.DwBranchFileTypeMapper;
 import com.minpay.db.table.mapper.DwFileDetail01Mapper;
+import com.minpay.db.table.mapper.DwFileDetail03Mapper;
 import com.minpay.db.table.mapper.PubAppparMapper;
+import com.minpay.db.table.model.DwBranchReportTypeExample;
 import com.minpay.db.table.model.DwFileDetail01;
 import com.minpay.db.table.model.DwFileDetail01Example;
+import com.minpay.db.table.model.DwFileDetail03;
+import com.minpay.db.table.model.DwFileDetail03Example;
 import com.minpay.db.table.model.PubApppar;
 import com.minpay.db.table.model.PubAppparExample;
 import com.minpay.db.table.own.mapper.ReportServiceMapper;
@@ -107,6 +112,9 @@ public class ReportServiceImpl implements IReportService {
     	} else if (Constant.REPORT_TYPE_04.equals(reportTypeId)) {
     		List<List<String>> resList = reportTypeFADZBB(FADateRange, yearChoose);
     		resMap.put("resList", resList);
+    	}else if(Constant.REPORT_TYPE_05.equals(reportTypeId)){
+    		List<List<String>> resList = reportTypeDDYZLFXB(range, reportTypeId);
+    		resMap.put("resList", resList);
     	}
 		return resMap;
 	}
@@ -1260,4 +1268,112 @@ public class ReportServiceImpl implements IReportService {
 		
 		return resList;
 	}
+	
+	/**
+	 * 低电压治理分析表
+	 * @param range
+	 * @param reportTypeId
+	 * @return
+	 * @throws MINBusinessException
+	 * @throws ParseException
+	 */
+	public List<List<String>> reportTypeDDYZLFXB(String range, String reportTypeId) throws MINBusinessException, ParseException{
+		IMINDataBaseService db = Service.lookup(IMINDataBaseService.class);
+		List<List<String>> resList = new ArrayList<List<String>>();
+		List<String> titleList = new ArrayList<String>();
+		titleList.add("序号");
+		titleList.add("县公司名称");
+		titleList.add("用户管理单位名称");
+		titleList.add("线路名称");
+		titleList.add("台区ID");
+		titleList.add("变压器名称");
+		titleList.add("用户编号");
+		titleList.add("低电压时长");
+		titleList.add("累计天数");
+		titleList.add("低电压主要原因（点选)");
+		titleList.add("具体原因");
+		titleList.add("治理措施");
+		titleList.add("是否治理（点选）");
+		titleList.add("治理完成时间");
+		titleList.add("是否消除");
+		range = range.replaceAll(" ", "");
+		String[] rangeArray = range.split("-");
+		String beginTime = rangeArray[0];
+		String endTime = rangeArray[1];
+		int count = DateUtil.diffDate(beginTime, endTime);
+		//日期集合
+		List<String> dateList = new ArrayList<String>();
+		for(int i=0;i<=count;i++){
+			String beginDate = DateUtil.dateAddDay(endTime,-i);
+			dateList.add(beginDate);
+			beginDate = beginDate.substring(4,6)+"/"+beginDate.substring(6);
+			titleList.add(beginDate+"低电压时长");
+		}
+		//子类数据
+		resList.add(titleList);
+		//查询累计天数以及累计时长
+		Map<String, String> param = new HashMap<String, String>();
+		param.put("beginTime", beginTime);
+		param.put("endTime", endTime);
+		List<Map<String, String>>  DDYZLFXBList = db.getMybatisMapper(ReportServiceMapper.class).selectDetail03ByDDYZLFXB(param);
+//		
+//		DwFileDetail03Example example = new DwFileDetail03Example();
+//		example.createCriteria().andSjrqBetween(beginTime, endTime);
+//		example.setOrderByClause("DFD3_SJRQ desc");
+//		List<DwFileDetail03> fileList = db.selectByExample(DwFileDetail03Mapper.class, example);
+		int a = 0;
+		for(Map<String, String> map :DDYZLFXBList){
+			List<String> childList = new ArrayList<String>();
+			String dysc = String.format("%.0f",map.get("dysc"));
+			String ljts = String.format("%.0f",map.get("ljts"));
+			a++;
+			childList.add(a+"");
+			childList.add(map.get("xgsmc"));
+			childList.add(map.get("yhgldw"));
+			childList.add(map.get("xlmc"));
+			childList.add(map.get("tqid"));
+			childList.add(map.get("byqmc"));
+			childList.add(map.get("yhid"));
+			childList.add(dysc);
+			childList.add(ljts);
+			childList.add("");
+			childList.add("");
+			childList.add("");
+			childList.add("");
+			childList.add("");
+			//查询该用户低电压明细
+			DwFileDetail03Example example03 = new DwFileDetail03Example();
+			example03.createCriteria().andYhidEqualTo(map.get("yhid")).andSjrqBetween(beginTime, endTime);
+			example03.setOrderByClause("DFD3_SJRQ desc");
+			List<DwFileDetail03> DateList = db.selectByExample(DwFileDetail03Mapper.class, example03);
+			int countJg = DateUtil.diffDate(DateList.get(0).getSjrq(), endTime);
+			//查询是否低电压已消除
+			if(countJg>=7){
+				childList.add("是");
+			}else{
+				childList.add("");
+			}
+			//循环加载低电压时长
+			for(String date:dateList){
+				int b = 0;
+				for(DwFileDetail03 detail:DateList){
+					if(date.equals(detail.getSjrq())){
+						childList.add(detail.getDysc());
+						b=1;
+						break;
+					}
+				}
+				if(b == 0){
+					childList.add("");
+				}
+				
+			}
+			resList.add(childList);
+		}
+		
+//		resList.add(DDYZLFXBList);
+		
+		return resList;
+	}
+	
 }

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

@@ -2,6 +2,7 @@ package com.minpay.common.util;
 
 import java.text.DateFormat;
 import java.text.ParseException;
+import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -532,6 +533,33 @@ public class DateUtil {
 	  return (int) ((getMillis(dateStart) - getMillis(dateEnd)) / (24 * 3600 * 1000));
 	 }
 	 
+	 /** 
+	  * @Title: diffDate
+	  * @Description: 两个日期相差几天
+	  * @param dateStart
+	  * @param dateEnd
+	  * @return
+	  */
+	 public static int diffDate(String startTimeStr, String endTimeStr) {
+		 int betweenDays = 0;
+			Date startTime = strToDateLong(startTimeStr);
+			Date endTime = strToDateLong(endTimeStr);
+			
+			long start = startTime.getTime();
+			long end = endTime.getTime();
+			
+			betweenDays = (int) (Math.abs(end - start)/(24*3600*1000));
+			
+			return betweenDays;
+	 }
+	 
+	 protected static Date strToDateLong(String strDate) {
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+			ParsePosition pos = new ParsePosition(0);
+			Date strtodate = formatter.parse(strDate, pos);
+			return strtodate;
+		}
+
 	 /**
 		 * 昨天
 		 * @param c
@@ -651,6 +679,4 @@ public class DateUtil {
 			cal.add(Calendar.YEAR, year);
 			return format.format(cal.getTime());
 		}
-		
-		
 }

src/main/java/com/minpay/db/table/mapper/DwFileDetail03Mapper.java

@@ -0,0 +1,97 @@
+package com.minpay.db.table.mapper;
+
+import com.minpay.db.table.model.DwFileDetail03;
+import com.minpay.db.table.model.DwFileDetail03Example;
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DwFileDetail03Mapper extends IMINMybatisEntityMapper<DwFileDetail03, String, DwFileDetail03Example> {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    int countByExample(DwFileDetail03Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    int deleteByExample(DwFileDetail03Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    int insert(DwFileDetail03 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    int insertSelective(DwFileDetail03 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    List<DwFileDetail03> selectByExample(DwFileDetail03Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    DwFileDetail03 selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    int updateByExampleSelective(@Param("record") DwFileDetail03 record, @Param("example") DwFileDetail03Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    int updateByExample(@Param("record") DwFileDetail03 record, @Param("example") DwFileDetail03Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKeySelective(DwFileDetail03 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_03
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKey(DwFileDetail03 record);
+}

src/main/java/com/minpay/db/table/model/DwFileDetail03.java

@@ -0,0 +1,741 @@
+package com.minpay.db.table.model;
+
+import com.startup.minpay.frame.data.AbstractMINBean;
+
+public class DwFileDetail03 extends AbstractMINBean {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_ID
+     *
+     * @mbggenerated
+     */
+    private String id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_NO
+     *
+     * @mbggenerated
+     */
+    private String no;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_SGSMC
+     *
+     * @mbggenerated
+     */
+    private String sgsmc;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_XGSMC
+     *
+     * @mbggenerated
+     */
+    private String xgsmc;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_BDZMC
+     *
+     * @mbggenerated
+     */
+    private String bdzmc;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_XLMC
+     *
+     * @mbggenerated
+     */
+    private String xlmc;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_TQID
+     *
+     * @mbggenerated
+     */
+    private String tqid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_BYQMC
+     *
+     * @mbggenerated
+     */
+    private String byqmc;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_YHGLDW1
+     *
+     * @mbggenerated
+     */
+    private String yhgldw1;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_YHID
+     *
+     * @mbggenerated
+     */
+    private String yhid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_YHMC
+     *
+     * @mbggenerated
+     */
+    private String yhmc;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_YHGLDW2
+     *
+     * @mbggenerated
+     */
+    private String yhgldw2;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_DYMAX
+     *
+     * @mbggenerated
+     */
+    private String dymax;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_DYMIN
+     *
+     * @mbggenerated
+     */
+    private String dymin;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_DYHGL
+     *
+     * @mbggenerated
+     */
+    private String dyhgl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_CSXL
+     *
+     * @mbggenerated
+     */
+    private String csxl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_CXXL
+     *
+     * @mbggenerated
+     */
+    private String cxxl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_DYSC
+     *
+     * @mbggenerated
+     */
+    private String dysc;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_GDLX
+     *
+     * @mbggenerated
+     */
+    private String gdlx;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_LJTS
+     *
+     * @mbggenerated
+     */
+    private String ljts;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_SJRQ
+     *
+     * @mbggenerated
+     */
+    private String sjrq;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_GDDW
+     *
+     * @mbggenerated
+     */
+    private String gddw;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_03.DFD3_FILE_ID
+     *
+     * @mbggenerated
+     */
+    private String fileId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_ID
+     *
+     * @return the value of dw_file_detail_03.DFD3_ID
+     *
+     * @mbggenerated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_ID
+     *
+     * @param id the value for dw_file_detail_03.DFD3_ID
+     *
+     * @mbggenerated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_NO
+     *
+     * @return the value of dw_file_detail_03.DFD3_NO
+     *
+     * @mbggenerated
+     */
+    public String getNo() {
+        return no;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_NO
+     *
+     * @param no the value for dw_file_detail_03.DFD3_NO
+     *
+     * @mbggenerated
+     */
+    public void setNo(String no) {
+        this.no = no == null ? null : no.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_SGSMC
+     *
+     * @return the value of dw_file_detail_03.DFD3_SGSMC
+     *
+     * @mbggenerated
+     */
+    public String getSgsmc() {
+        return sgsmc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_SGSMC
+     *
+     * @param sgsmc the value for dw_file_detail_03.DFD3_SGSMC
+     *
+     * @mbggenerated
+     */
+    public void setSgsmc(String sgsmc) {
+        this.sgsmc = sgsmc == null ? null : sgsmc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_XGSMC
+     *
+     * @return the value of dw_file_detail_03.DFD3_XGSMC
+     *
+     * @mbggenerated
+     */
+    public String getXgsmc() {
+        return xgsmc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_XGSMC
+     *
+     * @param xgsmc the value for dw_file_detail_03.DFD3_XGSMC
+     *
+     * @mbggenerated
+     */
+    public void setXgsmc(String xgsmc) {
+        this.xgsmc = xgsmc == null ? null : xgsmc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_BDZMC
+     *
+     * @return the value of dw_file_detail_03.DFD3_BDZMC
+     *
+     * @mbggenerated
+     */
+    public String getBdzmc() {
+        return bdzmc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_BDZMC
+     *
+     * @param bdzmc the value for dw_file_detail_03.DFD3_BDZMC
+     *
+     * @mbggenerated
+     */
+    public void setBdzmc(String bdzmc) {
+        this.bdzmc = bdzmc == null ? null : bdzmc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_XLMC
+     *
+     * @return the value of dw_file_detail_03.DFD3_XLMC
+     *
+     * @mbggenerated
+     */
+    public String getXlmc() {
+        return xlmc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_XLMC
+     *
+     * @param xlmc the value for dw_file_detail_03.DFD3_XLMC
+     *
+     * @mbggenerated
+     */
+    public void setXlmc(String xlmc) {
+        this.xlmc = xlmc == null ? null : xlmc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_TQID
+     *
+     * @return the value of dw_file_detail_03.DFD3_TQID
+     *
+     * @mbggenerated
+     */
+    public String getTqid() {
+        return tqid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_TQID
+     *
+     * @param tqid the value for dw_file_detail_03.DFD3_TQID
+     *
+     * @mbggenerated
+     */
+    public void setTqid(String tqid) {
+        this.tqid = tqid == null ? null : tqid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_BYQMC
+     *
+     * @return the value of dw_file_detail_03.DFD3_BYQMC
+     *
+     * @mbggenerated
+     */
+    public String getByqmc() {
+        return byqmc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_BYQMC
+     *
+     * @param byqmc the value for dw_file_detail_03.DFD3_BYQMC
+     *
+     * @mbggenerated
+     */
+    public void setByqmc(String byqmc) {
+        this.byqmc = byqmc == null ? null : byqmc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_YHGLDW1
+     *
+     * @return the value of dw_file_detail_03.DFD3_YHGLDW1
+     *
+     * @mbggenerated
+     */
+    public String getYhgldw1() {
+        return yhgldw1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_YHGLDW1
+     *
+     * @param yhgldw1 the value for dw_file_detail_03.DFD3_YHGLDW1
+     *
+     * @mbggenerated
+     */
+    public void setYhgldw1(String yhgldw1) {
+        this.yhgldw1 = yhgldw1 == null ? null : yhgldw1.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_YHID
+     *
+     * @return the value of dw_file_detail_03.DFD3_YHID
+     *
+     * @mbggenerated
+     */
+    public String getYhid() {
+        return yhid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_YHID
+     *
+     * @param yhid the value for dw_file_detail_03.DFD3_YHID
+     *
+     * @mbggenerated
+     */
+    public void setYhid(String yhid) {
+        this.yhid = yhid == null ? null : yhid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_YHMC
+     *
+     * @return the value of dw_file_detail_03.DFD3_YHMC
+     *
+     * @mbggenerated
+     */
+    public String getYhmc() {
+        return yhmc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_YHMC
+     *
+     * @param yhmc the value for dw_file_detail_03.DFD3_YHMC
+     *
+     * @mbggenerated
+     */
+    public void setYhmc(String yhmc) {
+        this.yhmc = yhmc == null ? null : yhmc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_YHGLDW2
+     *
+     * @return the value of dw_file_detail_03.DFD3_YHGLDW2
+     *
+     * @mbggenerated
+     */
+    public String getYhgldw2() {
+        return yhgldw2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_YHGLDW2
+     *
+     * @param yhgldw2 the value for dw_file_detail_03.DFD3_YHGLDW2
+     *
+     * @mbggenerated
+     */
+    public void setYhgldw2(String yhgldw2) {
+        this.yhgldw2 = yhgldw2 == null ? null : yhgldw2.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_DYMAX
+     *
+     * @return the value of dw_file_detail_03.DFD3_DYMAX
+     *
+     * @mbggenerated
+     */
+    public String getDymax() {
+        return dymax;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_DYMAX
+     *
+     * @param dymax the value for dw_file_detail_03.DFD3_DYMAX
+     *
+     * @mbggenerated
+     */
+    public void setDymax(String dymax) {
+        this.dymax = dymax == null ? null : dymax.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_DYMIN
+     *
+     * @return the value of dw_file_detail_03.DFD3_DYMIN
+     *
+     * @mbggenerated
+     */
+    public String getDymin() {
+        return dymin;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_DYMIN
+     *
+     * @param dymin the value for dw_file_detail_03.DFD3_DYMIN
+     *
+     * @mbggenerated
+     */
+    public void setDymin(String dymin) {
+        this.dymin = dymin == null ? null : dymin.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_DYHGL
+     *
+     * @return the value of dw_file_detail_03.DFD3_DYHGL
+     *
+     * @mbggenerated
+     */
+    public String getDyhgl() {
+        return dyhgl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_DYHGL
+     *
+     * @param dyhgl the value for dw_file_detail_03.DFD3_DYHGL
+     *
+     * @mbggenerated
+     */
+    public void setDyhgl(String dyhgl) {
+        this.dyhgl = dyhgl == null ? null : dyhgl.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_CSXL
+     *
+     * @return the value of dw_file_detail_03.DFD3_CSXL
+     *
+     * @mbggenerated
+     */
+    public String getCsxl() {
+        return csxl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_CSXL
+     *
+     * @param csxl the value for dw_file_detail_03.DFD3_CSXL
+     *
+     * @mbggenerated
+     */
+    public void setCsxl(String csxl) {
+        this.csxl = csxl == null ? null : csxl.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_CXXL
+     *
+     * @return the value of dw_file_detail_03.DFD3_CXXL
+     *
+     * @mbggenerated
+     */
+    public String getCxxl() {
+        return cxxl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_CXXL
+     *
+     * @param cxxl the value for dw_file_detail_03.DFD3_CXXL
+     *
+     * @mbggenerated
+     */
+    public void setCxxl(String cxxl) {
+        this.cxxl = cxxl == null ? null : cxxl.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_DYSC
+     *
+     * @return the value of dw_file_detail_03.DFD3_DYSC
+     *
+     * @mbggenerated
+     */
+    public String getDysc() {
+        return dysc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_DYSC
+     *
+     * @param dysc the value for dw_file_detail_03.DFD3_DYSC
+     *
+     * @mbggenerated
+     */
+    public void setDysc(String dysc) {
+        this.dysc = dysc == null ? null : dysc.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_GDLX
+     *
+     * @return the value of dw_file_detail_03.DFD3_GDLX
+     *
+     * @mbggenerated
+     */
+    public String getGdlx() {
+        return gdlx;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_GDLX
+     *
+     * @param gdlx the value for dw_file_detail_03.DFD3_GDLX
+     *
+     * @mbggenerated
+     */
+    public void setGdlx(String gdlx) {
+        this.gdlx = gdlx == null ? null : gdlx.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_LJTS
+     *
+     * @return the value of dw_file_detail_03.DFD3_LJTS
+     *
+     * @mbggenerated
+     */
+    public String getLjts() {
+        return ljts;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_LJTS
+     *
+     * @param ljts the value for dw_file_detail_03.DFD3_LJTS
+     *
+     * @mbggenerated
+     */
+    public void setLjts(String ljts) {
+        this.ljts = ljts == null ? null : ljts.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_SJRQ
+     *
+     * @return the value of dw_file_detail_03.DFD3_SJRQ
+     *
+     * @mbggenerated
+     */
+    public String getSjrq() {
+        return sjrq;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_SJRQ
+     *
+     * @param sjrq the value for dw_file_detail_03.DFD3_SJRQ
+     *
+     * @mbggenerated
+     */
+    public void setSjrq(String sjrq) {
+        this.sjrq = sjrq == null ? null : sjrq.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_GDDW
+     *
+     * @return the value of dw_file_detail_03.DFD3_GDDW
+     *
+     * @mbggenerated
+     */
+    public String getGddw() {
+        return gddw;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_GDDW
+     *
+     * @param gddw the value for dw_file_detail_03.DFD3_GDDW
+     *
+     * @mbggenerated
+     */
+    public void setGddw(String gddw) {
+        this.gddw = gddw == null ? null : gddw.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_03.DFD3_FILE_ID
+     *
+     * @return the value of dw_file_detail_03.DFD3_FILE_ID
+     *
+     * @mbggenerated
+     */
+    public String getFileId() {
+        return fileId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_03.DFD3_FILE_ID
+     *
+     * @param fileId the value for dw_file_detail_03.DFD3_FILE_ID
+     *
+     * @mbggenerated
+     */
+    public void setFileId(String fileId) {
+        this.fileId = fileId == null ? null : fileId.trim();
+    }
+}

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

@@ -23,6 +23,9 @@ public interface ReportServiceMapper extends IMINMybatisEntityMapper {
 	List<Map<String, String>> selectDetail02ByGZQJPDAndGZQHDHF(Map<String, String> param);
 
 	List<Map<String, String>> selectReportType00TqtdGS(Map<String, Object> param);
+	
+	List<Map<String, String>> selectDetail03ByDDYZLFXB(Map<String, String> param);
+	
 
 	// 分段时长条数
 	String selectReportType00FenDuan(Map<String, String> shiduanMap);

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

@@ -330,10 +330,14 @@ public class DataWareManageAction implements IMINAction {
 				String fileDetailId = db.getMybatisMapper(SequenceMapper.class).getSequence("FILE_DETAIL_03_NO");
 				String sjrq = excelMap.get("sjrq");
 				try {
-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
-					Date date = sdf.parse(sjrq);
-					SimpleDateFormat todf = new SimpleDateFormat("yyyyMMdd");// 设置日期格式
-					sjrq = todf.format(date);
+					if(sjrq.length()>10){
+						sjrq = sjrq.substring(0, 8);
+					}else{
+						SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+						Date date = sdf.parse(sjrq);
+						SimpleDateFormat todf = new SimpleDateFormat("yyyyMMdd");// 设置日期格式
+						sjrq = todf.format(date);
+					}
 				} catch (Exception ex) {
 				}
 //				DateFormat formater = new SimpleDateFormat("yyyyMMdd");

src/main/resources/com/minpay/db/table/mapper/DwFileDetail03Mapper.xml

@@ -0,0 +1,555 @@
+<?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.mapper.DwFileDetail03Mapper" >
+  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.DwFileDetail03" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="DFD3_ID" property="id" jdbcType="VARCHAR" />
+    <result column="DFD3_NO" property="no" jdbcType="VARCHAR" />
+    <result column="DFD3_SGSMC" property="sgsmc" jdbcType="VARCHAR" />
+    <result column="DFD3_XGSMC" property="xgsmc" jdbcType="VARCHAR" />
+    <result column="DFD3_BDZMC" property="bdzmc" jdbcType="VARCHAR" />
+    <result column="DFD3_XLMC" property="xlmc" jdbcType="VARCHAR" />
+    <result column="DFD3_TQID" property="tqid" jdbcType="VARCHAR" />
+    <result column="DFD3_BYQMC" property="byqmc" jdbcType="VARCHAR" />
+    <result column="DFD3_YHGLDW1" property="yhgldw1" jdbcType="VARCHAR" />
+    <result column="DFD3_YHID" property="yhid" jdbcType="VARCHAR" />
+    <result column="DFD3_YHMC" property="yhmc" jdbcType="VARCHAR" />
+    <result column="DFD3_YHGLDW2" property="yhgldw2" jdbcType="VARCHAR" />
+    <result column="DFD3_DYMAX" property="dymax" jdbcType="VARCHAR" />
+    <result column="DFD3_DYMIN" property="dymin" jdbcType="VARCHAR" />
+    <result column="DFD3_DYHGL" property="dyhgl" jdbcType="VARCHAR" />
+    <result column="DFD3_CSXL" property="csxl" jdbcType="VARCHAR" />
+    <result column="DFD3_CXXL" property="cxxl" jdbcType="VARCHAR" />
+    <result column="DFD3_DYSC" property="dysc" jdbcType="VARCHAR" />
+    <result column="DFD3_GDLX" property="gdlx" jdbcType="VARCHAR" />
+    <result column="DFD3_LJTS" property="ljts" jdbcType="VARCHAR" />
+    <result column="DFD3_SJRQ" property="sjrq" jdbcType="VARCHAR" />
+    <result column="DFD3_GDDW" property="gddw" jdbcType="VARCHAR" />
+    <result column="DFD3_FILE_ID" property="fileId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    DFD3_ID, DFD3_NO, DFD3_SGSMC, DFD3_XGSMC, DFD3_BDZMC, DFD3_XLMC, DFD3_TQID, DFD3_BYQMC, 
+    DFD3_YHGLDW1, DFD3_YHID, DFD3_YHMC, DFD3_YHGLDW2, DFD3_DYMAX, DFD3_DYMIN, DFD3_DYHGL, 
+    DFD3_CSXL, DFD3_CXXL, DFD3_DYSC, DFD3_GDLX, DFD3_LJTS, DFD3_SJRQ, DFD3_GDDW, DFD3_FILE_ID
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.minpay.db.table.model.DwFileDetail03Example" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from dw_file_detail_03
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from dw_file_detail_03
+    where DFD3_ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from dw_file_detail_03
+    where DFD3_ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.DwFileDetail03Example" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from dw_file_detail_03
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.minpay.db.table.model.DwFileDetail03" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into dw_file_detail_03 (DFD3_ID, DFD3_NO, DFD3_SGSMC, 
+      DFD3_XGSMC, DFD3_BDZMC, DFD3_XLMC, 
+      DFD3_TQID, DFD3_BYQMC, DFD3_YHGLDW1, 
+      DFD3_YHID, DFD3_YHMC, DFD3_YHGLDW2, 
+      DFD3_DYMAX, DFD3_DYMIN, DFD3_DYHGL, 
+      DFD3_CSXL, DFD3_CXXL, DFD3_DYSC, DFD3_GDLX, 
+      DFD3_LJTS, DFD3_SJRQ, DFD3_GDDW, DFD3_FILE_ID
+      )
+    values (#{id,jdbcType=VARCHAR}, #{no,jdbcType=VARCHAR}, #{sgsmc,jdbcType=VARCHAR}, 
+      #{xgsmc,jdbcType=VARCHAR}, #{bdzmc,jdbcType=VARCHAR}, #{xlmc,jdbcType=VARCHAR}, 
+      #{tqid,jdbcType=VARCHAR}, #{byqmc,jdbcType=VARCHAR}, #{yhgldw1,jdbcType=VARCHAR}, 
+      #{yhid,jdbcType=VARCHAR}, #{yhmc,jdbcType=VARCHAR}, #{yhgldw2,jdbcType=VARCHAR}, 
+      #{dymax,jdbcType=VARCHAR}, #{dymin,jdbcType=VARCHAR}, #{dyhgl,jdbcType=VARCHAR}, 
+      #{csxl,jdbcType=VARCHAR}, #{cxxl,jdbcType=VARCHAR}, #{dysc,jdbcType=VARCHAR}, #{gdlx,jdbcType=VARCHAR}, 
+      #{ljts,jdbcType=VARCHAR}, #{sjrq,jdbcType=VARCHAR}, #{gddw,jdbcType=VARCHAR}, #{fileId,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.minpay.db.table.model.DwFileDetail03" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into dw_file_detail_03
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        DFD3_ID,
+      </if>
+      <if test="no != null" >
+        DFD3_NO,
+      </if>
+      <if test="sgsmc != null" >
+        DFD3_SGSMC,
+      </if>
+      <if test="xgsmc != null" >
+        DFD3_XGSMC,
+      </if>
+      <if test="bdzmc != null" >
+        DFD3_BDZMC,
+      </if>
+      <if test="xlmc != null" >
+        DFD3_XLMC,
+      </if>
+      <if test="tqid != null" >
+        DFD3_TQID,
+      </if>
+      <if test="byqmc != null" >
+        DFD3_BYQMC,
+      </if>
+      <if test="yhgldw1 != null" >
+        DFD3_YHGLDW1,
+      </if>
+      <if test="yhid != null" >
+        DFD3_YHID,
+      </if>
+      <if test="yhmc != null" >
+        DFD3_YHMC,
+      </if>
+      <if test="yhgldw2 != null" >
+        DFD3_YHGLDW2,
+      </if>
+      <if test="dymax != null" >
+        DFD3_DYMAX,
+      </if>
+      <if test="dymin != null" >
+        DFD3_DYMIN,
+      </if>
+      <if test="dyhgl != null" >
+        DFD3_DYHGL,
+      </if>
+      <if test="csxl != null" >
+        DFD3_CSXL,
+      </if>
+      <if test="cxxl != null" >
+        DFD3_CXXL,
+      </if>
+      <if test="dysc != null" >
+        DFD3_DYSC,
+      </if>
+      <if test="gdlx != null" >
+        DFD3_GDLX,
+      </if>
+      <if test="ljts != null" >
+        DFD3_LJTS,
+      </if>
+      <if test="sjrq != null" >
+        DFD3_SJRQ,
+      </if>
+      <if test="gddw != null" >
+        DFD3_GDDW,
+      </if>
+      <if test="fileId != null" >
+        DFD3_FILE_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="no != null" >
+        #{no,jdbcType=VARCHAR},
+      </if>
+      <if test="sgsmc != null" >
+        #{sgsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="xgsmc != null" >
+        #{xgsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="bdzmc != null" >
+        #{bdzmc,jdbcType=VARCHAR},
+      </if>
+      <if test="xlmc != null" >
+        #{xlmc,jdbcType=VARCHAR},
+      </if>
+      <if test="tqid != null" >
+        #{tqid,jdbcType=VARCHAR},
+      </if>
+      <if test="byqmc != null" >
+        #{byqmc,jdbcType=VARCHAR},
+      </if>
+      <if test="yhgldw1 != null" >
+        #{yhgldw1,jdbcType=VARCHAR},
+      </if>
+      <if test="yhid != null" >
+        #{yhid,jdbcType=VARCHAR},
+      </if>
+      <if test="yhmc != null" >
+        #{yhmc,jdbcType=VARCHAR},
+      </if>
+      <if test="yhgldw2 != null" >
+        #{yhgldw2,jdbcType=VARCHAR},
+      </if>
+      <if test="dymax != null" >
+        #{dymax,jdbcType=VARCHAR},
+      </if>
+      <if test="dymin != null" >
+        #{dymin,jdbcType=VARCHAR},
+      </if>
+      <if test="dyhgl != null" >
+        #{dyhgl,jdbcType=VARCHAR},
+      </if>
+      <if test="csxl != null" >
+        #{csxl,jdbcType=VARCHAR},
+      </if>
+      <if test="cxxl != null" >
+        #{cxxl,jdbcType=VARCHAR},
+      </if>
+      <if test="dysc != null" >
+        #{dysc,jdbcType=VARCHAR},
+      </if>
+      <if test="gdlx != null" >
+        #{gdlx,jdbcType=VARCHAR},
+      </if>
+      <if test="ljts != null" >
+        #{ljts,jdbcType=VARCHAR},
+      </if>
+      <if test="sjrq != null" >
+        #{sjrq,jdbcType=VARCHAR},
+      </if>
+      <if test="gddw != null" >
+        #{gddw,jdbcType=VARCHAR},
+      </if>
+      <if test="fileId != null" >
+        #{fileId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.minpay.db.table.model.DwFileDetail03Example" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from dw_file_detail_03
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dw_file_detail_03
+    <set >
+      <if test="record.id != null" >
+        DFD3_ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.no != null" >
+        DFD3_NO = #{record.no,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sgsmc != null" >
+        DFD3_SGSMC = #{record.sgsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.xgsmc != null" >
+        DFD3_XGSMC = #{record.xgsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bdzmc != null" >
+        DFD3_BDZMC = #{record.bdzmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.xlmc != null" >
+        DFD3_XLMC = #{record.xlmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tqid != null" >
+        DFD3_TQID = #{record.tqid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.byqmc != null" >
+        DFD3_BYQMC = #{record.byqmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yhgldw1 != null" >
+        DFD3_YHGLDW1 = #{record.yhgldw1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yhid != null" >
+        DFD3_YHID = #{record.yhid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yhmc != null" >
+        DFD3_YHMC = #{record.yhmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yhgldw2 != null" >
+        DFD3_YHGLDW2 = #{record.yhgldw2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dymax != null" >
+        DFD3_DYMAX = #{record.dymax,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dymin != null" >
+        DFD3_DYMIN = #{record.dymin,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dyhgl != null" >
+        DFD3_DYHGL = #{record.dyhgl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.csxl != null" >
+        DFD3_CSXL = #{record.csxl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cxxl != null" >
+        DFD3_CXXL = #{record.cxxl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dysc != null" >
+        DFD3_DYSC = #{record.dysc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gdlx != null" >
+        DFD3_GDLX = #{record.gdlx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ljts != null" >
+        DFD3_LJTS = #{record.ljts,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sjrq != null" >
+        DFD3_SJRQ = #{record.sjrq,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gddw != null" >
+        DFD3_GDDW = #{record.gddw,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileId != null" >
+        DFD3_FILE_ID = #{record.fileId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dw_file_detail_03
+    set DFD3_ID = #{record.id,jdbcType=VARCHAR},
+      DFD3_NO = #{record.no,jdbcType=VARCHAR},
+      DFD3_SGSMC = #{record.sgsmc,jdbcType=VARCHAR},
+      DFD3_XGSMC = #{record.xgsmc,jdbcType=VARCHAR},
+      DFD3_BDZMC = #{record.bdzmc,jdbcType=VARCHAR},
+      DFD3_XLMC = #{record.xlmc,jdbcType=VARCHAR},
+      DFD3_TQID = #{record.tqid,jdbcType=VARCHAR},
+      DFD3_BYQMC = #{record.byqmc,jdbcType=VARCHAR},
+      DFD3_YHGLDW1 = #{record.yhgldw1,jdbcType=VARCHAR},
+      DFD3_YHID = #{record.yhid,jdbcType=VARCHAR},
+      DFD3_YHMC = #{record.yhmc,jdbcType=VARCHAR},
+      DFD3_YHGLDW2 = #{record.yhgldw2,jdbcType=VARCHAR},
+      DFD3_DYMAX = #{record.dymax,jdbcType=VARCHAR},
+      DFD3_DYMIN = #{record.dymin,jdbcType=VARCHAR},
+      DFD3_DYHGL = #{record.dyhgl,jdbcType=VARCHAR},
+      DFD3_CSXL = #{record.csxl,jdbcType=VARCHAR},
+      DFD3_CXXL = #{record.cxxl,jdbcType=VARCHAR},
+      DFD3_DYSC = #{record.dysc,jdbcType=VARCHAR},
+      DFD3_GDLX = #{record.gdlx,jdbcType=VARCHAR},
+      DFD3_LJTS = #{record.ljts,jdbcType=VARCHAR},
+      DFD3_SJRQ = #{record.sjrq,jdbcType=VARCHAR},
+      DFD3_GDDW = #{record.gddw,jdbcType=VARCHAR},
+      DFD3_FILE_ID = #{record.fileId,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.DwFileDetail03" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dw_file_detail_03
+    <set >
+      <if test="no != null" >
+        DFD3_NO = #{no,jdbcType=VARCHAR},
+      </if>
+      <if test="sgsmc != null" >
+        DFD3_SGSMC = #{sgsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="xgsmc != null" >
+        DFD3_XGSMC = #{xgsmc,jdbcType=VARCHAR},
+      </if>
+      <if test="bdzmc != null" >
+        DFD3_BDZMC = #{bdzmc,jdbcType=VARCHAR},
+      </if>
+      <if test="xlmc != null" >
+        DFD3_XLMC = #{xlmc,jdbcType=VARCHAR},
+      </if>
+      <if test="tqid != null" >
+        DFD3_TQID = #{tqid,jdbcType=VARCHAR},
+      </if>
+      <if test="byqmc != null" >
+        DFD3_BYQMC = #{byqmc,jdbcType=VARCHAR},
+      </if>
+      <if test="yhgldw1 != null" >
+        DFD3_YHGLDW1 = #{yhgldw1,jdbcType=VARCHAR},
+      </if>
+      <if test="yhid != null" >
+        DFD3_YHID = #{yhid,jdbcType=VARCHAR},
+      </if>
+      <if test="yhmc != null" >
+        DFD3_YHMC = #{yhmc,jdbcType=VARCHAR},
+      </if>
+      <if test="yhgldw2 != null" >
+        DFD3_YHGLDW2 = #{yhgldw2,jdbcType=VARCHAR},
+      </if>
+      <if test="dymax != null" >
+        DFD3_DYMAX = #{dymax,jdbcType=VARCHAR},
+      </if>
+      <if test="dymin != null" >
+        DFD3_DYMIN = #{dymin,jdbcType=VARCHAR},
+      </if>
+      <if test="dyhgl != null" >
+        DFD3_DYHGL = #{dyhgl,jdbcType=VARCHAR},
+      </if>
+      <if test="csxl != null" >
+        DFD3_CSXL = #{csxl,jdbcType=VARCHAR},
+      </if>
+      <if test="cxxl != null" >
+        DFD3_CXXL = #{cxxl,jdbcType=VARCHAR},
+      </if>
+      <if test="dysc != null" >
+        DFD3_DYSC = #{dysc,jdbcType=VARCHAR},
+      </if>
+      <if test="gdlx != null" >
+        DFD3_GDLX = #{gdlx,jdbcType=VARCHAR},
+      </if>
+      <if test="ljts != null" >
+        DFD3_LJTS = #{ljts,jdbcType=VARCHAR},
+      </if>
+      <if test="sjrq != null" >
+        DFD3_SJRQ = #{sjrq,jdbcType=VARCHAR},
+      </if>
+      <if test="gddw != null" >
+        DFD3_GDDW = #{gddw,jdbcType=VARCHAR},
+      </if>
+      <if test="fileId != null" >
+        DFD3_FILE_ID = #{fileId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where DFD3_ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.DwFileDetail03" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dw_file_detail_03
+    set DFD3_NO = #{no,jdbcType=VARCHAR},
+      DFD3_SGSMC = #{sgsmc,jdbcType=VARCHAR},
+      DFD3_XGSMC = #{xgsmc,jdbcType=VARCHAR},
+      DFD3_BDZMC = #{bdzmc,jdbcType=VARCHAR},
+      DFD3_XLMC = #{xlmc,jdbcType=VARCHAR},
+      DFD3_TQID = #{tqid,jdbcType=VARCHAR},
+      DFD3_BYQMC = #{byqmc,jdbcType=VARCHAR},
+      DFD3_YHGLDW1 = #{yhgldw1,jdbcType=VARCHAR},
+      DFD3_YHID = #{yhid,jdbcType=VARCHAR},
+      DFD3_YHMC = #{yhmc,jdbcType=VARCHAR},
+      DFD3_YHGLDW2 = #{yhgldw2,jdbcType=VARCHAR},
+      DFD3_DYMAX = #{dymax,jdbcType=VARCHAR},
+      DFD3_DYMIN = #{dymin,jdbcType=VARCHAR},
+      DFD3_DYHGL = #{dyhgl,jdbcType=VARCHAR},
+      DFD3_CSXL = #{csxl,jdbcType=VARCHAR},
+      DFD3_CXXL = #{cxxl,jdbcType=VARCHAR},
+      DFD3_DYSC = #{dysc,jdbcType=VARCHAR},
+      DFD3_GDLX = #{gdlx,jdbcType=VARCHAR},
+      DFD3_LJTS = #{ljts,jdbcType=VARCHAR},
+      DFD3_SJRQ = #{sjrq,jdbcType=VARCHAR},
+      DFD3_GDDW = #{gddw,jdbcType=VARCHAR},
+      DFD3_FILE_ID = #{fileId,jdbcType=VARCHAR}
+    where DFD3_ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -200,4 +200,25 @@
 			</if>
 		GROUP BY DFD2_GZQJPD,DFD2_GZQHDHF
 	</select>
+	<select id="selectDetail03ByDDYZLFXB" resultType="hashmap" parameterType="java.util.Map">
+		SELECT 	DFD3_XGSMC 'xgsmc',
+				DFD3_YHGLDW1 'yhgldw',
+				DFD3_XLMC 'xlmc',
+				DFD3_TQID 'tqid',
+				DFD3_BYQMC 'byqmc',
+				DFD3_YHID 'yhid', 
+				SUM(DFD3_DYSC) 'dysc',
+				SUM(DFD3_LJTS)  'ljts'
+		FROM  dw_file_detail_03 
+		WHERE 
+			1 = 1
+			<if test="beginTime != null  and beginTime != ''">
+				and substring(DFD3_SJRQ, 1, 8) &gt;= #{beginTime,jdbcType=VARCHAR}
+			</if>
+			<if test="endTime != null  and endTime != ''">
+				and substring(DFD3_SJRQ, 1, 8) &lt;= #{endTime,jdbcType=VARCHAR}
+			</if>
+		GROUP BY DFD3_YHID
+		ORDER BY dysc DESC
+	</select>
 </mapper>