From 863b22dd84364ef5a9c4d5057af5063f94e8f346 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 03:45:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
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..3a38040 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,9 +8,8 @@
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 lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;
@@ -26,11 +24,11 @@
* @date 2024-04-01
*/
@Service
+@RequiredArgsConstructor
public class ContractResultServiceImpl extends ServiceImpl<ContractResultMapper, ContractResult> implements IContractResultService {
- @Autowired
- private ContractResultMapper checkResultMapper;
- @Autowired
- private ContractResultRecordMapper contractResultRecordMapper;
+
+ private final ContractResultMapper checkResultMapper;
+ private final ContractResultRecordMapper contractResultRecordMapper;
/**
@@ -52,6 +50,7 @@
*/
@Override
public List<ContractResultVO> selectCheckResultList(ContractResultVO contractResult) {
+ contractResult.setUnitId(Long.valueOf(SecurityUtils.getUnitId()));
return checkResultMapper.selectCheckResultList(contractResult);
}
@@ -108,10 +107,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
--
Gitblit v1.8.0