From 7fa07718de92093c6315c5cb37bbc8dd7cdafa3c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 十二月 2024 10:28:43 +0800
Subject: [PATCH] 考核积分修改、点位导出修改
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java | 28 +++++++++++++++++-----------
1 files changed, 17 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..8843ace 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,15 +8,15 @@
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;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
/**
* 鑰冩牳缁撴灉Service涓氬姟灞傚鐞�
@@ -26,11 +25,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 +51,15 @@
*/
@Override
public List<ContractResultVO> selectCheckResultList(ContractResultVO contractResult) {
+ //閬垮厤鏌ヨ鏉′欢澶辨晥
+ if(contractResult.getUnitId()==null) {
+ Integer unitId = SecurityUtils.getUnitId();
+ Long uid = null;
+ if (Objects.nonNull(unitId)) {
+ uid = Long.valueOf(unitId);
+ }
+ contractResult.setUnitId(uid);
+ }
return checkResultMapper.selectCheckResultList(contractResult);
}
@@ -108,10 +116,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