bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复

This commit is contained in:
hongchao 2026-01-15 17:34:10 +08:00
parent 6885b17f6d
commit fab03a0f3d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java
View File

@ -80,13 +80,19 @@ public class SltAgreementReduceController extends BaseController {
Date currentDate = new Date(); Date currentDate = new Date();
PeriodCostQueryDto periodCostQueryDto = new PeriodCostQueryDto(); PeriodCostQueryDto periodCostQueryDto = new PeriodCostQueryDto();
periodCostQueryDto.setAgreementId(sltAgreement.getAgreementId()); periodCostQueryDto.setAgreementId(sltAgreement.getAgreementId());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (null == sltAgreement.getStartTime()) { if (null == sltAgreement.getStartTime()) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
periodCostQueryDto.setStartDate(sdf.parse("2018-01-01 01:00:00")); periodCostQueryDto.setStartDate(sdf.parse("2018-01-01 01:00:00"));
}else{
String formattedStartTime = sdf.format(sltAgreement.getStartTime());
periodCostQueryDto.setStartDate(sdf.parse(formattedStartTime));
} }
if (null == sltAgreement.getEndTime()) { if (null == sltAgreement.getEndTime()) {
periodCostQueryDto.setEndDate(currentDate); periodCostQueryDto.setEndDate(currentDate);
}else{
String formattedEndTime = sdf.format(sltAgreement.getEndTime());
periodCostQueryDto.setEndDate(sdf.parse(formattedEndTime));
} }
List<PeriodCostResultVo> resultVos = sltAgreementInfoService.selectPeriodCostList(periodCostQueryDto); List<PeriodCostResultVo> resultVos = sltAgreementInfoService.selectPeriodCostList(periodCostQueryDto);

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/PeriodCostResultVo.java
View File

@ -18,6 +18,8 @@ import java.util.Date;
@ApiModel("区间费用计算结果VO") @ApiModel("区间费用计算结果VO")
public class PeriodCostResultVo { public class PeriodCostResultVo {
private Long id;
@ApiModelProperty(value = "协议ID") @ApiModelProperty(value = "协议ID")
private Long agreementId; private Long agreementId;

1
bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
View File

@ -1667,6 +1667,7 @@
<select id="selectLeasePeriodCostList" parameterType="com.bonus.material.settlement.domain.dto.PeriodCostQueryDto" resultMap="PeriodCostResultMap"> <select id="selectLeasePeriodCostList" parameterType="com.bonus.material.settlement.domain.dto.PeriodCostQueryDto" resultMap="PeriodCostResultMap">
SELECT SELECT
sai.id,
bai.agreement_id, bai.agreement_code, bai.unit_id, bai.agreement_id, bai.agreement_code, bai.unit_id,
bu.unit_name, bu.unit_name,
bai.project_id, bai.project_id,