基因流程附件样式调整

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

@@ -342,12 +342,12 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
         dataMap.put("createDateStr", createDate);
         dataMap.put("createBySign", userIdNameCache.getSignBase64(Long.valueOf(flowInfo.getCreateBy())));
 
-        dataMap.put("approvalNo", flowInfo.getApprovalNo());
-        dataMap.put("revisionNo", flowInfo.getRevisionNo());
-        dataMap.put("receiptDate", flowInfo.getReceiptDate());
-        dataMap.put("approvalDate", flowInfo.getApprovalDate());
-        dataMap.put("animalEnrollment", flowInfo.getAnimalEnrollment());
-        dataMap.put("finalSampling", flowInfo.getFinalSampling());
+        dataMap.put("approvalNo", WordUtil.padString(flowInfo.getApprovalNo(), 14));
+        dataMap.put("revisionNo", WordUtil.padString(flowInfo.getRevisionNo(), 14));
+        dataMap.put("receiptDate", WordUtil.padString(flowInfo.getReceiptDate(), 12));
+        dataMap.put("approvalDate", WordUtil.padString(flowInfo.getApprovalDate(), 12));
+        dataMap.put("animalEnrollment", WordUtil.padString(flowInfo.getAnimalEnrollment(), 12));
+        dataMap.put("finalSampling", WordUtil.padString(flowInfo.getFinalSampling(), 12));
 
         //查询审核记录
         List<FlowAudit> flowAudits = flowAuditService.list(new LambdaQueryWrapper<>(FlowAudit.class)
@@ -412,6 +412,8 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
                         .insert();
             }
         }
+
+
     }
 
     @Override

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/util/WordUtil.java

@@ -1,5 +1,6 @@
 package com.github.jfcloud.gene.util;
 
+import cn.hutool.core.util.StrUtil;
 import freemarker.template.Configuration;
 import lombok.extern.slf4j.Slf4j;
 import sun.misc.BASE64Encoder;
@@ -85,5 +86,38 @@ public class WordUtil {
         // 对字节数组Base64编码
         return new BASE64Encoder().encode(buffer);
     }
+
+    /**
+     * 在字符串左右填充字符串
+     *
+     * @param content 字符串
+     * @param left    左侧空格
+     * @param right   右侧空格
+     * @return 填充后的字符串
+     */
+    public static String padString(String content, int left, int right) {
+        if (content == null) {
+            content = "";
+        }
+        return StrUtil.repeat(' ', left) + content + StrUtil.repeat(' ', right);
+    }
+
+    /**
+     * 在字符串左右填充字符串
+     *
+     * @param content 字符串
+     * @param length  需要达到的长度
+     * @return 填充后的字符串
+     */
+    public static String padString(String content, int length) {
+        if (content == null) {
+            content = StrUtil.repeat(' ', length);
+        }
+        if (content.length() >= length) {
+            return content;
+        }
+        int space = (length - content.length() / 2) / 2;
+        return padString(content, space, space);
+    }
 }
 

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

@@ -1362,7 +1362,7 @@
                                         <w:rPr>
                                             <w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体" w:hint="eastAsia"/>
                                         </w:rPr>
-                                        <#if custom.geneticModelType?? && custom.geneticModelType?contains('转基因TG')>
+                                        <#if custom.geneticModelType?? && custom.geneticModelType?contains('转基因')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -1388,7 +1388,7 @@
                                         <w:rPr>
                                             <w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体" w:hint="eastAsia"/>
                                         </w:rPr>
-                                        <#if custom.geneticModelType?? && custom.geneticModelType?contains('点突变KI')>
+                                        <#if custom.geneticModelType?? && custom.geneticModelType?contains('点突变')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -1420,7 +1420,7 @@
                                         <w:rPr>
                                             <w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体" w:hint="eastAsia"/>
                                         </w:rPr>
-                                        <#if custom.geneticModelType?? && custom.geneticModelType?contains('基因插入KI')>
+                                        <#if custom.geneticModelType?? && custom.geneticModelType?contains('基因插入')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>