From f6e9bfe4d3d0e4b7b592da642058773567f4dcf0 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 17 Jan 2023 16:19:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=B9=E7=94=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E9=A2=84=E8=A7=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/tbs/entity/bo/TbsActivityBo.java  |  7 +++++++
 .../tbs/service/TbsBudgetApplicationService.java    |  4 ++++
 .../tbs/service/impl/TbsActivityServiceImpl.java    | 13 +++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java
index b8b43232..780b470d 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java
@@ -2,6 +2,8 @@ package com.qs.serve.modules.tbs.entity.bo;
 
 import java.time.LocalDate;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -54,6 +56,11 @@ public class TbsActivityBo implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate preEndDate;
 
+    /** 预计核销时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate preCheckDate;
+
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
index 77bfafb9..1aa5d367 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
@@ -412,6 +412,10 @@ public class TbsBudgetApplicationService {
         //提取可用预算的考核期
         List<TbsScheduleItemBudget> currentScheduleItemBudgets = new ArrayList<>();
         for (TbsActivity activity : activityList) {
+            //忽略重叠情况
+            if(activityCostItem.getActivityId().equals(activity.getId())){
+                continue;
+            }
             for (TbsBudget budget : currentItemBudgetList) {
                 List<TbsScheduleItemBudget> scheduleItemBudgets = activity.getScheduleItemBudgetList();
                 for (TbsScheduleItemBudget scheduleItemBudget : scheduleItemBudgets) {
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
index b2df9287..04b09422 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
@@ -102,16 +102,21 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
             String random = String.format("%03d",new Random().nextInt(999));
             activity.setActivityCode("G"+ StringUtils.genShortId() + random);
         }
+        activity.setActStartDate(activityBo.getActStartDate());
+        activity.setActEndDate(activityBo.getActEndDate());
+        activity.setPreStartDate(activityBo.getPreStartDate());
+        activity.setPreEndDate(activityBo.getPreEndDate());
+        activity.setPreCheckDate(activityBo.getPreCheckDate());
         activity.setTemplateValue(activityBo.getTemplateValue());
         activity.setSupplierId(Long.parseLong(supplier.getId()));
         activity.setSupplierCode(supplier.getCode());
         activity.setSupplierName(supplier.getName());
         boolean isUpdate = activity.getId()!=null;
         activity.setTotalAmount(totalAmount);
-        SysConfig sysConfig = configService.getByKey(SysConfigKey.ActivityPreCheckDays);
-        Integer days = Integer.parseInt(sysConfig.getConfigValue());
-        LocalDate preDay = DateUtils.beSetDate(activity.getActEndDate(),days);
-        activity.setPreCheckDate(preDay);
+//        SysConfig sysConfig = configService.getByKey(SysConfigKey.ActivityPreCheckDays);
+//        Integer days = Integer.parseInt(sysConfig.getConfigValue());
+//        LocalDate preDay = DateUtils.beSetDate(activity.getActEndDate(),days);
+//        activity.setPreCheckDate(preDay);
         this.saveOrUpdate(activity);
         //统计费用信息
         this.updateCostTotal(costApply.getId());