From dc54c2986933fdc917005cb4970fa59082558a60 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 7 Mar 2024 23:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/logpm/supervise/api/ClassifyApi.java |  3 ++-
 .../com/logpm/supervise/service/IClassifyService.java  |  2 +-
 .../supervise/service/impl/ClassifyServiceImpl.java    | 10 +++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
index c9a6b5b8d..fec6bd5c5 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
@@ -57,6 +57,7 @@ public class ClassifyApi {
 //		}
 		List<Long> a = new ArrayList<>();
 		List<Long> list = Func.toLongList(deptId);
+		Long goal = list.get(list.size() - 1);
 		a.addAll(list);
 		Long aLong = list.get(list.size() - 1);
 		List<Long> userDeptList = Func.toLongList(dept);
@@ -68,7 +69,7 @@ public class ClassifyApi {
 			a.remove(indexOf);
 		}
 		String collect = a.stream().map(String::valueOf).collect(Collectors.joining(","));
-		List<ClassifyApiVO> detail = classifyService.selectClassifyList(collect);
+		List<ClassifyApiVO> detail = classifyService.selectClassifyList(collect,goal);
 		return R.data(detail);
 	}
 
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java
index 544b5ce91..89390d0f1 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java
@@ -59,7 +59,7 @@ public interface IClassifyService extends BaseService<ClassifyEntity> {
 	 * 查询指标项列表
 	 * @return
 	 */
-	List<ClassifyApiVO> selectClassifyList(String deptId);
+	List<ClassifyApiVO> selectClassifyList(String deptId,Long goal);
 
 	/**
 	 * API保存考核信息
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
index 87f01f75f..ea17a2101 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
@@ -67,6 +67,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -254,7 +255,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	}
 
 	@Override
-	public List<ClassifyApiVO> selectClassifyList(String deptId) {
+	public List<ClassifyApiVO> selectClassifyList(String deptId,Long goal) {
 		Long pid = 0L;
 		List<Long> listId = new ArrayList<>();
 		List<ClassifyApiVO> classifyEntities = getClassifyList(pid,null);
@@ -276,10 +277,13 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 					ClassifyApiVO classifyApiVO = Func.copy(classifyVO, ClassifyApiVO.class);
 					classifyApiVO.setIsCommit(0);
 					if (Func.isNotEmpty(listId)){
-						Long l = listId.get(listId.size()- 1);
+//						Long l = listId.get(listId.size()- 1);
+						//获取当前日期
+						String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 						List<IndicatorsEntity> indicatorsEntityList = iIndicatorsService.list(Wrappers.<IndicatorsEntity>query().lambda()
-							.eq(IndicatorsEntity::getAssessDept, l)
+							.eq(IndicatorsEntity::getAssessDept, goal)
 							.eq(IndicatorsEntity::getClassifyId, entity.getId())
+							.apply("DATE(create_time) = (select CURDATE())")
 						);
 						if (Func.isNotEmpty(indicatorsEntityList) && indicatorsEntityList.size()>= 1){
 							classifyApiVO.setIsCommit(1);