From a97d0fb1ceb8520fbcbdcacaf9483a0c548853e0 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 7 Sep 2021 15:43:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/aspect/ExportAspect.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java b/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java index 8bcf3198..761a0370 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java @@ -1,22 +1,17 @@ package com.foreverwin.mesnac.common.aspect; -import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.foreverwin.mesnac.common.export.ColumnConvert; -import com.foreverwin.mesnac.common.export.DateConvert; import com.foreverwin.mesnac.common.model.ExportTemplate; import com.foreverwin.mesnac.common.service.ExportTemplateService; -import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.SpringUtil; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.HSSFColor; import org.aspectj.lang.ProceedingJoinPoint; @@ -32,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.text.SimpleDateFormat; import java.util.*; @Aspect @@ -55,7 +49,7 @@ public class ExportAspect { String exportCode = ""; //------------------------------------------------------------------------------------------------------------------- if (paramtes == null || args == null || args.length == 0) return joinPoint.proceed(); - Boolean isDuoDuo = (args != null && args.length == 1) ? false : true; + Boolean isDuoDuo = (args != null && (args.length == 1 && args[0].getClass() != String.class)) ? false : true; //------------------------------------------------------------------------------------------------------------------- request.setCharacterEncoding("UTF-8"); //------------------------------------------------------------------------------------------------------------------- @@ -73,9 +67,12 @@ public class ExportAspect { while (paramtes.hasMoreElements()) { String param = paramtes.nextElement(); String value = request.getParameter(param); - if (param != null && param.equals("export")) export = true; - if (param != null && param.equals("exportCode")) exportCode = value; - + if (param != null && param.equals("export")) { + export = true; + } + if (param != null && param.equals("exportCode")) { + exportCode = value; + } paramMap.put(param, value); }//while args[0] = paramMap; From 8cf9d57efe84c96a64b0aa72496545a425f72561 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 7 Sep 2021 15:44:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReportDataController.java | 11 ++++ .../common/mapper/ReportDataMapper.java | 2 + .../common/service/ReportDataService.java | 2 + .../service/impl/ReportDataServiceImpl.java | 5 ++ .../resources/mapper/ReportDataMapper.xml | 51 ++++++++++++++++++- 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java index b5131170..45b13862 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java @@ -132,4 +132,15 @@ public class ReportDataController { } } + @GetMapping("/userPassRate") + public R findUserPassRate(@RequestParam(required = false) Map paramMap) { + try { + paramMap.put("site", CommonMethods.getSite()); + List> result = reportDataService.findUserPassRate(paramMap); + return R.ok(result); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java index 50905c4b..e90cbccd 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java @@ -27,4 +27,6 @@ public interface ReportDataMapper { List> findCheckUserPassRate(Map paramMap); + List> findUserPassRate(Map paramMap); + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java index fabb864c..a7819bb3 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java @@ -47,4 +47,6 @@ public interface ReportDataService { List> findCheckUserPassRate(Map paramMap); + List> findUserPassRate(Map paramMap); + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java index 9d58629d..cb4de8b1 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java @@ -72,4 +72,9 @@ public class ReportDataServiceImpl implements ReportDataService{ public List> findCheckUserPassRate(Map paramMap) { return reportDataMapper.findCheckUserPassRate(paramMap); } + + @Override + public List> findUserPassRate(Map paramMap) { + return reportDataMapper.findUserPassRate(paramMap); + } } diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 6bb7deec..5b3b8fb1 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -262,6 +262,8 @@ GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY, WT.DESCRIPTION,ZSD.DISPATCH_QTY ) GROUP BY DESCRIPTION, "MONTH" + ORDER BY DESCRIPTION,"MONTH" + + + \ No newline at end of file