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 String purchaseTime;
+    private Date purchaseTime;
 
     /** 到货日期 */
     @ApiModelProperty(value = "到货日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "到货日期")
-    private String arrivalTime;
+    private Date arrivalTime;
 
     /** 采购员 */
     @ApiModelProperty(value = "采购员")
@@ -167,21 +167,21 @@ public class PurchasePartInfo extends BaseEntity
     {
         return taskId;
     }
-    public void setPurchaseTime(String purchaseTime)
+    public void setPurchaseTime(Date purchaseTime)
     {
         this.purchaseTime = purchaseTime;
     }
 
-    public String getPurchaseTime()
+    public Date getPurchaseTime()
     {
         return purchaseTime;
     }
-    public void setArrivalTime(String arrivalTime)
+    public void setArrivalTime(Date arrivalTime)
     {
         this.arrivalTime = arrivalTime;
     }
 
-    public String getArrivalTime()
+    public Date getArrivalTime()
     {
         return arrivalTime;
     }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java

@@ -51,7 +51,7 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService {
         record.setMonth(month);
         cleanSameMonthOldRecords(record);
         List<AgreementInfo> list = agreementInfoService.getAllAgreementId();
-//        List<BmProjectLot> projectLots = agreementInfoService.getAllprojectId();
+        List<BmProjectLot> projectLots = agreementInfoService.getAllprojectId();
         // 如果该工程费用指标已超过，则不需要记录月结记录
     /*    for (BmProjectLot bmProjectLot : projectLots) {
             BigDecimal costIndicatorsByLotId = agreementInfoService.getCostIndicatorsByLotId(bmProjectLot);
@@ -119,9 +119,7 @@ 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);