From 74fb0ca8f830e145513cc8e18257c5bac4c5ed62 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期六, 24 八月 2024 12:09:32 +0800
Subject: [PATCH] refactor：合同考核结果详情调整
---
ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java | 3 ++-
ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java | 4 ++--
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java | 9 ++-------
ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java | 5 +++++
ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml | 11 +++++++++++
6 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
index 7f7e84e..7a6cb83 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
@@ -27,7 +27,7 @@
* 瑙勫垯鍚嶇О
*/
@ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "瑙勫垯鍚嶇О"})
- @ColumnWidth(40)
+ @ColumnWidth(130)
private String ruleName;
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
index de16ea7..ce6af88 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
@@ -45,8 +45,8 @@
*/
@PreAuthorize("@ss.hasPermi('system:result:query')")
@GetMapping("/record/list")
- public TableDataInfo recordList(Long resultId) {
- List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId);
+ public TableDataInfo recordList(Long resultId, Long contractId) {
+ List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId, contractId);
return getDataTable(list);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java
index 77b69c4..791adda 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.ContractResult;
+import com.ycl.platform.domain.entity.ContractResultRecord;
import com.ycl.platform.domain.vo.ContractResultVO;
import java.util.List;
@@ -13,5 +14,9 @@
* @date 2024-04-01
*/
public interface ContractResultMapper extends BaseMapper<ContractResult> {
+
List<ContractResultVO> selectCheckResultList(ContractResultVO checkResult);
+
+ List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId);
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
index 3faed01..3c4fde3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
@@ -72,9 +72,10 @@
/**
* 鏍规嵁鑰冩牳缁撴灉鏌ヨ璁板綍
* @param resultId 鑰冩牳缁撴灉id
+ * @param contractId 鍚堝悓id
* @return 鑰冩牳缁撴灉璁板綍
*/
- List<ContractResultRecord> selectCheckResultRecordList(Long resultId);
+ List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId);
Boolean publish(Long id);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
index 4a77bd9..17c9481 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
@@ -1,6 +1,5 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.ContractResult;
@@ -9,8 +8,6 @@
import com.ycl.platform.mapper.ContractResultMapper;
import com.ycl.platform.mapper.ContractResultRecordMapper;
import com.ycl.platform.service.IContractResultService;
-import com.ycl.platform.service.ITContractService;
-import com.ycl.platform.service.YwUnitService;
import com.ycl.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -108,10 +105,8 @@
}
@Override
- public List<ContractResultRecord> selectCheckResultRecordList(Long resultId) {
- return new LambdaQueryChainWrapper<>(contractResultRecordMapper)
- .eq(ContractResultRecord::getResultId, resultId)
- .list();
+ public List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId) {
+ return checkResultMapper.selectCheckResultRecordList(resultId, contractId);
}
@Override
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
index 5d46ac7..2206157 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
@@ -24,4 +24,15 @@
AND c.publish = #{publish}
</if>
</select>
+
+ <select id="selectCheckResultRecordList" resultType="com.ycl.platform.domain.entity.ContractResultRecord">
+ SELECT
+ a.rule_name,
+ COUNT(b.id) AS num,
+ IFNULL(-SUM(score), 0) AS score
+ FROM t_calculate_rule a
+ LEFT JOIN t_contract_result_record b ON SUBSTRING_INDEX(b.rule_ids, ',', -1) = a.id AND b.deleted = 0 AND b.result_id = #{resultId}
+ WHERE a.contract_id = #{contractId} AND a.deleted = 0
+ GROUP BY a.rule_name
+ </select>
</mapper>
--
Gitblit v1.8.0