From 3380b0f6767308fa91bd55d68a96a48be5029aa7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 19 十一月 2024 21:30:01 +0800
Subject: [PATCH] 合同考核调整+日志
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 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 d12887c..496430d 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
@@ -304,20 +304,6 @@
*/
@Override
public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
-// String date = exportDTO.getDate();
- //濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
-// if (StringUtils.isEmpty(exportDTO.getDate()) && CollectionUtils.isEmpty(exportDTO.getQuarter())) {
-// SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
-// if (exportDTO.getId() != null) {
-// CheckScore checkScore = getById(exportDTO.getId());
-// Date createTime = checkScore.getCreateTime();
-// date = formatter.format(createTime);
-// } else {
-// //闃叉鍗＄墖椤甸潰瀵煎嚭涓嶄紶scoreId锛屽鑷存姤閿�
-// date = formatter.format(new Date());
-// }
-// }
- //TODO:鏍囩bug淇
//娌℃湁鏍囩榛樿鍏ㄥ
if(CollectionUtils.isEmpty(exportDTO.getExamineTags())){
exportDTO.setExamineTags(Arrays.asList(0,1,2));
@@ -336,9 +322,6 @@
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexCar);
checkIndexCar.setExamineTag(Short.valueOf(examineTag + ""));
- if (examineTag == 0) {
- checkIndexCar.setProvinceTag(Boolean.TRUE);
- }
checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar));
}
@@ -374,6 +357,7 @@
checkIndexCarVOS.add(excelVo);
}
ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCarVOS, CheckIndexCarVO.class);
+
//浜鸿劯
List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
for (Integer examineTag : exportDTO.getExamineTags()) {
@@ -386,9 +370,6 @@
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexFace);
checkIndexFace.setExamineTag(Short.valueOf(examineTag + ""));
- if (examineTag == 0) {
- checkIndexFace.setProvinceTag(Boolean.TRUE);
- }
checkIndexFaces.addAll(indexFaceService.selectCheckIndexFaceList(checkIndexFace));
}
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -423,6 +404,7 @@
checkIndexFaceVOS.add(excelVo);
}
ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaceVOS, CheckIndexFaceVO.class);
+
//瑙嗛
List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
for (Integer examineTag : exportDTO.getExamineTags()) {
@@ -434,12 +416,6 @@
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexVideo);
checkIndexVideo.setExamineTag(Short.valueOf(examineTag + ""));
- if (examineTag == 0) {
- checkIndexVideo.setProvinceTag(Boolean.TRUE);
- }else if(examineTag ==2){
- //鍙湁瑙嗛鏈夊叕瀹夐儴鏁版嵁
- checkIndexVideo.setDeptTag(Boolean.TRUE);
- }
checkIndexVideos.addAll(indexVideoService.selectCheckIndexVideoList(checkIndexVideo));
}
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
--
Gitblit v1.8.0