基因定制净化扩繁遗传背景雌雄繁育方式可多选

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/GeneApplication.java

@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @ComponentScans(value = {
         @ComponentScan(value = "com.github.jfcloud.common.aspect"),
         @ComponentScan(value = "com.github.jfcloud.rich"),
+        @ComponentScan(value = "com.github.jfcloud.web"),
         @ComponentScan(value = "com.github.jfcloud.common.exception"),
         @ComponentScan(value = "com.github.jfcloud.common.exception.service.impl")
 })

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/file/service/impl/FileInfoServiceImpl.java

@@ -89,7 +89,6 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
                 new FlowFileVersion()
                         .setFlowId(flowId)
                         .setFlowStatus(flowStatus)
-                        .setDataMapWithoutImg(dataMap.toJSONString())
                         .setFileMd5(DigestUtil.md5Hex(byteArray))
                         .setFilename(fileVo.getName())
                         .setFilepath(fileVo.getUrl())

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/entity/FlowFileVersion.java

@@ -41,10 +41,6 @@ public class FlowFileVersion extends Model implements Serializable {
      */
     private String templateName;
 
-    /**
-     * 模板数据
-     */
-    private String dataMap;
 
     /**
      * 文件名称
@@ -83,13 +79,4 @@ public class FlowFileVersion extends Model implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 设置dataMap，替换图片Base64字符串
-     * @param dataMap
-     * @return
-     */
-    public FlowFileVersion setDataMapWithoutImg(String dataMap) {
-        this.dataMap = dataMap.replaceAll("\"iVBOR.*?\"", "\"[图片Base64]\"");
-        return this;
-    }
 }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowInfoServiceImpl.java

@@ -384,12 +384,19 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
         //遗传背景说明
         if (detail.getTarget().contains(GeneTargetEnum.PURIFICATION.getCode())) {
             StrainPurificationInfoDto purification = detail.getPurification();
-
             //遗传背景替换
             String geneticBackground = purification.getGeneticBackground();
             if (StrUtil.isNotBlank(geneticBackground)) {
                 purification.setGeneticBackground(geneticBackground.replace("CKO", "CK"));
             }
+            //遗传背景说明，HashMap不能一边遍历一边修改
+            JSONObject noteObj = purification.getGeneticBackgroundNoteObj();
+            if (noteObj != null) {
+                JSONObject newNoteObj = new JSONObject();
+                noteObj.forEach((k, v) -> newNoteObj.put(k + "_list", StrUtil.split(v.toString(), ",")));
+                newNoteObj.putAll(noteObj);
+                purification.setGeneticBackgroundNoteObj(newNoteObj);
+            }
         }
 
         JSONObject dataMap = JSON.parseObject(JSON.toJSONString(detail));

jfcloud-gene-biz/src/main/resources/ftlTemplate/geneCustom.ftl

@@ -3911,7 +3911,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KO_male?? && purification.geneticBackgroundNoteObj.KO_male=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.KO_male_list?? && purification.geneticBackgroundNoteObj.KO_male_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -3928,7 +3928,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KO_male?? && purification.geneticBackgroundNoteObj.KO_male=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.KO_male_list?? && purification.geneticBackgroundNoteObj.KO_male_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -3945,7 +3945,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KO_male?? && purification.geneticBackgroundNoteObj.KO_male=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.KO_male_list?? && purification.geneticBackgroundNoteObj.KO_male_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4034,7 +4034,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KO_female?? && purification.geneticBackgroundNoteObj.KO_female=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.KO_female_list?? && purification.geneticBackgroundNoteObj.KO_female_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4051,7 +4051,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KO_female?? && purification.geneticBackgroundNoteObj.KO_female=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.KO_female_list?? && purification.geneticBackgroundNoteObj.KO_female_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4068,7 +4068,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KO_female?? && purification.geneticBackgroundNoteObj.KO_female=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.KO_female_list?? && purification.geneticBackgroundNoteObj.KO_female_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4207,7 +4207,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.CKO_male?? && purification.geneticBackgroundNoteObj.CKO_male=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.CKO_male_list?? && purification.geneticBackgroundNoteObj.CKO_male_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4224,7 +4224,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.CKO_male?? && purification.geneticBackgroundNoteObj.CKO_male=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.CKO_male_list?? && purification.geneticBackgroundNoteObj.CKO_male_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4241,7 +4241,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.CKO_male?? && purification.geneticBackgroundNoteObj.CKO_male=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.CKO_male_list?? && purification.geneticBackgroundNoteObj.CKO_male_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4330,7 +4330,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.CKO_female?? && purification.geneticBackgroundNoteObj.CKO_female=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.CKO_female_list?? && purification.geneticBackgroundNoteObj.CKO_female_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4347,7 +4347,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.CKO_female?? && purification.geneticBackgroundNoteObj.CKO_female=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.CKO_female_list?? && purification.geneticBackgroundNoteObj.CKO_female_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4364,7 +4364,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.CKO_female?? && purification.geneticBackgroundNoteObj.CKO_female=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.CKO_female_list?? && purification.geneticBackgroundNoteObj.CKO_female_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4503,7 +4503,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KI_male?? && purification.geneticBackgroundNoteObj.KI_male=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.KI_male_list?? && purification.geneticBackgroundNoteObj.KI_male_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4520,7 +4520,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KI_male?? && purification.geneticBackgroundNoteObj.KI_male=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.KI_male_list?? && purification.geneticBackgroundNoteObj.KI_male_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4537,7 +4537,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KI_male?? && purification.geneticBackgroundNoteObj.KI_male=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.KI_male_list?? && purification.geneticBackgroundNoteObj.KI_male_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4626,7 +4626,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KI_female?? && purification.geneticBackgroundNoteObj.KI_female=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.KI_female_list?? && purification.geneticBackgroundNoteObj.KI_female_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4643,7 +4643,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KI_female?? && purification.geneticBackgroundNoteObj.KI_female=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.KI_female_list?? && purification.geneticBackgroundNoteObj.KI_female_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4660,7 +4660,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.KI_female?? && purification.geneticBackgroundNoteObj.KI_female=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.KI_female_list?? && purification.geneticBackgroundNoteObj.KI_female_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4799,7 +4799,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.TG_male?? && purification.geneticBackgroundNoteObj.TG_male=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.TG_male_list?? && purification.geneticBackgroundNoteObj.TG_male_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4816,7 +4816,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.TG_male?? && purification.geneticBackgroundNoteObj.TG_male=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.TG_male_list?? && purification.geneticBackgroundNoteObj.TG_male_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4833,7 +4833,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.TG_male?? && purification.geneticBackgroundNoteObj.TG_male=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.TG_male_list?? && purification.geneticBackgroundNoteObj.TG_male_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4922,7 +4922,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.TG_female?? && purification.geneticBackgroundNoteObj.TG_female=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.TG_female_list?? && purification.geneticBackgroundNoteObj.TG_female_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4939,7 +4939,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.TG_female?? && purification.geneticBackgroundNoteObj.TG_female=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.TG_female_list?? && purification.geneticBackgroundNoteObj.TG_female_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4956,7 +4956,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.TG_female?? && purification.geneticBackgroundNoteObj.TG_female=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.TG_female_list?? && purification.geneticBackgroundNoteObj.TG_female_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -5095,7 +5095,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.other_male?? && purification.geneticBackgroundNoteObj.other_male=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.other_male_list?? && purification.geneticBackgroundNoteObj.other_male_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -5112,7 +5112,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.other_male?? && purification.geneticBackgroundNoteObj.other_male=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.other_male_list?? && purification.geneticBackgroundNoteObj.other_male_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -5129,7 +5129,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.other_male?? && purification.geneticBackgroundNoteObj.other_male=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.other_male_list?? && purification.geneticBackgroundNoteObj.other_male_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -5218,7 +5218,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.other_female?? && purification.geneticBackgroundNoteObj.other_female=='纯合'>
+                                        <#if purification.geneticBackgroundNoteObj.other_female_list?? && purification.geneticBackgroundNoteObj.other_female_list?seq_contains('纯合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -5235,7 +5235,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.other_female?? && purification.geneticBackgroundNoteObj.other_female=='杂合'>
+                                        <#if purification.geneticBackgroundNoteObj.other_female_list?? && purification.geneticBackgroundNoteObj.other_female_list?seq_contains('杂合')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -5252,7 +5252,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.other_female?? && purification.geneticBackgroundNoteObj.other_female=='阳性'>
+                                        <#if purification.geneticBackgroundNoteObj.other_female_list?? && purification.geneticBackgroundNoteObj.other_female_list?seq_contains('阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -5269,7 +5269,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.other_female?? && purification.geneticBackgroundNoteObj.other_female?contains('野生型')>
+                                        <#if purification.geneticBackgroundNoteObj.other_female_list?? && purification.geneticBackgroundNoteObj.other_female_list?seq_contains('野生型')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -5286,7 +5286,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.other_female?? && purification.geneticBackgroundNoteObj.other_female?contains('纯合/阳性')>
+                                        <#if purification.geneticBackgroundNoteObj.other_female_list?? && purification.geneticBackgroundNoteObj.other_female_list?seq_contains('纯合/阳性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -5303,7 +5303,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackgroundNoteObj.other_female?? && purification.geneticBackgroundNoteObj.other_female?contains('纯合/阴性')>
+                                        <#if purification.geneticBackgroundNoteObj.other_female_list?? && purification.geneticBackgroundNoteObj.other_female_list?seq_contains('纯合/阴性')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>