浏览代码

样本送检 更新时更新申请人、部门负责人的id

陈长荣 2 月之前
父节点
当前提交
8d9b2cd7a0

+ 0 - 5
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/entity/SampleInfo.java

@@ -1,7 +1,5 @@
 package com.github.jfcloud.gene.sample.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.github.jfcloud.gene.common.entity.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -29,7 +27,6 @@ public class SampleInfo extends BaseEntity {
     @Schema(description = "状态")
     private String status;
 
-    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     @Schema(description = "申请人id")
     private Long applicantId;
 
@@ -51,14 +48,12 @@ public class SampleInfo extends BaseEntity {
     @Schema(description = "备注")
     private String remark;
 
-    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     @Schema(description = "部门负责人Id")
     private Long departLeaderId;
 
     @Schema(description = "部门负责人姓名")
     private String departLeaderName;
 
-    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     @Schema(description = "项目管理部审核人")
     private Long projectManageId;
 

+ 7 - 1
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleInfoServiceImpl.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jfcloud.admin.api.sys.dto.message.MessageUserDTO;
@@ -129,7 +130,12 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
 
         BeanUtil.copyProperties(vo, sampleInfo);
         sampleInfo.setInspector(vo.getInspector().toJSONString());
-        sampleInfo.updateById();
+        LambdaUpdateWrapper<SampleInfo> wrapper = new LambdaUpdateWrapper<SampleInfo>()
+                .eq(SampleInfo::getId, id)
+                .set(vo.getApplicantId() == null, SampleInfo::getApplicantId, null)
+                .set(vo.getDepartLeaderId() == null, SampleInfo::getDepartLeaderId, null)
+                .set(vo.getProjectManageId() == null, SampleInfo::getProjectManageId, null);
+        baseMapper.update(sampleInfo, wrapper);
 
         getServiceByType(vo.getType()).save(id, vo);
     }