From a8c87a18fed28e8cd06b20de9def11631f80ab96 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 16:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 214 ++++++++++++++++++++++++++++------------------------
1 files changed, 115 insertions(+), 99 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 b1568b9..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
@@ -1,10 +1,10 @@
package com.ycl.platform.service.impl;
+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;
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.vo.CheckScoreDetailVO;
import com.ycl.platform.mapper.CheckRuleMapper;
@@ -15,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;
@@ -30,20 +27,17 @@
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涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2024-04-22
*/
@@ -68,12 +62,13 @@
@Autowired
private ISysDeptService deptService;
/**
- * 鏌ヨ鑰冩牳绉垎
- *
+ * 鏌ヨ鑰冩牳绉垎鎸囨爣
+ *
* @param id 鑰冩牳绉垎涓婚敭
* @return 鑰冩牳绉垎
*/
@Override
+ @DataScope(deptAlias = "d",userAlias = "u")
public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO)
{
Long checkScoreId = checkScoreIndexDTO.getId();
@@ -104,7 +99,13 @@
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
date = formatter.format(createTime);
}
- List<Map> map = scoreMapper.selectScoreIndex(tableName,checkScore.getDeptId(),date);
+
+ ScoreIndexDTO scoreIndexDTO = new ScoreIndexDTO()
+ .setTableName(tableName)
+ .setDeptId(checkScore.getDeptId())
+ .setDate(date);
+ scoreIndexDTO.setParams(checkScoreIndexDTO.getParams());
+ List<Map> map = scoreMapper.selectScoreIndex(scoreIndexDTO);
scoreMap.put("tableData",checkRules);
scoreMap.put("dataMap",map);
@@ -117,14 +118,49 @@
/**
* 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
- *
+ *
* @param checkScore 鑰冩牳绉垎
* @return 鑰冩牳绉垎
*/
@Override
+ @DataScope(deptAlias = "d",userAlias = "u")
public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore)
{
- //TODO:鏁版嵁鏉冮檺
+ //鍖哄幙鍙兘鐪嬪凡鍙戝竷
+ roleControl(checkScore);
+
+ // 鑾峰彇鏁版嵁鏃ユ湡鏃堕棿
+ Calendar calendar = Calendar.getInstance();
+ // 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
+ if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); }
+ // 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛ｅ害 3 甯傚眬瀛ｅ害
+ 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();
@@ -139,9 +175,9 @@
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));
}
+
/**
* 鍖哄幙璇︽儏
*
@@ -149,61 +185,13 @@
* @return 鑰冩牳绉垎
*/
@Override
+ @DataScope(deptAlias = "d",userAlias = "u")
public List<CheckScore> page(CheckScore checkScore) {
- //TODO:鏁版嵁鏉冮檺
+ //鍖哄幙鍙兘鐪嬪凡鍙戝竷
+ roleControl(checkScore);
return scoreMapper.selectCheckScoreList(checkScore);
}
-
- /**
- * 鏂板鑰冩牳绉垎
- *
- * @param checkScore 鑰冩牳绉垎
- * @return 缁撴灉
- */
- @Override
- public int insertCheckScore(CheckScore checkScore)
- {
- checkScore.setCreateTime(DateUtils.getNowDate());
- return scoreMapper.insertCheckScore(checkScore);
- }
-
- /**
- * 淇敼鑰冩牳鏄庣粏
- *
- * @param checkScore 鑰冩牳绉垎鏄庣粏
- * @return 缁撴灉
- */
- @Override
- public int updateCheckScore(CheckScore checkScore)
- {
-
- return scoreMapper.updateCheckScore(checkScore);
- }
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳绉垎
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳绉垎涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteCheckScoreByIds(Long[] ids)
- {
- return scoreMapper.deleteCheckScoreByIds(ids);
- }
-
- /**
- * 鍒犻櫎鑰冩牳绉垎淇℃伅
- *
- * @param id 鑰冩牳绉垎涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteCheckScoreById(Long id)
- {
- return scoreMapper.deleteCheckScoreById(id);
- }
/**
* 鍙戝竷鑰冩牳绉垎淇℃伅
*
@@ -268,37 +256,65 @@
ExcelUtilManySheet<List<ExcelExp>> util = new ExcelUtilManySheet<>(mysheet);
util.exportExcelManySheet(response,mysheet);
- //瀵煎崟sheet鐨勬柟寮�
-// switch (CheckScoreType.fromValue(examineCategory)){
-// case CHECK_SCORE_TYPE_CAR:
-// //鏌ヨ溅杈�
-// List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(new CheckIndexCar());
-// export(response, depts, checkIndexCars,CheckIndexCar.class);
-// break;
-// case CHECK_SCORE_TYPE_FACE:
-// // 鏌ヤ汉鑴�
-// List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(new CheckIndexFace());
-// export(response, depts, checkIndexFaces,CheckIndexFace.class);
-// break;
-// case CHECK_SCORE_TYPE_VIDEO:
-// // 鏌ヨ棰�
-// List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(new CheckIndexVideo());
-// export(response, depts, checkIndexVideos,CheckIndexVideo.class);
-// break;
-// }
}
- private <T extends CheckIndex> void export(HttpServletResponse response, List<BaseSelect> depts, List<T> checkIndexes,Class<T> checkIndexClass) {
- //鏆傛椂娌＄敤锛屽鏋滄暟鎹繃澶э紝鍦╯erver灞傜炕璇戯紝閬垮厤杩炶〃
- checkIndexes.forEach(checkIndex->{
- Optional<BaseSelect> first = depts.stream().filter(baseSelect -> checkIndex.getDeptId().equals(Long.valueOf(baseSelect.getId()+""))).findFirst();
- if(first.isPresent()){
- checkIndex.setDeptName(first.get().getValue());
- }
- });
-
- ExcelUtil<T> util = new ExcelUtil<T>(checkIndexClass);
- util.exportExcel(response, checkIndexes, "鑰冩牳绉垎鏄庣粏鏁版嵁");
-
+ private void roleControl(CheckScore checkScore) {
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ SysRole sysRole = roles.get(0);
+ if("zg_province".equals(sysRole.getRoleKey())){
+ Map<String, Object> params = checkScore.getParams();
+ params.put("publish",PublishType.PUBLISHED.getCode());
+ }
}
+
+
+ // /**
+// * 鏂板鑰冩牳绉垎
+// *
+// * @param checkScore 鑰冩牳绉垎
+// * @return 缁撴灉
+// */
+// @Override
+// public int insertCheckScore(CheckScore checkScore)
+// {
+// checkScore.setCreateTime(DateUtils.getNowDate());
+// return scoreMapper.insertCheckScore(checkScore);
+// }
+//
+// /**
+// * 淇敼鑰冩牳鏄庣粏
+// *
+// * @param checkScore 鑰冩牳绉垎鏄庣粏
+// * @return 缁撴灉
+// */
+// @Override
+// public int updateCheckScore(CheckScore checkScore)
+// {
+//
+// return scoreMapper.updateCheckScore(checkScore);
+// }
+//
+// /**
+// * 鎵归噺鍒犻櫎鑰冩牳绉垎
+// *
+// * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳绉垎涓婚敭
+// * @return 缁撴灉
+// */
+// @Override
+// public int deleteCheckScoreByIds(Long[] ids)
+// {
+// return scoreMapper.deleteCheckScoreByIds(ids);
+// }
+//
+// /**
+// * 鍒犻櫎鑰冩牳绉垎淇℃伅
+// *
+// * @param id 鑰冩牳绉垎涓婚敭
+// * @return 缁撴灉
+// */
+// @Override
+// public int deleteCheckScoreById(Long id)
+// {
+// return scoreMapper.deleteCheckScoreById(id);
+// }
}
--
Gitblit v1.8.0