From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 31 七月 2024 14:54:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 36 insertions(+), 13 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java index 4993e48..84cdd90 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java @@ -2,8 +2,6 @@ import annotation.DataScope; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.platform.base.BaseSelect; -import com.ycl.platform.base.CheckIndex; import com.ycl.platform.domain.dto.CheckScoreDTO; import com.ycl.platform.domain.dto.CheckScoreIndexDTO; import com.ycl.platform.domain.dto.ScoreIndexDTO; @@ -17,14 +15,11 @@ import com.ycl.platform.service.ICheckIndexFaceService; import com.ycl.platform.service.ICheckIndexVideoService; import com.ycl.platform.service.ICheckScoreService; -import com.ycl.system.Result; import com.ycl.system.entity.SysRole; import com.ycl.system.service.ISysDeptService; +import com.ycl.utils.DateUtils; import com.ycl.utils.SecurityUtils; import com.ycl.utils.StringUtils; -import com.ycl.utils.poi.ExcelUtil; -import constant.CheckConstants; -import enumeration.general.CheckScoreType; import enumeration.general.PublishType; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; @@ -32,16 +27,13 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import pojo.ExcelExp; -import utils.DateUtils; import utils.poi.ExcelUtilManySheet; import java.io.IOException; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * 鑰冩牳绉垎鏄庣粏Service涓氬姟灞傚鐞� @@ -137,6 +129,39 @@ //鍖哄幙鍙兘鐪嬪凡鍙戝竷 roleControl(checkScore); + // 鑾峰彇鏁版嵁鏃ユ湡鏃堕棿 + Calendar calendar = Calendar.getInstance(); + // 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁 + if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); } + // 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛e害 3 甯傚眬瀛e害 + switch (checkScore.getExamineTag()) { + case 0, 1: + checkScore.setEndDate(calendar.getTime()); + calendar.set(Calendar.DAY_OF_MONTH, 1); + checkScore.setStartDate(calendar.getTime()); + break; + case 2, 3: + checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime()); + checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime()); + checkScore.setExamineTag(checkScore.getExamineTag() == 2 ? 0 : 1); + break; + } + return scoreMapper.selectCheckScoreMap(checkScore).stream().collect(Collectors.groupingBy(CheckScore::getDeptId)); + } + + /** + * 鏌ヨ鑰冩牳绉垎鍗$墖鍒楄〃 + * + * @param checkScore 鑰冩牳绉垎 + * @return 鑰冩牳绉垎 + */ + @Override + @DataScope(deptAlias = "d",userAlias = "u") + public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore) + { + //鍖哄幙鍙兘鐪嬪凡鍙戝竷 + roleControl(checkScore); + //鏌ヨ鎴愮哗 String date = checkScore.getDate(); if(StringUtils.isEmpty(date)){ @@ -150,10 +175,8 @@ checkScore.setDate(date); } List<CheckScore> checkScores = scoreMapper.selectCheckScoreList(checkScore); - Map<Long, List<CheckScore>> deptMap = checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId)); - return deptMap; + return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId)); } - /** * 鍖哄幙璇︽儏 -- Gitblit v1.8.0