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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2025-01-24 18:03:31 +08:00
parent c45378cde5 808b89b332
commit a5ebc4d727
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java
View File

@ -62,9 +62,9 @@ public class IwsCostPushController extends BaseController {
* @param obj 查询条件 * @param obj 查询条件
*/ */
@GetMapping("/getCostPushCheckList") @GetMapping("/getCostPushCheckList")
@ApiOperation("查询费用推送审核列表--分页") @ApiOperation("查询费用推送审核列表--不分页")
public TableDataInfo getCostPushCheckList(IwsCostPushBean obj) { public TableDataInfo getCostPushCheckList(IwsCostPushBean obj) {
startPage(); //startPage(); 取消分页
List<IwsCostPushBean> list = iwsCostPushService.getCostPushCheckList(obj); List<IwsCostPushBean> list = iwsCostPushService.getCostPushCheckList(obj);
return getDataTable(list); return getDataTable(list);
} }

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java
View File

@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -76,7 +77,7 @@ public class IwsCostPushServiceImpl implements IwsCostPushService {
// 清除旧的费用计算数据 // 清除旧的费用计算数据
// cleanSameMonthOldRecords(record); // cleanSameMonthOldRecords(record);
// 插入新的当前月份记录,并生成 // 插入新的当前月份记录,并生成id
iwsCostPushMapper.insertCalcMonthRecord(costDto); iwsCostPushMapper.insertCalcMonthRecord(costDto);
String taskId = costDto.getId(); String taskId = costDto.getId();
@ -143,10 +144,13 @@ public class IwsCostPushServiceImpl implements IwsCostPushService {
// 计算费用 // 计算费用
leaseCostInfo.setLeaseMoney(new BigDecimal(leaseCostInfo.getLeaseDays()) leaseCostInfo.setLeaseMoney(new BigDecimal(leaseCostInfo.getLeaseDays())
.multiply(new BigDecimal(leaseCostInfo.getLeasePrice())) .multiply(new BigDecimal(leaseCostInfo.getLeasePrice()))
.multiply(leaseCostInfo.getLeaseNum()) .multiply(leaseCostInfo.getLeaseNum()).setScale(2, RoundingMode.HALF_UP)
); );
} }
// 删除标记的非期间段数据
theMonthAgreementLeaseList.removeIf(IwsCostPushBean::isDelFlag);
return theMonthAgreementLeaseList; return theMonthAgreementLeaseList;
} }
} }

4
bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
View File

@ -98,6 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN slt_agreement_info sai ON bma.agreement_id = sai.agreement_id LEFT JOIN slt_agreement_info sai ON bma.agreement_id = sai.agreement_id
LEFT JOIN ma_type mt ON mt.type_id = sai.type_id LEFT JOIN ma_type mt ON mt.type_id = sai.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
where bma.agreement_id = #{agreementId} <where>
bma.agreement_id = #{agreementId}
</where>
</select> </select>
</mapper> </mapper>