From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/service/impl/TReportTemplateServiceImpl.java | 86 ++++++-------------------------------------
1 files changed, 12 insertions(+), 74 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/service/impl/TReportTemplateServiceImpl.java b/src/main/java/com/ots/project/exam/service/impl/TReportTemplateServiceImpl.java
index 5ec5010..2b71524 100644
--- a/src/main/java/com/ots/project/exam/service/impl/TReportTemplateServiceImpl.java
+++ b/src/main/java/com/ots/project/exam/service/impl/TReportTemplateServiceImpl.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.service.impl;
-
import com.ots.common.enums.UserTypeEnum;
import com.ots.common.utils.DateUtils;
import com.ots.common.utils.StringUtils;
@@ -19,42 +18,25 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
-/**
- * 鎶ュ憡妯℃澘閰嶇疆Service涓氬姟灞傚鐞�
- *
- * @author ots
- * @date 2020-03-24
- */
@Service
public class TReportTemplateServiceImpl implements ITReportTemplateService {
@Autowired
private TReportTemplateMapper tReportTemplateMapper;
-
@Autowired
private ISysUserExtendService sysUserExtendService;
-
@Autowired
private ISysUserPaperService userPaperService;
-
@Autowired
private ITExamPaperService paperService;
-
- /**
- * 鏌ヨ鎶ュ憡妯℃澘閰嶇疆
- *
- * @param id 鎶ュ憡妯℃澘閰嶇疆ID
- * @return 鎶ュ憡妯℃澘閰嶇疆
- */
+
@Override
public TReportTemplate selectTReportTemplateById(Long id) {
return tReportTemplateMapper.selectTReportTemplateById(id);
}
-
@Override
public String selectTReportTemplateFilePath(TReportTemplate tReportTemplate) {
TReportTemplate tReportTemplateResult = tReportTemplateMapper.selectTReportTemplate(tReportTemplate);
@@ -63,26 +45,17 @@
}
return "";
}
-
- /**
- * 鏌ヨ鎶ュ憡妯℃澘閰嶇疆鍒楄〃
- *
- * @param tReportTemplate 鎶ュ憡妯℃澘閰嶇疆
- * @return 鎶ュ憡妯℃澘閰嶇疆
- */
+
@Override
public List<TReportTemplate> selectTReportTemplateList(TReportTemplate tReportTemplate) {
return tReportTemplateMapper.selectTReportTemplateList(tReportTemplate);
}
-
@Override
public List<TReportTemplate> getReportTemplates(User user) {
return getReportTemplates(user, null);
}
-
@Override
public List<TReportTemplate> getReportTemplates(User user, Long prodId) {
-
if (Objects.nonNull(prodId)) {
TExamPaper tExamPaper = paperService.selectTExamPaperById(prodId);
String reportTemplateId = tExamPaper.getReportTemplateId();
@@ -92,17 +65,14 @@
item.setReportType(value);
return item;
}).collect(Collectors.toList());
-
- //鍙栫敤鎴锋巿鏉冨拰浜у搧鍖呴厤缃殑浜ら泦
+
if (!Objects.equals(UserTypeEnum.SYS_USER.getUserType(), user.getUserType())) {
SysUserExtend sysUserExtend = sysUserExtendService.selectSysUserExtendById(user.getUserId());
- //鏌ヨ浜у搧鍖呮巿鏉冨垎閰嶇殑鎶ュ憡妯℃澘
+
SysUserPaper sysUserPaper = new SysUserPaper();
sysUserPaper.setUserId(user.getUserId());
sysUserPaper.setProdId(prodId);
-
List<SysUserPaper> sysUserPapers = userPaperService.selectSysUserPaperList(sysUserPaper);
-
List<TReportTemplate> templates = new ArrayList<>();
for (SysUserPaper paper : sysUserPapers) {
String rid = paper.getReportTemplateId();
@@ -111,7 +81,6 @@
}
templates.addAll(selectTReportTemplates(rid));
}
-
List<Long> collect = ret.stream().map(pp -> pp.getId()).collect(Collectors.toList());
List<TReportTemplate> resultTemplateList = new ArrayList<>();
for (TReportTemplate template : templates) {
@@ -125,7 +94,7 @@
ArrayList::new
)
);
- //鏍规嵁浼佷笟鐢ㄦ埛閰嶇疆鐨勬敮鎸佽瑷�绫诲瀷杩囨护
+
if (Objects.nonNull(sysUserExtend) && Objects.nonNull(sysUserExtend.getLangType())) {
List<String> langTypes = Arrays.asList(sysUserExtend.getLangType().split(","));
tReportTemplates = tReportTemplates.stream().filter(f -> langTypes.contains(f.getLangType())).collect(Collectors.toList());
@@ -139,7 +108,6 @@
}
return ret;
}
-
if (Objects.equals(UserTypeEnum.SYS_USER.getUserType(), user.getUserType())) {
TReportTemplate template = new TReportTemplate();
List<TReportTemplate> tReportTemplates = tReportTemplateMapper.selectTReportTemplateList(template);
@@ -150,14 +118,12 @@
}).collect(Collectors.toList());
return ret;
}
-
- //鏌ヨ浜у搧鍖呮巿鏉冨垎閰嶇殑鎶ュ憡妯℃澘
+
SysUserPaper sysUserPaper = new SysUserPaper();
if (!Objects.equals(UserTypeEnum.SYS_USER.getUserType(), user.getUserType())) {
sysUserPaper.setUserId(user.getUserId());
}
List<SysUserPaper> sysUserPapers = userPaperService.selectSysUserPaperList(sysUserPaper);
-
List<TReportTemplate> templates = new ArrayList<>();
for (SysUserPaper paper : sysUserPapers) {
String reportTemplateId = paper.getReportTemplateId();
@@ -166,16 +132,15 @@
}
templates.addAll(selectTReportTemplates(reportTemplateId));
}
+
- //瀵硅薄鍘婚噸
-// List<TReportTemplate> tReportTemplates = templates.stream().distinct().collect(Collectors.toList());
List<TReportTemplate> tReportTemplates = templates.stream().collect(Collectors.collectingAndThen
(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(t -> t.getLocation()))),
ArrayList::new
)
);
- //鏍规嵁浼佷笟鐢ㄦ埛閰嶇疆鐨勬敮鎸佽瑷�绫诲瀷杩囨护
+
if (Objects.equals(UserTypeEnum.ENT_USER.getUserType(), user.getUserType())) {
SysUserExtend sysUserExtend = sysUserExtendService.selectSysUserExtendById(user.getUserId());
if (Objects.nonNull(sysUserExtend) && Objects.nonNull(sysUserExtend.getLangType())) {
@@ -188,10 +153,8 @@
item.setReportType(value);
return item;
}).collect(Collectors.toList());
-
return result;
}
-
@Override
public List<TReportTemplate> selectTReportTemplates(String ids) {
if (Objects.isNull(ids)) {
@@ -199,14 +162,7 @@
}
return tReportTemplateMapper.selectTReportTemplates(Convert.toStrArray(ids));
}
-
-
- /**
- * 鏂板鎶ュ憡妯℃澘閰嶇疆
- *
- * @param tReportTemplate 鎶ュ憡妯℃澘閰嶇疆
- * @return 缁撴灉
- */
+
@Override
public int insertTReportTemplate(TReportTemplate tReportTemplate) {
tReportTemplate.setCreateTime(DateUtils.getNowDate());
@@ -221,13 +177,7 @@
}
return tReportTemplateMapper.insertTReportTemplate(tReportTemplate);
}
-
- /**
- * 淇敼鎶ュ憡妯℃澘閰嶇疆
- *
- * @param tReportTemplate 鎶ュ憡妯℃澘閰嶇疆
- * @return 缁撴灉
- */
+
@Override
public int updateTReportTemplate(TReportTemplate tReportTemplate) {
tReportTemplate.setUpdateTime(DateUtils.getNowDate());
@@ -243,24 +193,12 @@
}
return tReportTemplateMapper.updateTReportTemplate(tReportTemplate);
}
-
- /**
- * 鍒犻櫎鎶ュ憡妯℃澘閰嶇疆瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
+
@Override
public int deleteTReportTemplateByIds(String ids) {
return tReportTemplateMapper.deleteTReportTemplateByIds(Convert.toStrArray(ids));
}
-
- /**
- * 鍒犻櫎鎶ュ憡妯℃澘閰嶇疆淇℃伅
- *
- * @param id 鎶ュ憡妯℃澘閰嶇疆ID
- * @return 缁撴灉
- */
+
public int deleteTReportTemplateById(Long id) {
return tReportTemplateMapper.deleteTReportTemplateById(id);
}
--
Gitblit v1.9.1