diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 3c5e023..1237e6f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -117,6 +117,13 @@ private String originalRecordFile; /** + * 原始记录文件(minio存储文件名) + */ + @ApiModelProperty(value = "原始记录文件(minio存储文件名)", dataType = "String") + @TableField("original_record_word_file") + private String originalRecordWordFile; + + /** * 证书报告文件(minio存储文件名) */ @ApiModelProperty(value = "证书报告文件(minio存储文件名)", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 3c5e023..1237e6f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -117,6 +117,13 @@ private String originalRecordFile; /** + * 原始记录文件(minio存储文件名) + */ + @ApiModelProperty(value = "原始记录文件(minio存储文件名)", dataType = "String") + @TableField("original_record_word_file") + private String originalRecordWordFile; + + /** * 证书报告文件(minio存储文件名) */ @ApiModelProperty(value = "证书报告文件(minio存储文件名)", dataType = "String") 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 273b088..c7da6e1 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 @@ -13,6 +13,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.utils.SpringContextUtil; +import com.deepoove.poi.data.PictureRenderData; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -117,7 +118,7 @@ signFileNames += signFileName + ","; log.debug("工作图片签名url为:{}", filePrintRegister.getTemDir() + signFileName); } - if(StringUtils.isNotEmpty(signFileNames)){ + if (StringUtils.isNotEmpty(signFileNames)) { signFileNames = signFileNames.substring(0, signFileNames.length() - 1); } ElectronicImage electronicImage = defaultElectronicSignName(customizedSignName); @@ -127,6 +128,9 @@ //放入待下载的文件集合 filePrintRegister.getBeDownloadedFileNames().add(signFileNames); electronicImageList.add(electronicImage); + if (StringUtils.isNotEmpty(signFileNames) && !signFileNames.contains(",") && approvalImageList.get(i).getDocName().matches("[a-zA-Z]+")) { + filePrintRegister.getParams().put(approvalImageList.get(i).getDocName(), new PictureRenderData(100, 35, filePrintRegister.getTemDir() + signFileNames)); + } } else { //多个工作流字段签名 for (ApprovalLogResponse approvalLog : approvalLogList) { @@ -144,6 +148,9 @@ //放入待下载的文件集合 filePrintRegister.setBeDownloadedFileNames(signFileName); electronicImageList.add(electronicImage); + if (StringUtils.isNotEmpty(signFileName) && !signFileName.contains(",") && approvalImageList.get(i).getDocName().matches("[a-zA-Z]+")) { + filePrintRegister.getParams().put(approvalImageList.get(i).getDocName(), new PictureRenderData(100, 35, filePrintRegister.getTemDir() + signFileName)); + } } } }