From e3f24df0b080f4b55abe05864b7f52e6393820b3 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 06 八月 2024 11:09:16 +0800 Subject: [PATCH] 内部新增工单方法 --- ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 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 c790715..21d675d 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 @@ -1,6 +1,7 @@ package com.ycl.platform.service.impl; import annotation.DataScope; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.platform.domain.dto.CheckScoreDTO; import com.ycl.platform.domain.dto.CheckScoreIndexDTO; @@ -133,8 +134,26 @@ // 鑾峰彇鏁版嵁鏃ユ湡鏃堕棿 Calendar calendar = Calendar.getInstance(); + getCheckScore(checkScore, calendar); + // 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁 if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); } + + List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore); + // 濡傛灉鏁版嵁涓虹┖锛屽垯鏌ヨ涔嬪墠鐨勬暟鎹� + if (checkScores.isEmpty()) { + CheckScore one = new LambdaQueryChainWrapper<>(baseMapper).select(CheckScore::getCreateTime).last("order by create_time desc limit 1").one(); + if (Objects.nonNull(one)) { + calendar.setTime(one.getCreateTime()); + getCheckScore(checkScore, calendar); + checkScores = scoreMapper.selectCheckScoreMap(checkScore); + } + } + return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId)); + } + + private void getCheckScore(CheckScore checkScore, Calendar calendar) + { // 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛e害 3 甯傚眬瀛e害 switch (checkScore.getExamineTag()) { case 0, 1: @@ -148,7 +167,6 @@ checkScore.setExamineTag(checkScore.getExamineTag() == 2 ? 0 : 1); break; } - return scoreMapper.selectCheckScoreMap(checkScore).stream().collect(Collectors.groupingBy(CheckScore::getDeptId)); } /** -- Gitblit v1.8.0