From b15cd814ca82087af7f8a0248ae16e533aa69709 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 7 Jan 2022 14:15:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=AF=84=E5=88=86=20=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=80=BB=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QualityEvaluationServiceImpl.java | 8 ++++---- .../QualityEvaluationMapper.xml | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index 6b8980ed..e721dc00 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -152,11 +152,11 @@ public class QualityEvaluationServiceImpl extends ServiceImpl{ + Collectors.summingDouble(item ->{ Double score; String value; @@ -173,10 +173,10 @@ public class QualityEvaluationServiceImpl extends ServiceImpl @@ -36,6 +35,7 @@ resultType="com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation"> SELECT + DISTINCT UNAME AS userName, score, reason, @@ -48,7 +48,8 @@ `index`.one_index_title as oneIndexTitle, `index`.two_index_title as twoIndexTitle, `index`.three_index_title as threeIndexTitle, - `index`.weight as weight + `index`.weight as weight, + `index`.index_sort FROM quality_evaluation LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID From be24afce0ef6f8b7fd67af1f141fef446cddf12f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 7 Jan 2022 14:16:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=8C=83=E5=9B=B4=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E5=A4=9A=E9=80=89=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 70 +++++-------------- 1 file changed, 17 insertions(+), 53 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 0182065a..b94c7bbf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -210,59 +210,23 @@ public class SarStandardsInfoController extends BaseController @GetMapping("/getSarStandardsInfoPageBak") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") public ResponseMessage> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { -// int isNull = -1; -// if (null != page.getNowOrderBy()) { -// switch (page.getNowOrderBy()) { -// case 1: -// page.setOrderByA("issueTime");//发布日期 -// break; -// case 2: -// page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期 -// break; -// case 3: -// page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期 -// break; -// case 4: -// page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态 -// break; -// case 5: -// page.setOrderByA("paixu"); -// break; -// case 6: -// page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ"); -// break; -// default: -// page.setNowOrder(null); -// break; -// } -// if (null != page.getNowOrder()) { -// switch (page.getNowOrder()) { -// case 1: -// page.setOrder1("desc"); -// break; -// case 2: -// page.setOrder1("asc"); -// default: -// page.setOrder1(null); -// break; -// } -// } -// } -// -// -// if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { -// List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); -// String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); -// if (StringUtils.isNotBlank(advanceStr)) { -// page.setAdvanceSearchStr(advanceStr); -// } else { -// page.setAdvanceSearchStr(null); -// } -// } -// -// if(page.getUserId() == null || page.getUserId().equals("")){ -// page.setUserId(LoginUserUtil.getUserId()); -// } + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } List rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak1(page); return Result.success(getPageInfo(page.getPager(), rows)); } From ab75e5245556d202267ded5017fd7eb662995324 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 7 Jan 2022 14:16:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandUnqualifiedDao.java | 2 ++ .../entity/SarStandUnqualified.java | 11 +++++---- .../impl/SarStandUnqualifiedServiceImpl.java | 12 +++++----- .../SarStandUnqualifiedMapper.xml | 23 +++++++++++++++++++ 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index c456d737..b83f734b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -24,6 +24,8 @@ public interface SarStandUnqualifiedDao extends BaseMapper List getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified); + List getSarStandUnqualifiedExcel(@Param("ids")List strings); + Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 1b256213..eeb93142 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -142,11 +142,16 @@ public class SarStandUnqualified extends BaseEntity { @TableField("AUTH_ENGINEER") private String authEngineer; - @ExcelProperty("责任工程师") + @ExcelIgnore @ApiModelProperty(value = "责任工程师") @TableField("DUTY_ENGINEER") private String dutyEngineer; + @ExcelProperty("责任工程师") + @ApiModelProperty(value = "责任工程师") + @TableField(exist=false) + private String dutyEngineerName; + @ExcelIgnore @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -177,10 +182,6 @@ public class SarStandUnqualified extends BaseEntity { @TableField(exist=false) private String authEngineerName; - @ExcelIgnore - @ApiModelProperty(value = "责任工程师") - @TableField(exist=false) - private String dutyEngineerName; @ExcelIgnore @ApiModelProperty(value = "国内OR海外") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index c2258498..76d1de95 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -148,12 +148,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO) { - QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); - sarStandUnqualifiedQueryWrapper.eq("close_state",1); - if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){ - sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds()); - } - List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); +// QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); +// sarStandUnqualifiedQueryWrapper.eq("close_state",1); +// if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){ +// sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds()); +// } + List stand = sarStandUnqualifiedDao.getSarStandUnqualifiedExcel(standUnqualifiedExcelVO.getIds()); // 去掉日期时分秒 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index 5d0c2271..9c185c3e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -63,6 +63,29 @@ ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows + +