瀏覽代碼

解决我的申请为审批完成数量不对的问题

dzx 8 月之前
父節點
當前提交
63ad598b4e

+ 5 - 0
src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -409,6 +409,11 @@ public class UserController {
         List<String> processIds = historicProcessInstances.stream().map(HistoricProcessInstance::getId).collect(Collectors.toList());
         int myApplicationCount = 0;
         for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
+            Long countByProcessId = workflowExecuteService.getCountByProcessId(historicProcessInstance.getId());
+            if(countByProcessId == 0L){
+                continue;
+
+            }
             if (!ObjectUtil.isNotNull(historicProcessInstance.getEndTime())) {
                 myApplicationCount ++;
             }

+ 1 - 0
src/main/java/com/xjrsoft/module/workflow/service/IWorkflowExecuteService.java

@@ -459,4 +459,5 @@ public interface IWorkflowExecuteService {
 
     List<UserDefinedProcessRecordListVo> listAuditApproveRecord(ApproveRecordListDto dto);
 
+    Long getCountByProcessId(String processId);
 }

+ 9 - 0
src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -13,6 +13,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Session;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6107,6 +6108,14 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         return userDefinedProcessRecordListVos;
     }
 
+    @Override
+    public Long getCountByProcessId(String processId) {
+        return xjrWorkflowExtraMapper.selectCount(
+                new QueryWrapper<WorkflowExtra>().lambda()
+                        .eq(WorkflowExtra::getProcessId, processId)
+        );
+    }
+
     /**
      * 获取上一节点信息
      * 分两种情况:

+ 1 - 1
src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 spring:
   # 环境 dev|pre|prod
   profiles:
-    active: dev
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8