动物样本检测委托附件调整

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalServiceImpl.java

@@ -34,6 +34,7 @@ import com.github.jfcloud.gene.sample.mapper.SampleCheckOrderMapper;
 import com.github.jfcloud.gene.sample.mapper.SampleInfoMapper;
 import com.github.jfcloud.gene.sample.service.*;
 import com.github.jfcloud.gene.sample.vo.*;
+import com.github.jfcloud.gene.util.LocalWord;
 import com.github.jfcloud.gene.util.WordDataService;
 import com.github.jfcloud.gene.util.WordUtil;
 import com.github.jfcloud.rich.config.WordConfig;
@@ -189,6 +190,15 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
         SampleInfo sampleInfo = sampleInfoMapper.selectById(sampleId);
         SampleAnimalVo sampleAnimal = getDetail(sampleId);
 
+        //委托列表扩展字段
+        sampleAnimal.getCommission().getPig().setExtObj(JSONObject.parseObject(sampleAnimal.getCommission().getPig().getExt()));
+        sampleAnimal.getCommission().getRodent().setExtObj(JSONObject.parseObject(sampleAnimal.getCommission().getRodent().getExt()));
+        sampleAnimal.getCommission().getMonkey().setExtObj(JSONObject.parseObject(sampleAnimal.getCommission().getMonkey().getExt()));
+        sampleAnimal.getCommission().getDog().setExtObj(JSONObject.parseObject(sampleAnimal.getCommission().getDog().getExt()));
+        sampleAnimal.getCommission().getCat().setExtObj(JSONObject.parseObject(sampleAnimal.getCommission().getCat().getExt()));
+        sampleAnimal.getCommission().getGoat().setExtObj(JSONObject.parseObject(sampleAnimal.getCommission().getGoat().getExt()));
+        sampleAnimal.getCommission().getMaterial().setExtObj(JSONObject.parseObject(sampleAnimal.getCommission().getMaterial().getExt()));
+
         //血清样本送检
         if (StrUtil.isNotBlank(sampleAnimal.getScientificSampleType()) &&
                 sampleAnimal.getScientificSampleType().contains(ScientificSampleTypeEnum.serum.getDescription())) {
@@ -299,7 +309,8 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
         sampleInfoObj.put("expireDate", WordUtil.padString(sampleInfo.getExpireDate(), 8));
 
         String modelName = "animalSampleTesting.ftl";
-        fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);
+//        fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);
+        LocalWord.exportWord(modelName, dataMap, fileName);
     }
 
     @Override

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/vo/CommissionVo.java

@@ -1,5 +1,6 @@
 package com.github.jfcloud.gene.sample.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -51,6 +52,9 @@ public class CommissionVo {
     @Schema(description = "扩展字段（json字符串）")
     private String ext;
 
+    @Schema(hidden = true)
+    private JSONObject extObj;
+
     @Schema(description = "样本列表")
     private List<CommissionDetailVo> detailList = new ArrayList<>();
 }

jfcloud-gene-biz/src/main/resources/mapper/InspectionCommissionMapper.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.github.jfcloud.gene.sample.mapper.InspectionCommissionMapper">
   <resultMap id="CommissionMap" type="com.github.jfcloud.gene.sample.vo.CommissionVo">
+    <result column="ext" property="ext" typeHandler="com.github.jfcloud.gene.handler.LongTextHandler" />
     <collection property="detailList" column="commissionId = id"
                 select="com.github.jfcloud.gene.sample.mapper.InspectionCommissionDetailMapper.getDetailList" />
   </resultMap>