fix: 各部门主动上报最后一个节点没有删除相应数据

This commit is contained in:
2024-02-28 11:01:28 +08:00
parent 7c587cd051
commit 3638504a36
@@ -15,6 +15,7 @@ import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.CommonVO;
import com.jero.modules.activiti.process.common.enums.ProcessType;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit;
import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport;
import com.jero.modules.activiti.process.esAnnualReport.entity.vo.AnnualReportDataVO;
import com.jero.modules.activiti.process.esAnnualReport.mapper.ProcessEsAnnualReportMapper;
@@ -50,6 +51,7 @@ import java.io.InputStream;
import java.util.*;
import java.util.stream.Collectors;
import static com.jero.modules.activiti.process.esAnnualInit.entity.AnnualInitTaskNameConstant.STANDARD_ENGINEER_COLLECT;
import static com.jero.modules.activiti.process.esAnnualReport.entity.AnnualReportTaskNameConstant.*;
/**
@@ -301,6 +303,14 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
userVariable.put("contactUserLeaderLeader", curLeader);
processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable);
break;
case STANDARD_ENGINEER_COLLECT:
// 根据流程ID删除所有数据后新增
dataList = annualReportDataVO.getDataList();
wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getValue());
remove(wrapper);
saveBatch(dataList);
break;
}
// 更新审批表为完成,填充数据
actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass);