Commit 2acadfe6 authored by liqin's avatar liqin 💬

bug fixed

parent 787a86df
...@@ -217,9 +217,6 @@ public class AuditController extends BaseController { ...@@ -217,9 +217,6 @@ public class AuditController extends BaseController {
return getFailResult(); return getFailResult();
} }
//=================审核管理接口=================
@GetMapping("/getPageAllList") @GetMapping("/getPageAllList")
@ApiOperation(value = "审核管理=========分页查询", notes = "审核管理=========分页查询") @ApiOperation(value = "审核管理=========分页查询", notes = "审核管理=========分页查询")
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
...@@ -229,11 +226,7 @@ public class AuditController extends BaseController { ...@@ -229,11 +226,7 @@ public class AuditController extends BaseController {
@ApiImplicitParam(name = "status", value = "待初审:TBC, 驳回:REFUSED,待复审:TBCA, 通过:APPROVED_FINAL", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "status", value = "待初审:TBC, 驳回:REFUSED,待复审:TBCA, 通过:APPROVED_FINAL", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "type", value = "视频内容:VIDEO_CONTENT,展板内容:EXHIBITION_BOARD,学习内容:LEARNING_CONTENT", paramType = "query", dataType = "String", allowableValues = "VIDEO_CONTENT,EXHIBITION_BOARD,LEARNING_CONTENT,ACCOUNT", required = true) @ApiImplicitParam(name = "type", value = "视频内容:VIDEO_CONTENT,展板内容:EXHIBITION_BOARD,学习内容:LEARNING_CONTENT", paramType = "query", dataType = "String", allowableValues = "VIDEO_CONTENT,EXHIBITION_BOARD,LEARNING_CONTENT,ACCOUNT", required = true)
}) })
public Map<String, Object> getPageAllList(String name, String status, public Map<String, Object> getPageAllList(String name, String status, @NotBlank(message = "type参数不能为空") String type) {
@NotBlank(message = "type参数不能为空") String type) {
//分页
Page<Object> page = getPage();
AuditStatusEnum auditStatus = null; AuditStatusEnum auditStatus = null;
AuditStatusEnum auditStatusLevel = null; AuditStatusEnum auditStatusLevel = null;
AuditTypeEnum auditTypeEnum = AuditTypeEnum.valueOf(type); AuditTypeEnum auditTypeEnum = AuditTypeEnum.valueOf(type);
...@@ -277,17 +270,14 @@ public class AuditController extends BaseController { ...@@ -277,17 +270,14 @@ public class AuditController extends BaseController {
} }
// //
try { try {
Page<Audit> auditList = auditService.pageList(name, auditStatus, auditStatusLevel, auditTypeEnum, page); Page<Audit> auditList = auditService.pageList(name, auditStatus, auditStatusLevel, auditTypeEnum, getPage());
return getResult(auditList); return getResult(auditList);
} catch ( } catch (Exception e) {
Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
return getFailResult(); return getFailResult();
} }
@PutMapping("/updateAuditAllById") @PutMapping("/updateAuditAllById")
@RequiresPermissions("/audit/update") @RequiresPermissions("/audit/update")
@ApiOperation(value = "审核管理===根据id修改审核信息", notes = "审核管理===根据id修改审核信息") @ApiOperation(value = "审核管理===根据id修改审核信息", notes = "审核管理===根据id修改审核信息")
......
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