From b7dcd397a426496cb9f961f2cb69152815cc169f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 26 四月 2024 13:44:47 +0800
Subject: [PATCH] 核算报告功能实现
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
index 99edde0..ee26421 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
@@ -5,6 +5,7 @@
import com.ycl.platform.domain.entity.CalculateReport;
import com.ycl.platform.domain.form.CalculateReportBackfillForm;
import com.ycl.platform.domain.vo.CalculateRecordVO;
+import com.ycl.platform.domain.vo.CalculateReportDetailVO;
import com.ycl.platform.mapper.CalculateRecordMapper;
import com.ycl.platform.mapper.CalculateReportMapper;
import com.ycl.platform.service.CalculateReportService;
@@ -16,6 +17,8 @@
import java.math.BigDecimal;
import java.util.List;
+
+import com.ycl.utils.SecurityUtils;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
@@ -83,7 +86,7 @@
* @return
*/
@Override
- public Result remove(List<String> ids) {
+ public Result remove(List<Long> ids) {
if(baseMapper.deleteBatchIds(ids) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -96,7 +99,7 @@
* @return
*/
@Override
- public Result removeById(String id) {
+ public Result removeById(Long id) {
if(baseMapper.deleteById(id) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -121,14 +124,10 @@
* @return
*/
@Override
- public Result detail(String id) {
- CalculateReport entity = baseMapper.selectById(id);
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- CalculateReportVO vo = CalculateReportVO.getVoByEntity(entity, null);
+ public Result detail(Long id) {
// 鏄庣粏鍒楄〃
- List<CalculateRecordVO> recordList = calculateRecordMapper.getByContractId(entity.getContractId());
- vo.setRecordList(recordList);
- return Result.ok().data(vo);
+ CalculateReportDetailVO detail = baseMapper.getById(id);
+ return Result.ok().data(detail);
}
/**
--
Gitblit v1.8.0