bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购配件时间类型修改

This commit is contained in:
liang.chao 2024-10-14 17:56:34 +08:00
parent 4e33fd229e
commit c109e426e4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java
View File

@ -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;
}

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

@ -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);