基因定制 遗传背景增加雌雄繁育方式

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/vo/FlowDetailVo.java

@@ -65,9 +65,6 @@ public class FlowDetailVo {
     @Schema(description = "机构名称")
     private String institutionName;
 
-    @Schema(description = "品系定制")
-    private StrainCustomVo custom;
-
     @Schema(description = "申请人id")
     private Long applicantId;
 
@@ -77,6 +74,9 @@ public class FlowDetailVo {
     @Schema(description = "申请人电话")
     private String applicantPhone;
 
+    @Schema(description = "品系定制")
+    private StrainCustomVo custom;
+
     @Schema(description = "品系净化扩繁")
     private StrainPurificationInfoVo purification;
 

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/form/dto/StrainPurificationInfoDto.java

@@ -1,5 +1,6 @@
 package com.github.jfcloud.gene.form.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.jfcloud.gene.file.vo.FileVo;
 import com.github.jfcloud.gene.form.entity.StrainPurificationInfo;
 import com.github.jfcloud.gene.form.vo.AnimalDemandVo;
@@ -16,6 +17,9 @@ import java.util.List;
 @Schema(description = "品系净化扩繁响应")
 public class StrainPurificationInfoDto extends StrainPurificationInfo {
 
+    @Schema(description = "遗传背景说明")
+    private JSONObject geneticBackgroundNoteObj = new JSONObject();
+
     @Schema(description = "检测附件")
     private List<FileVo> testingFiles = new ArrayList<>();
 

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/form/service/impl/StrainPurificationInfoServiceImpl.java

@@ -2,6 +2,8 @@ package com.github.jfcloud.gene.form.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.file.FileNameUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jfcloud.gene.common.constant.WhetherEnum;
@@ -41,6 +43,9 @@ public class StrainPurificationInfoServiceImpl extends ServiceImpl<StrainPurific
     public void saveForm(StrainPurificationInfoVo vo) {
         StrainPurificationInfo purificationInfo = BeanUtil.copyProperties(vo, StrainPurificationInfo.class);
         purificationInfo.setId(CustomIdGenerator.nextId());
+        if (vo.getGeneticBackgroundNoteObj() != null) {
+            purificationInfo.setGeneticBackgroundNote(vo.getGeneticBackgroundNoteObj().toJSONString());
+        }
         purificationInfo.insert();
 
         saveDetailList(purificationInfo.getId(), vo);
@@ -100,6 +105,9 @@ public class StrainPurificationInfoServiceImpl extends ServiceImpl<StrainPurific
         }
 
         BeanUtil.copyProperties(vo, info);
+        if (vo.getGeneticBackgroundNoteObj() != null) {
+            info.setGeneticBackgroundNote(vo.getGeneticBackgroundNoteObj().toJSONString());
+        }
         info.updateById();
 
         //先删除附件等，再进行保存
@@ -120,6 +128,10 @@ public class StrainPurificationInfoServiceImpl extends ServiceImpl<StrainPurific
         }
 
         StrainPurificationInfoDto dto = BeanUtil.copyProperties(info, StrainPurificationInfoDto.class);
+        if (StrUtil.isNotBlank(info.getGeneticBackgroundNote())) {
+            dto.setGeneticBackgroundNoteObj(JSONObject.parseObject(info.getGeneticBackgroundNote()));
+            dto.setGeneticBackgroundNote(null);
+        }
         //动物需求
         List<AnimalDemand> animalDemandList = animalDemandService.list(new LambdaQueryWrapper<AnimalDemand>()
                 .eq(AnimalDemand::getPurificationId, info.getId())

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/form/vo/StrainPurificationInfoVo.java

@@ -1,5 +1,6 @@
 package com.github.jfcloud.gene.form.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.jfcloud.gene.file.vo.FileVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -56,7 +57,7 @@ public class StrainPurificationInfoVo {
     private String geneticBackground;
 
     @Schema(description = "遗传背景说明")
-    private String geneticBackgroundNote;
+    private JSONObject geneticBackgroundNoteObj = new JSONObject();
     /**
      * 遗传背景（其他）
      */