Commit c4a80cee by 陈浩建

根据合伙人ID查询

parent 35758ab4
......@@ -128,7 +128,8 @@ public class PartnerController extends BaseController {
@SuppressWarnings("unchecked")
@Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Map<String, Object>>> listPartner(@RequestParam("school") String school,
public ResponseData<Page<Map<String, Object>>> listPartner(@RequestParam("id") String id,
@RequestParam("school") String school,
@RequestParam("name") String name, @RequestParam("substName") String substName,
@RequestParam("account") String account, @RequestParam("roleid") String roleid,
@RequestParam("isActive") String isActive,@RequestParam("isUpload") String isUpload,
......@@ -139,6 +140,7 @@ public class PartnerController extends BaseController {
ShiroUser user = getShiroUser();
Wrapper<HhrUser> wrapperHhr = new EntityWrapper<HhrUser>();
wrapperHhr.eq(StringUtils.isNotBlank(id),"id",id);
wrapperHhr.eq(StringUtils.isNotBlank(isActive), "is_active", isActive);
if(StringUtils.isNotBlank(isUpload) && "1".equals(isUpload)) {
wrapperHhr.isNotNull("idcard_img_url");
......@@ -155,6 +157,7 @@ public class PartnerController extends BaseController {
List<HhrSupervisorSchool> hhrSupervisorSchools = hhrSupervisorSchoolMapper.selectList(wrapper);
Wrapper<SysUser> wrapperSys = new EntityWrapper<SysUser>();
wrapperSys.eq(StringUtils.isNotBlank(id),"id",id);
wrapperSys.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapperSys.eq(StringUtils.isNotBlank(roleid), "roleid", roleid);
wrapperSys.eq(StringUtils.isNotBlank(account), "account", account);
......@@ -390,7 +393,8 @@ public class PartnerController extends BaseController {
}
@Permission(menuname = "导出合伙人信息", value = "exportUserList", method = RequestMethod.POST)
public void exportUserList(@RequestParam("school") String school,
public void exportUserList(@RequestParam("id") String id,
@RequestParam("school") String school,
@RequestParam("name") String name, @RequestParam("substName") String substName,
@RequestParam("account") String account, @RequestParam("roleid") String roleid,
@RequestParam("isActive") String isActive,@RequestParam("isUpload") String isUpload,
......@@ -400,6 +404,7 @@ public class PartnerController extends BaseController {
Wrapper<HhrUser> wrapperHhr = new EntityWrapper<HhrUser>();
wrapperHhr.setSqlSelect(" id,grade,parent_id parentId,position,id_card idCard,"
+ " (case when is_active = 1 then '活跃' when is_active = 0 then '不活跃' else '' end) isActive ");
wrapperHhr.eq(StringUtils.isNotBlank(id), "id", id);
wrapperHhr.eq(StringUtils.isNotBlank(isActive), "is_active", isActive);
if(StringUtils.isNotBlank(isUpload) && "1".equals(isUpload)) {
wrapperHhr.isNotNull("idcard_img_url");
......@@ -412,6 +417,7 @@ public class PartnerController extends BaseController {
Wrapper<SysUser> wrapperSys = new EntityWrapper<SysUser>();
wrapperSys.setSqlSelect(" id,name,account,roleid,phone,(case status when 1 then '启用' when 2 then '冻结' else status end) status,"
+ " (case sex when '1' then '男' when '2' then '女' else sex end) sex ");
wrapperSys.eq(StringUtils.isNotBlank(id), "id", id);
wrapperSys.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapperSys.eq(StringUtils.isNotBlank(roleid), "roleid", roleid);
wrapperSys.eq(StringUtils.isNotBlank(account), "account", account);
......
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