From 254f62e83f0a906b2d5724ae71bc97fe93ee812c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 四月 2024 16:39:02 +0800
Subject: [PATCH] 核算报告详情
---
ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRecordMapper.java | 10 ++++++++++
ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml | 11 +++++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java | 5 +++++
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java | 5 ++++-
ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml | 1 +
5 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
index ba81f0a..8a2caef 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
@@ -6,6 +6,8 @@
import java.math.BigDecimal;
import java.util.List;
import java.time.LocalDateTime;
+
+import com.ycl.platform.domain.form.CalculateRecordForm;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
@@ -46,6 +48,9 @@
/** 淇敼浜� */
private Long updateBy;
+ /** 鏄庣粏 */
+ private List<CalculateRecordVO> recordList;
+
public static CalculateReportVO getVoByEntity(@NonNull CalculateReport entity, CalculateReportVO vo) {
if(vo == null) {
vo = new CalculateReportVO();
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRecordMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRecordMapper.java
index fd51c68..eaa9c91 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRecordMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRecordMapper.java
@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.vo.CalculateRecordVO;
import com.ycl.platform.domain.form.CalculateRecordForm;
+
import java.util.List;
+
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* 鏍哥畻璁板綍 Mapper 鎺ュ彛
@@ -16,4 +19,11 @@
@Mapper
public interface CalculateRecordMapper extends BaseMapper<CalculateRecord> {
+ /**
+ * 鏍煎眬鍚堝悓ID鑾峰彇鏄庣粏
+ *
+ * @param contractId 鍚堝悓ID
+ * @return
+ */
+ List<CalculateRecordVO> getByContractId(@Param("contractId") Integer contractId);
}
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..99edde0 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,7 @@
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.mapper.CalculateRecordMapper;
import com.ycl.platform.mapper.CalculateReportMapper;
import com.ycl.platform.service.CalculateReportService;
@@ -121,10 +122,12 @@
*/
@Override
public Result detail(String id) {
-
CalculateReport entity = baseMapper.selectById(id);
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
CalculateReportVO vo = CalculateReportVO.getVoByEntity(entity, null);
+ // 鏄庣粏鍒楄〃
+ List<CalculateRecordVO> recordList = calculateRecordMapper.getByContractId(entity.getContractId());
+ vo.setRecordList(recordList);
return Result.ok().data(vo);
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml
index ed5ee91..bce717e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml
@@ -7,9 +7,20 @@
<result column="id" property="id" />
<result column="create_time" property="createTime" />
<result column="rule_id" property="ruleId" />
+ <result column="rule_name" property="ruleName" />
<result column="contract_id" property="contractId" />
<result column="deduct_money" property="deductMoney" />
<result column="score" property="score" />
</resultMap>
+ <select id="getByContractId" resultMap="BaseResultMap">
+ SELECT
+ tcr.id, tcr.create_time, tcr.deduct_money, tcru.rule_name, tcr.score, tcr.rule_id
+ FROM
+ t_calculate_record tcr
+ INNER JOIN t_calculate_rule tcru ON tcr.rule_id = tcru.id AND tcr.contract_id = #{contractId}
+ WHERE
+ tcru.deleted = 0 AND tcr.deleted = 0
+ </select>
+
</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
index 6ca3ff4..3af6b52 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -30,6 +30,7 @@
INNER JOIN t_contract tc ON tcr.contract_id = tc.id
INNER JOIN t_yw_unit tyu ON tyu.id = tc.unit_id
<where>
+ AND tcr.deleted = 0 AND tc.deleted = 0 AND tyu.deleted = 0
<if test="query.unitName != null and query.unitName != '' ">
AND tyu.unit_name like concat('%', #{query.unitName}, '%')
</if>
--
Gitblit v1.8.0