From b22b8f688b31ae7c6e503b787f66ec5fa329127d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 18:23:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 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 84cdd90..c790715 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
@@ -91,20 +91,22 @@
Short examineCategory = checkScore.getExamineCategory();
String[] indexTableArr ={"","t_check_index_video","t_check_index_car","t_check_index_face"};
String tableName = indexTableArr[examineCategory];
- //鑾峰綋鏈堜唤
- String date = checkScoreIndexDTO.getDate();
- if(StringUtils.isEmpty(date)){
- //濡傛灉鏌ヨ鏉′欢涓嶅惈鍙傛暟锛屾煡璇㈢Н鍒嗗搴斿垱寤烘椂闂�
- Date createTime = checkScore.getCreateTime();
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
- date = formatter.format(createTime);
- }
ScoreIndexDTO scoreIndexDTO = new ScoreIndexDTO()
.setTableName(tableName)
.setDeptId(checkScore.getDeptId())
- .setDate(date);
+ .setDate(checkScoreIndexDTO.getDate())
+ .setQuarter(checkScoreIndexDTO.getQuarter());
scoreIndexDTO.setParams(checkScoreIndexDTO.getParams());
+
+ //鑾峰綋鏈堜唤
+ if(StringUtils.isEmpty(scoreIndexDTO.getDate()) && CollectionUtils.isEmpty(checkScoreIndexDTO.getQuarter())){
+ //濡傛灉鏌ヨ鏉′欢涓嶅惈鍙傛暟锛屾煡璇㈢Н鍒嗗搴斿垱寤烘椂闂�
+ Date createTime = checkScore.getCreateTime();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
+ scoreIndexDTO.setDate(formatter.format(createTime));
+ }
+
List<Map> map = scoreMapper.selectScoreIndex(scoreIndexDTO);
scoreMap.put("tableData",checkRules);
@@ -168,7 +170,7 @@
//濡傛灉涓虹┖鏌ユ湰鏈堢殑鏁版嵁
Calendar now = Calendar.getInstance();
//鍙栨槰澶�
- now.add(Calendar.DATE, -1);
+ // now.add(Calendar.DATE, -1);
Date yesterday = now.getTime();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
date = simpleDateFormat.format(yesterday);
@@ -225,27 +227,30 @@
public void exportIndex(HttpServletResponse response,CheckScore checkScoreDTO) throws IOException {
String date = checkScoreDTO.getDate();
//濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
- if(StringUtils.isEmpty(date)) {
+ if(StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())){
CheckScore checkScore = getById(checkScoreDTO.getId());
Date createTime = checkScore.getCreateTime();
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
- date = simpleDateFormat.format(createTime);
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
+ date = formatter.format(createTime);
}
/** 瀵间笁寮爏heet */
//杞﹁締
CheckIndexCar checkIndexCar = new CheckIndexCar();
checkIndexCar.setDate(date);
+ checkIndexCar.setQuarter(checkScoreDTO.getQuarter());
List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
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);
//瑙嗛
CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
checkIndexVideo.setDate(date);
+ checkIndexVideo.setQuarter(checkScoreDTO.getQuarter());
List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁",checkIndexVideos,CheckIndexVideo.class);
--
Gitblit v1.8.0