فهرست منبع

fix on 2020.11.25

jiequan.bi 4 سال پیش
والد
کامیت
cabb0fbef7

+ 39 - 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileController.java

@@ -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;
+	}
+
 }

+ 12 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/entity/WpsFile.java

@@ -26,38 +26,38 @@ public class WpsFile {
 
 	/**id*/
 	@TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
+	@ApiModelProperty(value = "id")
 	private String id;
 	/**name*/
 	@Excel(name = "name", width = 15)
-    @ApiModelProperty(value = "name")
+	@ApiModelProperty(value = "name")
 	private String name;
 	/**version*/
 	@Excel(name = "version", width = 15)
-    @ApiModelProperty(value = "version")
+	@ApiModelProperty(value = "version")
 	private Integer version;
 	/**size*/
 	@Excel(name = "size", width = 15)
-    @ApiModelProperty(value = "size")
+	@ApiModelProperty(value = "size")
 	private Integer size;
 	/**creator*/
 	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
-    private String creator;
+	private String creator;
 	/**createTime*/
 	@Excel(name = "createTime", width = 15)
-    @ApiModelProperty(value = "createTime")
+	@ApiModelProperty(value = "createTime")
 	private Long createTime;
 	/**modifier*/
 	@Excel(name = "modifier", width = 15)
-    @ApiModelProperty(value = "modifier")
+	@ApiModelProperty(value = "modifier")
 	private String modifier;
 	/**modifyTime*/
 	@Excel(name = "modifyTime", width = 15)
-    @ApiModelProperty(value = "modifyTime")
+	@ApiModelProperty(value = "modifyTime")
 	private Long modifyTime;
 	/**downloadUrl*/
 	@Excel(name = "downloadUrl", width = 15)
-    @ApiModelProperty(value = "downloadUrl")
+	@ApiModelProperty(value = "downloadUrl")
 	private String downloadUrl;
 	/**deleted*/
 	private String deleted;
@@ -68,10 +68,12 @@ public class WpsFile {
 
 	private String code;
 
+	private Integer isScript;
+
 	public WpsFile(){super();}
 
 	public WpsFile(String name, int version, int size, String creator,
-					  String modifier, long create_time, long modify_time, String download_url) {
+				   String modifier, long create_time, long modify_time, String download_url) {
 		this.name = name;
 		this.version = version;
 		this.size = size;