From ee0db45b36ec144492562d4221c5c24ea3e809ba Mon Sep 17 00:00:00 2001 From: "a15234804788@163.com" Date: Mon, 10 Oct 2022 10:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=BA=9F=E5=8D=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=B6=E5=80=99=E7=9B=B8=E5=85=B3=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/springblade/lims/entry/Instrument.java | 4 ++-- .../lims/controller/RepairApplicationController.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java index b66d43b..4c32cfc 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java @@ -8,7 +8,7 @@ import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.data.annotation.Id; -import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -49,7 +49,7 @@ public class Instrument extends BaseEntity implements Serializable { private Date productionDate; // 启用日期 - @NotBlank(message = "设备启用时间不能为空") + @NotNull(message = "设备启用时间不能为空") private Date enableDate; public String manufacturerBrand; diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java index 2348b83..5b597cb 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java @@ -154,6 +154,13 @@ public class RepairApplicationController extends BladeController { scrapApplication.setModel(application.getVersion()); scrapApplication.setStatus(0); scrapApplication.setReasonAndState(repairApplication.getReasonForScrapping()); + //维修金额 + scrapApplication.setMoney(application.getTotalCost() == null ? 0 : application.getTotalCost()); + //购置日期 + Instrument instrumentThis = instrumentService.getById(application.getInstrumentId()); + scrapApplication.setPurchaseTime(instrumentThis.getPurchaseTime()); + //处理情况，使用维修单的维修记录 + scrapApplication.setHandling(application.getMaintenanceRecord() == null ? "" : application.getMaintenanceRecord()); scrapApplicationService.save(scrapApplication); } }