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 + +