MMF 2026-03-19 修改代办事项流程状态

src/main/java/com/zjsgfa/project/zjsgfa/controller/DjjcLcController.java

@@ -636,6 +636,9 @@ public class DjjcLcController
         List<BizTodoItem> bizTodoItems = getApprovalHistory(instanceId);
         List<BizTodoItem> bizTodoItems = getApprovalHistory(instanceId);
         resultMap.put("table", bizTodoItems);
         resultMap.put("table", bizTodoItems);
 
 
+        // 获取最后一个开始之后的审批历史
+        List<BizTodoItem> lastHistoryTodoItemsList = bizTodoItemService.lastHistoryByInstanceId(instanceId);
+
         if (bizTodoItems.isEmpty()) {
         if (bizTodoItems.isEmpty()) {
             return success(resultMap);
             return success(resultMap);
         }
         }
@@ -651,7 +654,7 @@ public class DjjcLcController
         List<Map<String, Object>> jdList = buildProcessNodes(isEngineeringType, ndjg, approvalInfo.getApplyUserName());
         List<Map<String, Object>> jdList = buildProcessNodes(isEngineeringType, ndjg, approvalInfo.getApplyUserName());
         
         
         // 查询审批人员并设置节点状态
         // 查询审批人员并设置节点状态
-        populateNodeUserInfo(jdList, bizTodoItems, approvalInfo.getSecondaryUnit(),approvalInfo.applyUserDeptId,isEngineeringType);
+        populateNodeUserInfo(jdList, bizTodoItems, approvalInfo.getSecondaryUnit(),approvalInfo.applyUserDeptId,isEngineeringType, lastHistoryTodoItemsList);
         
         
         resultMap.put("jdList", jdList);
         resultMap.put("jdList", jdList);
         return success(resultMap);
         return success(resultMap);
@@ -823,7 +826,7 @@ public class DjjcLcController
     /**
     /**
      * 填充节点用户信息和状态
      * 填充节点用户信息和状态
      */
      */
-    private void populateNodeUserInfo(List<Map<String, Object>> jdList, List<BizTodoItem> bizTodoItems, Long secondaryUnit,Long applyUserDeptId,Boolean isEngineeringType) {
+    private void populateNodeUserInfo(List<Map<String, Object>> jdList, List<BizTodoItem> bizTodoItems, Long secondaryUnit,Long applyUserDeptId,Boolean isEngineeringType, List<BizTodoItem> lastHistoryTodoItemsList) {
         List<SysDept> sysDeptList=sysDeptMapper.selectDeptListByParentId(secondaryUnit);
         List<SysDept> sysDeptList=sysDeptMapper.selectDeptListByParentId(secondaryUnit);
         SysDept sysDept = sysDeptMapper.selectDeptById(applyUserDeptId);
         SysDept sysDept = sysDeptMapper.selectDeptById(applyUserDeptId);
         for (Map<String, Object> it : jdList) {
         for (Map<String, Object> it : jdList) {
@@ -973,7 +976,7 @@ public class DjjcLcController
 //                userList = userService.selectUserLoginNamesByRoleKeyDept2(secondaryUnit, roleKey);
 //                userList = userService.selectUserLoginNamesByRoleKeyDept2(secondaryUnit, roleKey);
                 it.put("userList", userList.stream().distinct().collect(Collectors.toList()));
                 it.put("userList", userList.stream().distinct().collect(Collectors.toList()));
                 // 设置节点执行状态
                 // 设置节点执行状态
-                boolean isExecuted = bizTodoItems.stream()
+                boolean isExecuted = lastHistoryTodoItemsList.stream()
                         .anyMatch(todo -> todo.getNodeName().equals(nodeName) && "1".equals(todo.getIsHandle()));
                         .anyMatch(todo -> todo.getNodeName().equals(nodeName) && "1".equals(todo.getIsHandle()));
                 it.put("jdxz", isExecuted);
                 it.put("jdxz", isExecuted);
             }else {
             }else {

src/main/java/com/zjsgfa/project/zjsgfa/mapper/BizTodoItemMapper.java

@@ -73,4 +73,9 @@ public interface BizTodoItemMapper
 
 
     List<BizTodoItem> selectBizTodoItemSpList(String instanceId);
     List<BizTodoItem> selectBizTodoItemSpList(String instanceId);
 
 
+    /**
+     * 获取最后一个开始之后的审批历史
+     */
+    List<BizTodoItem> lastHistoryByInstanceId(String instanceId);
+
 }
 }

src/main/java/com/zjsgfa/project/zjsgfa/service/IBizTodoItemService.java

@@ -67,4 +67,8 @@ public interface IBizTodoItemService
 
 
     List<BizTodoItem> selectBizTodoItemListbyinstanceId(BizTodoItem query);
     List<BizTodoItem> selectBizTodoItemListbyinstanceId(BizTodoItem query);
 
 
+    /**
+     * 获取最后一个开始之后的审批历史
+     */
+    List<BizTodoItem> lastHistoryByInstanceId(String instanceId);
 }
 }

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/BizTodoItemServiceImpl.java

@@ -174,4 +174,13 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService
     public List<BizTodoItem> selectBizTodoItemListbyinstanceId(BizTodoItem query) {
     public List<BizTodoItem> selectBizTodoItemListbyinstanceId(BizTodoItem query) {
         return bizTodoItemMapper.selectBizTodoItemListbyinstanceId(query);
         return bizTodoItemMapper.selectBizTodoItemListbyinstanceId(query);
     }
     }
+
+    /**
+     * 获取最后一个开始之后的审批历史
+     */
+    @Override
+    public List<BizTodoItem> lastHistoryByInstanceId(String instanceId) {
+        List<BizTodoItem> dataList = bizTodoItemMapper.lastHistoryByInstanceId(instanceId);
+        return dataList;
+    }
 }
 }

src/main/resources/mybatis/zjsgfa/BizTodoItemMapper.xml

@@ -188,4 +188,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
             #{id}
         </foreach>
         </foreach>
     </delete>
     </delete>
+    <!--  获取最后一个开始之后的审批历史  -->
+    <select id="lastHistoryByInstanceId" parameterType="String" resultType="com.zjsgfa.project.zjsgfa.domain.BizTodoItem">
+        SELECT
+            id,
+            item_name,
+            item_content,
+            module,
+            task_id,
+            instance_id,
+            task_name,
+            node_name,
+            is_view,
+            is_handle,
+            todo_user_id,
+            todo_user_name,
+            handle_user_id,
+            handle_user_name,
+            todo_time,
+            handle_time,
+            COMMENT
+        FROM
+        biz_todo_item
+        WHERE
+            instance_id = #{instanceId}
+            AND id >= ( SELECT MAX(id) FROM biz_todo_item WHERE instance_id = #{instanceId} AND task_name = 'taskTb')
+    </select>
 </mapper>
 </mapper>
\ No newline at end of file