diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java index 53ca91e0b..5b27b8195 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java @@ -12,6 +12,7 @@ import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -111,4 +112,7 @@ public class LiquidTankTaskVO extends LiquidTankTask { @Schema(description = "创建时间-结束") private LocalDateTime createTimeEnd; + private BigDecimal phType; + private BigDecimal phRangeLeft; + private BigDecimal phRangeRight; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java index 8d5b7f22d..102d38e07 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java @@ -117,10 +117,14 @@ public class LiquidTankReportController extends BladeController { if(null == one.getUpdateUser()){ R user= iUserClient.userInfoById(one.getCreateUser()); - one.setUpdateUserRealName(user.getData().getRealName()); + if(null != user && null != user.getData() && null != user.getData().getRealName()){ + one.setUpdateUserRealName(user.getData().getRealName()); + } }else{ R user= iUserClient.userInfoById(one.getUpdateUser()); - one.setUpdateUserRealName(user.getData().getRealName()); + if(null != user && null != user.getData() && null != user.getData().getRealName()){ + one.setUpdateUserRealName(user.getData().getRealName()); + } } } return R.data(pagesVO); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/LiquidTankExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/LiquidTankExcel.java index d848d043e..367cd400f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/LiquidTankExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/LiquidTankExcel.java @@ -193,12 +193,12 @@ public class LiquidTankExcel implements Serializable { private String teamName; - /** - * 有效期 - */ - @ColumnWidth(20) - @ExcelProperty("有效期") - private LocalDate validDate; + ///** + // * 有效期 + // */ + //@ColumnWidth(20) + //@ExcelProperty("有效期") + //private LocalDate validDate; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml index 73d8aea55..ec8157801 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml @@ -146,7 +146,9 @@ TS_NAME formula1.content as afterFormulaContent, worktank.WORK_TANK_CODE as workTankName, good.goods_code as DRUG_MATERIAL_CODE, - ADD_MONTHS(task.CREATE_TIME, 0) + tank.ANALYSIS_CYCLE as tankEndTime + ADD_MONTHS(task.CREATE_TIME, 0) + tank.ANALYSIS_CYCLE as tankEndTime, + tank.PH_TYPE, + tank.PH_RANGE_LEFT ,tank.PH_RANGE_RIGHT FROM QA_LIQUID_TANK_TASK task left join QA_LIQUID_TANK tank on task.LIQUID_TANK_ID = tank.id left join BS_FORMULA formula on tank.ADD_DRUG_FORMULA_ID = formula.id diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/槽液信息模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/槽液信息模板.xls index 4096c62d5..f9bb72840 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/QA/槽液信息模板.xls and b/blade-service/blade-desk/src/main/resources/Excel/QA/槽液信息模板.xls differ