diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java index b0923ac..137b88d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java @@ -22,8 +22,27 @@ public class Users { private Date created; private String remarks; private Date lastLoginTime; + private Integer zhiChenId; + private String zhiChen; + + public String getZhiChen() { + return zhiChen; + } + + public void setZhiChen(String zhiChen) { + this.zhiChen = zhiChen; + } + private Integer otherAccount; //第三方帐号, 1医院帐号 + public Integer getZhiChenId() { + return zhiChenId; + } + + public void setZhiChenId(Integer zhiChenId) { + this.zhiChenId = zhiChenId; + } + public Integer getOtherAccount() { return otherAccount; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ZhiChenEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ZhiChenEnums.java new file mode 100644 index 0000000..be6e17f --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ZhiChenEnums.java @@ -0,0 +1,42 @@ +package com.lyms.platform.common.enums; + +/** + * 医院职称 + * + * Created by Administrator on 2016/7/27 0027. + */ +public enum ZhiChenEnums { + + DOCTOR("医生",1),HUSHI("护士",2),ZHIGONG("职工",3),QITA("其他",4); + + private ZhiChenEnums(String name,Integer id){ + this.id=id; + this.name=name; + } + public static String getById(Integer id){ + for(ZhiChenEnums enums:values()){ + if(enums.id==id){ + return enums.getName(); + } + } + return ""; + } + private Integer id; + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index 7aa2d7a..a6f35c4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.constants.ConstantInterface; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.UserTypeEnum; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.ZhiChenEnums; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AccessPermissionFacade; import com.lyms.platform.operate.web.result.FrontEndResult; @@ -113,7 +114,15 @@ public class UsersController extends BaseController { return frontEndResult; } - + @RequestMapping(value = "/users/enums",method = RequestMethod.GET) + @ResponseBody + public Map getEnums(){ + Map map=new HashMap(); + for(ZhiChenEnums zhiChenEnums:ZhiChenEnums.values()){ + map.put(zhiChenEnums.getId(),zhiChenEnums.getName()); + } + return map; + } /** * 获取用户列表 @@ -634,7 +643,8 @@ public class UsersController extends BaseController { @RequestParam(value = "phone", required = false) String phone, @RequestParam(value = "enable", required = false) Integer enable, @RequestParam(value = "remarks", required = false) String remarks, - @RequestParam(value = "roleIds") String roleIds) { + @RequestParam(value = "roleIds") String roleIds, + @RequestParam(value = "zhiCId")Integer zhiCId) { //获取登录用户 @@ -705,6 +715,7 @@ public class UsersController extends BaseController { users.setAccount(account); users.setPhone(phone); users.setEnable(enable); + users.setZhiChenId(zhiCId); users.setPwd(MD5Utils.md5(password).toUpperCase()); users.setRemarks(remarks); users.setKsId(ksId); @@ -713,6 +724,7 @@ public class UsersController extends BaseController { users.setYn(YnEnums.YES.getId()); users.setModified(new Date()); users.setCreated(new Date()); + users.setZhiChen(ZhiChenEnums.getById(zhiCId)); users.setLastLoginTime(new Date()); // users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));