修改

src/main/java/com/minpay/branchReportType/action/BranchReportTypeAction.java

@@ -50,7 +50,7 @@ public class BranchReportTypeAction implements IMINAction {
      */
     @MINAction(value = BRANCH_REPORTTYPE_QUERY)
     public MINActionResult branchReportTypeQuery(
-    	@MINParam(key = "timeType") String timeType,
+    	@MINParam(key = "reportType") String reportType,
         MINSession session
     ) throws MINBusinessException{
         MINActionResult res = new MINActionResult();
@@ -63,14 +63,14 @@ public class BranchReportTypeAction implements IMINAction {
         DwBranchReportTypeExample branchReportTypeExample = new DwBranchReportTypeExample();
         if (!Constant.SYSTEM_BRANCH_ID.equals(branchId)) {
         	// 日报周报月报搜索
-        	if (!CommonUtil.isEmpty(timeType)) {
-        		branchReportTypeExample.createCriteria().andBranchidEqualTo(branchId).andTimeTypeEqualTo(timeType);
+        	if (!CommonUtil.isEmpty(reportType)) {
+        		branchReportTypeExample.createCriteria().andBranchidEqualTo(branchId).andIdEqualTo(reportType);
         	} else {
         		branchReportTypeExample.createCriteria().andBranchidEqualTo(branchId);
         	}
         } else {
-        	if (!CommonUtil.isEmpty(timeType)) {
-        		branchReportTypeExample.createCriteria().andBranchidEqualTo(branchId).andTimeTypeEqualTo(timeType);
+        	if (!CommonUtil.isEmpty(reportType)) {
+        		branchReportTypeExample.createCriteria().andBranchidEqualTo(branchId).andIdEqualTo(reportType);
         	}
         }
 		List<DwBranchReportType> branchFileType = db.selectByExample(DwBranchReportTypeMapper.class, branchReportTypeExample);

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

@@ -293,7 +293,7 @@ public class Constant implements IMINBusinessConstant{
 	 */
 	public static final String FILE_DETAIL_TYPE_00 = "1000001";
 	/**
-	 * 原始文件类型 1000002:低过电压
+	 * 原始文件类型 1000002:终端投托运
 	 */
 	public static final String FILE_DETAIL_TYPE_01 = "1000002";
 	
@@ -311,6 +311,10 @@ public class Constant implements IMINBusinessConstant{
 	 * 报表类型 TQTDYB:台区停电月报
 	 */
 	public static final String REPORT_TYPE_02 = "TQTDYB";
+	/**
+	 * 报表类型 TQTDYB:终端投托运报表
+	 */
+	public static final String REPORT_TYPE_03 = "ZDTTYBB";
 	
 	/**
 	 * 原始文件状态 0正常

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

@@ -9,8 +9,11 @@ import com.minpay.common.format.IFormatService;
 import com.minpay.common.service.IDianwangService;
 import com.minpay.common.util.CommonUtil;
 import com.minpay.db.table.mapper.DwFileDetail00Mapper;
+import com.minpay.db.table.mapper.DwFileDetail01Mapper;
 import com.minpay.db.table.model.DwFileDetail00;
 import com.minpay.db.table.model.DwFileDetail00Example;
+import com.minpay.db.table.model.DwFileDetail01;
+import com.minpay.db.table.model.DwFileDetail01Example;
 import com.startup.minpay.frame.constant.IMINBusinessConstant;
 import com.startup.minpay.frame.exception.MINBusinessException;
 import com.startup.minpay.frame.jdbc.MINRowBounds;
@@ -54,9 +57,13 @@ public class DianwangServiceImpl implements IDianwangService {
     		resList = Service.lookup(IFormatService.class).formatDate(resList, "date");
     		resList = Service.lookup(IFormatService.class).formatDateTime(resList, "startTime", "endTime");
     		return resList;
-    	// 低电压
+    	// 终端投托运
     	} else if (Constant.FILE_DETAIL_TYPE_01.equals(fileType)) {
-    		return null;
+    		DwFileDetail01Example fileDetail01Example = new DwFileDetail01Example();
+    		fileDetail01Example.createCriteria().andFileIdEqualTo(fileId);
+    		List<DwFileDetail01> resList = db.selectByExample(DwFileDetail01Mapper.class, fileDetail01Example, rows);
+    		resList = Service.lookup(IFormatService.class).formatDateTime(resList, "excelTytime");
+    		return resList;
     	}
     	return null;
 	}

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

@@ -11,6 +11,9 @@ 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.DwFileDetail01Mapper;
+import com.minpay.db.table.model.DwFileDetail01;
+import com.minpay.db.table.model.DwFileDetail01Example;
 import com.minpay.db.table.own.mapper.ReportServiceMapper;
 import com.startup.minpay.frame.exception.MINBusinessException;
 import com.startup.minpay.frame.service.base.IMINDataBaseService;
@@ -40,6 +43,8 @@ public class ReportServiceImpl implements IReportService {
 		String range = param.get("range");
 		String timeRange = param.get("timeRange");
 		String reportTypeId = param.get("reportTypeId");
+		String firstFileId = param.get("firstFileId");
+		String secondFileId = param.get("secondFileId");
 		
 		Map<String, Object> resMap = new HashMap<String, Object>();
     	// 台区停电日报
@@ -55,7 +60,11 @@ public class ReportServiceImpl implements IReportService {
     		resMap.put("resList", resList);
     	// 台区停电月报
     	} else if (Constant.REPORT_TYPE_02.equals(reportTypeId)) {
-    		
+    		reportTypeTQTDYB(range, timeRange);
+    	// 终端投托运报表
+    	} else if (Constant.REPORT_TYPE_03.equals(reportTypeId)) {
+    		List<List<String>> resList = reportTypeZDDTYBB(firstFileId, secondFileId);
+    		resMap.put("resList", resList);
     	}
 		return resMap;
 	}
@@ -616,4 +625,83 @@ public class ReportServiceImpl implements IReportService {
 		
 		return resList;
 	}
+	
+	public List<List<String>> reportTypeZDDTYBB(String firstFileId, String secondFileId) throws MINBusinessException{
+		IMINDataBaseService db = Service.lookup(IMINDataBaseService.class);
+		List<List<String>> resList = new ArrayList<List<String>>();
+		
+		List<String> titleList = new ArrayList<String>();
+		titleList.add("ID");
+		titleList.add("TNAME");
+		titleList.add("CMODE");
+		titleList.add("VALUE");
+		titleList.add("facname");
+		titleList.add("type");
+		titleList.add("fdid");
+		titleList.add("yxstatus");
+		titleList.add("tytime");
+		titleList.add("SRC");
+		resList.add(titleList);
+		
+		DwFileDetail01Example fileDetail01Example = new DwFileDetail01Example();
+		fileDetail01Example.createCriteria().andFileIdEqualTo(firstFileId);
+		// 选择文件
+		List<DwFileDetail01> firstList = db.selectByExample(DwFileDetail01Mapper.class, fileDetail01Example);
+		fileDetail01Example.clear();
+		// 对比文件
+		fileDetail01Example.createCriteria().andFileIdEqualTo(secondFileId);
+		List<DwFileDetail01> secondList = db.selectByExample(DwFileDetail01Mapper.class, fileDetail01Example);
+		
+		for (DwFileDetail01 first : firstList) {
+			String firstExcelId = first.getExcelId();
+			boolean flag = false;
+			for (DwFileDetail01 second : secondList) {
+				String secondExcelId = second.getExcelId();
+				if (firstExcelId.equals(secondExcelId)) {
+					flag = true;
+					break;
+				}
+			}
+			if (!flag) {
+				List<String> resChildList = new ArrayList<String>();
+				resChildList.add(first.getExcelId());
+				resChildList.add(first.getExcelTname());
+				resChildList.add(first.getExcelCmode());
+				resChildList.add(first.getExcelValue());
+				resChildList.add(first.getExcelFacname());
+				resChildList.add(first.getExcelFdid());
+				resChildList.add(first.getExcelType());
+				resChildList.add(first.getExcelYxstatus());
+				resChildList.add(first.getExcelTytime());
+				resChildList.add("退出");
+				resList.add(resChildList);
+			}
+		}
+		for (DwFileDetail01 second : secondList) {
+			String secondExcelId = second.getExcelId();
+			boolean flag = false;
+			for (DwFileDetail01 first : firstList) {
+				String firstExcelId = first.getExcelId();
+				if (secondExcelId.equals(firstExcelId)) {
+					flag = true;
+					break;
+				}
+			}
+			if (!flag) {
+				List<String> resChildList = new ArrayList<String>();
+				resChildList.add(second.getExcelId());
+				resChildList.add(second.getExcelTname());
+				resChildList.add(second.getExcelCmode());
+				resChildList.add(second.getExcelValue());
+				resChildList.add(second.getExcelFacname());
+				resChildList.add(second.getExcelFdid());
+				resChildList.add(second.getExcelType());
+				resChildList.add(second.getExcelYxstatus());
+				resChildList.add(second.getExcelTytime());
+				resChildList.add("投入");
+				resList.add(resChildList);
+			}
+		}
+		return resList;
+	}
 }

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

@@ -1,158 +0,0 @@
-package com.minpay.common.util;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsRequest;
-import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsResponse;
-import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
-import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.profile.DefaultProfile;
-import com.aliyuncs.profile.IClientProfile;
-import com.minpay.common.constant.ServConstant;
-import com.minpay.common.service.IPublicService;
-import com.startup.minpay.frame.exception.MINBusinessException;
-import com.startup.minpay.frame.service.base.Service;
-
-/**
- * 短信发送类---阿里云
- * @author ZHANGZZ@MINPAY.CC
- */
-public class SmsAliSendUtil {
-	
-	//产品名称:云通信短信API产品,开发者无需替换
-    static final String product = "Dysmsapi";
-    //产品域名,开发者无需替换
-    static final String domain = "dysmsapi.aliyuncs.com";
-
-    // 此处需要替换成开发者自己的AK(在阿里云访问控制台寻找)
-    static final String accessKeyId = ServConstant.ALI_ACCKEY_ID;
-    static final String accessKeySecret = ServConstant.ALI_ACCKEY_SECRET;
-    
-    
-    
-
-    /**
-     * 发送阿里短信
-     * @param mobile
-     * @param signName
-     * @param tempCode
-     * @param jsonParam
-     * @param channel 
-     * @return
-     * @throws ClientException
-     * @throws MINBusinessException 
-     */
-    public static SendSmsResponse sendSms(String mobile, String signName, String tempCode, String jsonParam, String channel) throws ClientException, MINBusinessException {
-
-        //可自助调整超时时间
-        System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
-        System.setProperty("sun.net.client.defaultReadTimeout", "10000");
-        
-        String accessKeyId = Service.lookup(IPublicService.class).getSysParValue(channel+"_ALI_ACCESSKEYID");
-        String accessKeySecret = Service.lookup(IPublicService.class).getSysParValue(channel+"_ALI_ACCESSKEYSECRET");
-        
-
-        //初始化acsClient,暂不支持region化
-        IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret);
-        DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain);
-        IAcsClient acsClient = new DefaultAcsClient(profile);
-
-        //组装请求对象-具体描述见控制台-文档部分内容
-        SendSmsRequest request = new SendSmsRequest();
-        //必填:待发送手机号
-        request.setPhoneNumbers(mobile);
-        //必填:短信签名-可在短信控制台中找到
-        request.setSignName(signName);
-        //必填:短信模板-可在短信控制台中找到
-        request.setTemplateCode(tempCode);
-        //可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为
-        request.setTemplateParam(jsonParam);
-
-        //选填-上行短信扩展码(无特殊需求用户请忽略此字段)
-        //request.setSmsUpExtendCode("90997");
-
-        //可选:outId为提供给业务方扩展字段,最终在短信回执消息中将此值带回给调用者
-        request.setOutId("yourOutId");
-
-        //hint 此处可能会抛出异常，注意catch
-        SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
-
-        return sendSmsResponse;
-    }
-
-
-    public static QuerySendDetailsResponse querySendDetails(String bizId) throws ClientException {
-
-        //可自助调整超时时间
-        System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
-        System.setProperty("sun.net.client.defaultReadTimeout", "10000");
-
-        //初始化acsClient,暂不支持region化
-        IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret);
-        DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain);
-        IAcsClient acsClient = new DefaultAcsClient(profile);
-
-        //组装请求对象
-        QuerySendDetailsRequest request = new QuerySendDetailsRequest();
-        //必填-号码
-        request.setPhoneNumber("15000000000");
-        //可选-流水号
-        request.setBizId(bizId);
-        //必填-发送日期 支持30天内记录查询，格式yyyyMMdd
-        SimpleDateFormat ft = new SimpleDateFormat("yyyyMMdd");
-        request.setSendDate(ft.format(new Date()));
-        //必填-页大小
-        request.setPageSize(10L);
-        //必填-当前页码从1开始计数
-        request.setCurrentPage(1L);
-
-        //hint 此处可能会抛出异常，注意catch
-        QuerySendDetailsResponse querySendDetailsResponse = acsClient.getAcsResponse(request);
-
-        return querySendDetailsResponse;
-    }
-
-    public static void main(String[] args) throws ClientException, InterruptedException {
-
-        
-       /* //发短信
-        SendSmsResponse response = sendSms("18654574122", Constant.BTXZS_NAME, "SMS_145590111", "{code:123322}");
-        System.out.println("短信接口返回的数据----------------");
-        System.out.println("Code=" + response.getCode());
-        System.out.println("Message=" + response.getMessage());
-        System.out.println("RequestId=" + response.getRequestId());
-        System.out.println("BizId=" + response.getBizId());
-
-        Thread.sleep(3000L);
-
-        //查明细
-        if(response.getCode() != null && response.getCode().equals("OK")) {
-            QuerySendDetailsResponse querySendDetailsResponse = querySendDetails(response.getBizId());
-            System.out.println("短信明细查询接口返回数据----------------");
-            System.out.println("Code=" + querySendDetailsResponse.getCode());
-            System.out.println("Message=" + querySendDetailsResponse.getMessage());
-            int i = 0;
-            for(QuerySendDetailsResponse.SmsSendDetailDTO smsSendDetailDTO : querySendDetailsResponse.getSmsSendDetailDTOs())
-            {
-                System.out.println("SmsSendDetailDTO["+i+"]:");
-                System.out.println("Content=" + smsSendDetailDTO.getContent());
-                System.out.println("ErrCode=" + smsSendDetailDTO.getErrCode());
-                System.out.println("OutId=" + smsSendDetailDTO.getOutId());
-                System.out.println("PhoneNum=" + smsSendDetailDTO.getPhoneNum());
-                System.out.println("ReceiveDate=" + smsSendDetailDTO.getReceiveDate());
-                System.out.println("SendDate=" + smsSendDetailDTO.getSendDate());
-                System.out.println("SendStatus=" + smsSendDetailDTO.getSendStatus());
-                System.out.println("Template=" + smsSendDetailDTO.getTemplateCode());
-            }
-            System.out.println("TotalCount=" + querySendDetailsResponse.getTotalCount());
-            System.out.println("RequestId=" + querySendDetailsResponse.getRequestId());
-        }*/
-
-    	
-    	
-    }
-}

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

@@ -76,6 +76,14 @@ public class DwReportInf extends AbstractMINBean {
     private String timeInterval;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_report_inf.DRI_ZDTTY_COMPARE_ID
+     *
+     * @mbggenerated
+     */
+    private String zdttyCompareId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column dw_report_inf.DRI_ID
      *
@@ -290,4 +298,28 @@ public class DwReportInf extends AbstractMINBean {
     public void setTimeInterval(String timeInterval) {
         this.timeInterval = timeInterval == null ? null : timeInterval.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_report_inf.DRI_ZDTTY_COMPARE_ID
+     *
+     * @return the value of dw_report_inf.DRI_ZDTTY_COMPARE_ID
+     *
+     * @mbggenerated
+     */
+    public String getZdttyCompareId() {
+        return zdttyCompareId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_report_inf.DRI_ZDTTY_COMPARE_ID
+     *
+     * @param zdttyCompareId the value for dw_report_inf.DRI_ZDTTY_COMPARE_ID
+     *
+     * @mbggenerated
+     */
+    public void setZdttyCompareId(String zdttyCompareId) {
+        this.zdttyCompareId = zdttyCompareId == null ? null : zdttyCompareId.trim();
+    }
 }

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

@@ -891,6 +891,84 @@ public class DwReportInfExample {
             addCriterion("DRI_TIME_INTERVAL not between", value1, value2, "timeInterval");
             return (Criteria) this;
         }
+
+        public Criteria andZdttyCompareIdIsNull() {
+            addCriterion("DRI_ZDTTY_COMPARE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdIsNotNull() {
+            addCriterion("DRI_ZDTTY_COMPARE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdEqualTo(String value) {
+            if(value == null ){
+                andZdttyCompareIdIsNull();
+            } else {
+                addCriterion("DRI_ZDTTY_COMPARE_ID =", value, "zdttyCompareId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdNotEqualTo(String value) {
+            if(value == null ){
+                andZdttyCompareIdIsNotNull();
+            } else {
+                addCriterion("DRI_ZDTTY_COMPARE_ID <>", value, "zdttyCompareId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdGreaterThan(String value) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID >", value, "zdttyCompareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdGreaterThanOrEqualTo(String value) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID >=", value, "zdttyCompareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdLessThan(String value) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID <", value, "zdttyCompareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdLessThanOrEqualTo(String value) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID <=", value, "zdttyCompareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdLike(String value) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID like", value, "zdttyCompareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdNotLike(String value) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID not like", value, "zdttyCompareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdIn(List<String> values) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID in", values, "zdttyCompareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdNotIn(List<String> values) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID not in", values, "zdttyCompareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdBetween(String value1, String value2) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID between", value1, value2, "zdttyCompareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andZdttyCompareIdNotBetween(String value1, String value2) {
+            addCriterion("DRI_ZDTTY_COMPARE_ID not between", value1, value2, "zdttyCompareId");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -22,11 +22,16 @@ import com.minpay.common.util.CommonUtil;
 import com.minpay.common.util.FilesUtil;
 import com.minpay.common.util.ListUtil;
 import com.minpay.db.table.mapper.DwFileDetail00Mapper;
+import com.minpay.db.table.mapper.DwFileDetail01Mapper;
 import com.minpay.db.table.mapper.DwFileInfMapper;
+import com.minpay.db.table.mapper.DwReporttypeFiletypeRelMapper;
 import com.minpay.db.table.mapper.ImUserMapper;
 import com.minpay.db.table.model.DwFileDetail00;
 import com.minpay.db.table.model.DwFileDetail00Example;
+import com.minpay.db.table.model.DwFileDetail01;
 import com.minpay.db.table.model.DwFileInf;
+import com.minpay.db.table.model.DwReporttypeFiletypeRelExample;
+import com.minpay.db.table.model.DwReporttypeFiletypeRelKey;
 import com.minpay.db.table.model.ImUser;
 import com.minpay.db.table.model.ImUserExample;
 import com.minpay.db.table.own.mapper.DataWareManageMapper;
@@ -89,7 +94,7 @@ public class DataWareManageAction implements IMINAction {
         @MINParam(key = "date") String date,
         @MINParam(key = "fileName") String fileName,
         @MINParam(key = "notInData") String notInData,
-        @MINParam(key = "fileType") String fileType,
+        @MINParam(key = "reportType") String reportType,
         MINSession session
     ) throws MINBusinessException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException {
         MINActionResult res = new MINActionResult();
@@ -108,10 +113,13 @@ public class DataWareManageAction implements IMINAction {
 				param.put("notInArray", notInArray);
 			}
 		}
-		if (!CommonUtil.isEmpty(fileType)) {
-			JSONArray fileTypeArray = JSONArray.fromObject(fileType);
-			if (fileTypeArray.size() != 0) {
-				param.put("fileTypeArray", fileTypeArray);
+		// 查询生成报表所需的文件类型
+		if (!CommonUtil.isEmpty(reportType)) {
+			DwReporttypeFiletypeRelExample reporttypeFiletypeRelExample = new DwReporttypeFiletypeRelExample();
+			reporttypeFiletypeRelExample.createCriteria().andReporttypeIdEqualTo(reportType);
+			List<DwReporttypeFiletypeRelKey> selectByExample = db.selectByExample(DwReporttypeFiletypeRelMapper.class, reporttypeFiletypeRelExample);
+			if (selectByExample.size() > 0) {
+				param.put("fileTypeArray", selectByExample);
 			}
 		}
 		
@@ -209,10 +217,37 @@ public class DataWareManageAction implements IMINAction {
 				fileDetail00.setFileId(fileId);
 				db.insertSelective(DwFileDetail00Mapper.class, fileDetail00);
 			}
-			
-		// 低电压
+		// 终端投托运
 		} else if (Constant.FILE_DETAIL_TYPE_01.equals(fileType)) {
+			String[] titleKey = new String[]{"id","tname","cmode","value", "facname","type","fdid","yxstatus","tytime"};
+			list = FilesUtil.readExecleasy(fileItem, titleKey, 1);
 			
+			if (list.size() == 0) {
+				throw new MINBusinessException("无数据，请添加数据");//无数据，请添加数据
+			}
+			
+			// 详情数据存入数据库
+			for (Map<String,String> excelMap : list) {
+				String fileDetailId = db.getMybatisMapper(SequenceMapper.class).getSequence("FILE_DETAIL_01_NO");
+				DwFileDetail01 fileDetail01 = new DwFileDetail01();
+				fileDetail01.setId(fileDetailId);
+				fileDetail01.setExcelId(excelMap.get("id"));
+				fileDetail01.setExcelTname(excelMap.get("tname"));
+				fileDetail01.setExcelCmode(excelMap.get("cmode"));
+				fileDetail01.setExcelValue(excelMap.get("value"));
+				fileDetail01.setExcelFacname(excelMap.get("facname"));
+				fileDetail01.setExcelType(excelMap.get("type"));
+				fileDetail01.setExcelFdid(excelMap.get("fdid"));
+				fileDetail01.setExcelYxstatus(excelMap.get("yxstatus"));
+				String tytime = excelMap.get("tytime");
+				tytime = tytime.replaceAll("-", "").replaceAll(" ", "").replaceAll(":", "");
+				if (!CommonUtil.isEmpty(tytime) && tytime.length() != 14) {
+					throw new MINBusinessException(excelMap.get("tytime") + "--时间格式错误");
+				}
+				fileDetail01.setExcelTytime(tytime);
+				fileDetail01.setFileId(fileId);
+				db.insertSelective(DwFileDetail01Mapper.class, fileDetail01);
+			}
 		}
 		
 		// 文件名

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

@@ -99,6 +99,7 @@ public class ReportManageAction implements IMINAction {
         @MINParam(key = "date") String date,
         @MINParam(key = "fileName") String fileName,
         @MINParam(key = "timeType") String timeType,
+        @MINParam(key = "reportType") String reportType,
         MINSession session
     ) throws MINBusinessException {
         MINActionResult res = new MINActionResult();
@@ -111,6 +112,7 @@ public class ReportManageAction implements IMINAction {
 		param.put("date", date);
 		param.put("fileName", fileName);
 		param.put("timeType", timeType);
+		param.put("reportType", reportType);
 		
 		User user = session.getUser();
 		String roleId = user.getRoleId();
@@ -191,12 +193,17 @@ public class ReportManageAction implements IMINAction {
     }
     
     /**
-     * 报告明细信息组装
-     * @param chooseFileListStr
-     * @param session
+     * 报表信息组装
+     * @param range			日期范围
+     * @param timeRange		时分秒范围
+     * @param reportInf		报表信息 
+     * @param monthNum		台区停电   monthNum个月内停电countNum次
+     * @param countNum		台区停电   monthNum个月内停电countNum次
+     * @param firstFileId	终端投托运报表选择的第一个原始数据文件
+     * @param secondFileId	终端投托运报表选择的对比原始数据文件
      * @return
      * @throws MINBusinessException
-     * @throws ParseException 
+     * @throws ParseException
      */
     @MINAction(value = REPORT_NEED_DATA_DETAIL)
     public MINActionResult reportNeedDataDetail(
@@ -204,7 +211,9 @@ public class ReportManageAction implements IMINAction {
     		@MINParam(key = "timeRange") String timeRange,
     		@MINParam(key = "reportInf") String reportInf,
     		@MINParam(key = "monthNum") String monthNum,
-    		@MINParam(key = "countNum") String countNum
+    		@MINParam(key = "countNum") String countNum,
+    		@MINParam(key = "firstFileId") String firstFileId,
+    		@MINParam(key = "secondFileId") String secondFileId
     		) throws MINBusinessException, ParseException {
     	MINActionResult res = new MINActionResult();
     	
@@ -217,6 +226,8 @@ public class ReportManageAction implements IMINAction {
     	param.put("reportTypeId", reportTypeId);
     	param.put("monthNum", monthNum);
     	param.put("countNum", countNum);
+    	param.put("firstFileId", firstFileId);
+    	param.put("secondFileId", secondFileId);
     	Map<String, Object> resMap = Service.lookup(IReportService.class).reportNeedDetail(param);
     	res.set(IMINBusinessConstant.F_PAGING_LAY, resMap);
     	return res;
@@ -239,6 +250,8 @@ public class ReportManageAction implements IMINAction {
     		@MINParam(key = "fileName") String fileName,
     		@MINParam(key = "range") String range,
     		@MINParam(key = "timeRange") String timeRange,
+    		@MINParam(key = "firstFileId") String firstFileId,
+    		@MINParam(key = "secondFileId") String secondFileId,
     		MINSession session
     		) throws MINBusinessException {
     	db = Service.lookup(IMINDataBaseService.class);
@@ -264,6 +277,7 @@ public class ReportManageAction implements IMINAction {
     	report.setCreatUser(user.getId());
     	report.setBranch(user.getBranchid());
     	report.setType(reportTypeId);
+    	report.setZdttyCompareId(firstFileId + "-" + secondFileId);
     	
     	report.setDayInterval(range.replaceAll(" ", ""));		// 日期时间段
     	report.setTimeInterval(timeRange.replaceAll(" ", ""));	// 时分秒时间段

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

@@ -15,6 +15,7 @@
     <result column="DRI_STATE" jdbcType="VARCHAR" property="state" />
     <result column="DRI_DAY_INTERVAL" jdbcType="VARCHAR" property="dayInterval" />
     <result column="DRI_TIME_INTERVAL" jdbcType="VARCHAR" property="timeInterval" />
+    <result column="DRI_ZDTTY_COMPARE_ID" jdbcType="VARCHAR" property="zdttyCompareId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -88,7 +89,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     DRI_ID, DRI_UPLOAD_DATE, DRI_FILE_NAME, DRI_CREAT_USER, DRI_BRANCH, DRI_TYPE, DRI_STATE, 
-    DRI_DAY_INTERVAL, DRI_TIME_INTERVAL
+    DRI_DAY_INTERVAL, DRI_TIME_INTERVAL, DRI_ZDTTY_COMPARE_ID
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.DwReportInfExample" resultMap="BaseResultMap">
     <!--
@@ -143,12 +144,12 @@
     -->
     insert into dw_report_inf (DRI_ID, DRI_UPLOAD_DATE, DRI_FILE_NAME, 
       DRI_CREAT_USER, DRI_BRANCH, DRI_TYPE, 
-      DRI_STATE, DRI_DAY_INTERVAL, DRI_TIME_INTERVAL
-      )
+      DRI_STATE, DRI_DAY_INTERVAL, DRI_TIME_INTERVAL, 
+      DRI_ZDTTY_COMPARE_ID)
     values (#{id,jdbcType=VARCHAR}, #{uploadDate,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, 
       #{creatUser,jdbcType=VARCHAR}, #{branch,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{state,jdbcType=VARCHAR}, #{dayInterval,jdbcType=VARCHAR}, #{timeInterval,jdbcType=VARCHAR}
-      )
+      #{state,jdbcType=VARCHAR}, #{dayInterval,jdbcType=VARCHAR}, #{timeInterval,jdbcType=VARCHAR}, 
+      #{zdttyCompareId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.DwReportInf">
     <!--
@@ -184,6 +185,9 @@
       <if test="timeInterval != null">
         DRI_TIME_INTERVAL,
       </if>
+      <if test="zdttyCompareId != null">
+        DRI_ZDTTY_COMPARE_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -213,6 +217,9 @@
       <if test="timeInterval != null">
         #{timeInterval,jdbcType=VARCHAR},
       </if>
+      <if test="zdttyCompareId != null">
+        #{zdttyCompareId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.DwReportInfExample" resultType="java.lang.Integer">
@@ -259,6 +266,9 @@
       <if test="record.timeInterval != null">
         DRI_TIME_INTERVAL = #{record.timeInterval,jdbcType=VARCHAR},
       </if>
+      <if test="record.zdttyCompareId != null">
+        DRI_ZDTTY_COMPARE_ID = #{record.zdttyCompareId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -278,7 +288,8 @@
       DRI_TYPE = #{record.type,jdbcType=VARCHAR},
       DRI_STATE = #{record.state,jdbcType=VARCHAR},
       DRI_DAY_INTERVAL = #{record.dayInterval,jdbcType=VARCHAR},
-      DRI_TIME_INTERVAL = #{record.timeInterval,jdbcType=VARCHAR}
+      DRI_TIME_INTERVAL = #{record.timeInterval,jdbcType=VARCHAR},
+      DRI_ZDTTY_COMPARE_ID = #{record.zdttyCompareId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -314,6 +325,9 @@
       <if test="timeInterval != null">
         DRI_TIME_INTERVAL = #{timeInterval,jdbcType=VARCHAR},
       </if>
+      <if test="zdttyCompareId != null">
+        DRI_ZDTTY_COMPARE_ID = #{zdttyCompareId,jdbcType=VARCHAR},
+      </if>
     </set>
     where DRI_ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -330,7 +344,8 @@
       DRI_TYPE = #{type,jdbcType=VARCHAR},
       DRI_STATE = #{state,jdbcType=VARCHAR},
       DRI_DAY_INTERVAL = #{dayInterval,jdbcType=VARCHAR},
-      DRI_TIME_INTERVAL = #{timeInterval,jdbcType=VARCHAR}
+      DRI_TIME_INTERVAL = #{timeInterval,jdbcType=VARCHAR},
+      DRI_ZDTTY_COMPARE_ID = #{zdttyCompareId,jdbcType=VARCHAR}
     where DRI_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -27,5 +27,8 @@
 			<if test="timeType != null  and timeType != ''">
 		    	and b.DBRT_TIME_TYPE = #{timeType,jdbcType=VARCHAR}
 		   	</if>
+			<if test="reportType != null  and reportType != ''">
+		    	and b.DBRT_ID = #{reportType,jdbcType=VARCHAR}
+		   	</if>
 	</select>
 </mapper>

src/main/webapp/admin/common/chooseDataWare.html

@@ -49,7 +49,11 @@
 	var chooseFileData = getTempVal("chooseFileData");
 	setTempVal("chooseFileData", null);
 	
-	var fileType = getTempVal("fileType");
+	// 报表类型
+	var reportType = getQueryString("reportType");
+	// 选择文件最大数
+	var chooseNum = getQueryString("chooseNum");
+	
      var table;
      var form;
      layui.use(['table','laydate'], function(){
@@ -72,7 +76,7 @@
 		    ,limit:10
 		    ,url: 'DataWareManageAction/fileInfQuery' //数据接口
 		    ,method: 'post'
-		    ,where:{MINView:"JSON", notInData : JSON.stringify(chooseFileData), fileType : JSON.stringify(fileType)}
+		    ,where:{MINView:"JSON", notInData : JSON.stringify(chooseFileData), reportType : reportType}
 		    ,page: true //开启分页
 		    ,cols: [[ //表头
 		       {type:'checkbox',width:'5%'}
@@ -188,6 +192,10 @@
 			$.ErrorAlert("请选择数据");
 			return;
 		}
+		if (!isEmpty(chooseNum) && checkData.length != chooseNum) {
+			$.ErrorAlert("请选择"+chooseNum + "一个文件!");
+			return;
+		}
 		setTempVal("dataWareData", checkData);
 		deleteTabPageParent(pageId);
 	}

src/main/webapp/css/login.css

@@ -35,7 +35,7 @@ p {
     margin: auto;
     margin-top: 1rem;
 }
-.login-input img{
+.login-input i{
    	margin: 0px 12px 0 13px;
 }
 .login-input input {
@@ -59,7 +59,7 @@ input[type="checkbox"]+label {
 
 input[type="checkbox"]+label::before {
 	content: "\a0";
-	/*涓嶆崲琛岀┖鏍�*/
+	/*娑撳秵宕茬悰宀�鈹栭弽锟�*/
 	display: inline-block;
 	width: 14px;
 	height: 14px;
@@ -68,7 +68,7 @@ input[type="checkbox"]+label::before {
 	margin-right: 10px;
 }
 
-/*input 閫変腑鍚庣殑鏍峰紡 */
+/*input 闁鑵戦崥搴ｆ畱閺嶅嘲绱� */
 input[type="checkbox"]:checked+label::before {
 	border: 3px solid #0BA1F8;
 	content: "\2714";

src/main/webapp/images/bg_login-border.svg

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="434px" height="315px" viewBox="0 0 434 315" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
-    <title>bg_login-border</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="登录" transform="translate(-503.000000, -213.000000)">
-            <g id="分组" transform="translate(502.000000, 212.000000)">
-                <g id="bg_login-border" transform="translate(0.321888, 0.548498)">
-                    <polygon id="Stroke-1" stroke="#0BA1F8" points="2 314 433.974249 314 433.974249 1 2 1"></polygon>
-                    <polygon id="Fill-3" fill="#0BA1F8" opacity="0.10265532" points="2 314 433.974249 314 433.974249 1 2 1"></polygon>
-                    <path d="M6.39313305,1.00888412 L35.389485,1.00888412 L30.1175966,5.40008584 L6.39313305,5.40008584 L6.39313305,29.1155365 L2,34.3861373 L2,1.00888412 L6.39313305,1.00888412 Z" id="合并形状" fill="#00E1EB"></path>
-                    <path d="M2,309.61867 L2,280.633906 L6.39313305,285.903863 L6.39313305,309.61867 L30.1175966,309.61867 L35.389485,314.010515 L2,314.010515 L2,309.61867 Z" id="合并形状" fill="#0BA1F8"></path>
-                    <path d="M429.581116,309.61867 L429.581116,285.903863 L433.974249,280.633906 L433.974249,309.61867 L433.974249,314.010515 L400.584764,314.010515 L405.856652,309.61867 L429.581116,309.61867 Z" id="合并形状" fill="#00E1EB"></path>
-                    <path d="M429.581116,5.40008584 L405.856652,5.40008584 L400.584764,1.00888412 L429.581116,1.00888412 L433.974249,1.00888412 L433.974249,34.3861373 L429.581116,29.1155365 L429.581116,5.40008584 Z" id="合并形状" fill="#0BA1F8"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/main/webapp/images/icon_password.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="17px" viewBox="0 0 16 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
-    <title>icon_password</title>
-    <desc>Created with Sketch.</desc>
-    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="输入框/icon-密码" transform="translate(0.000000, 1.000000)" fill-rule="nonzero">
-            <g id="icon_password" transform="translate(0.000000, -0.000000)">
-                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                <path d="M7.696,6.472 C7.36,4.56 8.64,2.728 10.552,2.392 C12.464,2.056 14.296,3.336 14.632,5.248 C14.968,7.16 13.688,8.992 11.776,9.328 C9.864,9.664 8.032,8.384 7.696,6.472 L7.696,6.472 Z M9.272,6.192 C9.456,7.24 10.456,7.936 11.496,7.752 C12.544,7.568 13.24,6.568 13.056,5.528 C12.872,4.48 11.872,3.784 10.832,3.968 C9.792,4.152 9.088,5.152 9.272,6.192 Z" id="形状" fill="#00E1EB"></path>
-                <path d="M3.52,13.48 L9.216,8.696 C9.704,8.288 10.008,7.792 9.6,7.304 C9.192,6.816 8.456,6.752 7.968,7.16 L2.272,11.944 C1.784,12.352 1.56,12.928 1.968,13.416 C2.376,13.904 3.024,13.888 3.52,13.48 L3.52,13.48 Z" id="路径" fill="#00E1EB"></path>
-                <path d="M3.76,12.096 L5,11.104 C5.136,10.992 5.152,10.784 5.04,10.656 L3.48,8.8 C3.368,8.664 3.16,8.648 3.032,8.76 L1.792,9.752 C1.656,9.864 1.64,10.072 1.752,10.2 L3.304,12.056 C3.424,12.192 3.624,12.208 3.76,12.096 L3.76,12.096 Z" id="路径" fill="#00E1EB"></path>
-            </g>
-        </g>
-    </g>
-</svg>

src/main/webapp/images/icon_user.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
-    <title>icon_user</title>
-    <desc>Created with Sketch.</desc>
-    <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="输入框/icon-用户名" fill-rule="nonzero">
-            <g id="icon_user">
-                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                <path d="M3.99999999,5.00000001 C3.99999999,7.209 5.79100001,9 8,9 C10.209,9 12,7.209 12,5.00000001 C12,2.791 10.209,1 8,1 C5.79100001,1 3.99999999,2.791 3.99999999,5.00000001 L3.99999999,5.00000001 L3.99999999,5.00000001 Z M5.00000001,10 C2.791,10 1,11.791 1,14 L1,14 C1,14.5522845 1.44994875,15 1.99562215,15 L14.0043778,15 C14.5542448,15 15,14.5526475 15,14 L15,14 C15,11.791 13.209,10 11,10 L5.00000001,10 L5.00000001,10 Z" id="形状" fill="#00E1EB"></path>
-            </g>
-        </g>
-    </g>
-</svg>

src/main/webapp/images/icon_xuanze.svg

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 52 (66869) - http://www.bohemiancoding.com/sketch -->
-    <title>icon_xuanze</title>
-    <desc>Created with Sketch.</desc>
-    <g id="总经理首页优化" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="首页4-2" transform="translate(-797.000000, -291.000000)">
-            <g id="业务趋势" transform="translate(24.000000, 273.000000)">
-                <g id="年份选择" transform="translate(722.000000, 12.000000)">
-                    <g id="icon_xuanze" transform="translate(51.000000, 6.000000)">
-                        <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                        <path d="M4.52115427,9 C4.0910871,9 3.81605726,9.57428391 4.14552653,9.9036338 L7.84727768,13.6055586 C8.05958712,13.817868 8.375338,13.817868 8.58763659,13.6055586 L12.289518,9.9036338 C12.6107171,9.58255402 12.3602914,9 11.9193277,9 L4.52115427,9 Z" id="路径" fill="#00A0E8"></path>
-                        <path d="M4.52115427,2 C4.0910871,2 3.81605726,2.57428391 4.14552653,2.9036338 L7.84727768,6.6055586 C8.05958712,6.81786804 8.375338,6.81786804 8.58763659,6.6055586 L12.289518,2.9036338 C12.6107171,2.58255402 12.3602914,2 11.9193277,2 L4.52115427,2 Z" id="路径-copy" fill="#00A0E8" transform="translate(8.217403, 4.382395) scale(1, -1) translate(-8.217403, -4.382395) "></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/main/webapp/images/inactive.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="220px" height="30px" viewBox="0 0 220 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
-    <title>progress bar _inactive</title>
-    <desc>Created with Sketch.</desc>
-    <g id="前台界面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="2-1订单详情4-" transform="translate(-1092.000000, -172.000000)" fill="#E5E5E5">
-            <g id="融资订单/进度条-copy-4" transform="translate(1092.000000, 172.000000)">
-                <g id="progress-bar-_inactive">
-                    <polygon id="路径-2-copy" points="0 7.10542736e-15 14.8740296 15 0 30 204.848134 30 220 15 204.848134 1.95399252e-14"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/main/webapp/images/normal.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="220px" height="30px" viewBox="0 0 220 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
-    <title>progress bar _normal</title>
-    <desc>Created with Sketch.</desc>
-    <g id="前台界面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.497302827">
-        <g id="2-1订单详情4-" transform="translate(-128.000000, -172.000000)" fill="#7D8488">
-            <g id="融资订单/进度条" transform="translate(128.000000, 172.000000)">
-                <g id="progress-bar-_normal">
-                    <polygon id="路径-2-copy" points="0 7.10542736e-15 14.8740296 15 0 30 204.848134 30 220 15 204.848134 1.95399252e-14"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/main/webapp/images/selected.svg

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="220px" height="30px" viewBox="0 0 220 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
-    <title>progress bar _selected</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <filter x="-5.5%" y="-29.3%" width="110.9%" height="158.5%" filterUnits="objectBoundingBox" id="filter-1">
-            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-    </defs>
-    <g id="前台界面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="2-1订单详情4-" transform="translate(-851.000000, -172.000000)" fill="#2ECC71">
-            <g id="融资订单/进度条-copy-3" filter="url(#filter-1)" transform="translate(851.000000, 172.000000)">
-                <g id="progress-bar-_selected">
-                    <polygon id="progress-bar" points="0 7.10542736e-15 14.8740296 15 0 30 204.848134 30 220 15 204.848134 1.95399252e-14"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/main/webapp/img/bg_sx_edu.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="341px" height="205px" viewBox="0 0 341 205" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
-    <title>可用额度_bg</title>
-    <desc>Created with Sketch.</desc>
-    <g id="前台界面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="3-1个人中心--授信初始" transform="translate(-648.000000, -97.000000)" fill="#FFFFFF">
-            <g id="授信图表" transform="translate(638.000000, 97.000000)">
-                <g id="额度_bg" transform="translate(10.000000, 0.000000)">
-                    <path d="M3.4923149,205 C1.20267171,193.858033 0,182.319466 0,170.5 C0,76.3354502 76.3354502,-5.68434189e-14 170.5,-5.68434189e-14 C264.66455,-5.68434189e-14 341,76.3354502 341,170.5 C341,182.319466 339.797328,193.858033 337.507685,205 L3.4923149,205 Z" id="合并形状" opacity="0.0793108259"></path>
-                    <path d="M14.7410708,205 C12.2913907,193.890355 11,182.345988 11,170.5 C11,82.4105824 82.4105824,11 170.5,11 C258.589418,11 330,82.4105824 330,170.5 C330,182.345988 328.708609,193.890355 326.258929,205 L14.7410708,205 Z" id="合并形状" opacity="0.0972842262"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>