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 810a0aa5..e02f4a2f 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 @@ -8,8 +8,24 @@ import org.jeecgframework.poi.excel.annotation.Excel; @Data public class WithoutDistributeExcelTemplate { + /** + * 条款号 + */ + @ApiModelProperty(value = "id") private String id; + /** + * 流程实例Id + */ + @ApiModelProperty(value = "流程实例Id") + private String processInstanceId; + + /** + * 主表Id + */ + @ApiModelProperty(value = "主表Id") + private String checkId; + /** * 条款号 */ 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 b78c7bc8..e4da0a30 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 @@ -213,6 +213,23 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl { + detail.setId(null); + detail.setResult(null); + detail.setCorrectionSolution(null); + detail.setCorrectionCost(null); + detail.setCorrectionPeriod(null); + detail.setDescription(null); + detail.setCommonality(null); + detail.setCommonalityCost(null); + detail.setDescription(null); + detail.setUnsatisfiedRequire(null); + detail.setValuationTime(null); + detail.setAuthDept(null); + detail.setIsSameAsPrevVersion(null); + detail.setMaterial(null); + detail.setRemark(null); + detail.setMainCheckUser(null); + detail.setDesignEngineer(null); detail.setCheckId(checkId); detail.setProcessInstanceId(processInstanceId); }); @@ -736,6 +753,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl