From 586510e643625b09f08e7289d90c9d5df1a56304 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 26 四月 2024 14:17:13 +0800 Subject: [PATCH] 字段调整 --- ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 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 4829785..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 @@ -4,6 +4,8 @@ import com.ycl.platform.domain.entity.CalculateRecord; 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; @@ -15,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; @@ -82,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("鍒犻櫎鎴愬姛"); } @@ -95,7 +99,7 @@ * @return */ @Override - public Result removeById(String id) { + public Result removeById(Long id) { if(baseMapper.deleteById(id) > 0) { return Result.ok("鍒犻櫎鎴愬姛"); } @@ -120,12 +124,10 @@ * @return */ @Override - public Result detail(String id) { - - CalculateReport entity = baseMapper.selectById(id); - Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); - CalculateReportVO vo = CalculateReportVO.getVoByEntity(entity, null); - return Result.ok().data(vo); + public Result detail(Long id) { + // 鏄庣粏鍒楄〃 + CalculateReportDetailVO detail = baseMapper.getById(id); + return Result.ok().data(detail); } /** -- Gitblit v1.8.0