diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java index 44f502c1..f837d482 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java @@ -246,6 +246,18 @@ public class ProcessStandardComplianceCheckDetail implements Serializable, Compa return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList(); } + /** + * 附件 + */ + @ApiModelProperty(value = "辅助说明材料") + @ExcelCollection(name = "", orderNum = "17") + @TableField(exist = false) + private List fileListTwo = Collections.emptyList(); + + public List obtainFileTwoIds() { + return unsatisfiedRequireAttach != null ? Arrays.asList(unsatisfiedRequireAttach.split(",")) : Collections.emptyList(); + } + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java index e02f4a2f..ded8b546 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java @@ -119,14 +119,6 @@ public class WithoutDistributeExcelTemplate { @Excel(name = "备注", width = 15, orderNum = "13") private String remark; - /** - * 附件 - */ -// @ApiModelProperty(value = "佐证材料") -// @ExcelCollection(name = "", orderNum = "14") -// @TableField(exist = false) -// private List fileList = Collections.emptyList(); - /** * 佐证材料 */ @@ -135,11 +127,15 @@ public class WithoutDistributeExcelTemplate { @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private String material; - private String sort; + /** + * 佐证材料 + */ + @ApiModelProperty(value = "辅助说明材料") + @Excel(name = "辅助说明材料", width = 15, orderNum = "14") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") + private String unsatisfiedRequireAttach; -// public List obtainFileIds() { -// return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList(); -// } + private String sort; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 6bebb991..9afcc750 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -627,6 +627,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl String regex = "<[^>]*>"; @@ -650,6 +654,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl