考核指标修复

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);
 	}
 

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保存考核信息

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);