From 528583047b08f74df27ac538705627741363602e Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期日, 28 四月 2024 18:06:26 +0800
Subject: [PATCH] 合同积分详情，合同考核结果展示

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java |   77 +++++++++++++++++++++++++-------------
 1 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
index d8ba31d..6ac8771 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
@@ -2,96 +2,119 @@
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.platform.domain.entity.CheckResult;
+import com.ycl.platform.domain.entity.ContractResultRecord;
+import com.ycl.platform.domain.vo.CheckResultVO;
 import com.ycl.platform.mapper.CheckResultMapper;
+import com.ycl.platform.mapper.ContractResultRecordMapper;
 import com.ycl.platform.service.ICheckResultService;
+import com.ycl.platform.service.ITContractService;
+import com.ycl.platform.service.YwUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import utils.DateUtils;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
  * 鑰冩牳缁撴灉Service涓氬姟灞傚鐞�
- * 
+ *
  * @author ruoyi
  * @date 2024-04-01
  */
 @Service
-public class CheckResultServiceImpl extends ServiceImpl<CheckResultMapper, CheckResult> implements ICheckResultService
-{
+public class CheckResultServiceImpl extends ServiceImpl<CheckResultMapper, CheckResult> implements ICheckResultService {
     @Autowired
     private CheckResultMapper checkResultMapper;
+    @Autowired
+    private ContractResultRecordMapper contractResultRecordMapper;
+    @Autowired
+    private YwUnitService unitService;
+    @Autowired
+    private ITContractService contractService;
+
 
     /**
      * 鏌ヨ鑰冩牳缁撴灉
-     * 
+     *
      * @param id 鑰冩牳缁撴灉涓婚敭
      * @return 鑰冩牳缁撴灉
      */
     @Override
-    public CheckResult selectCheckResultById(Long id)
-    {
-        return checkResultMapper.selectCheckResultById(id);
+    public CheckResult selectCheckResultById(Long id) {
+        return checkResultMapper.selectById(id);
     }
 
     /**
      * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
-     * 
+     *
      * @param checkResult 鑰冩牳缁撴灉
      * @return 鑰冩牳缁撴灉
      */
     @Override
-    public List<CheckResult> selectCheckResultList(CheckResult checkResult)
-    {
-        return checkResultMapper.selectCheckResultList(checkResult);
+    public List<CheckResultVO> selectCheckResultList(CheckResult checkResult) {
+        return checkResultMapper.selectList(null).stream().map(
+                item -> {
+                    CheckResultVO checkResultVO = CheckResultVO.getVoByEntity(item, null);
+                    checkResultVO.setUnitName(unitService.getById(item.getUnitId()).getUnitName());
+                    checkResultVO.setContractName(contractService.getById(item.getContractId()).getName());
+                    return checkResultVO;
+                }
+        ).toList();
+    }
+
+    @Override
+    public List<CheckResult> selectCheckResult(CheckResult checkResult) {
+        return checkResultMapper.selectList(null);
     }
 
     /**
      * 鏂板鑰冩牳缁撴灉
-     * 
+     *
      * @param checkResult 鑰冩牳缁撴灉
      * @return 缁撴灉
      */
     @Override
-    public int insertCheckResult(CheckResult checkResult)
-    {
-        return checkResultMapper.insertCheckResult(checkResult);
+    public int insertCheckResult(CheckResult checkResult) {
+        return checkResultMapper.insert(checkResult);
     }
 
     /**
      * 淇敼鑰冩牳缁撴灉
-     * 
+     *
      * @param checkResult 鑰冩牳缁撴灉
      * @return 缁撴灉
      */
     @Override
-    public int updateCheckResult(CheckResult checkResult)
-    {
+    public int updateCheckResult(CheckResult checkResult) {
         checkResult.setUpdateTime(DateUtils.getNowDate());
-        return checkResultMapper.updateCheckResult(checkResult);
+        return checkResultMapper.updateById(checkResult);
     }
 
     /**
      * 鎵归噺鍒犻櫎鑰冩牳缁撴灉
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳缁撴灉涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteCheckResultByIds(Long[] ids)
-    {
-        return checkResultMapper.deleteCheckResultByIds(ids);
+    public int deleteCheckResultByIds(Long[] ids) {
+        return checkResultMapper.deleteBatchIds(Arrays.asList(ids));
     }
 
     /**
      * 鍒犻櫎鑰冩牳缁撴灉淇℃伅
-     * 
+     *
      * @param id 鑰冩牳缁撴灉涓婚敭
      * @return 缁撴灉
      */
     @Override
-    public int deleteCheckResultById(Long id)
-    {
-        return checkResultMapper.deleteCheckResultById(id);
+    public int deleteCheckResultById(Long id) {
+        return checkResultMapper.deleteById(id);
+    }
+
+    @Override
+    public void saveBatchRecord(List<ContractResultRecord> contractResultRecord) {
+        // contractResultRecordMapper
     }
 }

--
Gitblit v1.8.0