From 7c5f46126684c8de888c192b252d48ef9f068c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?= <11918452+yang-haihang@user.noreply.gitee.com> Date: Tue, 19 Nov 2024 11:55:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=201.=E5=A7=94=E6=89=98?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=BF=AE=E6=94=B9=E5=A7=94=E6=89=98=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E8=A6=81=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/ApprovedUpdateEntrustDTO.java | 3 +++ .../entrustment/dto/EntrustmentDTO.java | 2 ++ .../entrustment/entity/Entrustment.java | 15 ++++++++------- .../impl/EntrustAlterApplyServiceImpl.java | 18 ++++++++++++------ .../service/impl/EntrustmentServiceImpl.java | 6 +++--- 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java index ca6f162..3abce6c 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java @@ -24,6 +24,9 @@ public class ApprovedUpdateEntrustDTO { @ApiModelProperty(value = "案件简要") private String caseBrief; + @ApiModelProperty(value = "鉴定要求") + private String entrustRequirement; + @ApiModelProperty(value = "委托检材列表") private List materialList; diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustmentDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustmentDTO.java index 844e1ef..f58a15c 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustmentDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustmentDTO.java @@ -1,5 +1,6 @@ package digital.laboratory.platform.entrustment.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import digital.laboratory.platform.entrustment.entity.Entrustment; import lombok.Data; @@ -11,6 +12,7 @@ public class EntrustmentDTO extends Entrustment { private String caseBrief; private String caseName; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate happenTime; } diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java index d51ad78..47b230a 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java @@ -5,20 +5,20 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; -//import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import digital.laboratory.platform.common.mybatis.base.BaseEntity; import digital.laboratory.platform.sewage.entity.UpdateInfo; import digital.laboratory.platform.sys.entity.DrugLite; -import digital.laboratory.platform.common.mybatis.base.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.time.LocalDateTime; -import java.util.List; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + /** * 委托 @@ -80,7 +80,8 @@ public class Entrustment extends BaseEntity { * 委托日期, 鉴定委托书打印日期 */ @ApiModelProperty(value="委托日期, 鉴定委托书打印日期") - private LocalDateTime entrustmentTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDate entrustmentTime; /** * 委托提交者, 后期可能会转给其他人user_id diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java index d9af575..7699968 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java @@ -275,7 +275,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl renewList = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery() - .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustmentId) - .orderByAsc(EntrustmentIdentificationMaterial::getOrderNo)); - entrustment.setEntrustRequirement(entrustmentService.buildEntrustReq(renewList)); + public void updateEntrustmentRequirement(String entrustmentId, Entrustment entrustment, String entrustRequirement) { + if (StrUtil.isNotBlank(entrustRequirement)) { + entrustment.setEntrustRequirement(entrustRequirement); + } else { + List renewList = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery() + .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustmentId) + .orderByAsc(EntrustmentIdentificationMaterial::getOrderNo)); + entrustment.setEntrustRequirement(entrustmentService.buildEntrustReq(renewList)); + } entrustmentService.updateById(entrustment); } diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java index df3c498..ab8d2e5 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java @@ -2130,7 +2130,7 @@ public class EntrustmentServiceImpl extends ServiceImpl dm = ClassUtils.objectToMap(ev); if (ev.getEntrustmentTime() == null) { - ev.setEntrustmentTime(LocalDateTime.now()); + ev.setEntrustmentTime(LocalDate.now()); UpdateWrapper updateWrapper = new UpdateWrapper(); updateWrapper.eq("id", ev.getId()); // 查询条件是 id 相等 @@ -2641,7 +2641,7 @@ public class EntrustmentServiceImpl extends ServiceImpl dm = ClassUtils.objectToMap(ev); if (ev.getEntrustmentTime() == null) { - ev.setEntrustmentTime(LocalDateTime.now()); + ev.setEntrustmentTime(LocalDate.now()); UpdateWrapper updateWrapper = new UpdateWrapper(); updateWrapper.eq("id", ev.getId()); // 查询条件是 id 相等 @@ -3477,7 +3477,7 @@ public class EntrustmentServiceImpl extends ServiceImpl