宠物食品增加项目编号和项目名称

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

@@ -128,6 +128,8 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
 
         //替换excel中的变量，勾选框使用字符串代替
         Map<String, String> mappings = new HashMap<>();
+        mappings.put("项目编号", sampleInfo.getProjectNo());
+        mappings.put("项目名称", sampleInfo.getProjectName());
         mappings.put("送检目的", detail.getPurpose());
         mappings.put("送检方名称", detail.getSenderName());
         mappings.put("送检方地址", detail.getSenderAddress());
@@ -260,21 +262,21 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
             //提交之后，显示送检人签字
             if (!GeneStatusEnum.SUBMIT_STATUS.contains(sampleInfo.getStatus())) {
                 String signPic = userIdNameCache.getSignPic(sampleInfo.getApplicantId());
-                imageList.add(new ExcelImageService.ExcelImage(signPic, "B26"));
+                imageList.add(new ExcelImageService.ExcelImage(signPic, "B27"));
                 signPic = userIdNameCache.getSignPic(detail.getReceiverId());
-                imageList.add(new ExcelImageService.ExcelImage(signPic, "I26"));
+                imageList.add(new ExcelImageService.ExcelImage(signPic, "I27"));
 
                 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")));
+                        .ifPresent(audit -> imageList.add(new ExcelImageService.ExcelImage(audit.getCreateSign(), "G27")));
                 //部门负责人审核
                 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")));
+                        .ifPresent(audit -> imageList.add(new ExcelImageService.ExcelImage(audit.getCreateSign(), "D27")));
             }
             excelImageService.addImageDrawingPart(opcPackagePkg, 0, imageList);