From 43e37e3d477b4dc7d62b99736556dd28294e2c2f Mon Sep 17 00:00:00 2001 From: Wanghong <1417307168@qq.com> Date: Fri, 30 Jul 2021 17:40:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandUnqualifiedController.java | 7 +- .../entity/SarStandUnqualified.java | 29 +++---- .../entity/SarStandUnqualifiedPage.java | 18 ++-- .../service/ISarStandUnqualifiedService.java | 4 +- .../impl/SarStandUnqualifiedServiceImpl.java | 83 ++++++++----------- 5 files changed, 65 insertions(+), 76 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java index e6fb66e1..a0994984 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -58,16 +58,17 @@ public class SarStandUnqualifiedController extends BaseController> */ @ApiOperation("分页查询未符合项") @GetMapping - public ResponseMessage> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){ - IPage sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedPage(sarStandUnqualifiedPage); + public ResponseMessage> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){ + IPage sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedPage(sarStandUnqualifiedPage); return Result.success(sarStandUnqualifiedIPage); } + /** * 分页查询未符合项历史数据 * @param sarStandUnqualifiedPage：筛选、分页信息 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 1c5c3a6a..d6e29253 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 @@ -36,7 +36,7 @@ public class SarStandUnqualified extends BaseEntity { private static final long serialVersionUID = 1L; - @ExcelProperty("标准编号") + @ExcelProperty("标准ID") @ApiModelProperty(value = "标准ID") @TableField("STAND_ID") private String standId; @@ -46,17 +46,18 @@ public class SarStandUnqualified extends BaseEntity { @TableField("STAND_NAME") private String standName; - @ApiModelProperty(value = "标准编号") - @TableField("STAND_NUMBER") - private String standNumber; - - @ApiModelProperty(value = "标准类别") - @TableField("STAND_SORT") - private String standSort; - - @ApiModelProperty(value = "标准年份") - @TableField("STAND_YEAR") - private String standYear; +// @ExcelProperty("标准编号") +// @ApiModelProperty(value = "标准编号") +// @TableField("STAND_NUMBER") +// private String standNumber; +// +// @ApiModelProperty(value = "标准类别") +// @TableField("STAND_SORT") +// private String standSort; +// +// @ApiModelProperty(value = "标准年份") +// @TableField("STAND_YEAR") +// private String standYear; @ExcelProperty("条款号") @ApiModelProperty(value = "条款号") @@ -138,8 +139,8 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; - @ExcelProperty("标准编号组合") - @ApiModelProperty(value = "标准编号组合") + @ExcelProperty("标准编号") + @ApiModelProperty(value = "标准编号") @TableField("STAND_SERIAL_NUMBER") private String standSerialNumber; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualifiedPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualifiedPage.java index 5954c5d2..636027e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualifiedPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualifiedPage.java @@ -45,7 +45,7 @@ public class SarStandUnqualifiedPage { @ApiModelProperty(value = "计划关闭时间") private Timestamp planCloseTime; - @ApiModelProperty(value = "标准编号组合") + @ApiModelProperty(value = "标准编号") private String standSerialNumber; @ApiModelProperty(value = "质量工程师") @@ -90,13 +90,13 @@ public class SarStandUnqualifiedPage { @ApiModelProperty("每页条数") private Integer size; - @ApiModelProperty(value = "标准编号") - private String standNumber; - - @ApiModelProperty(value = "标准类别") - private String standSort; - - @ApiModelProperty(value = "标准年份") - private String standYear; +// @ApiModelProperty(value = "标准编号") +// private String standNumber; +// +// @ApiModelProperty(value = "标准类别") +// private String standSort; +// +// @ApiModelProperty(value = "标准年份") +// private String standYear; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java index e1e40b5f..df5fa169 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java @@ -21,10 +21,10 @@ public interface ISarStandUnqualifiedService extends IService */ - IPage getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage); + IPage getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage); /** * 分页查询未符合项历史数据 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 7ecd99ae..7e62b1f5 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 @@ -35,32 +35,47 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl */ @Override - public IPage getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR"); - wrapper.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE r.STAND_ID ='"+ sarStandUnqualifiedPage.getStandId()+"'"); - Page page = new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); - IPage userIPage = SarStandardsInfoDao.selectPage(page, wrapper); - List list = new ArrayList<>(); - List list1 = userIPage.getRecords(); - for(SarStandardsInfo s : list1){ - SarStandUnqualifiedPage p = new SarStandUnqualifiedPage(); - p.setStandSerialNumber(s.getStandSort()+s.getStandNumber()+s.getStandYear()); + public IPage getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR"); + wrapper1.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE sar_standards_info.ID='"+sarStandUnqualifiedPage.getStandId()+"'"); + Page page1 = new Page<>(); + IPage userIPage1 = sarStandardsInfoDao.selectPage(page1,wrapper1); + List list1 = userIPage1.getRecords(); + + QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper1.like("stand_number",null); + wrapper.select("STAND_SERIAL_NUMBER"); + Page page = new Page<>(); + IPage userIPage = sarStandUnqualifiedDao.selectPage(page,wrapper); + List list = userIPage.getRecords(); + + for (SarStandardsInfo s : list1){ + for (SarStandUnqualified a : list){ + a.setStandSerialNumber(s.getStandSort()+" "+s.getStandNumber()+"-"+s.getStandYear()); + } } + QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); + if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ + sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()); + } if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());//查询详情页所需的标准ID + sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); } - if (sarStandUnqualifiedPage.getStandSerialNumber()!=null){ - sarStandUnqualifiedQueryWrapper.like("STAND_SERIAL_NUMBER",sarStandUnqualifiedPage.getStandSerialNumber()); + if (sarStandUnqualifiedPage.getStandName()!=null){ + sarStandUnqualifiedQueryWrapper.like("stand_number",sarStandUnqualifiedPage.getStandName()); } if (sarStandUnqualifiedPage.getStandName()!=null){ sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName()); @@ -79,39 +94,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); } - List list2 = sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper).getRecords(); - for (SarStandardsInfo s : list1){ - SarStandUnqualifiedPage p = new SarStandUnqualifiedPage(); - p.setStandNumber(s.getStandNumber()); - p.setStandSort(s.getStandSort()); - p.setStandYear(s.getStandYear()); - for (SarStandUnqualified a : list2){ - if (s.getId().equals(a.getStandId())){ - p.setCreateDeptId(a.getCreateDeptId()); - p.setCreateById(a.getCreateById()); - p.setCreateTime((Timestamp)a.getCreateTime()); - p.setCloseState(a.getCloseState()); - p.setActualCloseTime((Timestamp)a.getActualCloseTime()); - p.setPlanCloseTime((Timestamp)a.getPlanCloseTime()); - p.setQaEngineer(a.getQaEngineer()); - p.setDutyEngineer(a.getDutyEngineer()); - p.setResponsibleUnit(a.getResponsibleUnit()); - p.setProductName(a.getProductName()); - p.setProductLine(a.getProductLine()); - p.setProductType(a.getProductType()); - p.setItemsName(a.getItemsName()); - p.setItemsNum(a.getItemsNum()); - p.setStandName(a.getStandName()); - p.setStandId(a.getStandId()); - p.setId(a.getId()); - p.setStandSerialNumber(a.getStandSerialNumber()); - } - } - list.add(p); - } - IPage userIPage1 = new Page<>(); - userIPage1.setRecords(list); - return userIPage1; + return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); } /** @@ -122,10 +105,14 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); + if(sarStandUnqualifiedPage.getStandId()!=null){ sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId()); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); } + if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ + sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()); + } if (sarStandUnqualifiedPage.getStandName()!=null){ sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName()); } From ed4dd5ae232cb8a1680c00a83b4366c053f29ecb Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Fri, 30 Jul 2021 17:55:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 9ae9fbad..4758cd0b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -83,8 +83,8 @@ order by number