From 888af852af74ecd24f4f4370b61427771e60d314 Mon Sep 17 00:00:00 2001
From: Administrator <2863138610@qq.com>
Date: 星期一, 12 十二月 2022 11:18:56 +0800
Subject: [PATCH] 华为云obs上传访问
---
src/main/java/com/qxueyou/scc/evaluate/service/impl/EvaluateService.java | 182 ++++++++++++++++++++++----------------------
1 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/evaluate/service/impl/EvaluateService.java b/src/main/java/com/qxueyou/scc/evaluate/service/impl/EvaluateService.java
index bb89a25..844a2f4 100644
--- a/src/main/java/com/qxueyou/scc/evaluate/service/impl/EvaluateService.java
+++ b/src/main/java/com/qxueyou/scc/evaluate/service/impl/EvaluateService.java
@@ -85,7 +85,7 @@
IMsgInfoService msgInfoService;
/**
- * 查询列表数据
+ * 鏌ヨ鍒楄〃鏁版嵁
* @param pageNum
* @param pageSize
* @return
@@ -98,10 +98,10 @@
QExerciseGroup group = QExerciseGroup.exerciseGroup;
QSubject subject = QSubject.subject;
- // 搜索名
+ // 鎼滅储鍚�
keyword = StringUtils.isBlank(keyword) ? null : "%"+keyword+"%";
- // 获取查询结果集合
+ // 鑾峰彇鏌ヨ缁撴灉闆嗗悎
QueryResults<Tuple> results = this.getQueryFactory()
.select(qEva, group,subject)
.from(qEva, template, group,subject)
@@ -117,7 +117,7 @@
.orderBy(qEva.createTime.desc())
.fetchResults();
- // 封装参数
+ // 灏佽鍙傛暟
List<Map<String,Object>> resultLst =
results.getResults()
.stream()
@@ -135,9 +135,9 @@
map.put("createTime", tuple.get(qEva).getCreateTime());
map.put("groupId", tuple.get(group).getGroupId());
map.put("exerCount", tuple.get(group).getAllCount());
- map.put("evaluateCount", this.getEvaluateCount(tuple.get(qEva).getEvaluateId()));//已评估人数
+ map.put("evaluateCount", this.getEvaluateCount(tuple.get(qEva).getEvaluateId()));//宸茶瘎浼颁汉鏁�
map.put("evaluateAllCount", this
- .queryEvaluateAllCount(tuple.get(qEva).getEvalRangeType(), tuple.get(qEva).getEvalRangeId().split(",")));//应评估人数
+ .queryEvaluateAllCount(tuple.get(qEva).getEvalRangeType(), tuple.get(qEva).getEvalRangeId().split(",")));//搴旇瘎浼颁汉鏁�
return map;
}).collect(Collectors.toList());
@@ -147,9 +147,9 @@
}
/**
- * 获取范围选择
+ * 鑾峰彇鑼冨洿閫夋嫨
*
- * type: lesson:课程 class:班级 person:人员
+ * type: lesson:璇剧▼ class:鐝骇 person:浜哄憳
*
* @return
*/
@@ -157,18 +157,18 @@
public ResultJson queryRangeList(String type,String searchName) {
List<Tuple> tupleLst = null;
- // 搜索名
+ // 鎼滅储鍚�
searchName = StringUtils.isBlank(searchName) ? null : "%"+searchName+"%";
- if(ClientUtils.isAdmin()){// 管理员
+ if(ClientUtils.isAdmin()){// 绠＄悊鍛�
tupleLst = getAdminRangeList(type,searchName);
- }else{// 老师
+ }else{// 鑰佸笀
tupleLst = getTeacherRangeList(type,searchName);
}
- // 统一处理返回数据
+ // 缁熶竴澶勭悊杩斿洖鏁版嵁
List<Map<String,Object>> resultLst = tupleLst.stream()
.map(tuple -> {
Map<String,Object> map = new HashMap<String,Object>(2);
@@ -181,7 +181,7 @@
}
/**
- * 获取管理员范围选择
+ * 鑾峰彇绠＄悊鍛樿寖鍥撮�夋嫨
* @param type
* @return
*/
@@ -191,7 +191,7 @@
QUser user = QUser.user;
List<Tuple> tupleLst = null;
- if(SchEvaluate.EVALUATE_RANGE_LESSON.equals(type)){//课程
+ if(SchEvaluate.EVALUATE_RANGE_LESSON.equals(type)){//璇剧▼
tupleLst = this.getQueryFactory().select(subject.name.as("name"),subject.subjectId.as("id")).distinct()
.from(subject)
@@ -202,7 +202,7 @@
.orderBy(subject.createTime.desc())
.fetch();
- }else if(SchEvaluate.EVALUATE_RANGE_CLASS.equals(type)){//班级
+ }else if(SchEvaluate.EVALUATE_RANGE_CLASS.equals(type)){//鐝骇
tupleLst = this.getQueryFactory().select(cls.name.as("name"),cls.classId.as("id")).distinct()
.from(cls)
@@ -212,7 +212,7 @@
.build())
.orderBy(cls.createTime.desc())
.fetch();
- }else if(SchEvaluate.EVALUATE_RANGE_PERSON.equals(type)){//人员
+ }else if(SchEvaluate.EVALUATE_RANGE_PERSON.equals(type)){//浜哄憳
QStuStudent stu = QStuStudent.stuStudent;
tupleLst = this.getQueryFactory().select(user.name.as("name"),user.userId.as("id")).distinct()
@@ -230,7 +230,7 @@
}
/**
- * 获取老师范围选择
+ * 鑾峰彇鑰佸笀鑼冨洿閫夋嫨
* @param type
* @return
*/
@@ -242,7 +242,7 @@
List<Tuple> tupleLst = null;
String teacherId = teacherService.getTeacherIdByUserId(ClientUtils.getUserId());
- if(SchEvaluate.EVALUATE_RANGE_LESSON.equals(type)){//课程
+ if(SchEvaluate.EVALUATE_RANGE_LESSON.equals(type)){//璇剧▼
tupleLst = this.getQueryFactory().select(subject.name.as("name"),subject.subjectId.as("id")).distinct()
.from(subject)
@@ -254,7 +254,7 @@
.orderBy(subject.createTime.desc())
.fetch();
- }else if(SchEvaluate.EVALUATE_RANGE_CLASS.equals(type)){//班级
+ }else if(SchEvaluate.EVALUATE_RANGE_CLASS.equals(type)){//鐝骇
tupleLst = this.getQueryFactory().select(cls.name.as("name"),cls.classId.as("id")).distinct()
.from(subject, re, cls)
@@ -270,7 +270,7 @@
.orderBy(subject.createTime.desc())
.fetch();
- }else if(SchEvaluate.EVALUATE_RANGE_PERSON.equals(type)){//人员
+ }else if(SchEvaluate.EVALUATE_RANGE_PERSON.equals(type)){//浜哄憳
QStuStudent stu = QStuStudent.stuStudent;
tupleLst = this.getQueryFactory().select(stu.name.as("name"),stu.userId.as("id")).distinct()
@@ -297,7 +297,7 @@
}
/**
- * 后台新增评估
+ * 鍚庡彴鏂板璇勪及
* @param eva
* @return
*/
@@ -305,12 +305,12 @@
public ResultJson addOrUpdateEvaluate(SchEvaluate eva) {
String evaluateId = eva.getEvaluateId();
String groupId = null;
- if(StringUtils.isBlank(evaluateId)){// 新增
- //1、插入组
+ if(StringUtils.isBlank(evaluateId)){// 鏂板
+ //1銆佹彃鍏ョ粍
ExerciseGroup obj = this.insertExerciseGroup(eva.getEvaluateName(),
ExerciseGroup.TYPE_EXERCISE_TEACH_EVALUATE);
- //2、插入评估模板
+ //2銆佹彃鍏ヨ瘎浼版ā鏉�
SchEvaluateTemplate objTemplate = new SchEvaluateTemplate();
TraceUtils.setCreateTrace(objTemplate);
objTemplate.setEvaluateTemplateName(eva.getEvaluateName());
@@ -320,7 +320,7 @@
objTemplate.setOrgName(ClientUtils.getOrgName());
this.save(objTemplate);
- // 3、插入评估表
+ // 3銆佹彃鍏ヨ瘎浼拌〃
eva.setEvalTemplateId(objTemplate.getEvaluateTemplateId());
eva.setEvalTemplateName(objTemplate.getEvaluateTemplateName());
eva.setEvaluateCount(BigInteger.ZERO);
@@ -332,7 +332,7 @@
evaluateId = eva.getEvaluateId();
groupId = obj.getGroupId();
- }else{// 编辑
+ }else{// 缂栬緫
SchEvaluate newEva = this.read(SchEvaluate.class, eva.getEvaluateId());
newEva.setEvaluateName(eva.getEvaluateName());
@@ -349,7 +349,7 @@
}
/**
- * ：后台 插入评估模板时调用
+ * 锛氬悗鍙� 鎻掑叆璇勪及妯℃澘鏃惰皟鐢�
*
* @param name
* @param type
@@ -366,12 +366,12 @@
obj.setAllCount(BigInteger.ZERO);
this.save(obj);
- // 保存
+ // 淇濆瓨
return obj;
}
/**
- * 查询基本信息
+ * 鏌ヨ鍩烘湰淇℃伅
*/
@Override
public ResultJson queryBaseInfo(String evaluateId) {
@@ -381,7 +381,7 @@
QSchEvaluateTemplate template = QSchEvaluateTemplate.schEvaluateTemplate;
QExerciseGroup group = QExerciseGroup.exerciseGroup;
- // 获取查询结果集合
+ // 鑾峰彇鏌ヨ缁撴灉闆嗗悎
ExerciseGroup g = this.getQueryFactory()
.select(group)
.from(qEva, template, group)
@@ -407,7 +407,7 @@
}
/**
- * 删除
+ * 鍒犻櫎
*/
@Override
public ResultJson delete(String evaluateIds){
@@ -423,7 +423,7 @@
}
/**
- * 激活
+ * 婵�娲�
*/
@Override
public ResultJson doActive(String evaluateIds){
@@ -446,7 +446,7 @@
return new ResultJson(true, "success");
}
- //发布消息
+ //鍙戝竷娑堟伅
private void doSendhMsg(String evaluateId){
SchEvaluate evaluate = this.read(SchEvaluate.class,evaluateId);
@@ -462,12 +462,12 @@
Map<String,String> attrs = CollectionUtils.newStringMap("evaluateId",evaluate.getEvaluateId(),"evaluateName",evaluate.getEvaluateName(),
"templateId",evaluate.getEvalTemplateId(),"evalRangeName",evaluate.getEvalRangeName(),"creator",evaluate.getCreator());
- msgInfoService.doSendTextMsgToUsersLoop(lstUserIds, MsgInfo.TYPE_EVALUATE, "发布了问卷调查", attrs);
+ msgInfoService.doSendTextMsgToUsersLoop(lstUserIds, MsgInfo.TYPE_EVALUATE, "鍙戝竷浜嗛棶鍗疯皟鏌�", attrs);
}
}
/**
- *回退
+ *鍥為��
*/
@Override
public ResultJson doWithdraw(String evaluateIds){
@@ -483,7 +483,7 @@
}
/**
- * 复制
+ * 澶嶅埗
*/
@Override
public ResultJson doCopy(SchEvaluate eva){
@@ -491,10 +491,10 @@
SchEvaluate schEva = evaRepository.getOne(eva.getEvaluateId());
SchEvaluateTemplate oldTemplate = this.read(SchEvaluateTemplate.class, schEva.getEvalTemplateId());
- // 1、生成习题组
+ // 1銆佺敓鎴愪範棰樼粍
String newGroupId = exerciseService.doCopyExerciseByEvaluate(oldTemplate.getGroupId());
- // 2、生成模板
+ // 2銆佺敓鎴愭ā鏉�
SchEvaluateTemplate newTemplate = new SchEvaluateTemplate();
BeanUtils.copyProperties(newTemplate, oldTemplate);
@@ -503,7 +503,7 @@
TraceUtils.setCreateTrace(newTemplate);
this.save(newTemplate);
- // 3、生成评估表
+ // 3銆佺敓鎴愯瘎浼拌〃
SchEvaluate newEva = new SchEvaluate();
BeanUtils.copyProperties(newEva, eva);
newEva.setEvaluateId(null);
@@ -519,14 +519,14 @@
return new ResultJson(true, "success", CollectionUtils.newObjectMap("evaluateId", newEva.getEvaluateId(), "groupId", newGroupId));
} catch (Exception e) {
- log.error("doCopy评估复制：复制练习BeanUtils.copyProperties()方法copy失败", e);
+ log.error("doCopy璇勪及澶嶅埗锛氬鍒剁粌涔燘eanUtils.copyProperties()鏂规硶copy澶辫触", e);
}
return new ResultJson(false);
}
/**
- * 查看结果 问卷整体情况
+ * 鏌ョ湅缁撴灉 闂嵎鏁翠綋鎯呭喌
* @param evaluateId
* @param groupId
* @param evalRangeType
@@ -535,16 +535,16 @@
@Override
public ResultJson queryEvaluateDetail(String evaluateId,String groupId){
- // 1、查询已提交问卷list
+ // 1銆佹煡璇㈠凡鎻愪氦闂嵎list
List<Map<String, Object>> answerUserLst = queryAnswerEvaLst(evaluateId);
- // 已经答题过的学员id
+ // 宸茬粡绛旈杩囩殑瀛﹀憳id
List<String> userAnswerList = new ArrayList<String>(answerUserLst.size());
for(Map<String,Object> map:answerUserLst){
userAnswerList.add(String.valueOf(map.get("userId")));
}
- // 2、查询未提交答案list
+ // 2銆佹煡璇㈡湭鎻愪氦绛旀list
List<Map<String,Object>> notAnswerUserLst = this.queryNotAnswerEvaLst(evaluateId, userAnswerList);
@@ -554,7 +554,7 @@
}
/**
- * 查询已答题的学员list
+ * 鏌ヨ宸茬瓟棰樼殑瀛﹀憳list
* @param evaluateId
* @return
*/
@@ -584,7 +584,7 @@
}
/**
- * 查询未答题的学员list
+ * 鏌ヨ鏈瓟棰樼殑瀛﹀憳list
* @param rangeType
* @param evalRangeIds
* @param userAnswerList
@@ -601,22 +601,22 @@
QSubject qSubject = QSubject.subject;
Predicate predicate = null;
- if(SchEvaluate.EVALUATE_RANGE_LESSON.equals(rangeType)){//课程
+ if(SchEvaluate.EVALUATE_RANGE_LESSON.equals(rangeType)){//璇剧▼
predicate = stu.classId.in(getQueryFactory().select(re.classId).from(re,qSubject)
.where(qSubject.origSubjectId.in(evalRangeIds).and(re.subjectId.eq(qSubject.subjectId))
.and(qSubject.deleteFlag.isFalse()).and(re.deleteFlag.eq(false))));
- }else if(SchEvaluate.EVALUATE_RANGE_CLASS.equals(rangeType)){//班级
+ }else if(SchEvaluate.EVALUATE_RANGE_CLASS.equals(rangeType)){//鐝骇
predicate = stu.classId.in(evalRangeIds);
- }else if(SchEvaluate.EVALUATE_RANGE_PERSON.equals(rangeType)){//人员
+ }else if(SchEvaluate.EVALUATE_RANGE_PERSON.equals(rangeType)){//浜哄憳
predicate = stu.userId.in(evalRangeIds);
}
List<Map<String,Object>> notAnswerUserLst = this.getQueryFactory().select(stu.userId, stu.name).distinct()
.from(stu)
- .where(stu.userId.notIn(userAnswerList)// 过滤掉已经答题过的学员
+ .where(stu.userId.notIn(userAnswerList)// 杩囨护鎺夊凡缁忕瓟棰樿繃鐨勫鍛�
.and(stu.deleteFlag.eq(false))
.and(predicate))
.orderBy(stu.createTime.desc())
@@ -635,10 +635,10 @@
}
- /** ------前端 ---------------------------start------------------------------------------------------------------ */
+ /** ------鍓嶇 ---------------------------start------------------------------------------------------------------ */
/**
- * 提交答案
+ * 鎻愪氦绛旀
* @param score
* @return
*/
@@ -648,37 +648,37 @@
List<TeachEvaScoreData> lstScore = scoreResult.getItems();
String evaluateId = scoreResult.getEvaluateId();
- // 1.操作ExerciseRecord做题记录
+ // 1.鎿嶄綔ExerciseRecord鍋氶璁板綍
ExerciseRecord record = this.doOperExerciseRecord(scoreResult);
if(null == record){
- return new ResultJson(false,"您已经提交，不能重复提交");
+ return new ResultJson(false,"鎮ㄥ凡缁忔彁浜わ紝涓嶈兘閲嶅鎻愪氦");
}
String exerciseRecordId = record.getRecordId();
if(!scoreResult.getItems().isEmpty()){
- // 2.记录练习答案 ExerciseItemAnswerU
+ // 2.璁板綍缁冧範绛旀 ExerciseItemAnswerU
this.doOperExerciseItemAnswerUBatch(lstScore, exerciseRecordId);
}
- // 3.插入评估记录关联表
+ // 3.鎻掑叆璇勪及璁板綍鍏宠仈琛�
this.doOperSchEvaRecordRe(exerciseRecordId, evaluateId);
- // 4.更新评估表的完成人数
+ // 4.鏇存柊璇勪及琛ㄧ殑瀹屾垚浜烘暟
SchEvaluate eval = this.updateEvaluateCount(evaluateId);
if(!scoreResult.getItems().isEmpty()){
- // 5.插入评估明细表
+ // 5.鎻掑叆璇勪及鏄庣粏琛�
this.insertEvaluateDetailBatch(lstScore,evaluateId);
}
- return new ResultJson(true, "操作成功",
+ return new ResultJson(true, "鎿嶄綔鎴愬姛",
CollectionUtils.newObjectMap("doNumber", eval.getEvaluateCount(), "recordId", exerciseRecordId));
}
/**
- * 操作本次做题记录
+ * 鎿嶄綔鏈鍋氶璁板綍
* @return
*/
public ExerciseRecord doOperExerciseRecord(TeachEvaScoreResult scoreResult) {
@@ -694,14 +694,14 @@
String doCount = String.valueOf(scoreResult.getItems().size());
- // 2.查询总题目数
+ // 2.鏌ヨ鎬婚鐩暟
ExerciseGroup group = this.findUnique("select g from ExerciseGroup g,SchEvaluate e,SchEvaluateTemplate t "
+ "where g.groupId=t.groupId and e.evalTemplateId=t.evaluateTemplateId and e.evaluateId=?"
+ " and g.deleteFlag is false and e.deleteFlag is false ",
CollectionUtils.newList(scoreResult.getEvaluateId()), ExerciseGroup.class);
BigInteger allCount = group.getAllCount();
- // 3.查询做题记录obj
+ // 3.鏌ヨ鍋氶璁板綍obj
BigDecimal completionRate = ExerciseUtils.parseStrToBigDecimal(doCount, String.valueOf(allCount));
ExerciseRecord record = new ExerciseRecord();
@@ -721,14 +721,14 @@
}
/**
- * 批量增加或修改练习记录答案
+ * 鎵归噺澧炲姞鎴栦慨鏀圭粌涔犺褰曠瓟妗�
* @return
*/
public Result doOperExerciseItemAnswerUBatch(List<TeachEvaScoreData> lstScore, String exerciseRecordId) {
String userId = ClientUtils.getUserId();
List<ExerciseItemAnswerU> lstNewAnswerU = new ArrayList<ExerciseItemAnswerU>(lstScore.size());
- // 组装答案记录
+ // 缁勮绛旀璁板綍
ExerciseItemAnswerU answerU = null;
for(TeachEvaScoreData score:lstScore){
if(StringUtils.isBlank(score.getAnswer())){
@@ -745,14 +745,14 @@
lstNewAnswerU.add(answerU);
}
- // 批量保存
+ // 鎵归噺淇濆瓨
this.saveOrUpdateAll(lstNewAnswerU);
return new Result(true);
}
/**
- * 批量增加或修改评估明细记录
+ * 鎵归噺澧炲姞鎴栦慨鏀硅瘎浼版槑缁嗚褰�
* @return
*/
public Result insertEvaluateDetailBatch(List<TeachEvaScoreData> lstScore,String evaluateId) {
@@ -793,14 +793,14 @@
lstDetail.add(record);
}
- // 批量保存
+ // 鎵归噺淇濆瓨
this.saveOrUpdateAll(lstDetail);
return new Result(true);
}
/**
- * 新增评估与记录关联表
+ * 鏂板璇勪及涓庤褰曞叧鑱旇〃
* @param groupId
* @return
*/
@@ -818,7 +818,7 @@
SchEvaRecordRe record = new SchEvaRecordRe();
record.setEvaluateId(evaluateId);
record.setExerciseRecordId(recordId);
- //记录答题所在班级
+ //璁板綍绛旈鎵�鍦ㄧ彮绾�
if(null != ClientUtils.getUserInfo()){
record.setClassId(ClientUtils.getClassId());
record.setOrgId(ClientUtils.getOrgId());
@@ -830,7 +830,7 @@
}
/**
- * 更新评估表记录
+ * 鏇存柊璇勪及琛ㄨ褰�
* @return
*/
public SchEvaluate updateEvaluateCount(String evaluateId) {
@@ -844,14 +844,14 @@
record.setEvaluateCount(BigInteger.valueOf(this.getEvaluateCount(evaluateId)));
TraceUtils.setUpdateTrace(record);
- // 保存
+ // 淇濆瓨
this.save(record);
return record;
}
/**
- * 查询问卷统计
+ * 鏌ヨ闂嵎缁熻
* @param groupId
* @param evaluateId
* @return
@@ -888,16 +888,16 @@
lstExerciseItemAnswerU.add(objExerciseItemAnswerU);
}
- // 查询答案
+ // 鏌ヨ绛旀
objExerciseItem.setExerciseItemAnswerU(lstExerciseItemAnswerU);
}
}
objSchEvaluate.setEvaluateCount(BigInteger.valueOf(this.getEvaluateCount(evaluateId)));
- // 查询应评估总人数
+ // 鏌ヨ搴旇瘎浼版�讳汉鏁�
objSchEvaluate.setEvaluateAllCount(BigInteger.valueOf(this
.queryEvaluateAllCount(objSchEvaluate.getEvalRangeType(),objSchEvaluate.getEvalRangeId().split(","))));
- //拼装前端所需要的数据
+ //鎷艰鍓嶇鎵�闇�瑕佺殑鏁版嵁
Map<String, Object> resultMap =
ExerciseUtils.packageExerciseDetail(items, objSchEvaluate);
@@ -905,7 +905,7 @@
}
/**
- * 查询应评估人数
+ * 鏌ヨ搴旇瘎浼颁汉鏁�
* @param rangeType
* @param evalRangeIds
* @return
@@ -917,15 +917,15 @@
QSubject qSubject = QSubject.subject;
Predicate predicate = null;
- if(SchEvaluate.EVALUATE_RANGE_LESSON.equals(rangeType)){//课程
+ if(SchEvaluate.EVALUATE_RANGE_LESSON.equals(rangeType)){//璇剧▼
predicate = stu.classId.in(getQueryFactory().select(re.classId).from(re,qSubject)
.where(qSubject.origSubjectId.in(evalRangeIds).and(re.subjectId.eq(qSubject.subjectId))
.and(qSubject.deleteFlag.isFalse()).and(re.deleteFlag.eq(false))));
- }else if(SchEvaluate.EVALUATE_RANGE_CLASS.equals(rangeType)){//班级
+ }else if(SchEvaluate.EVALUATE_RANGE_CLASS.equals(rangeType)){//鐝骇
predicate = stu.classId.in(evalRangeIds);
- }else if(SchEvaluate.EVALUATE_RANGE_PERSON.equals(rangeType)){//人员
+ }else if(SchEvaluate.EVALUATE_RANGE_PERSON.equals(rangeType)){//浜哄憳
return evalRangeIds.length;
}
@@ -939,7 +939,7 @@
}
/**
- * 获取问卷答卷人数
+ * 鑾峰彇闂嵎绛斿嵎浜烘暟
*
* @param schEvaluateId
* @param classId
@@ -960,7 +960,7 @@
}
/**
- * 查询学生评估list
+ * 鏌ヨ瀛︾敓璇勪及list
* @return
*/
@Override
@@ -999,7 +999,7 @@
}
/**
- * 查询学生评估count
+ * 鏌ヨ瀛︾敓璇勪及count
* @return
*/
@Override
@@ -1026,7 +1026,7 @@
}
/**
- * 获取评估题目
+ * 鑾峰彇璇勪及棰樼洰
* @param templateId
* @param status
* @param exerciseRecordId
@@ -1038,7 +1038,7 @@
+ "where t.evaluateTemplateId=e.evalTemplateId and e.evaluateId=?",
CollectionUtils.newList(evaluateId),String.class);
- // 2.查找评估组下所有对应的练习
+ // 2.鏌ユ壘璇勪及缁勪笅鎵�鏈夊搴旂殑缁冧範
String hql_item = "select item"
+ " from ExerciseItem item, ExerciseGroupItemRe re, ExerciseGroup g"
+ " where item.exerciseId=re.exerciseItemId "
@@ -1051,9 +1051,9 @@
List<ExerciseItem> lstItems = this.find(hql_item, CollectionUtils.newList(groupId), ExerciseItem.class);
if(lstItems.isEmpty()){
- return new ResultJson(false,"当前评估未添加题目");
+ return new ResultJson(false,"褰撳墠璇勪及鏈坊鍔犻鐩�");
}
- //查询用户所填答案
+ //鏌ヨ鐢ㄦ埛鎵�濉瓟妗�
List<ExerciseItemAnswerU> lstUserAnswer = null;
String exerciseRecordId = this.findUnique("select r.recordId from SchEvaRecordRe re, ExerciseRecord r "
+ "where re.exerciseRecordId=r.recordId and re.evaluateId=? and r.deleteFlag is false and r.userId = ?",
@@ -1062,7 +1062,7 @@
String hql_options = "select o from ExerciseItemAnswerU o where o.exerciseRecordId = ? and o.deleteFlag is false";
lstUserAnswer = this.find(hql_options, CollectionUtils.newList(exerciseRecordId), ExerciseItemAnswerU.class);
}
- // 2.1.组装参数 用于查询问卷选项图片
+ // 2.1.缁勮鍙傛暟 鐢ㄤ簬鏌ヨ闂嵎閫夐」鍥剧墖
Map<String, Object> argsImgMap = new HashMap<String, Object>();
String argImgs = "";
Map<String, Object> argsMap = new HashMap<String, Object>();
@@ -1082,20 +1082,20 @@
}
argsMap.put("exerciseIds", args);
argsImgMap.put("optionIds", argImgs.split(";"));
- // 2-3-1查询题目是否关联图片
+ // 2-3-1鏌ヨ棰樼洰鏄惁鍏宠仈鍥剧墖
String hql_itemImgs = "from ExerciseObjectImg where exerciseObjectId in (:exerciseIds) and deleteFlag is false and objectType=1 order by exerciseObjectId,imgOrder ";
List<ExerciseObjectImg> lstItemImgs = this.findByComplexHql(hql_itemImgs, argsMap, ExerciseObjectImg.class);
- // 2-3-2查询题目选项是否关联图片
+ // 2-3-2鏌ヨ棰樼洰閫夐」鏄惁鍏宠仈鍥剧墖
String hql_optionImgs = "from ExerciseObjectImg where exerciseObjectId in (:optionIds) and deleteFlag is false and objectType=2";
List<ExerciseObjectImg> lstOptionImgs = this.findByComplexHql(hql_optionImgs, argsImgMap, ExerciseObjectImg.class);
- // 重新组装练习选项
+ // 閲嶆柊缁勮缁冧範閫夐」
ExerciseUtils.packageExerciseItem(lstItems, lstUserAnswer, lstOptionImgs);
Map<String, List<ExerciseObjectImg>> imgItemMap = ExerciseUtils.packageExerciseItemImg(lstItemImgs);
for(ExerciseItem item:lstItems){
- // 4.5题目中是否有图片
+ // 4.5棰樼洰涓槸鍚︽湁鍥剧墖
if(imgItemMap.get(item.getExerciseId()) != null){
item.setImgs(imgItemMap.get(item.getExerciseId()));
}
--
Gitblit v1.8.0