diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java index c5d43e6e3..b1c0c767e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java @@ -25,10 +25,12 @@ public enum CertificationFlowNodeEnum { * 任务办理 -> 责任人接受之后,等待提交交付物 * 任务审查 -> 责任人提交交付物之后,认证工程师审查。 */ + LIST_CONFIRMATION("List Release","清单校核","List Release"), CHECKLIST_VERIFICATION ("Task initiation","任务发起","Task Initiation"), TASK_RESPONSIBILITY_CONFIRMATION ("Task responsibility confirmation","任务责任确认","Responsibilty Confirmation"), TASK_HANDLING ("Task handling","任务办理","Task Handling"), TASK_REVIEW ("Task Review","任务审查","Task Review"), + TASK_SS("Supplementary Submission","补充提交","Supplementary Submission"), // 责任人补充提交发起 ; String key; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 87312065f..263506baa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -66,6 +66,7 @@ import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.enums.FlowTypeEnum; +import com.jero.modules.wkflow.service.IProcessHistoryEOService; import lombok.SneakyThrows; import org.apache.commons.io.FileUtils; import org.apache.poi.hssf.usermodel.*; @@ -177,6 +178,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl updateStatusBatch(JSONObject json) { String ids = json.getString("ids"); String flowStatus = json.getString("flowStatus"); + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if(StringUtils.isNotEmpty(ids)){ QueryWrapper pciQueryWrap = new QueryWrapper<>(); pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(","))); @@ -852,6 +856,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { pciEo.setFlowStatus(flowStatus); + processHistoryEOService.add(pciEo.getId(),CertificationFlowNodeEnum.TASK_SS.getKey(),currentUser.getId(),null,null,null); }); this.updateBatchById(pciEoList); @@ -1149,11 +1154,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl processInfoDetailEOList = new ArrayList<>(); - + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { // 将数据的状态更新为:清单待校核,更新截止时间。等待认证工程师进行操作。 projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); projectCertificationInventoryEO.setInventoryVerifyEndTime(inventoryVerifyEndTime); + processHistoryEOService.add(projectCertificationInventoryEO.getId(),CertificationFlowNodeEnum.LIST_CONFIRMATION.getKey(),currentUser.getId(),null,null,null); } this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue()); @@ -1900,6 +1906,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> queryCertificationProcessHistoryList(@RequestParam String id,@RequestParam String cut) { + List list = processHistoryEOService.queryCertificationProcessHistoryList(id,cut); + return Result.OK(list); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java index 5c9d6adcd..2455d8b9a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java @@ -23,6 +23,18 @@ public interface IProcessHistoryEOService extends IService { */ void add(ProcessHistoryEO processHistoryEO); + + /** + * 添加历史记录 + * @param pid 流程实例ID + * @param tdKey 操作节点 + * @param opPersonId 操作人 + * @param opResult 操作结果 + * @param opinion 意见 + * @param file 附件id,多个之间使用英文逗号分隔 + */ + void add(String pid, String tdKey, String opPersonId, String opResult, String opinion, String file); + /** * 更新 * @@ -39,6 +51,8 @@ public interface IProcessHistoryEOService extends IService { */ void deleteById(String id); + void deleteByPId(String pids); + /** * 批量删除 * @@ -77,4 +91,6 @@ public interface IProcessHistoryEOService extends IService { * @return */ List queryComplianceProcessHistoryList(Map params); + + List queryCertificationProcessHistoryList(String id,String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java index a1708edf1..419ebd2b7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java @@ -63,6 +63,27 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,pids.split(",")); + this.baseMapper.delete(queryWrapper); + } + } + /** * 批量删除 * @@ -283,4 +313,17 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl queryCertificationProcessHistoryList(String id,String cut) { + List processHistoryEOList = null; + if(StringUtils.isNotEmpty(id)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByAsc("create_time"); + queryWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId, id); + processHistoryEOList = this.baseMapper.selectList(queryWrapper); + this.disposeData(processHistoryEOList, cut); + } + return processHistoryEOList; + + } }