From 72d954db683f9205615eac8501c1a74a1b65ce10 Mon Sep 17 00:00:00 2001 From: Wanghong <1417307168@qq.com> Date: Thu, 29 Jul 2021 16:13:00 +0800 Subject: [PATCH 1/4] =?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=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandUnqualified.java | 14 ++- .../entity/SarStandUnqualifiedPage.java | 9 ++ .../impl/SarStandUnqualifiedServiceImpl.java | 89 +++++++++++-------- 3 files changed, 74 insertions(+), 38 deletions(-) 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 7158dc30..d6086a2a 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 @@ -22,7 +22,7 @@ import org.springframework.format.annotation.DateTimeFormat; /** *

- * + * *

* * @author super_liu @@ -46,6 +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("ITEMS_NUM") 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 c2801a4c..b00de78a 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 @@ -85,4 +85,13 @@ public class SarStandUnqualifiedPage { @ApiModelProperty("每页条数") private Integer size; + @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/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 71be68e1..21e7954d 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 @@ -1,13 +1,13 @@ package com.adc.da.slrs.sarStandUnqualified.service.impl; -import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; -import com.adc.da.slrs.sarLawsDetailedList.entity.ExcelDto; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage; import com.adc.da.slrs.sarStandUnqualified.entity.StandUnqualifiedExcelVO; import com.adc.da.slrs.sarStandUnqualified.entity.StandUnqualifiedListVO; import com.adc.da.slrs.sarStandUnqualified.service.ISarStandUnqualifiedService; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,9 +15,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; import java.sql.Timestamp; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; /** @@ -33,16 +33,26 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl */ @Override - public IPage getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { + 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(); QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId()); + sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());//查询详情页所需的标准ID // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); } if (sarStandUnqualifiedPage.getStandName()!=null){ @@ -62,7 +72,38 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); } - return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); + 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()); + } + } + list.add(p); + } + IPage userIPage1 = new Page<>(); + userIPage1.setRecords(list); + return userIPage1; } /** @@ -128,35 +169,9 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl0){ sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds()); } - List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); - List list = new ArrayList<>(); - list = BeanConverUtil.converList(stand,ExcelDto.class); - for (int a=0;a stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); + List a = stand; + return a; } private boolean closeSarStandUnqualified(String standUnqualifiedId){ From 502aff853993b61afad91c0be383c6386443ada6 Mon Sep 17 00:00:00 2001 From: Wanghong <1417307168@qq.com> Date: Thu, 29 Jul 2021 16:15:57 +0800 Subject: [PATCH 2/4] =?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=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ISarStandUnqualifiedService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 df5fa169..e1e40b5f 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); /** * 分页查询未符合项历史数据 From a40bada8ab17822ef7c08655f8de13849f5cf555 Mon Sep 17 00:00:00 2001 From: Wanghong <1417307168@qq.com> Date: Thu, 29 Jul 2021 16:29:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandUnqualified/entity/SarStandUnqualified.java | 5 +++++ .../entity/SarStandUnqualifiedPage.java | 5 +++++ .../service/impl/SarStandUnqualifiedServiceImpl.java | 8 ++++++++ 3 files changed, 18 insertions(+) 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 d6086a2a..18ffa0db 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 @@ -138,6 +138,11 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; + @ExcelProperty("标准编号组合") + @ApiModelProperty(value = "标准编号组合") + @TableField("STAND_SERIAL_ NUMBER") + private String standSerialNumber; + @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") @TableField("PRODUCT_TYPE") 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 b00de78a..5954c5d2 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 @@ -4,6 +4,8 @@ import com.adc.da.base.entity.BaseEntity; import java.sql.Timestamp; import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonBackReference; @@ -43,6 +45,9 @@ public class SarStandUnqualifiedPage { @ApiModelProperty(value = "计划关闭时间") private Timestamp planCloseTime; + @ApiModelProperty(value = "标准编号组合") + private String standSerialNumber; + @ApiModelProperty(value = "质量工程师") private String qaEngineer; 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 21e7954d..864c621c 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 @@ -50,11 +50,18 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl 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()); + } QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); if(sarStandUnqualifiedPage.getStandId()!=null){ sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());//查询详情页所需的标准ID // 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()); } @@ -97,6 +104,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl Date: Thu, 29 Jul 2021 16:37:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandUnqualifiedController.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 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 91ead351..e6fb66e1 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 @@ -1,8 +1,6 @@ package com.adc.da.slrs.sarStandUnqualified.controller; -import com.adc.da.common.ReadExcel; -import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.ResponseMessage; import com.adc.da.http.ResponseMessageCodeEnum; import com.adc.da.http.Result; @@ -11,16 +9,10 @@ import com.adc.da.slrs.sarStandUnqualified.entity.StandUnqualifiedExcelVO; import com.adc.da.slrs.sarStandUnqualified.entity.StandUnqualifiedListVO; import com.adc.da.slrs.sarStandUnqualified.service.ISarStandUnqualifiedService; import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; -import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; -import com.adc.da.slrs.sarStandardsInfo.entity.StandardsInfoExcelVO; -import com.adc.da.utils.util.StandExportUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -29,13 +21,8 @@ import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; import java.net.URLEncoder; -import java.sql.Timestamp; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -71,13 +58,13 @@ 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); }