修改审核重新提交节点

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);
 }

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<String, Object> map = new HashMap<>();
-
-
         //审核人员列表
         map.put(ProcessConstants.USER_LIST, list);
         //审核类型 人员入场、机具入场等

bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml

@@ -183,6 +183,9 @@
     <delete id="delectCheckPerson">
         delete from nxdt_ii.pt_check_person where task_id = #{taskId}
     </delete>
+    <delete id="deleteCheckRemark">
+        delete from nxdt_ii.pt_check_person_remark where task_id = #{taskId} and audit_status=2
+    </delete>
 
     <insert id="insertCheckPerson" parameterType="java.util.List">
             insert into nxdt_ii.pt_check_person(task_id, user_id,exam_type,type,sort,version)

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<Equipment> selectEquipList(Equipment bean) {
-        List<Equipment> list = mapper.selectEquipList(bean);
         RequestEntity entity = new RequestEntity();
-        entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
+        //数据查询
-        // 创建一个 GenericProcessor 实例 对审批流程数据进行处理
+        Map<String, String> checkMaps= Maps.newHashMap();
-        GenericProcessor processor = new GenericProcessor();
+        if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){
-        processor.processEntities(list, entity, flowTaskService);
+            entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
-        if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) {
+            AjaxResult ajaxResult = flowTaskService.getStayFlow(entity);
-            list = list.stream()
+            if (ajaxResult.isSuccess()) {
-                    .filter(equipment -> bean.getStatus().equals(equipment.getIntoStatus()))
+                List<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
-                    .collect(Collectors.toList());
+                List<String> 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<Equipment> 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<Equipment> selectEquipList(Equipment bean) {
+//        List<Equipment> 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<String, String> allRequestParams){

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 @@
         <if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
             and ppt.status = #{status}
         </if>
+            <if test='dataType==1'>
+                AND     ppt.proc_inst_id IN (
+                <foreach collection="proInsId" item="item" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
+            <if test="status==2 or  status=='2'">
+                and  ppt.status  = #{status}
+            </if>
         group by ppt.tools_id
     </select>
     <select id="getInfo" resultType="com.bonus.project.domain.Equipment">