宠物食品检测附件，更新申请人签字

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

@@ -255,24 +255,25 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
 
             //查询审核记录，添加签字图片
             List<ExcelImageService.ExcelImage> imageList = new ArrayList<>();
-            List<FlowAudit> flowAudits = flowAuditService.auditList(sampleId, "sample." + sampleInfo.getType(), true);
-            //项目管理部审核
-            flowAudits.stream()
-                    .filter(audit -> GeneStatusEnum.PROJECT_MANAGEMENT.getStatus().equals(audit.getFlowStatus()) && StrConstant.YES.equals(audit.getAuditResult()))
-                    .findFirst()
-                    .ifPresent(audit -> imageList.add(new ExcelImageService.ExcelImage(audit.getCreateSign(), "G26")));
-            //部门负责人审核
-            flowAudits.stream()
-                    .filter(audit -> GeneStatusEnum.DEPART_LEADER.getStatus().equals(audit.getFlowStatus()) && StrConstant.YES.equals(audit.getAuditResult()))
-                    .findFirst()
-                    .ifPresent(audit -> imageList.add(new ExcelImageService.ExcelImage(audit.getCreateSign(), "D26")));
 
             //提交之后，显示送检人签字
             if (!GeneStatusEnum.SUBMIT_STATUS.contains(sampleInfo.getStatus())) {
-                String signPic = userIdNameCache.getSignPic(detail.getSenderContactId());
+                String signPic = userIdNameCache.getSignPic(sampleInfo.getApplicantId());
                 imageList.add(new ExcelImageService.ExcelImage(signPic, "B26"));
                 signPic = userIdNameCache.getSignPic(detail.getReceiverId());
                 imageList.add(new ExcelImageService.ExcelImage(signPic, "I26"));
+
+                List<FlowAudit> flowAudits = flowAuditService.auditList(sampleId, "sample." + sampleInfo.getType(), true);
+                //项目管理部审核
+                flowAudits.stream()
+                        .filter(audit -> GeneStatusEnum.PROJECT_MANAGEMENT.getStatus().equals(audit.getFlowStatus()) && StrConstant.YES.equals(audit.getAuditResult()))
+                        .findFirst()
+                        .ifPresent(audit -> imageList.add(new ExcelImageService.ExcelImage(audit.getCreateSign(), "G26")));
+                //部门负责人审核
+                flowAudits.stream()
+                        .filter(audit -> GeneStatusEnum.DEPART_LEADER.getStatus().equals(audit.getFlowStatus()) && StrConstant.YES.equals(audit.getAuditResult()))
+                        .findFirst()
+                        .ifPresent(audit -> imageList.add(new ExcelImageService.ExcelImage(audit.getCreateSign(), "D26")));
             }
             excelImageService.addImageDrawingPart(opcPackagePkg, 0, imageList);
 
@@ -334,7 +335,11 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
         for (String s : split) {
             if (StrUtil.isNotBlank(s)) {
                 //勾选
-                value = value.replace("☐" + s, "☑" + s);
+                if (s.equals("其他")) {
+                    value = value.replace("☐" + s, "☑" + s);
+                } else {
+                    value = value.replace("☐" + s + " ", "☑" + s + " ");
+                }
             }
         }
         mappings.put(key, value);