From eb72b4515dc20a03029ebaac31998433af175569 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 14 Aug 2023 15:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=8C=B9=E9=85=8D=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=9B=E5=AE=A1=E6=89=B9=E9=A1=B6=E5=B1=82=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/seeyon/service/SeeYonOperationService.java      | 4 +---
 .../serve/modules/tbs/common/util/CostSort2WrapperUtil.java | 2 +-
 .../service/impl/TbsBudgetApplyOperationServiceImpl.java    | 6 ++++++
 .../service/impl/TbsBudgetChangeOperationServiceImpl.java   | 6 ++++++
 .../service/impl/VtbVerificationOperationServiceImpl.java   | 6 ++++++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java
index 3d9e6c8a..63ffcf21 100644
--- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java
+++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java
@@ -131,9 +131,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
      * @param targetId
      * @return
      */
-    default boolean checkSyFormIdIsNotNull(String targetId){
-        return false;
-    }
+    boolean checkSyFormIdIsNotNull(String targetId);
 
     /**
      * 审批列表(用于详情页)
diff --git a/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java b/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java
index e5acfd9d..0491a52a 100644
--- a/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java
+++ b/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java
@@ -59,8 +59,8 @@ public class CostSort2WrapperUtil {
         }
         sortProductAndTime(sortOfNoCondition);
         sortProductAndTime(sortOfCondition);
-        listResult.addAll(sortOfNoCondition);
         listResult.addAll(sortOfCondition);
+        listResult.addAll(sortOfNoCondition);
         return listResult;
     }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
index 6bdf9886..23dcf8cb 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
@@ -25,6 +25,12 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic
 
     private TbsBudgetMapper budgetMapper;
 
+    @Override
+    public boolean checkSyFormIdIsNotNull(String targetId) {
+        TbsBudget tbsBudget = budgetMapper.selectById(targetId);
+        return tbsBudget.getSyFormId()!=null;
+    }
+
     @Override
     public void doCommitBacked(String targetId) {
         AsyncManager.me().execute(AsyncFactory.submitBudgetApply(targetId));
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java
index ccd25d79..e672bca9 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java
@@ -47,6 +47,12 @@ public class TbsBudgetChangeOperationServiceImpl implements SeeYonOperationServi
 
     private TbsScheduleItemBudgetService tbsScheduleItemBudgetService;
 
+    @Override
+    public boolean checkSyFormIdIsNotNull(String targetId) {
+        TbsBudgetChange budgetChange = budgetChangeMapper.selectById(targetId);
+        return budgetChange.getSyFormId()!=null;
+    }
+
     @Override
     public void doCommitBacked(String targetId) {
         AsyncManager.me().execute(AsyncFactory.submitBudgetChange(targetId));
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java
index 7fa81f69..69b38dd4 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java
@@ -42,6 +42,12 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
     private TbsActivityPayConditionService activityPayConditionService;
     private TbsActivityService tbsActivityService;
 
+    @Override
+    public boolean checkSyFormIdIsNotNull(String targetId) {
+        VtbVerification verification = vtbVerificationMapper.selectById(targetId);
+        return verification.getSyFormId()!=null;
+    }
+
     @Override
     public String getTemplateCode() {
         return TbsSeeYonConst.CostCheckConf.Code();