Skip to content

G
gdtel-gztel-school-center
Commit 7c9f87de by 董有沛
Options

用户修改

parent b88929f1
Showing with 54 additions and 17 deletions
service-manager/src/main/java/com/winsun/controller/PartnerController.java
...@@ -84,7 +84,8 @@ public class PartnerController extends BaseController { ...@@ -84,7 +84,8 @@ public class PartnerController extends BaseController {
) { ) {
SysUser user = sysUserMapper.selectById(id); SysUser user = sysUserMapper.selectById(id);
password = StringUtils.isNotBlank(password) ? MD5Utils.md5(password, user.getSalt()) : user.getPassword(); password = StringUtils.isNotBlank(password) ? MD5Utils.md5(password, user.getSalt()) : user.getPassword();
parentId = !"null".equals(parentId) ? parentId : "";
parentIds = !"null".equals(parentIds) ? parentIds : "";
int updateSysUse = partnerMapper.updateSysUser(phone, name, account, sex, password,roleId, id); int updateSysUse = partnerMapper.updateSysUser(phone, name, account, sex, password,roleId, id);
int updateHhUser = partnerMapper.updateHhUser(ysm, grade, idCard,position,parentId,parentIds,id); int updateHhUser = partnerMapper.updateHhUser(ysm, grade, idCard,position,parentId,parentIds,id);
int updateSchoolRef = partnerMapper.updateSchoolRef(schoolId, id); int updateSchoolRef = partnerMapper.updateSchoolRef(schoolId, id);
...@@ -210,6 +211,29 @@ public class PartnerController extends BaseController { ...@@ -210,6 +211,29 @@ public class PartnerController extends BaseController {
@RequestParam(name = "parentId", required = false) String parentId, @RequestParam(name = "parentId", required = false) String parentId,
@RequestParam(name = "parentIds", required = false) String parentIds){ @RequestParam(name = "parentIds", required = false) String parentIds){
Wrapper<SysUser> userWrapper = new EntityWrapper<SysUser>();
userWrapper.eq("account", account);
userWrapper.ne("status", "3");
List<SysUser> accountList = sysUserMapper.selectList(userWrapper);
if(accountList.size() > 0) {
return ResponseData.error("账号已存在");
}
Wrapper<HhrUser> hhrWrapper = new EntityWrapper<HhrUser>();
hhrWrapper.eq("id_card", idCard);
List<HhrUser> hhrList = hhrUserMapper.selectList(hhrWrapper);
if(hhrList.size() > 0) {
for(HhrUser hhrUser : hhrList) {
SysUser sysUser = sysUserMapper.selectById(hhrUser.getId());
if(!sysUser.getStatus().equals("3")) {
// 判断剔除已删除的用户
return ResponseData.error("身份证已存在");
}
}
}
// String salt = Integer.toString((int)(Math.random()*100000)); // String salt = Integer.toString((int)(Math.random()*100000));
String salt = MD5Utils.getRandomString(5); String salt = MD5Utils.getRandomString(5);
password = MD5Utils.md5(password, salt); password = MD5Utils.md5(password, salt);
...@@ -304,7 +328,7 @@ public class PartnerController extends BaseController { ...@@ -304,7 +328,7 @@ public class PartnerController extends BaseController {
Wrapper<HhrUser> wrapperHhr = new EntityWrapper<HhrUser>(); Wrapper<HhrUser> wrapperHhr = new EntityWrapper<HhrUser>();
wrapperHhr.setSqlSelect(" id,grade,parent_id parentId,position,id_card idCard," wrapperHhr.setSqlSelect(" id,grade,parent_id parentId,position,id_card idCard,"
+ " (case is_active when 1 then '活跃' when 0 then '不活跃' else '' end) isActive "); + " (case when is_active = 1 then '活跃' when is_active = 0 then '不活跃' else '' end) isActive ");
wrapperHhr.eq(StringUtils.isNotBlank(isActive), "is_active", isActive); wrapperHhr.eq(StringUtils.isNotBlank(isActive), "is_active", isActive);
if(StringUtils.isNotBlank(isUpload) && "1".equals(isUpload)) { if(StringUtils.isNotBlank(isUpload) && "1".equals(isUpload)) {
wrapperHhr.isNotNull("idcard_img_url"); wrapperHhr.isNotNull("idcard_img_url");
...@@ -312,15 +336,16 @@ public class PartnerController extends BaseController { ...@@ -312,15 +336,16 @@ public class PartnerController extends BaseController {
wrapperHhr.isNull("idcard_img_url"); wrapperHhr.isNull("idcard_img_url");
} }
List<HhrUser> hhrUserList = hhrUserMapper.selectList(wrapperHhr); List<Map<String, Object>> hhrUserList = hhrUserMapper.selectMaps(wrapperHhr);
Wrapper<SysUser> wrapperSys = new EntityWrapper<SysUser>(); Wrapper<SysUser> wrapperSys = new EntityWrapper<SysUser>();
wrapperSys.setSqlSelect(" id,name,account,roleid,sex,phone,(case status when 1 then '启用' when 2 then '冻结' else status) status "); 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.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT); wrapperSys.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapperSys.eq(StringUtils.isNotBlank(roleid), "roleid", roleid); wrapperSys.eq(StringUtils.isNotBlank(roleid), "roleid", roleid);
wrapperSys.eq(StringUtils.isNotBlank(account), "account", account); wrapperSys.eq(StringUtils.isNotBlank(account), "account", account);
wrapperSys.eq(StringUtils.isNotBlank(status), "status", status); wrapperSys.eq(StringUtils.isNotBlank(status), "status", status);
wrapperSys.notIn("status", "3,4"); wrapperSys.notIn("status");
List<SysUser> sysUserList = sysUserMapper.selectList(wrapperSys); List<SysUser> sysUserList = sysUserMapper.selectList(wrapperSys);
Wrapper<School> wrapperSchool = new EntityWrapper<School>(); Wrapper<School> wrapperSchool = new EntityWrapper<School>();
...@@ -344,17 +369,17 @@ public class PartnerController extends BaseController { ...@@ -344,17 +369,17 @@ public class PartnerController extends BaseController {
Map<String, Object> dataMap = new HashMap<String, Object>(); Map<String, Object> dataMap = new HashMap<String, Object>();
for(HhrUser hhrUser : hhrUserList) { for(Map<String, Object> hhrMap : hhrUserList) {
String hhrUserId = hhrUser.getId(); String hhrUserId = hhrMap.get("id").toString();
if(sysUserId.equals(hhrUserId)) { if(sysUserId.equals(hhrUserId)) {
dataMap.put("grade",hhrUser.getGrade()); dataMap.put("grade", hhrMap.get("grade"));
dataMap.put("parentId",hhrUser.getParentId()); dataMap.put("parentId", hhrMap.get("parentId"));
dataMap.put("position",hhrUser.getPosition()); dataMap.put("position", hhrMap.get("position"));
dataMap.put("idCard",hhrUser.getIdCard()); dataMap.put("idCard", hhrMap.get("idCard"));
dataMap.put("ysm",hhrUser.getYsm()); dataMap.put("ysm", hhrMap.get("ysm"));
dataMap.put("isActive",hhrUser.getIsActive()); dataMap.put("isActive",hhrMap.get("isActive"));
dataMap.put("idCardImgUrl",hhrUser.getIdcardImgUrl()); dataMap.put("idCardImgUrl", hhrMap.get("idCardImgUrl"));
dataMap.put("studentImgUrl",hhrUser.getStudentImgUrl()); dataMap.put("studentImgUrl", hhrMap.get("studentImgUrl"));
dataMap.put("hasHhr","0"); dataMap.put("hasHhr","0");
break; break;
} }
...@@ -389,7 +414,7 @@ public class PartnerController extends BaseController { ...@@ -389,7 +414,7 @@ public class PartnerController extends BaseController {
newList = dataAuthUtil.authDeal(newList, user); newList = dataAuthUtil.authDeal(newList, user);
ServletOutputStream os = null; ServletOutputStream os = null;
XSSFWorkbook workbook = ExcelDealUtils.getWorkBook(ExcelDealUtils.billStatisExcel("用户清单"), newList); XSSFWorkbook workbook = ExcelDealUtils.getWorkBook(ExcelDealUtils.hhrUserExcel("用户清单"), newList);
try { try {
HttpServletResponse response = getHttpServletResponse(); HttpServletResponse response = getHttpServletResponse();
...@@ -406,5 +431,17 @@ public class PartnerController extends BaseController { ...@@ -406,5 +431,17 @@ public class PartnerController extends BaseController {
} }
} }
@Permission(menuname = "删除用户", value = "deleteUser", method = RequestMethod.POST)
public ResponseData<Object> deleteUser(@Param("id") String id) {
SysUser sysUser = new SysUser();
sysUser.setId(id);
sysUser.setStatus("3");
int num = sysUserMapper.updateById(sysUser);
if(num > 0) {
return ResponseData.success("删除成功");
}
return ResponseData.success("删除失败");
}
} }
service-manager/src/main/java/com/winsun/utils/ExcelDealUtils.java
...@@ -415,7 +415,7 @@ public class ExcelDealUtils { ...@@ -415,7 +415,7 @@ public class ExcelDealUtils {
// 合伙人管理导出excel表头 // 合伙人管理导出excel表头
public static Map<String, Object> hhrUserExcel(String sheetName){ public static Map<String, Object> hhrUserExcel(String sheetName){
Map<String, Object> headMap = new LinkedHashMap<String, Object>(); Map<String, Object> headMap = new LinkedHashMap<String, Object>();
headMap.put("姓名", "account"); headMap.put("姓名", "name");
headMap.put("电话", "phone"); headMap.put("电话", "phone");
headMap.put("学校", "school"); headMap.put("学校", "school");
headMap.put("身份证", "idCard"); headMap.put("身份证", "idCard");
......
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