更新

1.更新案件时，添加检材委托类型参数

src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java

@@ -3,12 +3,10 @@ package digital.laboratory.platform.entrustment.controller;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.amazonaws.services.s3.model.AmazonS3Exception;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,22 +16,24 @@ import digital.laboratory.platform.common.core.util.R;
 import digital.laboratory.platform.common.log.annotation.SysLog;
 import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
 import digital.laboratory.platform.common.oss.service.OssFile;
-//import digital.laboratory.platform.common.security.service.DLPUser;
 import digital.laboratory.platform.entrustment.convert.CaseEventConvert;
 import digital.laboratory.platform.entrustment.dto.UpdateCaseAndEntrustTypeDTO;
-import digital.laboratory.platform.entrustment.entity.*;
+import digital.laboratory.platform.entrustment.entity.CaseEvent;
-import digital.laboratory.platform.othersys.vo.EntrustDataVo;
+import digital.laboratory.platform.entrustment.entity.CaseEvidence;
+import digital.laboratory.platform.entrustment.entity.Entrustment;
+import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
 import digital.laboratory.platform.entrustment.service.CaseEventService;
 import digital.laboratory.platform.entrustment.service.CaseEvidenceService;
 import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService;
 import digital.laboratory.platform.entrustment.service.EntrustmentService;
 import digital.laboratory.platform.entrustment.vo.CaseEventVO;
+import digital.laboratory.platform.othersys.vo.EntrustDataVo;
 import digital.laboratory.platform.sys.entity.SysOrg;
 import digital.laboratory.platform.sys.feign.RemoteOrgService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -44,9 +44,10 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.security.Principal;
-import java.time.LocalDateTime;
+import java.util.Date;
-import java.time.ZoneId;
+import java.util.HashMap;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 
 /**

src/main/java/digital/laboratory/platform/entrustment/dto/UpdateCaseAndEntrustTypeDTO.java

@@ -92,7 +92,7 @@ public class UpdateCaseAndEntrustTypeDTO {
     private Integer dataSources;
 
     @ApiModelProperty(value="委托id")
-    private Integer entrustId;
+    private String entrustId;
 
     @ApiModelProperty(value="委托类型: 0=常规毒品, 1=生物样本")
     private Integer entrustmentType;