From 937daff0ebc1aa16a852d5a86434ab1994d8a02d Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期一, 11 九月 2023 10:41:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/controller/EvaluateController.java | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/EvaluateController.java b/src/main/java/com/qxueyou/scc/controller/EvaluateController.java
index 01f3a1d..1004e0f 100644
--- a/src/main/java/com/qxueyou/scc/controller/EvaluateController.java
+++ b/src/main/java/com/qxueyou/scc/controller/EvaluateController.java
@@ -25,11 +25,11 @@
/**
- * 评估控制器
+ * 璇勪及鎺у埗鍣�
*
* @author zhiyong
*/
-@Api(tags = "问卷接口")
+@Api(tags = "闂嵎鎺ュ彛")
@Controller
@CrossOrigin(origins="*",maxAge=3600)
@RequestMapping(value = "/evaluate")
@@ -44,19 +44,19 @@
@Autowired
IOssService ossService;
- // ------------------------------后台 start------------------------------------------------------------
+ // ------------------------------鍚庡彴 start------------------------------------------------------------
/**
- * 获取列表数据
+ * 鑾峰彇鍒楄〃鏁版嵁
*
* @return
*/
- @ApiOperation(value = "获取列表数据-教师端", notes = "", httpMethod = "GET")
+ @ApiOperation(value = "鑾峰彇鍒楄〃鏁版嵁-鏁欏笀绔�", notes = "", httpMethod = "GET")
@ApiImplicitParams({
- @ApiImplicitParam(name = "pageNum", value = "页码", required = false, paramType="query", dataType = "Integer"),
- @ApiImplicitParam(name = "pageSize", value = "每页数目", required = false, paramType="query", dataType = "Integer"),
- @ApiImplicitParam(name = "keyword", value = "查询字段", required = false, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "sort", value = "排序字段", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "pageNum", value = "椤电爜", required = false, paramType="query", dataType = "Integer"),
+ @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏁扮洰", required = false, paramType="query", dataType = "Integer"),
+ @ApiImplicitParam(name = "keyword", value = "鏌ヨ瀛楁", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "sort", value = "鎺掑簭瀛楁", required = false, paramType="query", dataType = "String"),
})
@RequestMapping(value = "list", method = RequestMethod.GET)
public @ResponseBody
@@ -66,15 +66,15 @@
}
/**
- * 获取范围选择
+ * 鑾峰彇鑼冨洿閫夋嫨
* <p>
- * type: lesson:课程 class:班级 person:人员
+ * type: lesson:璇剧▼ class:鐝骇 person:浜哄憳
*
* @return
*/
- @ApiOperation(value = "获取范围选择", notes = "根据填写范围获取下拉列表的值")
+ @ApiOperation(value = "鑾峰彇鑼冨洿閫夋嫨", notes = "鏍规嵁濉啓鑼冨洿鑾峰彇涓嬫媺鍒楄〃鐨勫��")
@ApiImplicitParams({
- @ApiImplicitParam(name = "type", value = "填写范围【lesson:课程 class:班级 person:人员】", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "type", value = "濉啓鑼冨洿銆恖esson:璇剧▼ class:鐝骇 person:浜哄憳銆�", required = false, paramType="query", dataType = "String"),
})
@RequestMapping(value = "rangeList", method = RequestMethod.GET)
public @ResponseBody
@@ -84,13 +84,13 @@
}
/**
- * 后台管理
- * 新增或修改教学评估
+ * 鍚庡彴绠＄悊
+ * 鏂板鎴栦慨鏀规暀瀛﹁瘎浼�
*
* @param obj
* @return
*/
- @ApiOperation(value = "新增或修改问卷", notes = "")
+ @ApiOperation(value = "鏂板鎴栦慨鏀归棶鍗�", notes = "")
@RequestMapping(value = "addOrUpdate", method = RequestMethod.POST)
public @ResponseBody
ResultJson addOrUpdateEvaluate(@RequestBody SchEvaluate eva) {
@@ -99,13 +99,13 @@
}
/**
- * 获取回显数据
+ * 鑾峰彇鍥炴樉鏁版嵁
*
* @return
*/
- @ApiOperation(value = "读取问卷的信息", notes = "")
+ @ApiOperation(value = "璇诲彇闂嵎鐨勪俊鎭�", notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "evaluateId", value = "问卷id", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "evaluateId", value = "闂嵎id", required = false, paramType="query", dataType = "String"),
})
@RequestMapping(value = "baseInfo", method = RequestMethod.GET)
public @ResponseBody
@@ -115,13 +115,13 @@
}
/**
- * 删除
+ * 鍒犻櫎
*
* @return
*/
- @ApiOperation(value = "删除问卷", notes = "")
+ @ApiOperation(value = "鍒犻櫎闂嵎", notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "evaluateIds", value = "问卷id,id", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "evaluateIds", value = "闂嵎id,id", required = false, paramType="query", dataType = "String"),
})
@RequestMapping(value = "delete", method = RequestMethod.POST)
public @ResponseBody
@@ -131,14 +131,14 @@
}
/**
- * 后台管理
- * 激活教学评估
+ * 鍚庡彴绠＄悊
+ * 婵�娲绘暀瀛﹁瘎浼�
*
* @return
*/
- @ApiOperation(value = "激活教学评估", notes = "")
+ @ApiOperation(value = "婵�娲绘暀瀛﹁瘎浼�", notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "evaluateIds", value = "问卷id,id", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "evaluateIds", value = "闂嵎id,id", required = false, paramType="query", dataType = "String"),
})
@RequestMapping(value = "active", method = RequestMethod.POST)
@ResponseBody
@@ -149,14 +149,14 @@
}
/**
- * 后台管理
- * 撤回
+ * 鍚庡彴绠＄悊
+ * 鎾ゅ洖
*
* @return
*/
- @ApiOperation(value = "撤回教学评估", notes = "")
+ @ApiOperation(value = "鎾ゅ洖鏁欏璇勪及", notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "evaluateIds", value = "问卷id,id", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "evaluateIds", value = "闂嵎id,id", required = false, paramType="query", dataType = "String"),
})
@RequestMapping(value = "withdraw", method = RequestMethod.POST)
@ResponseBody
@@ -167,12 +167,12 @@
}
/**
- * 后台管理
- * 复制
+ * 鍚庡彴绠＄悊
+ * 澶嶅埗
*
* @return
*/
- @ApiOperation(value = "复制教学评估", notes = "")
+ @ApiOperation(value = "澶嶅埗鏁欏璇勪及", notes = "")
@RequestMapping(value = "copy", method = RequestMethod.POST)
@ResponseBody
public ResultJson doCopy(@RequestBody SchEvaluate eva) {
@@ -183,17 +183,17 @@
/**
- * 查看结果 问卷整体情况
+ * 鏌ョ湅缁撴灉 闂嵎鏁翠綋鎯呭喌
*
* @param groupId
* @param schEvaluateId
* @param classId
* @return
*/
- @ApiOperation(value = "问卷整体答题情况", notes = "")
+ @ApiOperation(value = "闂嵎鏁翠綋绛旈鎯呭喌", notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "evaluateId", value = "问卷id", required = false, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "groupId", value = "练习组id", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "evaluateId", value = "闂嵎id", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "groupId", value = "缁冧範缁刬d", required = false, paramType="query", dataType = "String"),
})
@RequestMapping(value = "queryEvaluateDetail", method = RequestMethod.GET)
@ResponseBody
@@ -203,16 +203,16 @@
}
/**
- * 查看统计
+ * 鏌ョ湅缁熻
*
* @param groupId
* @param schEvaluateId
* @return
*/
- @ApiOperation(value = "查看问卷统计情况", notes = "")
+ @ApiOperation(value = "鏌ョ湅闂嵎缁熻鎯呭喌", notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "evaluateId", value = "问卷id", required = false, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "groupId", value = "练习组id", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "evaluateId", value = "闂嵎id", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "groupId", value = "缁冧範缁刬d", required = false, paramType="query", dataType = "String"),
})
@RequestMapping(value = "evaluateStatisDetail", method = RequestMethod.GET)
@ResponseBody
@@ -222,18 +222,18 @@
}
- // ------------------------------后台 end------------------------------------------------------------
+ // ------------------------------鍚庡彴 end------------------------------------------------------------
- // ------------------------------前端 start-----------------------------------------------------------
+ // ------------------------------鍓嶇 start-----------------------------------------------------------
/**
- * 微信提交问卷
+ * 寰俊鎻愪氦闂嵎
*
* @param answers
* @param userId
* @return
*/
- @ApiOperation(value = "提交问卷答案", notes = "")
+ @ApiOperation(value = "鎻愪氦闂嵎绛旀", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "answers", value = "{\"evaluateId\":\"297ebe0e653d1bf601654064de690004\",\"exerciseGroupId\":\"297ebe0e653d1bf601654064de2b0002\",\"items\":[{\"exerciseId\":\"297ebe0e653d1bf60165407d5e9f0033\",\"answer\":\"B,C\"},{\"exerciseId\":\"297ebe0e653d1bf60165407eb3b6003e\",\"answer\":\"B\"},{\"exerciseId\":\"297ebe0e653d1bf6016541a801c5009e\",\"answer\":\"A,B\"},{\"exerciseId\":\"297ebe0e653d1bf6016540755a4a0005\",\"answer\":\"B\"},{\"exerciseId\":\"297ebe0e653d1bf6016540787e42001d\",\"answer\":\"B\"},{\"exerciseId\":\"297ebe0e653d1bf60165407b48a80028\",\"answer\":\"B\"}]}", required = false, paramType="query", dataType = "String"),
})
@@ -245,9 +245,9 @@
try {
ObjectMapper mapper = new ObjectMapper();
- // 装换json到对象
+ // 瑁呮崲json鍒板璞�
TeachEvaScoreResult scoreResult = mapper.readValue(answers, TeachEvaScoreResult.class);
- // 提交答卷入库
+ // 鎻愪氦绛斿嵎鍏ュ簱
result = evaluateService.doSubmitTeachEvalScoreData(scoreResult, userId);
evaluateService.updateEvaluateCount(scoreResult.getEvaluateId());
@@ -261,11 +261,11 @@
}
/**
- * 查询学生评估list
+ * 鏌ヨ瀛︾敓璇勪及list
*
* @return
*/
- @ApiOperation(value = "问卷列表-学员端", notes = "")
+ @ApiOperation(value = "闂嵎鍒楄〃-瀛﹀憳绔�", notes = "")
@RequestMapping(value = "stuEvaluateList", method = RequestMethod.GET)
public @ResponseBody
ResultJson queryStuEvaluateList(Pager pager) {
@@ -274,14 +274,14 @@
}
/**
- * 问卷查询题目
+ * 闂嵎鏌ヨ棰樼洰
*
* @param evaluateId
* @return
*/
- @ApiOperation(value = "问卷题目列表", notes = "")
+ @ApiOperation(value = "闂嵎棰樼洰鍒楄〃", notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "evaluateId", value = "问卷id", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "evaluateId", value = "闂嵎id", required = false, paramType="query", dataType = "String"),
})
@RequestMapping(value = "viewStuEvaluate", method = RequestMethod.GET)
public @ResponseBody
@@ -290,5 +290,5 @@
return evaluateService.doGetEvalExerItemResponseDataNew(evaluateId);
}
- // ------------------------------前端 end------------------------------------------------------------
+ // ------------------------------鍓嶇 end------------------------------------------------------------
}
--
Gitblit v1.8.0