From 3848c5677aefdb201c24d615a7c2ad03fd5154e6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 137 +++++++++++++++++++++++++++++++++++----------
1 files changed, 105 insertions(+), 32 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 eb9098a..1294a76 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
@@ -5,14 +5,12 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.base.CheckIndex;
+import com.ycl.platform.domain.dto.CheckResultExportDTO;
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.CheckIndexCarVO;
-import com.ycl.platform.domain.vo.CheckIndexFaceVO;
-import com.ycl.platform.domain.vo.CheckIndexVideoVO;
-import com.ycl.platform.domain.vo.CheckScoreDetailVO;
+import com.ycl.platform.domain.vo.*;
import com.ycl.platform.mapper.CheckRuleMapper;
import com.ycl.platform.mapper.CheckScoreMapper;
import com.ycl.platform.mapper.CheckTemplateMapper;
@@ -40,9 +38,12 @@
import utils.poi.ExcelUtilManySheet;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -71,6 +72,7 @@
@Autowired
private ISysDeptService deptService;
+
/**
* 鏌ヨ鑰冩牳绉垎鎸囨爣
*
@@ -88,10 +90,10 @@
Integer templateId = 0;
//鏂逛究鍒囨崲鏀逛负锛氭牴鎹畇core鑰冩牳绫诲埆鍜宒to鑰冩牳鏍囩鏌ユā鏉胯鍒欏拰鏉冮噸,娉ㄦ剰鍚岀绫诲悓鏍囩鍙兘鏈変竴涓ā鏉�
QueryWrapper<CheckTemplate> wrapper = new QueryWrapper<>();
- wrapper.eq("examine_tag",checkScoreIndexDTO.getExamineTag());
- wrapper.eq("examine_category",checkScore.getExamineCategory());
+ wrapper.eq("examine_tag", checkScoreIndexDTO.getExamineTag());
+ wrapper.eq("examine_category", checkScore.getExamineCategory());
Optional<CheckTemplate> first = templateMapper.selectList(wrapper).stream().findFirst();
- if(first.isPresent()){
+ if (first.isPresent()) {
CheckTemplate checkTemplate = first.get();
templateId = checkTemplate.getId();
}
@@ -256,31 +258,25 @@
//鎺у埗index琛ㄧ殑鍙戝竷鐘舵��
List<Integer> ids = checkScoreDTO.getId();
QueryWrapper<CheckScore> queryWrapper = new QueryWrapper<>();
- queryWrapper.in("id",ids);
+ queryWrapper.in("id", ids);
List<CheckScore> scoreList = scoreMapper.selectList(queryWrapper);
//鏈�澶氫负3娆″惊鐜�
for (CheckScore checkScore : scoreList) {
Short examineCategory = checkScore.getExamineCategory();
- if(CheckConstants.Rule_Category_Video.equals(examineCategory)){
+ if (CheckConstants.Rule_Category_Video.equals(examineCategory)) {
UpdateWrapper<CheckIndexVideo> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("publish",code);
- updateWrapper.eq("dept_id",checkScore.getDeptId());
- updateWrapper.eq("examine_tag",checkScore.getExamineTag());
- updateWrapper.between("create_time",DateUtils.getDayStart(checkScore.getCreateTime()),DateUtils.getDayEnd(checkScore.getCreateTime()));
+ updateWrapper.set("publish", code);
+ updateWrapper.eq("id", checkScore.getIndexId());
indexVideoService.update(updateWrapper);
- }else if(CheckConstants.Rule_Category_Car.equals(examineCategory)){
+ } else if (CheckConstants.Rule_Category_Car.equals(examineCategory)) {
UpdateWrapper<CheckIndexCar> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("publish",code);
- updateWrapper.eq("dept_id",checkScore.getDeptId());
- updateWrapper.eq("examine_tag",checkScore.getExamineTag());
- updateWrapper.between("create_time",DateUtils.getDayStart(checkScore.getCreateTime()),DateUtils.getDayEnd(checkScore.getCreateTime()));
+ updateWrapper.set("publish", code);
+ updateWrapper.eq("id", checkScore.getIndexId());
indexCarService.update(updateWrapper);
- }else if(CheckConstants.Rule_Category_Face.equals(examineCategory)){
+ } else if (CheckConstants.Rule_Category_Face.equals(examineCategory)) {
UpdateWrapper<CheckIndexFace> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("publish",code);
- updateWrapper.eq("dept_id",checkScore.getDeptId());
- updateWrapper.eq("examine_tag",checkScore.getExamineTag());
- updateWrapper.between("create_time",DateUtils.getDayStart(checkScore.getCreateTime()),DateUtils.getDayEnd(checkScore.getCreateTime()));
+ updateWrapper.set("publish", code);
+ updateWrapper.eq("id", checkScore.getIndexId());
indexFaceService.update(updateWrapper);
}
}
@@ -294,24 +290,47 @@
* @return 鑰冩牳绉垎
*/
@Override
- public void exportIndex(HttpServletResponse response, CheckScore checkScoreDTO) throws IOException {
- String date = checkScoreDTO.getDate();
+ public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
+ String date = exportDTO.getDate();
//濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
- if (StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())) {
- CheckScore checkScore = getById(checkScoreDTO.getId());
- Date createTime = checkScore.getCreateTime();
+ if (StringUtils.isEmpty(exportDTO.getDate()) && CollectionUtils.isEmpty(exportDTO.getQuarter())) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
- date = formatter.format(createTime);
+ if (exportDTO.getId() != null) {
+ CheckScore checkScore = getById(exportDTO.getId());
+ Date createTime = checkScore.getCreateTime();
+ date = formatter.format(createTime);
+ } else {
+ //闃叉鍗＄墖椤甸潰瀵煎嚭涓嶄紶scoreId锛屽鑷存姤閿�
+ date = formatter.format(new Date());
+ }
}
/** 瀵间笁寮爏heet */
//杞﹁締
CheckIndexCar checkIndexCar = new CheckIndexCar();
checkIndexCar.setDate(date);
- checkIndexCar.setQuarter(checkScoreDTO.getQuarter());
+ checkIndexCar.setQuarter(exportDTO.getQuarter());
+ checkIndexCar.setDeptId(exportDTO.getDeptId());
+ checkIndexCar.setDeptIds(exportDTO.getDeptIds());
+ checkIndexCar.setExamineTags(exportDTO.getExamineTags());
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexCar);
List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
+ //璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
+ if (exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexCars)) {
+ //鍏堝尯鍒嗗悇涓尯鍘匡紝鍐嶅尯鍒嗚�冩牳鏍囩
+ Map<Long, List<CheckIndexCar>> carMap = checkIndexCars.stream().collect(Collectors.groupingBy(CheckIndexCar::getDeptId));
+ carMap.forEach((deptId,list)->{
+ List<CheckIndexCar> provinceList = list.stream().filter(car -> CheckConstants.Examine_Tag_Province.equals(car.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(provinceList)) {
+ checkIndexCars.add(CheckIndexCar.calculateAverage(provinceList));
+ }
+ List<CheckIndexCar> countyList = list.stream().filter(car -> CheckConstants.Examine_Tag_County.equals(car.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(countyList)) {
+ checkIndexCars.add(CheckIndexCar.calculateAverage(countyList));
+ }
+ });
+ }
List<CheckIndexCarVO> checkIndexCarVOS = new ArrayList<>();
for (CheckIndexCar indexCar : checkIndexCars) {
CheckIndexCarVO excelVo = CheckIndexCar.getExcelVo(indexCar);
@@ -321,10 +340,28 @@
//浜鸿劯
CheckIndexFace checkIndexFace = new CheckIndexFace();
checkIndexFace.setDate(date);
- checkIndexFace.setQuarter(checkScoreDTO.getQuarter());
+ checkIndexFace.setQuarter(exportDTO.getQuarter());
+ checkIndexFace.setDeptId(exportDTO.getDeptId());
+ checkIndexFace.setDeptIds(exportDTO.getDeptIds());
+ checkIndexFace.setExamineTags(exportDTO.getExamineTags());
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexFace);
List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
+ //璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
+ if (exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexFaces)) {
+ //鍏堝尯鍒嗗悇涓尯鍘匡紝鍐嶅尯鍒嗚�冩牳鏍囩
+ Map<Long, List<CheckIndexFace>> faceMap = checkIndexFaces.stream().collect(Collectors.groupingBy(CheckIndexFace::getDeptId));
+ faceMap.forEach((deptId,list)->{
+ List<CheckIndexFace> provinceList = list.stream().filter(face -> CheckConstants.Examine_Tag_Province.equals(face.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(provinceList)) {
+ checkIndexFaces.add(CheckIndexFace.calculateAverage(provinceList));
+ }
+ List<CheckIndexFace> countyList = list.stream().filter(face -> CheckConstants.Examine_Tag_County.equals(face.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(countyList)) {
+ checkIndexFaces.add(CheckIndexFace.calculateAverage(countyList));
+ }
+ });
+ }
List<CheckIndexFaceVO> checkIndexFaceVOS = new ArrayList<>();
for (CheckIndexFace indexFace : checkIndexFaces) {
CheckIndexFaceVO excelVo = CheckIndexFace.getExcelVo(indexFace);
@@ -334,10 +371,28 @@
//瑙嗛
CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
checkIndexVideo.setDate(date);
- checkIndexVideo.setQuarter(checkScoreDTO.getQuarter());
+ checkIndexVideo.setQuarter(exportDTO.getQuarter());
+ checkIndexVideo.setDeptId(exportDTO.getDeptId());
+ checkIndexVideo.setDeptIds(exportDTO.getDeptIds());
+ checkIndexVideo.setExamineTags(exportDTO.getExamineTags());
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexVideo);
List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
+ //璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
+ if (exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexVideos)) {
+ //鍏堝尯鍒嗗悇涓尯鍘匡紝鍐嶅尯鍒嗚�冩牳鏍囩
+ Map<Long, List<CheckIndexVideo>> videoMap = checkIndexVideos.stream().collect(Collectors.groupingBy(CheckIndexVideo::getDeptId));
+ videoMap.forEach((deptId,list)->{
+ List<CheckIndexVideo> provinceList = list.stream().filter(video -> CheckConstants.Examine_Tag_Province.equals(video.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(provinceList)) {
+ checkIndexVideos.add(CheckIndexVideo.calculateAverage(provinceList));
+ }
+ List<CheckIndexVideo> countyList = list.stream().filter(video -> CheckConstants.Examine_Tag_County.equals(video.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(countyList)) {
+ checkIndexVideos.add(CheckIndexVideo.calculateAverage(countyList));
+ }
+ });
+ }
List<CheckIndexVideoVO> checkIndexVideoVOS = new ArrayList<>();
for (CheckIndexVideo indexVideo : checkIndexVideos) {
CheckIndexVideoVO excelVo = CheckIndexVideo.getExcelVo(indexVideo);
@@ -349,6 +404,23 @@
mysheet.add(e1);
mysheet.add(e2);
mysheet.add(e3);
+ //瑙勫垯鏄庣粏
+ List<RuleExcelVO> allRuleTemplate = templateRuleMapper.getAllRuleTemplate();
+ //鏁村悎鏁版嵁
+ List<RuleExcelVO> countyRuleList = allRuleTemplate.stream().filter(vo -> vo.getExamineTag().equals(Integer.parseInt(CheckConstants.Examine_Tag_County + ""))).collect(Collectors.toList());
+ List<RuleExcelVO> provinceRuleList = allRuleTemplate.stream().filter(vo -> vo.getExamineTag().equals(Integer.parseInt(CheckConstants.Examine_Tag_Province + ""))).collect(Collectors.toList());
+ //鐢ㄥ尯鍘胯鍒欏仛涓讳綋灞曠ず
+ for (RuleExcelVO countyRule : countyRuleList) {
+ countyRule.setCountyWeight(countyRule.getWeight());
+ //绛涢�夊悓绉嶈鍒欐潈閲�
+ for (RuleExcelVO provinceRule : provinceRuleList) {
+ if (provinceRule.getRuleId().equals(countyRule.getRuleId()) && provinceRule.getExamineCategory().equals(countyRule.getExamineCategory())) {
+ countyRule.setProvinceWeight(provinceRule.getWeight());
+ }
+ }
+ }
+ ExcelExp e4 = new ExcelExp("瑙勫垯鏄庣粏", countyRuleList, RuleExcelVO.class);
+ mysheet.add(e4);
ExcelUtilManySheet<List<ExcelExp>> util = new ExcelUtilManySheet<>(mysheet);
util.exportExcelManySheet(response, mysheet);
@@ -366,6 +438,7 @@
}
}
}
+
private void roleControl(BaseEntity checkScore) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
SysUser user = SecurityUtils.getLoginUser().getUser();
--
Gitblit v1.8.0