From d1fdd436697edc3f6423c7d96617f17482e57100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Fri, 29 May 2026 20:33:59 +0800 Subject: [PATCH] bug --- .../quality/pojo/vo/LiquidTankTaskVO.java | 4 ++++ .../LiquidTankReportController.java | 8 ++++++-- .../desk/quality/excel/LiquidTankExcel.java | 12 ++++++------ .../quality/mapper/LiquidTankTaskMapper.xml | 4 +++- .../resources/Excel/QA/槽液信息模板.xls | Bin 24576 -> 24576 bytes 5 files changed, 19 insertions(+), 9 deletions(-) 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 4096c62d5ddc1a97081af747cf276b4a6406274a..f9bb72840bbc98a377ad90d4d0982709ceecee88 100644 GIT binary patch delta 1020 zcmaiz%WD%+6vn@MGkKWAB+cZV)HIE)wXHP+r|(v67H;;vA^b0=X^>cV?qIKT7V^SCp2YU`}F&fYC3 z=CAeBTXW*B@{C;*yGoV)(C(Wry0q`Ak69}CeKq?^ zd{{|gcToJyr};)f>nQZ{>Pn9r910%6i4d7)Z*dr5)H+)nK?Ey(Esi3JT6>H40ER<3 z>a76WC1-?9f5xQ8Jx#x#NvFo#u*smLnD|yy2V>YLkz$g{ff$wkCuY_woGPjQgS)L# z(Pm3GnR}Q{2mFDZo?#4$jdE8~wjQB!jX0xGM$m2$Cpsb$W9O=IBj%u3he1xFgh7Xi zIt_9mkEB6vqN4_Rh`NX#b365HBLaL`IU9qQsN2}75*?d2&_~!~B>MHlolGM!Ky;k6 zHN8xbs6a<s?80J#wKbk-;OOSk7c69vOus|JcLP{)QdYw z3pX>PkVDFgGS&2~P0vd2dK#bUSGh;>OFU;~wtxr3a-HQ~ytmNEcCj?w?Q%e+AcKQU zRkgPhGs<%1#p?M0x4z-=+lwD6TKk0}7k4hb7AeKHI(viJYS#l>bK75-Sicg}o?L!t F{tNO3o(=#2 delta 1162 zcmaKrO=uHA6vzKFNj6E1N!q3#Nj9b?ZS9xZ1U%ZNG@5>-scF;N51~aZ6_kP?h*(Vo zMWKS=h>&X$5j-ee5HD)(f_M=RdeDm$FP0uEf<@nK(haS}ePlDg|9kV^%-fkxIzOOf?weOxvrwE4JEG52# z+S#yhguBJ%a8w)#HM0@zQTRhJy3qrA6gG-;m?OJ{2yVfH_x(HdsIH$H6i<8O)@P;& z`6FVZ_qW{yW}oky3(jln@iER+(U)lUIR5-xdY9_B`XH6OgPFIJ=O^-Mv5@eZBRJY6 zmJ(4u-mkq$wDD}t?E;4x*Wf@cS-z#rUU;EZl-UO#a-lN&;YYr`%qmpm0%hI=^~K&x zOEm-BDYpch{tn0yrf#z+Q z_%!6sCXn1=HTwEF9k?WgBgVKw6YGd%F;3l2;*g%uN#w;4Qo5