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