Browse Source

样本送检病理附件富文本图片宽度限制

陈长荣 2 tháng trước cách đây
mục cha
commit
3ac4344dc4

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

@@ -267,11 +267,11 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
                 });
 
         //项目管理部填写字段
-        sampleInfoObj.put("approvalNo", WordUtil.padString(sampleInfo.getApprovalNo(), 16));
-        sampleInfoObj.put("revisionNo", WordUtil.padString(sampleInfo.getRevisionNo(), 16));
-        sampleInfoObj.put("receiptDate", WordUtil.padString(sampleInfo.getReceiptDate(), 12));
-        sampleInfoObj.put("approvalDate", WordUtil.padString(sampleInfo.getApprovalDate(), 12));
-        sampleInfoObj.put("expiryDate", WordUtil.padString(sampleInfo.getExpiryDate(), 12));
+        sampleInfoObj.put("approvalNo", WordUtil.padString(sampleInfo.getApprovalNo(), 14));
+        sampleInfoObj.put("revisionNo", WordUtil.padString(sampleInfo.getRevisionNo(), 14));
+        sampleInfoObj.put("receiptDate", WordUtil.padString(sampleInfo.getReceiptDate(), 8));
+        sampleInfoObj.put("approvalDate", WordUtil.padString(sampleInfo.getApprovalDate(), 8));
+        sampleInfoObj.put("expiryDate", WordUtil.padString(sampleInfo.getExpiryDate(), 8));
 
         String modelName = "animalSampleTesting.ftl";
         fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);

+ 3 - 1
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SamplePathologicalServiceImpl.java

@@ -40,6 +40,7 @@ import com.github.jfcloud.gene.sample.vo.SamplePathologicalVo;
 import com.github.jfcloud.gene.sample.vo.SampleSubmitVo;
 import com.github.jfcloud.gene.sys.service.DBSystemPropertiesService;
 import com.github.jfcloud.gene.util.WordDataService;
+import com.github.jfcloud.rich.config.WordConfig;
 import com.github.jfcloud.rich.vo.HtmlParseVo;
 import com.github.jfcloud.rich.word.WordNodeFactory;
 import lombok.RequiredArgsConstructor;
@@ -181,7 +182,8 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
                 item.setXftj(item.getXftj().replace("高温高压", "温压"));
             }
             if (StrUtil.isNotBlank(item.getSyjg())) {
-                HtmlParseVo parseVo = WordNodeFactory.html2xml(item.getSyjg());
+                WordConfig wordConfig = new WordConfig().setMaxImageWidth(400);
+                HtmlParseVo parseVo = WordNodeFactory.html2xml(item.getSyjg(), wordConfig);
                 item.setSyjg(parseVo.getContent());
                 images.addAll(parseVo.getImageCache());
             }