| src/main/java/com/ruoyi/account/controller/BorrowInfoController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/account/mapper/BorrowInfoMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/account/pojo/BorrowInfo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/account/service/BorrowInfoService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/account/BorrowInfoMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
ÎļþÒÑɾ³ý src/main/java/com/ruoyi/account/mapper/BorrowInfoMapper.java
ÎļþÒÑɾ³ý src/main/java/com/ruoyi/account/pojo/BorrowInfo.java
ÎļþÒÑɾ³ý src/main/java/com/ruoyi/account/service/BorrowInfoService.java
ÎļþÒÑɾ³ý src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.DeviceTypeDetail; import com.ruoyi.account.bean.dto.DeviceTypeDistributionVO; import com.ruoyi.account.mapper.BorrowInfoMapper; import com.ruoyi.account.pojo.BorrowInfo; import com.ruoyi.device.mapper.DeviceLedgerMapper; import com.ruoyi.device.pojo.DeviceLedger; import com.ruoyi.framework.web.domain.AjaxResult; @@ -38,7 +36,6 @@ public class AccountingServiceImpl { private final DeviceLedgerMapper deviceLedgerMapper; private final BorrowInfoMapper borrowInfoMapper; private final CustomStorageMapper customStorageMapper; private final ProcurementRecordMapper procurementRecordMapper; private final ProcurementRecordOutMapper procurementRecordOutMapper; @@ -75,17 +72,8 @@ map.put("netValue",reduce.subtract(total)); } // è´åº LambdaQueryWrapper<BorrowInfo> borrowInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); borrowInfoLambdaQueryWrapper.like(BorrowInfo::getCreateTime,year) .eq(BorrowInfo::getStatus,1); List<BorrowInfo> borrowInfos = borrowInfoMapper.selectList(borrowInfoLambdaQueryWrapper); if(CollectionUtils.isNotEmpty(borrowInfos)){ BigDecimal reduce = borrowInfos.stream() .map(BorrowInfo::getBorrowAmount) .filter(Objects::nonNull) .reduce(BigDecimal.ZERO, BigDecimal::add); map.put("debt",reduce); } map.put("debt",BigDecimal.ZERO); // åºåèµäº§ LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordStorageLambdaQueryWrapper = new LambdaQueryWrapper<>(); procurementRecordStorageLambdaQueryWrapper.like(ProcurementRecordStorage::getCreateTime,year); src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
ÎļþÒÑɾ³ý src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
@@ -199,7 +199,6 @@ AFTER_SALES_SERVICE_FILE("after_sales_service_file"), AFTER_SALES_NEAR_EXPIRY("after_sales_near_expiry"), // Account BORROW_INFO("borrow_info"), SALES_REFUND_AMOUNT_ORDER("sales_refund_amount_order"), SALES_RECEIPT_RETURN("sales_receipt_return"), FIN_VOUCHER("fin_voucher"), src/main/resources/mapper/account/BorrowInfoMapper.xml
ÎļþÒÑɾ³ý