From 3486499f56e487cd6df88a8fa2448ff72d72a1e0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 02:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 109 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 35 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 21d675d..0137fda 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.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.dto.CheckScoreDTO;
@@ -17,10 +18,12 @@
import com.ycl.platform.service.ICheckIndexVideoService;
import com.ycl.platform.service.ICheckScoreService;
import com.ycl.system.entity.SysRole;
+import com.ycl.system.entity.SysUser;
import com.ycl.system.service.ISysDeptService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
import com.ycl.utils.StringUtils;
+import constant.CheckConstants;
import enumeration.general.PublishType;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
@@ -44,8 +47,7 @@
*/
@Service
@Slf4j
-public class CheckScoreServiceImpl extends ServiceImpl<CheckScoreMapper, CheckScore> implements ICheckScoreService
-{
+public class CheckScoreServiceImpl extends ServiceImpl<CheckScoreMapper, CheckScore> implements ICheckScoreService {
@Autowired
private CheckScoreMapper scoreMapper;
@Autowired
@@ -62,6 +64,7 @@
private ICheckIndexVideoService indexVideoService;
@Autowired
private ISysDeptService deptService;
+
/**
* 鏌ヨ鑰冩牳绉垎鎸囨爣
*
@@ -69,20 +72,29 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
- public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO) {
Long checkScoreId = checkScoreIndexDTO.getId();
CheckScoreDetailVO checkScoreDetailVO = new CheckScoreDetailVO();
//鏍规嵁id璇诲彇score
CheckScore checkScore = scoreMapper.selectCheckScoreById(checkScoreId);
+ Integer templateId = 0;
+ //鏂逛究鍒囨崲鏀逛负锛氭牴鎹畇core鑰冩牳绫诲埆鍜宒to鑰冩牳鏍囩鏌ユā鏉胯鍒欏拰鏉冮噸,娉ㄦ剰鍚岀绫诲悓鏍囩鍙兘鏈変竴涓ā鏉�
+ QueryWrapper<CheckTemplate> wrapper = new QueryWrapper<>();
+ wrapper.eq("examine_tag",checkScoreIndexDTO.getExamineTag());
+ wrapper.eq("examine_category",checkScore.getExamineCategory());
+ Optional<CheckTemplate> first = templateMapper.selectList(wrapper).stream().findFirst();
+ if(first.isPresent()){
+ CheckTemplate checkTemplate = first.get();
+ templateId = checkTemplate.getId();
+ }
//璇诲彇瑙勫垯浠ュ強鏉冮噸
- List<CheckTemplateRule> templateRuleList = templateRuleMapper.selectListByTemplateId(checkScore.getTemplateId());
+ List<CheckTemplateRule> templateRuleList = templateRuleMapper.selectListByTemplateId(templateId);
List<CheckRule> checkRules = new ArrayList<>();
//璇诲彇妯℃澘瀵瑰簲鎵�鏈夎鍒�
- Map<String,Object> scoreMap = new HashMap<>();
+ Map<String, Object> scoreMap = new HashMap<>();
List<Integer> ruleIds = templateRuleList.stream().map(checkTemplateRule -> checkTemplateRule.getCheckRuleId())
.collect(Collectors.toList());
List<CheckRule> ruleIndex = ruleMapper.selectBatchIds(ruleIds);
@@ -90,7 +102,7 @@
checkRules.addAll(ruleIndex);
//鏍规嵁examineCategory 璇诲彇涓嶅悓index琛�
Short examineCategory = checkScore.getExamineCategory();
- String[] indexTableArr ={"","t_check_index_video","t_check_index_car","t_check_index_face"};
+ String[] indexTableArr = {"", "t_check_index_video", "t_check_index_car", "t_check_index_face"};
String tableName = indexTableArr[examineCategory];
ScoreIndexDTO scoreIndexDTO = new ScoreIndexDTO()
@@ -99,9 +111,9 @@
.setDate(checkScoreIndexDTO.getDate())
.setQuarter(checkScoreIndexDTO.getQuarter());
scoreIndexDTO.setParams(checkScoreIndexDTO.getParams());
-
+ scoreIndexDTO.setExamineTag(checkScoreIndexDTO.getExamineTag());
//鑾峰綋鏈堜唤
- if(StringUtils.isEmpty(scoreIndexDTO.getDate()) && CollectionUtils.isEmpty(checkScoreIndexDTO.getQuarter())){
+ if (StringUtils.isEmpty(scoreIndexDTO.getDate()) && CollectionUtils.isEmpty(checkScoreIndexDTO.getQuarter())) {
//濡傛灉鏌ヨ鏉′欢涓嶅惈鍙傛暟锛屾煡璇㈢Н鍒嗗搴斿垱寤烘椂闂�
Date createTime = checkScore.getCreateTime();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
@@ -110,8 +122,8 @@
List<Map> map = scoreMapper.selectScoreIndex(scoreIndexDTO);
- scoreMap.put("tableData",checkRules);
- scoreMap.put("dataMap",map);
+ scoreMap.put("tableData", checkRules);
+ scoreMap.put("dataMap", map);
checkScoreDetailVO.setCheckRuleList(templateRuleList);
checkScoreDetailVO.setScoreMap(scoreMap);
@@ -126,9 +138,8 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
- public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore) {
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
@@ -137,12 +148,15 @@
getCheckScore(checkScore, calendar);
// 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
- if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); }
+ 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();
+ CheckScore one = scoreMapper.getLast(checkScore);
if (Objects.nonNull(one)) {
calendar.setTime(one.getCreateTime());
getCheckScore(checkScore, calendar);
@@ -152,8 +166,7 @@
return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
- private void getCheckScore(CheckScore checkScore, Calendar calendar)
- {
+ private void getCheckScore(CheckScore checkScore, Calendar calendar) {
// 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛ｅ害 3 甯傚眬瀛ｅ害
switch (checkScore.getExamineTag()) {
case 0, 1:
@@ -176,15 +189,14 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
- public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore) {
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
//鏌ヨ鎴愮哗
String date = checkScore.getDate();
- if(StringUtils.isEmpty(date)){
+ if (StringUtils.isEmpty(date)) {
//濡傛灉涓虹┖鏌ユ湰鏈堢殑鏁版嵁
Calendar now = Calendar.getInstance();
//鍙栨槰澶�
@@ -205,7 +217,7 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<CheckScore> page(CheckScore checkScore) {
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
@@ -220,7 +232,7 @@
*/
@Override
public int publishCheckScore(CheckScoreDTO checkScoreDTO) {
- if(CollectionUtils.isEmpty(checkScoreDTO.getId())){
+ if (CollectionUtils.isEmpty(checkScoreDTO.getId())) {
return 0;
}
PublishType publishType = null;
@@ -242,10 +254,10 @@
* @return 鑰冩牳绉垎
*/
@Override
- public void exportIndex(HttpServletResponse response,CheckScore checkScoreDTO) throws IOException {
+ public void exportIndex(HttpServletResponse response, CheckScore checkScoreDTO) throws IOException {
String date = checkScoreDTO.getDate();
//濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
- if(StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())){
+ if (StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())) {
CheckScore checkScore = getById(checkScoreDTO.getId());
Date createTime = checkScore.getCreateTime();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
@@ -258,38 +270,65 @@
checkIndexCar.setDate(date);
checkIndexCar.setQuarter(checkScoreDTO.getQuarter());
List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
- ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁",checkIndexCars,CheckIndexCar.class);
+ for (CheckIndexCar indexCar : checkIndexCars) {
+ indexCar.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(indexCar.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳");
+ }
+ ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCars, CheckIndexCar.class);
//浜鸿劯
CheckIndexFace checkIndexFace = new CheckIndexFace();
checkIndexFace.setDate(date);
checkIndexFace.setQuarter(checkScoreDTO.getQuarter());
List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
- ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁",checkIndexFaces,CheckIndexFace.class);
+ for (CheckIndexFace indexFace : checkIndexFaces) {
+ indexFace.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(indexFace.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳");
+ }
+ ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaces, CheckIndexFace.class);
//瑙嗛
CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
checkIndexVideo.setDate(date);
checkIndexVideo.setQuarter(checkScoreDTO.getQuarter());
List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
- ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁",checkIndexVideos,CheckIndexVideo.class);
+ for (CheckIndexVideo indexVideo : checkIndexVideos) {
+ indexVideo.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(indexVideo.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳");
+ }
+ ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁", checkIndexVideos, CheckIndexVideo.class);
List<ExcelExp> mysheet = new ArrayList<>();
mysheet.add(e1);
mysheet.add(e2);
mysheet.add(e3);
ExcelUtilManySheet<List<ExcelExp>> util = new ExcelUtilManySheet<>(mysheet);
- util.exportExcelManySheet(response,mysheet);
+ util.exportExcelManySheet(response, mysheet);
}
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());
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ if (!user.isAdmin()) {
+ for (SysRole role : roles) {
+ if (role.getPermissions().contains("check:score:role:publish")) {
+ Map<String, Object> params = checkScore.getParams();
+ params.put("publish", PublishType.PUBLISHED.getCode());
+ }
+ }
}
}
+ @Override
+ public List<Map<String, Object>> home() {
+ return baseMapper.home();
+ }
+
+
+ @Override
+ public List<Map<String, Object>> calculate(String category) {
+ Calendar calendar = Calendar.getInstance();
+ Date endDate = calendar.getTime();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ Date startDate = calendar.getTime();
+ return scoreMapper.calculate(startDate, endDate, category);
+ }
// /**
// * 鏂板鑰冩牳绉垎
--
Gitblit v1.8.0