fix: 87915 法规符合性排查流程(主排查人分批下发) --不分发--导出的条款内容有代码
This commit is contained in:
+16
@@ -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;
|
||||
|
||||
/**
|
||||
* 条款号
|
||||
*/
|
||||
|
||||
+19
@@ -213,6 +213,23 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
|
||||
sccDetailService.remove(updateWrapper);
|
||||
// 子表设置流程实例Id
|
||||
detailInfoList.parallelStream().forEach(detail -> {
|
||||
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<Proce
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
WithoutDistributeExcelTemplate item = list.get(i);
|
||||
item.setId(existDataList.get(i).getId());
|
||||
item.setProcessInstanceId(existDataList.get(i).getProcessInstanceId());
|
||||
item.setCheckId(existDataList.get(i).getCheckId());
|
||||
String result = item.getResult();
|
||||
if (StrUtil.isBlank(result)) {
|
||||
item.setUnsatisfiedRequire(null);
|
||||
|
||||
Reference in New Issue
Block a user