动物样本送检附件委托书以及申请单列表，富文本解析以及图片资源加载

jfcloud-gene-biz/pom.xml

@@ -53,6 +53,12 @@
       <version>K7.0.0</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.github.jfcloud</groupId>
+      <artifactId>jfcloud-aew-rich-text</artifactId>
+      <version>k6.7</version>
+    </dependency>
+
     <dependency>
       <groupId>com.github.jfcloud</groupId>
       <artifactId>jfcloud-project-api</artifactId>

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

@@ -26,8 +26,8 @@ import com.github.jfcloud.gene.sample.service.SampleAnimalService;
 import com.github.jfcloud.gene.sample.service.SampleCheckItemService;
 import com.github.jfcloud.gene.sample.service.SampleEditService;
 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.rich.word.WordNodeFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -180,13 +180,22 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
             sampleInfoObj.put("inspectorName", inspectorName);
         }
 
-        //
+        //富文本图片
+        JSONArray images = new JSONArray();
+        dataMap.put("images", images);
+
+        //富文本
+        String preliminaryNotes = WordNodeFactory.html2xml(sampleAnimal.getPreliminaryNotes());
+        images.addAll(WordNodeFactory.imageCache);
+        sampleAnimalObj.put("preliminaryNotes", preliminaryNotes);
+        String detectionParameters = WordNodeFactory.html2xml(sampleAnimal.getDetectionParameters());
+        images.addAll(WordNodeFactory.imageCache);
+        sampleAnimalObj.put("detectionParameters", detectionParameters);
+        String specialDetectionParameters = WordNodeFactory.html2xml(sampleAnimal.getSpecialDetectionParameters());
+        images.addAll(WordNodeFactory.imageCache);
+        sampleAnimalObj.put("specialDetectionParameters", specialDetectionParameters);
 
         String modelName = "animalSampleTesting.ftl";
-        if (LocalWord.exportWord(modelName, dataMap, fileName)) {
-            return;
-        }
-
         fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);
     }