机构申请审核、变更审核合并为一个功能需求后对接口进行调整
This commit is contained in:
parent
46f80aaa57
commit
03775be4c7
|
|
@ -78,7 +78,6 @@ public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgAp
|
|||
customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR);
|
||||
customeRuleMap.put("izEntry", QueryRuleEnum.LIKE_WITH_OR);
|
||||
QueryWrapper<OrgApplyInfo> queryWrapper = QueryGenerator.initQueryWrapper(orgApplyInfo, req.getParameterMap(), customeRuleMap);
|
||||
queryWrapper.in("status", new String[]{"1", "2", "3"});
|
||||
Page<OrgApplyInfo> page = new Page<OrgApplyInfo>(pageNo, pageSize);
|
||||
if (StringUtils.isNotBlank(orgApplyInfo.getTitle())) {
|
||||
String value = orgApplyInfo.getTitle();
|
||||
|
|
@ -88,36 +87,6 @@ public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgAp
|
|||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param orgApplyInfo
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "机构信息变更申请-分页列表查询", notes = "机构信息变更申请-分页列表查询")
|
||||
@GetMapping(value = "/modifyLlist")
|
||||
public Result<IPage<OrgApplyInfo>> modifyLlist(OrgApplyInfo orgApplyInfo,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
// 自定义查询规则
|
||||
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
||||
// 自定义多选的查询规则为:LIKE_WITH_OR
|
||||
customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR);
|
||||
customeRuleMap.put("izEntry", QueryRuleEnum.LIKE_WITH_OR);
|
||||
QueryWrapper<OrgApplyInfo> queryWrapper = QueryGenerator.initQueryWrapper(orgApplyInfo, req.getParameterMap(), customeRuleMap);
|
||||
queryWrapper.in("status", new String[]{"4", "5"});
|
||||
Page<OrgApplyInfo> page = new Page<OrgApplyInfo>(pageNo, pageSize);
|
||||
if (StringUtils.isNotBlank(orgApplyInfo.getTitle())) {
|
||||
String value = orgApplyInfo.getTitle();
|
||||
queryWrapper.and(c -> c.like("com_name", value).or().like("org_leader", value).or().like("org_leader_phone", value));
|
||||
}
|
||||
IPage<OrgApplyInfo> pageList = orgApplyInfoService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
|
|
|
|||
Loading…
Reference in New Issue