Commit 0a713dd1 authored by Quxl's avatar Quxl

x

parent 720c13f6
...@@ -102,7 +102,13 @@ public class AdminReviewController { ...@@ -102,7 +102,13 @@ public class AdminReviewController {
@ApiImplicitParam(paramType="query", dataType="long", name="index", value="分页编号"), @ApiImplicitParam(paramType="query", dataType="long", name="index", value="分页编号"),
@ApiImplicitParam(paramType="query", dataType="long", name="limit", value="分页大小"), @ApiImplicitParam(paramType="query", dataType="long", name="limit", value="分页大小"),
}) })
public Object getBestMvListByGroup(String keyword, Integer review_state, Integer review_round, String ext_type, Long index, Long limit) { public Object getBestMvListByGroup(
String keyword,
Integer review_state,
Integer review_round,
String ext_type,
Long index,
Long limit) {
index = index == null ? 1 : index; index = index == null ? 1 : index;
limit = limit == null ? 20 : limit; limit = limit == null ? 20 : limit;
Page page = new Page(index, limit); Page page = new Page(index, limit);
...@@ -115,7 +121,6 @@ public class AdminReviewController { ...@@ -115,7 +121,6 @@ public class AdminReviewController {
return Rjx.jsonOk().setData(ugList).setPage(page); return Rjx.jsonOk().setData(ugList).setPage(page);
} }
@ResponseBody @ResponseBody
@PostMapping("getReviewGroupUserList") @PostMapping("getReviewGroupUserList")
@ApiOperation("可分配的审片评委查询") @ApiOperation("可分配的审片评委查询")
...@@ -123,7 +128,9 @@ public class AdminReviewController { ...@@ -123,7 +128,9 @@ public class AdminReviewController {
@ApiImplicitParam(paramType="query", dataType="int", required=true, name="review_id", value="审片主表ID"), @ApiImplicitParam(paramType="query", dataType="int", required=true, name="review_id", value="审片主表ID"),
@ApiImplicitParam(paramType="query", dataType="int", required=true, name="review_round", value="分配评委的审片环节"), @ApiImplicitParam(paramType="query", dataType="int", required=true, name="review_round", value="分配评委的审片环节"),
}) })
public Object getReviewGroupUserList(Integer review_id, Integer review_round) { public Object getReviewGroupUserList(
Integer review_id,
Integer review_round) {
List<Map<String, Object>> groupList = adminUserService.getReviewGroupList(review_id, review_round); List<Map<String, Object>> groupList = adminUserService.getReviewGroupList(review_id, review_round);
List<Map<String, Object>> userList = adminUserService.getReviewUserList(review_id, review_round); List<Map<String, Object>> userList = adminUserService.getReviewUserList(review_id, review_round);
return Rjx.jsonOk().set("userList", userList).set("groupList", groupList); return Rjx.jsonOk().set("userList", userList).set("groupList", groupList);
...@@ -138,7 +145,11 @@ public class AdminReviewController { ...@@ -138,7 +145,11 @@ public class AdminReviewController {
@ApiImplicitParam(paramType="query", dataType="string", required=true, name="is_cancel", value="是否取消分配 true|false 或 1|0", allowMultiple=true), @ApiImplicitParam(paramType="query", dataType="string", required=true, name="is_cancel", value="是否取消分配 true|false 或 1|0", allowMultiple=true),
@ApiImplicitParam(paramType="query", dataType="int", required=true, name="user_id", value="审片评委ID", allowMultiple=true), @ApiImplicitParam(paramType="query", dataType="int", required=true, name="user_id", value="审片评委ID", allowMultiple=true),
}) })
public Object allot(String[] is_cancel, Integer review_id, Integer review_round, Integer[] user_id) { public Object allot(
String[] is_cancel,
Integer review_id,
Integer review_round,
Integer[] user_id) {
List<Integer> saveList = new ArrayList<Integer>(); List<Integer> saveList = new ArrayList<Integer>();
List<Integer> cancelList = new ArrayList<Integer>(); List<Integer> cancelList = new ArrayList<Integer>();
if(is_cancel != null) { if(is_cancel != null) {
...@@ -171,7 +182,6 @@ public class AdminReviewController { ...@@ -171,7 +182,6 @@ public class AdminReviewController {
return Rjx.jsonOk().setData(list); return Rjx.jsonOk().setData(list);
} }
@ResponseBody @ResponseBody
@PostMapping("toNextRound") @PostMapping("toNextRound")
@ApiOperation("查询审片评委") @ApiOperation("查询审片评委")
...@@ -201,7 +211,19 @@ public class AdminReviewController { ...@@ -201,7 +211,19 @@ public class AdminReviewController {
@ApiImplicitParam(paramType = "query", dataType = "string", required = false, allowMultiple=true, name = "ext_name", value="评奖主体名称"), @ApiImplicitParam(paramType = "query", dataType = "string", required = false, allowMultiple=true, name = "ext_name", value="评奖主体名称"),
@ApiImplicitParam(paramType = "query", dataType = "double", required = false, allowMultiple=true, name = "ext_score", value="评奖得分"), @ApiImplicitParam(paramType = "query", dataType = "double", required = false, allowMultiple=true, name = "ext_score", value="评奖得分"),
}) })
public Object saveReviewRecord(Integer record_id, Integer review_state, Double review_score, String review_text, String review_text_1, String review_text_2, String review_text_3, String review_text_4, String[] ext_title, String[] ext_type, String[] ext_name, Double[] ext_score) { public Object saveReviewRecord(
Integer record_id,
Integer review_state,
Double review_score,
String review_text,
String review_text_1,
String review_text_2,
String review_text_3,
String review_text_4,
String[] ext_title,
String[] ext_type,
String[] ext_name,
Double[] ext_score) {
Map<String, Object> recordMap = reviewService.queryReviewRecordMapById(record_id); Map<String, Object> recordMap = reviewService.queryReviewRecordMapById(record_id);
Fc_review_record ru = Util.mapTo(recordMap, Fc_review_record.class); Fc_review_record ru = Util.mapTo(recordMap, Fc_review_record.class);
ru.setReview_score(review_score); ru.setReview_score(review_score);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment