Commit e30a533c by 吴学德

合伙人配置

parent 650cd99d
...@@ -12,7 +12,7 @@ import java.io.Serializable; ...@@ -12,7 +12,7 @@ import java.io.Serializable;
*合伙人信息 *合伙人信息
*/ */
@Data @Data
@TableName("hhr_user") @TableName("hhr_user_view")
public class Partner implements Serializable { public class Partner implements Serializable {
/** /**
...@@ -57,7 +57,6 @@ public class Partner implements Serializable { ...@@ -57,7 +57,6 @@ public class Partner implements Serializable {
* 性别 * 性别
*/ */
private String gender; private String gender;
/** /**
* 县分(区域) * 县分(区域)
*/ */
......
...@@ -3,9 +3,18 @@ package com.winsun.mapper; ...@@ -3,9 +3,18 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Partner; import com.winsun.bean.Partner;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Mapper @Mapper
@Component @Component
public interface PartnerMapper extends BaseMapper<Partner> { public interface PartnerMapper extends BaseMapper<Partner> {
@Update("update sys_user set phone = #{phone} ,name = #{name} ,account = #{account} ,sex = #{gender} ,substName = #{area} where id=#{id}")
int updateSysUser(@Param("phone") String phone,@Param("name") String name,@Param("account") String account,@Param("gender") String gender,@Param("area") String area,@Param("id") String id);
@Update("update hhr_user set ysm = #{ysm} ,wx_id = #{wxId} ,id_card = #{idCard} ,school = #{school} where id=#{id}")
int updateHhUser(@Param("ysm") String ysm,@Param("wxId") String wxId,@Param("idCard") String idCard,@Param("school") String school,@Param("id") String id);
} }
...@@ -35,69 +35,31 @@ public class PartnerController extends BaseController { ...@@ -35,69 +35,31 @@ public class PartnerController extends BaseController {
private static PartnerMapper partnerMapper; private static PartnerMapper partnerMapper;
@Autowired @Autowired
public PartnerController(PartnerMapper partnerMapper) { public PartnerController(PartnerMapper partnerMapper) {
PartnerController.partnerMapper = partnerMapper; PartnerController.partnerMapper = partnerMapper;
} }
@Permission(menuname = "添加合伙人信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertPartner(@RequestParam("partner") String partner) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Partner sale = JSON.parseObject(partner, Partner.class);
partnerMapper.insert(sale);
return ResponseData.success("添加完毕!");
}
@Permission(menuname = "删除合伙人信息", value = "delete", method = RequestMethod.POST)
public ResponseData<String> deletePartner(@RequestParam("id") String id) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
partnerMapper.deleteById(id);
return ResponseData.success("删除完毕!");
}
@Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST) @Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updatePartner(@RequestParam("partner") String partner) { public ResponseData<String> updatePartner(@RequestParam("id") String id,@RequestParam("phoneNum") String phoneNum, @RequestParam("school") String school
ShiroUser user = getShiroUser(); , @RequestParam("name") String name, @RequestParam("account") String account, @RequestParam("idCard") String idCard, @RequestParam("ysm") String ysm
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { , @RequestParam("gender") String gender, @RequestParam("area") String area, @RequestParam("wxId") String wxId) {
return ResponseData.error("无数据权限"); int updateSysUse = partnerMapper.updateSysUser(phoneNum, name, account, gender, area, id);
int updateHhUser = partnerMapper.updateHhUser(ysm,wxId,idCard,school,id);
if (updateSysUse==1&&updateHhUser==1){
return ResponseData.success("修改完毕!");
} }
Partner sale = JSON.parseObject(partner, Partner.class); return ResponseData.error("修改失败");
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", sale.getId());
/**
* 待定............................
*/
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("phoneNum", "");
partnerMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕!");
} }
@Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST) @Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Partner>> listPartner(@RequestParam("phoneNum") String phoneNum, @RequestParam("status") String status, public ResponseData<Page<Partner>> listPartner(@RequestParam("school") String school, @RequestParam("name") String name, @RequestParam("area") String area,
@RequestParam("school") String school, @RequestParam("account") String account, @RequestParam(name = "pageNo", required = false) int pageIndex, @RequestParam(name = "pageSize", required = false) int pageSize) {
@RequestParam("name") String name, @RequestParam("gender") String gender, @RequestParam("area") String area,
@RequestParam("grade") String grade,
@RequestParam(name = "pageIndex", required = false) int pageIndex, @RequestParam(name = "pageSize", required = false) int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<Partner> wrapper = new EntityWrapper(); Wrapper<Partner> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(phoneNum), "phone_num", phoneNum, SqlLike.LEFT);
wrapper.like(StringUtils.isNotBlank(school), "school", school, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(school), "school", school, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(account), "account", account, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(status), "status", Integer.parseInt(status));
wrapper.eq(StringUtils.isNotBlank(grade), "grade", grade);
wrapper.eq(StringUtils.isNotBlank(area), "area", area); wrapper.eq(StringUtils.isNotBlank(area), "area", area);
wrapper.eq(StringUtils.isNotBlank(gender), "gender", gender);
Page<Partner> page = new Page<>(pageIndex, pageSize); Page<Partner> page = new Page<>(pageIndex, pageSize);
List<Partner> salespeople = partnerMapper.selectPage(page, wrapper); List<Partner> salespeople = partnerMapper.selectPage(page, wrapper);
page.setRecords(salespeople); page.setRecords(salespeople);
......
...@@ -119,4 +119,11 @@ public class YsmUserController extends BaseController { ...@@ -119,4 +119,11 @@ public class YsmUserController extends BaseController {
page.setRecords(ysmUsers); page.setRecords(ysmUsers);
return ResponseData.success(page, "查询成功!"); return ResponseData.success(page, "查询成功!");
} }
@Permission(menuname = "查询", value = "getlist", method = RequestMethod.POST)
public ResponseData<List<Map<String,Object>>> getlistYsmUser() {
Wrapper<YsmUser> wrapper = new EntityWrapper();
wrapper.setSqlSelect("id,user_name as userName");
return ResponseData.success(ysmUserMapper.selectMaps(wrapper), "查询成功!");
}
} }
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