|
@@ -60,7 +60,7 @@ public class WpsFileController {
|
|
|
}
|
|
|
}
|
|
|
/**
|
|
|
- * 分页列表查询
|
|
|
+ * 分页列表查询
|
|
|
* @param wpsFile
|
|
|
* @param pageNo
|
|
|
* @param pageSize
|
|
@@ -78,9 +78,11 @@ public class WpsFileController {
|
|
|
wpsFile.setName(null);
|
|
|
Result<IPage<WpsFile>> result = new Result<>();
|
|
|
QueryWrapper<WpsFile> queryWrapper = QueryGenerator.initQueryWrapper(wpsFile, req.getParameterMap());
|
|
|
- if(null!=name&&!"".equals(name.trim())){
|
|
|
+ if(null!=name&&!name.trim().equals("")){
|
|
|
queryWrapper.like("name",name);
|
|
|
}
|
|
|
+ //只查询题库的文件
|
|
|
+ queryWrapper.eq("is_script",0);
|
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
|
|
|
if(null==roleCode||!roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
@@ -94,7 +96,7 @@ public class WpsFileController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 添加
|
|
|
+ * 添加
|
|
|
* @param wpsFile
|
|
|
* @return
|
|
|
*/
|
|
@@ -114,7 +116,7 @@ public class WpsFileController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 编辑
|
|
|
+ * 编辑
|
|
|
* @param wpsFile
|
|
|
* @return
|
|
|
*/
|
|
@@ -137,7 +139,7 @@ public class WpsFileController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 通过id删除
|
|
|
+ * 通过id删除
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
@@ -155,7 +157,7 @@ public class WpsFileController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 批量删除
|
|
|
+ * 批量删除
|
|
|
* @param ids
|
|
|
* @return
|
|
|
*/
|
|
@@ -174,7 +176,7 @@ public class WpsFileController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 通过id查询
|
|
|
+ * 通过id查询
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
@@ -202,4 +204,34 @@ public class WpsFileController {
|
|
|
String newUrl = wpsFileService.createTemplateFile(template);
|
|
|
return Response.success(newUrl);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 查询题库文件
|
|
|
+ */
|
|
|
+ @GetMapping(value = "/queryQuestionBank")
|
|
|
+ public Result<IPage<WpsFile>> queryQuestionBank(WpsFile wpsFile,
|
|
|
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
+ HttpServletRequest req) {
|
|
|
+ String name = wpsFile.getName();
|
|
|
+ wpsFile.setName(null);
|
|
|
+ Result<IPage<WpsFile>> result = new Result<>();
|
|
|
+ QueryWrapper<WpsFile> queryWrapper = QueryGenerator.initQueryWrapper(wpsFile, req.getParameterMap());
|
|
|
+ if(null!=name&&!"".equals(name.trim())){
|
|
|
+ queryWrapper.like("name",name);
|
|
|
+ }
|
|
|
+ //只查询题库的文件
|
|
|
+ queryWrapper.eq("is_script",1);
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
|
|
|
+ if(null==roleCode||!roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
|
+ queryWrapper.eq("creator",sysUser.getId());
|
|
|
+ }
|
|
|
+ Page<WpsFile> page = new Page<>(pageNo, pageSize);
|
|
|
+ IPage<WpsFile> pageList = wpsFileService.page(page, queryWrapper);
|
|
|
+ result.setSuccess(true);
|
|
|
+ result.setResult(pageList);
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
}
|