From 4be7831f3e4c1119950362068e37c70e17ad1a39 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Fri, 9 Aug 2024 14:18:39 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E5=BC=82=E5=8A=A8=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tbs/controller/TbsCostApplyController.java        |  2 +-
 .../service/impl/TbsCostChangeInfoServiceImpl.java    | 11 ++++++++---
 src/main/java/com/qs/serve/task/TagTask.java          |  4 ++--
 src/main/resources/mapper/tag/TagDataMapper.xml       |  6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
index d0a16240..df09dc95 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
+++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
@@ -407,7 +407,7 @@ public class TbsCostApplyController {
         lqw.orderByAsc(TbsCostApply::getCreateTime);
         List<TbsCostApply> costApplyList = tbsCostApplyService.list(lqw);
         for (TbsCostApply apply : costApplyList) {
-            tbsCostChangeInfoService.compareToBuildChangeInfo(apply.getChangeSourceId(),apply.getChangeExtendId());
+            tbsCostChangeInfoService.compareToBuildChangeInfo(apply.getId(),apply.getChangeExtendId());
             List<TbsCostChangeInfo> changeInfoList = tbsCostChangeInfoService.listByExtendCostApplyId(apply.getId());
             apply.setChangeInfoLogs(changeInfoList);
         }
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostChangeInfoServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostChangeInfoServiceImpl.java
index 6c0c5122..bb46b073 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostChangeInfoServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostChangeInfoServiceImpl.java
@@ -72,12 +72,17 @@ public class TbsCostChangeInfoServiceImpl extends ServiceImpl<TbsCostChangeInfoM
         checkBuild.eq(TbsCostChangeInfo::getSourceId,orgId);
         checkBuild.eq(TbsCostChangeInfo::getExtendId,newId);
         Long count = this.count(checkBuild);
+        TbsCostApply newApply = costApplyService.getById(newId);
         if(count>0){
-            return;
+            //未提交则进行删除
+            if(newApply.getChargeState().equals(0)){
+                this.remove(checkBuild);
+            }else {
+                return;
+            }
         }
         List<TbsCostChangeInfo> changeInfoList = new ArrayList<>();
         TbsCostApply oldApply = costApplyService.getById(orgId);
-        TbsCostApply newApply = costApplyService.getById(newId);
         if(!oldApply.getChargeTheme().equals(newApply.getChargeTheme())){
             changeInfoList.add(TbsCostChangeInfo.toNewObject("档案标题更变",newApply.getChargeTheme()));
         }
@@ -90,7 +95,7 @@ public class TbsCostChangeInfoServiceImpl extends ServiceImpl<TbsCostChangeInfoM
             for (TbsActivity newAct : newActivityList) {
                 if(orgAct.getActivityCode().equals(newAct.getActivityCode())){
                     orgMatchNewAct = true;
-                    if(orgAct.getActTitle().equals(newAct.getActTitle())){
+                    if(!orgAct.getActTitle().equals(newAct.getActTitle())){
                         changeInfoList.add(TbsCostChangeInfo.toNewObject("活动活动简述及目的更变",newAct.getActTitle()));
                     }
                     if(!orgAct.getActStartDate().equals(newAct.getActStartDate())||!orgAct.getActEndDate().equals(newAct.getActEndDate())){
diff --git a/src/main/java/com/qs/serve/task/TagTask.java b/src/main/java/com/qs/serve/task/TagTask.java
index 56c26367..32f67730 100644
--- a/src/main/java/com/qs/serve/task/TagTask.java
+++ b/src/main/java/com/qs/serve/task/TagTask.java
@@ -30,9 +30,9 @@ public class TagTask {
     /**
      * 数据处理10-15分钟，清理过期数据
      */
-    @Scheduled(cron="0 0/1 * * * ?")
+    //@Scheduled(cron="0 0/1 * * * ?")
     public void buildTempTable(){
-        tagDataMapper.deleteExpireData();
+        //tagDataMapper.deleteExpireData();
     }
 
 
diff --git a/src/main/resources/mapper/tag/TagDataMapper.xml b/src/main/resources/mapper/tag/TagDataMapper.xml
index 8b278701..a675220f 100644
--- a/src/main/resources/mapper/tag/TagDataMapper.xml
+++ b/src/main/resources/mapper/tag/TagDataMapper.xml
@@ -49,9 +49,9 @@
         left join tag_info on tag_data.tag_id = tag_info.id
         <where>
             and tag_info.del_flag = 0 and `tag_data`.del_flag = 0
-            <if test="query.ignoreDateFlag = null or query.ignoreDateFlag != '1' ">
-                and (tag_data.start_date is null or tag_data.start_date &gt;= now() )
-                and (tag_data.end_date is null or tag_data.end_date &lt;= now() )
+            <if test="query.ignoreDateFlag = null or query.ignoreDateFlag != 1 ">
+                and (tag_data.start_date is null or tag_data.start_date &lt;= now() )
+                and (tag_data.end_date is null or tag_data.end_date &gt;= now() )
             </if>
             <if test="query.id != null"> and `tag_data`.`id` = #{query.id}</if>
             <if test="query.tagName != null and query.tagName != ''"> and `tag_data`.`tag_name` = #{query.tagName}</if>