diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java index 37ade79..15996c7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java @@ -51,6 +51,17 @@ private Boolean mergeDoc; + public void setElectronicImageList(List imageList) { + //健壮性校验 + if (CollectionUtil.isEmpty(imageList)) { + return; + } + if (CollectionUtil.isEmpty(electronicImageList)) { + electronicImageList = new ArrayList<>(); + } + electronicImageList.addAll(imageList); + } + public void setMergeColNames(List newMergeColNames) { //健壮性校验 if (CollectionUtil.isEmpty(newMergeColNames)) { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java index 37ade79..15996c7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java @@ -51,6 +51,17 @@ private Boolean mergeDoc; + public void setElectronicImageList(List imageList) { + //健壮性校验 + if (CollectionUtil.isEmpty(imageList)) { + return; + } + if (CollectionUtil.isEmpty(electronicImageList)) { + electronicImageList = new ArrayList<>(); + } + electronicImageList.addAll(imageList); + } + public void setMergeColNames(List newMergeColNames) { //健壮性校验 if (CollectionUtil.isEmpty(newMergeColNames)) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index a2c04ce..ae59ea4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -141,7 +141,8 @@ DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl()); //设置图片位于文字顶层 if (ObjectUtils.isNotEmpty(electronicSeal.getIsSealImage()) && electronicSeal.getIsSealImage()) { - docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text); + //图片置为背景底层 + docPicture.setTextWrappingStyle(TextWrappingStyle.Behind); } DocPictureProvider.populateSingleImage(electronicSeal, keyWordIndex, textSelections, docPicture); //带有公章的关键字且页数大于2，需要设置骑缝章 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java index 37ade79..15996c7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java @@ -51,6 +51,17 @@ private Boolean mergeDoc; + public void setElectronicImageList(List imageList) { + //健壮性校验 + if (CollectionUtil.isEmpty(imageList)) { + return; + } + if (CollectionUtil.isEmpty(electronicImageList)) { + electronicImageList = new ArrayList<>(); + } + electronicImageList.addAll(imageList); + } + public void setMergeColNames(List newMergeColNames) { //健壮性校验 if (CollectionUtil.isEmpty(newMergeColNames)) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index a2c04ce..ae59ea4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -141,7 +141,8 @@ DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl()); //设置图片位于文字顶层 if (ObjectUtils.isNotEmpty(electronicSeal.getIsSealImage()) && electronicSeal.getIsSealImage()) { - docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text); + //图片置为背景底层 + docPicture.setTextWrappingStyle(TextWrappingStyle.Behind); } DocPictureProvider.populateSingleImage(electronicSeal, keyWordIndex, textSelections, docPicture); //带有公章的关键字且页数大于2，需要设置骑缝章 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java index 67fdf93..8e040ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java @@ -176,18 +176,22 @@ * 构建带有关键字的工作流签名图片方法 */ private static void bindSignPictureKey(FilePrintRegister filePrintRegister, List imageConfig, List> approvalLogList) { - if (CollectionUtils.isEmpty(approvalLogList)) { + if (CollectionUtils.isEmpty(approvalLogList) || CollectionUtils.isEmpty(imageConfig)) { + return; + } + //处理具备审批标志的 + List approvalImageList = imageConfig.stream() + .filter(e -> "1".equals(e.getApprovalFlag())) + .collect(Collectors.toList()); + if(CollectionUtils.isEmpty(imageConfig)){ return; } Map> approvalLogMap = approvalLogList.stream() .collect(Collectors.toMap(e -> e.get(0).getTaskName(), e -> e, (e1, e2) -> e1)); //处理文中的章 if (ObjectUtils.isNotEmpty(approvalLogMap)) { - //处理具备审批标志的 - List approvalImageList = imageConfig.stream() - .filter(e -> "1".equals(e.getApprovalFlag())) - .collect(Collectors.toList()); - filePrintRegister.getElectronicImageList().addAll(ApprovalImage.signNamesCreator(approvalLogMap, filePrintRegister, approvalImageList)); + + filePrintRegister.setElectronicImageList(ApprovalImage.signNamesCreator(approvalLogMap, filePrintRegister, approvalImageList)); } }