diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java index 9a97e8a..491beb8 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java @@ -489,4 +489,11 @@ public interface BusinessMapper { * @return */ Integer getAuditRemark(RequestEntity params); + + /** + * + * 删除审核的驳回的数据 + * @param taskId + */ + void deleteCheckRemark(String taskId); } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java index 65c8938..444a674 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java @@ -543,6 +543,7 @@ public class BusinessServiceImpl implements BusinessService { } //添加审核人员树信息 mapper.insertCheckPerson(finaList); + mapper.deleteCheckRemark(auditTask.getTaskId()); } /** @@ -563,8 +564,6 @@ public class BusinessServiceImpl implements BusinessService { String processType, String finalCheck, String examineId, String sort, String processKey, boolean iaAdd, String enterStatus,String version) { Map map = new HashMap<>(); - - //审核人员列表 map.put(ProcessConstants.USER_LIST, list); //审核类型 人员入场、机具入场等 diff --git a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml index 94d0283..0f7ecea 100644 --- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml +++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml @@ -183,6 +183,9 @@ delete from nxdt_ii.pt_check_person where task_id = #{taskId} + + delete from nxdt_ii.pt_check_person_remark where task_id = #{taskId} and audit_status=2 + insert into nxdt_ii.pt_check_person(task_id, user_id,exam_type,type,sort,version) diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java index 7ed047c..abe9779 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java @@ -52,20 +52,56 @@ public class EquipServiceImpl implements EquipService { private FlowTaskService flowTaskService; @Override public List selectEquipList(Equipment bean) { - List list = mapper.selectEquipList(bean); RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(equipment -> bean.getStatus().equals(equipment.getIntoStatus())) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + } } + PageUtils.startPage(); + List list = mapper.selectEquipList(bean); + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); + return list; } +// @Override +// public List selectEquipList(Equipment bean) { +// List list = mapper.selectEquipList(bean); +// RequestEntity entity = new RequestEntity(); +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(equipment -> bean.getStatus().equals(equipment.getIntoStatus())) +// .collect(Collectors.toList()); +// } +// return list; +// } + + @Override @Transactional(rollbackFor = Exception.class) public int addEquip(MultipartFile[] instrumentDocumentFiles, Map allRequestParams){ diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml index 31b754e..3f227b0 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml @@ -57,7 +57,7 @@ ppt.admission_date as admissionDate, ppt.departure_date as departureDate, ppt.status as intoStatus, - '0' as status, + #{dataType} as status, group_concat(pci.information_path) as filePath from pt_pro_tools ppt left join sys_dict_data sdd1 on sdd1.dict_value = ppt.tools_type and sdd1.dict_type = 'sys_tools_type' and @@ -82,6 +82,16 @@ and ppt.status = #{status} + + AND ppt.proc_inst_id IN ( + + #{item} + + ) + + + and ppt.status = #{status} + group by ppt.tools_id