feat(REQ-3300) - 完善申请用印逻辑

visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java

@@ -55,6 +55,7 @@ import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.groovy.util.Maps;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -444,13 +445,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
         AssertUtil.notNull(visa, "变洽签单据不存在");
 
         // 创建电子签合同
-        createContract(req, visa);
+        Map<Long, String> essRecipientIdMap = createContract(req, visa);
-        ChangeRecordRelation recipientRelation = new ChangeRecordRelation();
-        Map<Long, String> essRecipientIdMap = new HashMap<>();
-        recipientRelation.setVisaId(visa.getId());
-        recipientRelation.setVarName(ESS_RECIPIENT_ID_MAP.name());
-        recipientRelation.setVarType(VisaRelationVarTypeEnum.JSON.getType());
-        recipientRelation.setContent(JSON.toJSONString(essRecipientIdMap));
 
         // 用印申请信息
         List<ChangeRecordRelation> relations = req.getRequestStamps().stream().map(i -> {
@@ -466,6 +461,15 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
             return stamp;
         }).collect(Collectors.toList());
 
+        if (Objects.nonNull(essRecipientIdMap)) {
+            // 记录单位与其在合同中的签章位置
+            ChangeRecordRelation recipientRelation = new ChangeRecordRelation();
+            recipientRelation.setVisaId(visa.getId());
+            recipientRelation.setVarName(ESS_RECIPIENT_ID_MAP.name());
+            recipientRelation.setVarType(VisaRelationVarTypeEnum.JSON.getType());
+            recipientRelation.setContent(JSON.toJSONString(essRecipientIdMap));
+        }
+
         // 打印生成的 PDF 文件信息
         if (Objects.nonNull(req.getPdfFile())) {
             ChangeRecordRelation relation = new ChangeRecordRelation();
@@ -481,35 +485,43 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
         saveBatch(relations);
     }
 
-    private void createContract(VisaRequestStampReq req, ChangeRecord visa) {
+    private Map<Long, String> createContract(VisaRequestStampReq req, ChangeRecord visa) {
-        if (!StringUtils.hasText(visa.getContractId())) {
+        if (StringUtils.hasText(visa.getContractId())) {
-            CreateContractByFileRequest createContractRequest = new CreateContractByFileRequest();
+            return null;
-            CreateContractByFile pdfFile = new CreateContractByFile();
-            pdfFile.setContractName(visa.getTopic());
-            try {
-                pdfFile.setBase64Files(Lists.newArrayList(downloadFileAndConvertToBase64(req.getPdfFile().getFileUrl())));
-            } catch (Exception e) {
-                throw new ServiceException("拉取表单 PDF 文件失败");
-            }
-            pdfFile.setApprovers(req.getRequestStamps().stream().map(i -> {
-                Approver approver = new Approver();
-                approver.setSealTypes(Lists.newArrayList(i.getSealType()));
-                return approver;
-            }).collect(Collectors.toList()));
-
-            createContractRequest.setByFile(pdfFile);
-            createContractRequest.setAppCode(MSG_CENTER_APP_CODE);
-            createContractRequest.setBizCode(String.valueOf(visa.getId()));
-            OperatorInfo creator = new OperatorInfo();
-            creator.setOuId(req.getOperatorOuId());
-            creator.setPersonId(req.getOperatorPersonId());
-            createContractRequest.setCreator(creator);
-
-            CreateContractByFileResponse contract = essGateway.createContract(createContractRequest);
-            AssertUtil.notNull(contract, "腾讯电子签合同创建失败");
-            visa.setContractId(contract.getEssContractId());
-            changeRecordService.updateById(visa);
         }
+        CreateContractByFileRequest createContractRequest = new CreateContractByFileRequest();
+        CreateContractByFile pdfFile = new CreateContractByFile();
+        pdfFile.setContractName(visa.getTopic());
+        try {
+            pdfFile.setBase64Files(Lists.newArrayList(downloadFileAndConvertToBase64(req.getPdfFile().getFileUrl())));
+        } catch (Exception e) {
+            throw new ServiceException("拉取表单 PDF 文件失败");
+        }
+        pdfFile.setApprovers(req.getRequestStamps().stream().map(i -> {
+            Approver approver = new Approver();
+            approver.setSealTypes(Lists.newArrayList(i.getSealType()));
+            return approver;
+        }).collect(Collectors.toList()));
+
+        createContractRequest.setByFile(pdfFile);
+        createContractRequest.setAppCode(MSG_CENTER_APP_CODE);
+        createContractRequest.setBizCode(String.valueOf(visa.getId()));
+        OperatorInfo creator = new OperatorInfo();
+        creator.setOuId(req.getOperatorOuId());
+        creator.setPersonId(req.getOperatorPersonId());
+        createContractRequest.setCreator(creator);
+
+        CreateContractByFileResponse contract = essGateway.createContract(createContractRequest);
+        AssertUtil.notNull(contract, "腾讯电子签合同创建失败");
+        visa.setContractId(contract.getEssContractId());
+        changeRecordService.updateById(visa);
+
+        Map<Long, String> essRecipientIdMap = new HashMap<>();
+        for (int i = 0; i < req.getRequestStamps().size(); i++) {
+            essRecipientIdMap.put(req.getRequestStamps().get(i).getOuId(), contract.getEssRecipientIds().get(i));
+        }
+        return essRecipientIdMap;
+
     }
 
     public static String downloadFileAndConvertToBase64(String fileUrl) throws IOException {
@@ -548,7 +560,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
         create.setPendingVariables(Maps.of(
                 WORKFLOW_PENDING_INITIATOR_NAME, profile.getRealName(),
                 IM_GROUP_BIZ_INFO_VISA_TYPE, visa.getType()
-                ));
+        ));
 
         VisaChangeApproveCreateReq createReq = visaHelper.buildVisaChangeApproveCreateReqByVisaId(req.getVisaId());
         AssertUtil.notNull(createReq, "未找到变洽签单据");
@@ -557,7 +569,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
         create.setVariables(Maps.of(
                 WORKFLOW_VAR_STAMP_OU_ID, model.getOuId(),
                 WORKFLOW_VAR_STAMP_TYPE, model.getSealType().name(),
-                WORKFLOW_VAR_STAMP_RECIPIENT, essRecipientIdMap.getOrDefault(model.getOuId(), "")
+                WORKFLOW_VAR_STAMP_RECIPIENT, MapUtils.emptyIfNull(essRecipientIdMap).getOrDefault(model.getOuId(), "")
         ));
         return workflowGateway.processInstanceCreate(create);
     }