admin
2019-10-17 70cfe5f0c05b8ba31550dcabc45301aaa9bad64f
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -106,7 +106,6 @@
   @Resource
   private UserInfoExtraService userInfoExtraService;
   
   /**
    * 
    * 方法说明: 通过提现请求 可jsonP方式
@@ -396,6 +395,11 @@
            AdminUser adminUser = record.getAdminUser();
            if (adminUser == null) {
               record.setAdminUser(new AdminUser());
            }
            // 查询用户备注信息
            UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(record.getExtract().getUserInfo().getId());
            if (extra != null) {
               record.getExtract().getUserInfo().setStateDesc(extra.getMark());
            }
            int warnLevel = 0;
@@ -850,8 +854,8 @@
               innerList.put("name", "驳回数");
            }
            List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year,
                  startTime, endTime);
            List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year, startTime,
                  endTime);
            if (dateType != 3) {
               innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
            } else {
@@ -935,8 +939,8 @@
         JSONObject innerList = new JSONObject();
         innerList.put("name", "总计");
         List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year,
               startTime, endTime);
         List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year, startTime,
               endTime);
         if (dateType != 3) {
            innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
@@ -1020,12 +1024,11 @@
         Gson gson = new Gson();
         List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
         JSONObject innerList = new JSONObject();
         innerList.put("name", "总计");
         List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year,
               startTime, endTime);
         List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year, startTime,
               endTime);
         if (dateType != 3) {
            innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
@@ -1070,7 +1073,8 @@
         response.reset();
          response.setContentType("application/octet-stream");
          String fileName= URLDecoder.decode(filepath,"utf-8");
          response.addHeader("Content-Disposition","attachment;"+ "filename=\"" +URLEncoder.encode(fileName, "utf-8") + "\"");
         response.addHeader("Content-Disposition",
               "attachment;" + "filename=\"" + URLEncoder.encode(fileName, "utf-8") + "\"");
         
         StringBuilder sb = new StringBuilder();
         for(String t:list){
@@ -1093,7 +1097,6 @@
      }
   }
   
   @RequestMapping(value = "uploadExcel", method = RequestMethod.POST)
   public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
      if (file == null) {
@@ -1112,8 +1115,6 @@
         out.print(JsonUtil.loadFalseResult("上传失败"));
      }
   }
   
   @RequestMapping(value = "preAutoUser")
   public void preAutoUser(String callback, Integer pageIndex, Integer pageSize, PrintWriter out) {