From 660b072b084f3f765ff8bfcb1abdd7f1cd9ed068 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期二, 28 二月 2023 14:24:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/exercise/action/ExerciseCorrectionController.java | 86 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/exercise/action/ExerciseCorrectionController.java b/src/main/java/com/qxueyou/scc/exercise/action/ExerciseCorrectionController.java
index 5494085..dab6a88 100644
--- a/src/main/java/com/qxueyou/scc/exercise/action/ExerciseCorrectionController.java
+++ b/src/main/java/com/qxueyou/scc/exercise/action/ExerciseCorrectionController.java
@@ -27,7 +27,7 @@
import com.qxueyou.scc.sys.model.SysDictionary;
/**
- * 练习纠错控制
+ * 缁冧範绾犻敊鎺у埗
* @author alger
*/
@Controller
@@ -41,15 +41,15 @@
private IExerciseCorrectionService exerciseCorrectionService;
/**
- * APP2.0: 从客户端接收纠错信息
+ * APP2.0: 浠庡鎴风鎺ユ敹绾犻敊淇℃伅
* URL: /exercise/correction/addCorrInfoNew
*
- * @param groupId 组Id
- * @param groupName 组名
- * @param exerciseNum 练习
- * @param exerciseId 练习id
- * @param correctids 错误选项信息
- * @param content 错误内容
+ * @param groupId 缁処d
+ * @param groupName 缁勫悕
+ * @param exerciseNum 缁冧範
+ * @param exerciseId 缁冧範id
+ * @param correctids 閿欒閫夐」淇℃伅
+ * @param content 閿欒鍐呭
* @return
*/
@RequestMapping(value="addCorrInfoNew",method=RequestMethod.GET)
@@ -63,25 +63,25 @@
{
Result objResult = exerciseCorrectionService.insertExerciseCorrection(groupId,groupName,exerciseNum,exerciseId,correctids,content);
- // 返回给客户端结果信息
+ // 杩斿洖缁欏鎴风缁撴灉淇℃伅
return objResult;
}
/**
- * APP2.0: 客户端通过此从字典中查找信息
+ * APP2.0: 瀹㈡埛绔�氳繃姝や粠瀛楀吀涓煡鎵句俊鎭�
* URL: /exercise/correction/corrOptionsNew
*
- * @return lst的键值对
+ * @return lst鐨勯敭鍊煎
*/
@RequestMapping(value="corrOptionsNew",method=RequestMethod.POST)
public @ResponseBody List<Map<String, String>> queryExerCorrectionOptions() {
- //从字典中查出数据
+ //浠庡瓧鍏镐腑鏌ュ嚭鏁版嵁
List<SysDictionary> lstDict = commonDAO.queryDictConfigMap("EXERCISE_CORRECTION_INFO");
if(lstDict.isEmpty()){
return new ArrayList<Map<String, String>>();
}
- //赋值给map集合
+ //璧嬪�肩粰map闆嗗悎
List<Map<String, String>> lstMap = new ArrayList<Map<String, String>>(lstDict.size());
Map<String, String> map = null;
for(SysDictionary dict:lstDict){
@@ -93,10 +93,10 @@
return lstMap;
}
- /******************************************************************* 上面为App接口，下面为后台接口 **************************/
+ /******************************************************************* 涓婇潰涓篈pp鎺ュ彛锛屼笅闈负鍚庡彴鎺ュ彛 **************************/
/**
- * list页
+ * list椤�
*
* @return
*/
@@ -108,21 +108,21 @@
}
/**
- * 获取列表数据
+ * 鑾峰彇鍒楄〃鏁版嵁
*
* @return
*/
@RequestMapping(value = "data", method = RequestMethod.GET)
public @ResponseBody List<ExerciseCorrection> data() {
- //查找
+ //鏌ユ壘
String hql = "from ExerciseCorrection where deleteFlag is false and classId= ? order by createTime Desc";
- //获取列表数据，显示在屏幕的后台纠错页面表的基本信息
+ //鑾峰彇鍒楄〃鏁版嵁锛屾樉绀哄湪灞忓箷鐨勫悗鍙扮籂閿欓〉闈㈣〃鐨勫熀鏈俊鎭�
List<ExerciseCorrection> list = commonDAO.find(hql, CollectionUtils.newList(ClientUtils.getClassId()), ExerciseCorrection.class);
return list;
}
/**
- * 点击查看，读取题目
+ * 鐐瑰嚮鏌ョ湅锛岃鍙栭鐩�
* @param exerciseCorrectionId
* @return
*/
@@ -130,7 +130,7 @@
public @ResponseBody ExerciseCorrectionResult read(String exerciseCorrectionId,String exerciseItemId) {
ExerciseCorrectionResult obj = new ExerciseCorrectionResult();
String hql = "from ExerciseCorrection where deleteFlag is false and exerciseItemId = ? ";
- //通过集合查询所有相同题目，不同人，以及不同类型的错误
+ //閫氳繃闆嗗悎鏌ヨ鎵�鏈夌浉鍚岄鐩紝涓嶅悓浜猴紝浠ュ強涓嶅悓绫诲瀷鐨勯敊璇�
List<ExerciseCorrection> list = commonDAO.find(hql, CollectionUtils.newList(exerciseItemId), ExerciseCorrection.class);
if(null != list && !list.isEmpty()){
String itemId1 = list.get(0).getExerciseItemId();
@@ -143,24 +143,24 @@
/**
- * 用来保存前台修改的数据
- * @param correctionType 保存和纠错保存区分的状态码
- * @param exerciseId 练习Id
- * @param analysis 题目分析
- * @param title 题目
- * @param type 类型
- * @param optionA 选项A
- * @param optionB 选项B
- * @param optionC 选项C
- * @param optionD 选项D
- * @param optionE 选项E
- * @param optionF 选项F
- * @param checkA 判断A
- * @param checkB 判断B
- * @param checkC 判断C
- * @param checkD 判断D
- * @param checkE 判断E
- * @param checkF 判断F
+ * 鐢ㄦ潵淇濆瓨鍓嶅彴淇敼鐨勬暟鎹�
+ * @param correctionType 淇濆瓨鍜岀籂閿欎繚瀛樺尯鍒嗙殑鐘舵�佺爜
+ * @param exerciseId 缁冧範Id
+ * @param analysis 棰樼洰鍒嗘瀽
+ * @param title 棰樼洰
+ * @param type 绫诲瀷
+ * @param optionA 閫夐」A
+ * @param optionB 閫夐」B
+ * @param optionC 閫夐」C
+ * @param optionD 閫夐」D
+ * @param optionE 閫夐」E
+ * @param optionF 閫夐」F
+ * @param checkA 鍒ゆ柇A
+ * @param checkB 鍒ゆ柇B
+ * @param checkC 鍒ゆ柇C
+ * @param checkD 鍒ゆ柇D
+ * @param checkE 鍒ゆ柇E
+ * @param checkF 鍒ゆ柇F
* @return
*/
@RequestMapping(value = "item/addOrUpdate", method = RequestMethod.POST)
@@ -205,7 +205,7 @@
createItemOption(getOptionOrder(type,'E'),optionE, checkE, optionE_Id, optionE_imgIds, lstOptions);
createItemOption(getOptionOrder(type,'F'),optionF, checkF, optionF_Id, optionF_imgIds, lstOptions);
- //读取练习，查找题目名和题目类型
+ //璇诲彇缁冧範锛屾煡鎵鹃鐩悕鍜岄鐩被鍨�
ExerciseItem item = this.commonDAO.read(ExerciseItem.class, exerciseId);
item.setTitle(title);
item.setType(type);
@@ -214,7 +214,7 @@
}
/**
- * 创建习题选项
+ * 鍒涘缓涔犻閫夐」
* @param option
* @param check
* @param lstOptions
@@ -231,10 +231,10 @@
}
ExerciseItemOption a = new ExerciseItemOption();
- if(StringUtils.isNotBlank(optionId)){// 更新
+ if(StringUtils.isNotBlank(optionId)){// 鏇存柊
a.setOptionId(optionId);
}
- if(StringUtils.isNotBlank(imgsId)){//新增图片
+ if(StringUtils.isNotBlank(imgsId)){//鏂板鍥剧墖
String[] strImgsId = imgsId.split(",");
List<ExerciseObjectImg> imgs = new ArrayList<ExerciseObjectImg>(strImgsId.length);
ExerciseObjectImg objImg = null;
@@ -252,7 +252,7 @@
}
/**
- * 获得题目选项的顺序编号
+ * 鑾峰緱棰樼洰閫夐」鐨勯『搴忕紪鍙�
* @param type2
* @param order
* @return
--
Gitblit v1.8.0