From c109e426e4a2db985daca6d8da8c10f4f8d0a4d9 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 14 Oct 2024 17:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=85=8D=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/material/domain/PurchasePartInfo.java | 12 ++++++------
 .../remind/service/CalcMonthlyServiceImp.java        |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java
index e54d950..e15728b 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java
@@ -38,14 +38,14 @@ public class PurchasePartInfo extends BaseEntity
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "采购日期")
-    private Date purchaseTime;
+    private String purchaseTime;
 
     /** 到货日期 */
     @ApiModelProperty(value = "到货日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "到货日期")
-    private Date arrivalTime;
+    private String arrivalTime;
 
     /** 采购员 */
     @ApiModelProperty(value = "采购员")
@@ -167,21 +167,21 @@ public class PurchasePartInfo extends BaseEntity
     {
         return taskId;
     }
-    public void setPurchaseTime(Date purchaseTime)
+    public void setPurchaseTime(String purchaseTime)
     {
         this.purchaseTime = purchaseTime;
     }
 
-    public Date getPurchaseTime()
+    public String getPurchaseTime()
     {
         return purchaseTime;
     }
-    public void setArrivalTime(Date arrivalTime)
+    public void setArrivalTime(String arrivalTime)
     {
         this.arrivalTime = arrivalTime;
     }
 
-    public Date getArrivalTime()
+    public String getArrivalTime()
     {
         return arrivalTime;
     }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java
index 268655e..cef1561 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java
@@ -119,7 +119,9 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService {
                     // 如果该工程费用指标已超过，则不需要记录月结记录
                     BmProjectLot bmProjectLot = new BmProjectLot();
                     bmProjectLot.setLotId(projectMonthCosts.getProjectId());
+                    // 获取已结算金额
                     BigDecimal costByLotId = agreementInfoService.getCostByLotId(bmProjectLot);
+                    // 获取该工程费用指标
                     BigDecimal costIndicatorsByLotId = agreementInfoService.getCostIndicatorsByLotId(bmProjectLot);
                     if (costByLotId.compareTo(costIndicatorsByLotId) > 0) {
                         List<String> proMonthCostIds = calMonthlyMapper.selectIdByProjectIdAndMonth(projectMonthCosts);