From a97c6a3bd386983ea8442c05f0c2cdae7edcbf59 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 11 Sep 2023 09:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=B8=E9=94=80=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bms/entity/bo/BmsSupplierExcelBo.java     |  2 +-
 .../modules/tbs/entity/TbsCostApply.java      | 17 +++++++++++
 .../modules/tbs/entity/vo/TbsCostApplyVo.java | 10 +++++++
 .../service/impl/TbsCostApplyServiceImpl.java | 30 +++++++++++++++++--
 .../impl/VtbVerificationServiceImpl.java      |  4 ++-
 5 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java
index f3d5796d..40f36554 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java
@@ -124,7 +124,7 @@ public class BmsSupplierExcelBo {
         if(StringUtils.hasText(bmsSupplier.getOtherUserNames())) {
             bo.setMinorHeadNames(bmsSupplier.getOtherUserNames().replaceAll(",", ";"));
         }
-        if(StringUtils.hasText(bmsSupplier.if(StringUtils.hasText(bmsSupplier.getUserCode())) {())) {
+        if(StringUtils.hasText(bmsSupplier.getOtherUserCodes())) {
             bo.setMinorHeadCodes(bmsSupplier.getOtherUserCodes().replaceAll(",", ";"));
         }
         bo.setIsExpendableExpense(bmsSupplier.getCostFlag());
diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
index 1f792f49..2ff9e4a9 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
@@ -68,6 +68,22 @@ public class TbsCostApply implements Serializable {
     @NotNull(message = "状态不能为空")
     private Integer chargeState;
 
+    /**
+     * 核销状态：
+     * 有这四个状态：
+     * 0-未核销：代表这案子里面的所有活动都还未开始核销；
+     * 1-已通过：代表这个案子的所有活动都已经核销完成；
+     * 2-核销中：代表这个案子的某些活动在核销中；
+     * 3-被拒绝；代表这个案子里面的所有活动金额都被释放了
+     */
+    private Integer checkState;
+
+    /**
+     * 记录核销状态
+     * 用于记录核销前状态
+     */
+    //private Integer logCheckState;
+
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;
@@ -229,5 +245,6 @@ public class TbsCostApply implements Serializable {
     @TableField(exist = false)
     List<String> selectUserIds;
 
+
 }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java
index 27ebb5b8..46cf515c 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java
@@ -94,5 +94,15 @@ public class TbsCostApplyVo implements Serializable {
 
     private String templateTitle;
 
+    /**
+     * 核销状态：
+     * 有这四个状态：
+     * 0-未核销：代表这案子里面的所有活动都还未开始核销；
+     * 1-已通过：代表这个案子的所有活动都已经核销完成；
+     * 2-核销中：代表这个案子的某些活动在核销中；
+     * 3-被拒绝；代表这个案子里面的所有活动金额都被释放了
+     */
+    private Integer checkState;
+
 }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
index d30413ca..2f92253d 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
@@ -889,18 +889,22 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
 
     @Override
     public void flushCostStatus(Long costApplyId,boolean isContractFlag) {
+        LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
+        actLqw.eq(TbsActivity::getCostApplyId,costApplyId);
+        List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
         if(isContractFlag){
             LambdaQueryWrapper<TbsActivityPayCondition> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsActivityPayCondition::getCostApplyId,costApplyId);
             lqw.ne(TbsActivityPayCondition::getFinishedFlag,1);
             Long count = tbsActivityPayConditionMapper.selectCount(lqw);
             if (count>0){
+                TbsCostApply costApply = new TbsCostApply();
+                costApply.setId(costApplyId);
+                costApply.setCheckState(2);
+                this.updateById(costApply);
                 return;
             }
         }else {
-            LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
-            actLqw.eq(TbsActivity::getCostApplyId,costApplyId);
-            List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
             for (TbsActivity activity : activityList) {
                 if(activity.getActivityState().equals(TbsActivityState.STATE_4_Release)){
                         continue;
@@ -908,12 +912,32 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 if(activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
                     continue;
                 }
+                TbsCostApply costApply = new TbsCostApply();
+                costApply.setId(costApplyId);
+                costApply.setCheckState(2);
+                this.updateById(costApply);
                 return;
             }
         }
+        boolean isAllCancel = true;
+        for (TbsActivity activity : activityList) {
+            boolean itemCancel = activity.getReleaseFlag().equals(1)
+                    && activity.getReleaseAmount()!=null
+                    && activity.getReleaseAmount().compareTo(activity.getTotalAmount())==0;
+            if(!itemCancel){
+                isAllCancel = false;
+                break;
+            }
+        }
+
         TbsCostApply costApply = new TbsCostApply();
         costApply.setId(costApplyId);
         costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode());
+        if(isAllCancel){
+            costApply.setCheckState(3);
+        }else {
+            costApply.setCheckState(1);
+        }
         costApply.setPassTime(LocalDateTime.now());
         this.updateById(costApply);
     }
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index 1edba1fd..f0d79724 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
@@ -713,7 +713,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             orgData.setVerificationState(VtbVerificationState.Close.getCode());
             this.updateById(orgData);
         }
-
+//        //记录核销状态到费用申请
+//        costApply.setLogCheckState(costApply.getCheckState());
+//        costApplyService.updateById(costApply);
         //判断是否直接跳过审批的申请
         AsyncManager.me().execute(AsyncFactory.saveVtbSubmit(verification.getId(), totalAmount,1,false));