From 41b4e595ccaae573d06e1caeee26c94f76f86426 Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Thu, 8 Dec 2022 10:16:54 +0800
Subject: [PATCH 1/3] 1

---
 .../reader/prediction/QueryYBInfoServiceImpl.java   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
index 16a6d05b..0a35a664 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
@@ -23,9 +23,12 @@ import com.seasky.projectplan.infrastructure.dataobject.co.YBExamineDo;
 import com.seasky.projectplan.infrastructure.dataobject.co.YBHisInfoDo;
 import com.seasky.projectplan.infrastructure.dataobject.po.*;
 import com.seasky.projectplan.infrastructure.db.mapper.table.*;
+import com.seasky.projectplan.infrastructure.interceptor.InitCountNextApplicationRunner;
 import com.seasky.projectplan.infrastructure.rpc.api.FlowRpc;
 import com.seasky.projectplan.infrastructure.rpc.api.TripartiteRPC;
 import net.sf.json.JSONArray;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -33,10 +36,7 @@ import com.seasky.projectplan.domain.aggregate.common.flowTypeEnum;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -280,27 +280,30 @@ public class QueryYBInfoServiceImpl extends AbstractService<ProjectPlanBookPo, P
      * @param ybExamineCmd yb妫€鏌md
      * @return {@link Pagination}<{@link YBExamineOut}>
      */
+    private static final Logger log = LoggerFactory.getLogger(InitCountNextApplicationRunner.class);
     @Override
     public Pagination<YBExamineOut> queryYBExamine(YBExamineCmd ybExamineCmd) {
 
         Page<YBExamineDo> page = new Page<>(ybExamineCmd.getPageIndex(), ybExamineCmd.getPageSize());
         Page<YBExamineOut> pageOut = new Page<>(ybExamineCmd.getPageIndex(), ybExamineCmd.getPageSize());
-
         List<Long> processIdList = new ArrayList<>();
         //寰呭姙
         Result<String> processAllByUserIdByFlow = iFlow.getProcessAllByUserIdByFlow(flowTypeEnum.weichi.key());
         if (!ObjectUtils.isEmpty(processAllByUserIdByFlow) && processAllByUserIdByFlow.getData().size() > 0) {
             processIdList.addAll(processAllByUserIdByFlow.getData().stream().map(f -> Long.parseLong(f)).collect(Collectors.toList()));
+            log.info("浠e姙:{}" + processIdList.toString());
         }
         //宸插姙
         Result<String> doneAllByUserIdByFlow = iFlow.getDoneAllByUserIdByFlow(flowTypeEnum.weichi.key());
         if (!ObjectUtils.isEmpty(doneAllByUserIdByFlow) && doneAllByUserIdByFlow.getData().size() > 0) {
             processIdList.addAll(doneAllByUserIdByFlow.getData().stream().map(f -> Long.parseLong(f)).collect(Collectors.toList()));
+            log.info("宸插姙:{}" + processIdList.toString());
         }
         //宸插畬鎴�
         Result<String> fishAllByUserIdByFlow = iFlow.getFishAllByUserIdByFlow(flowTypeEnum.weichi.key());
         if (!ObjectUtils.isEmpty(fishAllByUserIdByFlow) && fishAllByUserIdByFlow.getData().size() > 0) {
             processIdList.addAll(fishAllByUserIdByFlow.getData().stream().map(f -> Long.parseLong(f)).collect(Collectors.toList()));
+            log.info("宸插畬鎴�:{}" + processIdList.toString());
         }
 
         List<YBExamineOut> objects = new ArrayList<>();
-- 
GitLab


From ff1feb74c2257e21b3d1b963944c3108f2064b5b Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Thu, 8 Dec 2022 13:28:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=84=E6=8B=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/db/mapper/xml/ProjectMapper.xml          | 2 +-
 .../reader/prediction/QueryYBInfoServiceImpl.java           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectMapper.xml
index c156158a..1370605f 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectMapper.xml
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectMapper.xml
@@ -22,7 +22,7 @@
         from project_prediction tb1 inner join project_plan_book tb2 on tb1.projectPlanBookId=tb2.id inner join budget_info tb3 on tb2.project_type_id = tb3.id
         <where>
             tb1.available = 'YES'and tb2.available = 'YES' and tb3.available = 'YES'
-            <if test="pm.year != null and pm.year != ''">
+            <if test="pm.year != null">
                 and tb2.year = #{pm.year}
             </if>
             <if test="pm.departmentName != null and pm.departmentName != ''" >
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
index 0a35a664..239f452d 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
@@ -288,19 +288,19 @@ public class QueryYBInfoServiceImpl extends AbstractService<ProjectPlanBookPo, P
         Page<YBExamineOut> pageOut = new Page<>(ybExamineCmd.getPageIndex(), ybExamineCmd.getPageSize());
         List<Long> processIdList = new ArrayList<>();
         //寰呭姙
-        Result<String> processAllByUserIdByFlow = iFlow.getProcessAllByUserIdByFlow(flowTypeEnum.weichi.key());
+        Result<String> processAllByUserIdByFlow = iFlow.getProcessAllByUserIdByFlow(flowTypeEnum.yubo.key());
         if (!ObjectUtils.isEmpty(processAllByUserIdByFlow) && processAllByUserIdByFlow.getData().size() > 0) {
             processIdList.addAll(processAllByUserIdByFlow.getData().stream().map(f -> Long.parseLong(f)).collect(Collectors.toList()));
             log.info("浠e姙:{}" + processIdList.toString());
         }
         //宸插姙
-        Result<String> doneAllByUserIdByFlow = iFlow.getDoneAllByUserIdByFlow(flowTypeEnum.weichi.key());
+        Result<String> doneAllByUserIdByFlow = iFlow.getDoneAllByUserIdByFlow(flowTypeEnum.yubo.key());
         if (!ObjectUtils.isEmpty(doneAllByUserIdByFlow) && doneAllByUserIdByFlow.getData().size() > 0) {
             processIdList.addAll(doneAllByUserIdByFlow.getData().stream().map(f -> Long.parseLong(f)).collect(Collectors.toList()));
             log.info("宸插姙:{}" + processIdList.toString());
         }
         //宸插畬鎴�
-        Result<String> fishAllByUserIdByFlow = iFlow.getFishAllByUserIdByFlow(flowTypeEnum.weichi.key());
+        Result<String> fishAllByUserIdByFlow = iFlow.getFishAllByUserIdByFlow(flowTypeEnum.yubo.key());
         if (!ObjectUtils.isEmpty(fishAllByUserIdByFlow) && fishAllByUserIdByFlow.getData().size() > 0) {
             processIdList.addAll(fishAllByUserIdByFlow.getData().stream().map(f -> Long.parseLong(f)).collect(Collectors.toList()));
             log.info("宸插畬鎴�:{}" + processIdList.toString());
-- 
GitLab


From 86bd8439f959c8e933da782353c351ecc414205e Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Thu, 8 Dec 2022 13:44:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E6=8B=A8=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reader/prediction/QueryYBInfoServiceImpl.java              | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
index 239f452d..0ad41a23 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
@@ -291,19 +291,16 @@ public class QueryYBInfoServiceImpl extends AbstractService<ProjectPlanBookPo, P
         Result<String> processAllByUserIdByFlow = iFlow.getProcessAllByUserIdByFlow(flowTypeEnum.yubo.key());
         if (!ObjectUtils.isEmpty(processAllByUserIdByFlow) && processAllByUserIdByFlow.getData().size() > 0) {
             processIdList.addAll(processAllByUserIdByFlow.getData().stream().map(f -> Long.parseLong(f)).collect(Collectors.toList()));
-            log.info("浠e姙:{}" + processIdList.toString());
         }
         //宸插姙
         Result<String> doneAllByUserIdByFlow = iFlow.getDoneAllByUserIdByFlow(flowTypeEnum.yubo.key());
         if (!ObjectUtils.isEmpty(doneAllByUserIdByFlow) && doneAllByUserIdByFlow.getData().size() > 0) {
             processIdList.addAll(doneAllByUserIdByFlow.getData().stream().map(f -> Long.parseLong(f)).collect(Collectors.toList()));
-            log.info("宸插姙:{}" + processIdList.toString());
         }
         //宸插畬鎴�
         Result<String> fishAllByUserIdByFlow = iFlow.getFishAllByUserIdByFlow(flowTypeEnum.yubo.key());
         if (!ObjectUtils.isEmpty(fishAllByUserIdByFlow) && fishAllByUserIdByFlow.getData().size() > 0) {
             processIdList.addAll(fishAllByUserIdByFlow.getData().stream().map(f -> Long.parseLong(f)).collect(Collectors.toList()));
-            log.info("宸插畬鎴�:{}" + processIdList.toString());
         }
 
         List<YBExamineOut> objects = new ArrayList<>();
-- 
GitLab