Skip to content

W
workoffice
提交 f3d987c6 authored 作者: lgd's avatar lgd
浏览文件
操作

1.添加部门，接口未走通 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token
上级 9f0f65f5
隐藏空白字符变更
内嵌 并排
正在显示 包含 655 行增加 和 620 行删除
app/src/main/java/com/wd/workoffice/bean/DepBean.java
浏览文件 @ f3d987c6
...@@ -10,63 +10,341 @@ import java.util.List; ...@@ -10,63 +10,341 @@ import java.util.List;
**/ **/
public class DepBean { public class DepBean {
/**
* createdBy : 1
* createdByName : null
* createdTime : 2019-09-02 10:53:47
* updatedBy : 111
* updatedByName : null
* updatedTime : 2019-11-26 17:41:42
* id : 121
* parentId : CO001
* status : 1
* type : 1
* typeString : null
* outdeptLedger : {"gk":"","gt":""}
* permission : ["销售接单"]
* permissionString : null
* tag : []
* code : 0004
* name : 模具车间
* level : 2
* erpId : GK17
* children : null
* deptRulers : null
* deptRulerList : [{"createdBy":675,"createdByName":null,"createdTime":"2020-03-24 14:10:39","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":735,"userName":"13791807752","nickName":"刘中纲","identifier":null,"phone":"13791807752","email":"lghiworld@126.com","type":"2","status":"1","erpId":"EM0903001","roles":null,"permissionList":null,"ofDept":null,"access":null,"ofDeptRuler":"1","roleNames":null,"deptName":null,"roleId":null,"deptId":null},{"createdBy":111,"createdByName":null,"createdTime":"2019-11-27 09:45:02","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":686,"userName":"muju","nickName":"模具","identifier":null,"phone":"15020099999","email":"dd@dd.com","type":"2","status":"1","erpId":"58","roles":null,"permissionList":null,"ofDept":null,"access":null,"ofDeptRuler":"1","roleNames":null,"deptName":null,"roleId":null,"deptId":null}]
* deptUserList : [{"createdBy":675,"createdByName":null,"createdTime":"2020-03-24 14:10:44","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":761,"userName":"13553070808","nickName":"王慧","identifier":null,"phone":"13553070808","email":"","type":"2","status":"1","erpId":"EM1503005","roles":null,"permissionList":null,"ofDept":null,"access":null,"ofDeptRuler":"0","roleNames":null,"deptName":null,"roleId":null,"deptId":null}]
* targetUserOfRuler : null
* deptRulerTotal : null
* gk : null
* gt : null
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private int updatedBy;
private Object updatedByName;
private String updatedTime;
private int id;
private String parentId;
private String status;
private int type;
private Object typeString;
private String outdeptLedger;
private Object permissionString;
private String code;
private String name;
private int level;
private String erpId;
private Object children;
private Object deptRulers;
private Object targetUserOfRuler;
private Object deptRulerTotal;
private Object gk;
private Object gt;
private List<String> permission;
private List<String> tag;
private List<DeptRulerListBean> deptRulerList;
private List<DeptUserListBean> deptUserList;
private int ofRegisterNewDept;//传1，不是传0
public int getOfRegisterNewDept() {
return ofRegisterNewDept;
}
public void setOfRegisterNewDept(int ofRegisterNewDept) {
this.ofRegisterNewDept = ofRegisterNewDept;
}
public int getCreatedBy() {
return createdBy;
}
public void setCreatedBy(int createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public String getCreatedTime() {
return createdTime;
}
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
public int getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(int updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public String getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getParentId() {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public Object getTypeString() {
return typeString;
}
public void setTypeString(Object typeString) {
this.typeString = typeString;
}
public String getOutdeptLedger() {
return outdeptLedger;
}
public void setOutdeptLedger(String outdeptLedger) {
this.outdeptLedger = outdeptLedger;
}
public Object getPermissionString() {
return permissionString;
}
public void setPermissionString(Object permissionString) {
this.permissionString = permissionString;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getLevel() {
return level;
}
public void setLevel(int level) {
this.level = level;
}
public String getErpId() {
return erpId;
}
public void setErpId(String erpId) {
this.erpId = erpId;
}
public Object getChildren() {
return children;
}
public void setChildren(Object children) {
this.children = children;
}
public Object getDeptRulers() {
return deptRulers;
}
public void setDeptRulers(Object deptRulers) {
this.deptRulers = deptRulers;
}
public Object getTargetUserOfRuler() {
return targetUserOfRuler;
}
public void setTargetUserOfRuler(Object targetUserOfRuler) {
this.targetUserOfRuler = targetUserOfRuler;
}
public Object getDeptRulerTotal() {
return deptRulerTotal;
}
public void setDeptRulerTotal(Object deptRulerTotal) {
this.deptRulerTotal = deptRulerTotal;
}
public Object getGk() {
return gk;
}
public void setGk(Object gk) {
this.gk = gk;
}
public Object getGt() {
return gt;
}
public void setGt(Object gt) {
this.gt = gt;
}
public List<String> getPermission() {
return permission;
}
public void setPermission(List<String> permission) {
this.permission = permission;
}
public List<String> getTag() {
return tag;
}
public void setTag(List<String> tag) {
this.tag = tag;
}
public List<DeptRulerListBean> getDeptRulerList() {
return deptRulerList;
}
public void setDeptRulerList(List<DeptRulerListBean> deptRulerList) {
this.deptRulerList = deptRulerList;
}
public List<DeptUserListBean> getDeptUserList() {
return deptUserList;
}
public void setDeptUserList(List<DeptUserListBean> deptUserList) {
this.deptUserList = deptUserList;
}
public static class DeptRulerListBean {
/** /**
* createdBy : 1 * createdBy : 675
* createdByName : null * createdByName : null
* createdTime : 2019-09-02 10:53:47 * createdTime : 2020-03-24 14:10:39
* updatedBy : 111 * updatedBy : null
* updatedByName : null * updatedByName : null
* updatedTime : 2019-11-26 17:41:42 * updatedTime : null
* id : 121 * id : 735
* parentId : CO001 * userName : 13791807752
* nickName : 刘中纲
* identifier : null
* phone : 13791807752
* email : lghiworld@126.com
* type : 2
* status : 1 * status : 1
* type : 1 * erpId : EM0903001
* typeString : null * roles : null
* outdeptLedger : {"gk":"","gt":""} * permissionList : null
* permission : ["销售接单"] * ofDept : null
* permissionString : null * access : null
* tag : [] * ofDeptRuler : 1
* code : 0004 * roleNames : null
* name : 模具车间 * deptName : null
* level : 2 * roleId : null
* erpId : GK17 * deptId : null
* children : null
* deptRulers : null
* deptRulerList : [{"createdBy":675,"createdByName":null,"createdTime":"2020-03-24 14:10:39","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":735,"userName":"13791807752","nickName":"刘中纲","identifier":null,"phone":"13791807752","email":"lghiworld@126.com","type":"2","status":"1","erpId":"EM0903001","roles":null,"permissionList":null,"ofDept":null,"access":null,"ofDeptRuler":"1","roleNames":null,"deptName":null,"roleId":null,"deptId":null},{"createdBy":111,"createdByName":null,"createdTime":"2019-11-27 09:45:02","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":686,"userName":"muju","nickName":"模具","identifier":null,"phone":"15020099999","email":"dd@dd.com","type":"2","status":"1","erpId":"58","roles":null,"permissionList":null,"ofDept":null,"access":null,"ofDeptRuler":"1","roleNames":null,"deptName":null,"roleId":null,"deptId":null}]
* deptUserList : [{"createdBy":675,"createdByName":null,"createdTime":"2020-03-24 14:10:44","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":761,"userName":"13553070808","nickName":"王慧","identifier":null,"phone":"13553070808","email":"","type":"2","status":"1","erpId":"EM1503005","roles":null,"permissionList":null,"ofDept":null,"access":null,"ofDeptRuler":"0","roleNames":null,"deptName":null,"roleId":null,"deptId":null}]
* targetUserOfRuler : null
* deptRulerTotal : null
* gk : null
* gt : null
*/ */
private int createdBy; private int createdBy;
private Object createdByName; private Object createdByName;
private String createdTime; private String createdTime;
private int updatedBy; private Object updatedBy;
private Object updatedByName; private Object updatedByName;
private String updatedTime; private Object updatedTime;
private int id; private int id;
private String parentId; private String userName;
private String nickName;
private Object identifier;
private String phone;
private String email;
private String type;
private String status; private String status;
private int type;
private Object typeString;
private String outdeptLedger;
private Object permissionString;
private String code;
private String name;
private int level;
private String erpId; private String erpId;
private Object children; private Object roles;
private Object deptRulers; private Object permissionList;
private Object targetUserOfRuler; private Object ofDept;
private Object deptRulerTotal; private Object access;
private Object gk; private String ofDeptRuler;
private Object gt; private Object roleNames;
private List<String> permission; private Object deptName;
private List<String> tag; private Object roleId;
private List<DeptRulerListBean> deptRulerList; private Object deptId;
private List<DeptUserListBean> deptUserList;
public int getCreatedBy() { public int getCreatedBy() {
return createdBy; return createdBy;
...@@ -92,11 +370,11 @@ public class DepBean { ...@@ -92,11 +370,11 @@ public class DepBean {
this.createdTime = createdTime; this.createdTime = createdTime;
} }
public int getUpdatedBy() { public Object getUpdatedBy() {
return updatedBy; return updatedBy;
} }
public void setUpdatedBy(int updatedBy) { public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy; this.updatedBy = updatedBy;
} }
...@@ -108,11 +386,11 @@ public class DepBean { ...@@ -108,11 +386,11 @@ public class DepBean {
this.updatedByName = updatedByName; this.updatedByName = updatedByName;
} }
public String getUpdatedTime() { public Object getUpdatedTime() {
return updatedTime; return updatedTime;
} }
public void setUpdatedTime(String updatedTime) { public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime; this.updatedTime = updatedTime;
} }
...@@ -124,12 +402,52 @@ public class DepBean { ...@@ -124,12 +402,52 @@ public class DepBean {
this.id = id; this.id = id;
} }
public String getParentId() { public String getUserName() {
return parentId; return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public Object getIdentifier() {
return identifier;
}
public void setIdentifier(Object identifier) {
this.identifier = identifier;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getEmail() {
return email;
} }
public void setParentId(String parentId) { public void setEmail(String email) {
this.parentId = parentId; this.email = email;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
} }
public String getStatus() { public String getStatus() {
...@@ -140,639 +458,330 @@ public class DepBean { ...@@ -140,639 +458,330 @@ public class DepBean {
this.status = status; this.status = status;
} }
public int getType() { public String getErpId() {
return type; return erpId;
} }
public void setType(int type) { public void setErpId(String erpId) {
this.type = type; this.erpId = erpId;
} }
public Object getTypeString() { public Object getRoles() {
return typeString; return roles;
} }
public void setTypeString(Object typeString) { public void setRoles(Object roles) {
this.typeString = typeString; this.roles = roles;
} }
public String getOutdeptLedger() { public Object getPermissionList() {
return outdeptLedger; return permissionList;
} }
public void setOutdeptLedger(String outdeptLedger) { public void setPermissionList(Object permissionList) {
this.outdeptLedger = outdeptLedger; this.permissionList = permissionList;
} }
public Object getPermissionString() { public Object getOfDept() {
return permissionString; return ofDept;
} }
public void setPermissionString(Object permissionString) { public void setOfDept(Object ofDept) {
this.permissionString = permissionString; this.ofDept = ofDept;
} }
public String getCode() { public Object getAccess() {
return code; return access;
} }
public void setCode(String code) { public void setAccess(Object access) {
this.code = code; this.access = access;
} }
public String getName() { public String getOfDeptRuler() {
return name; return ofDeptRuler;
} }
public void setName(String name) { public void setOfDeptRuler(String ofDeptRuler) {
this.name = name; this.ofDeptRuler = ofDeptRuler;
} }
public int getLevel() { public Object getRoleNames() {
return level; return roleNames;
} }
public void setLevel(int level) { public void setRoleNames(Object roleNames) {
this.level = level; this.roleNames = roleNames;
} }
public String getErpId() { public Object getDeptName() {
return erpId; return deptName;
} }
public void setErpId(String erpId) { public void setDeptName(Object deptName) {
this.erpId = erpId; this.deptName = deptName;
} }
public Object getChildren() { public Object getRoleId() {
return children; return roleId;
} }
public void setChildren(Object children) { public void setRoleId(Object roleId) {
this.children = children; this.roleId = roleId;
} }
public Object getDeptRulers() { public Object getDeptId() {
return deptRulers; return deptId;
} }
public void setDeptRulers(Object deptRulers) { public void setDeptId(Object deptId) {
this.deptRulers = deptRulers; this.deptId = deptId;
} }
}
public static class DeptUserListBean {
/**
* createdBy : 675
* createdByName : null
* createdTime : 2020-03-24 14:10:44
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 761
* userName : 13553070808
* nickName : 王慧
* identifier : null
* phone : 13553070808
* email :
* type : 2
* status : 1
* erpId : EM1503005
* roles : null
* permissionList : null
* ofDept : null
* access : null
* ofDeptRuler : 0
* roleNames : null
* deptName : null
* roleId : null
* deptId : null
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private int id;
private String userName;
private String nickName;
private Object identifier;
private String phone;
private String email;
private String type;
private String status;
private String erpId;
private Object roles;
private Object permissionList;
private Object ofDept;
private Object access;
private String ofDeptRuler;
private Object roleNames;
private Object deptName;
private Object roleId;
private Object deptId;
public Object getTargetUserOfRuler() { public int getCreatedBy() {
return targetUserOfRuler; return createdBy;
} }
public void setTargetUserOfRuler(Object targetUserOfRuler) { public void setCreatedBy(int createdBy) {
this.targetUserOfRuler = targetUserOfRuler; this.createdBy = createdBy;
} }
public Object getDeptRulerTotal() { public Object getCreatedByName() {
return deptRulerTotal; return createdByName;
} }
public void setDeptRulerTotal(Object deptRulerTotal) { public void setCreatedByName(Object createdByName) {
this.deptRulerTotal = deptRulerTotal; this.createdByName = createdByName;
} }
public Object getGk() { public String getCreatedTime() {
return gk; return createdTime;
} }
public void setGk(Object gk) { public void setCreatedTime(String createdTime) {
this.gk = gk; this.createdTime = createdTime;
}
public Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
} }
public Object getGt() { public Object getUpdatedByName() {
return gt; return updatedByName;
} }
public void setGt(Object gt) { public void setUpdatedByName(Object updatedByName) {
this.gt = gt; this.updatedByName = updatedByName;
} }
public List<String> getPermission() { public Object getUpdatedTime() {
return permission; return updatedTime;
} }
public void setPermission(List<String> permission) { public void setUpdatedTime(Object updatedTime) {
this.permission = permission; this.updatedTime = updatedTime;
} }
public List<String> getTag() { public int getId() {
return tag; return id;
} }
public void setTag(List<String> tag) { public void setId(int id) {
this.tag = tag; this.id = id;
} }
public List<DeptRulerListBean> getDeptRulerList() { public String getUserName() {
return deptRulerList; return userName;
} }
public void setDeptRulerList(List<DeptRulerListBean> deptRulerList) { public void setUserName(String userName) {
this.deptRulerList = deptRulerList; this.userName = userName;
} }
public List<DeptUserListBean> getDeptUserList() { public String getNickName() {
return deptUserList; return nickName;
} }
public void setDeptUserList(List<DeptUserListBean> deptUserList) { public void setNickName(String nickName) {
this.deptUserList = deptUserList; this.nickName = nickName;
} }
public static class DeptRulerListBean { public Object getIdentifier() {
/** return identifier;
* createdBy : 675 }
* createdByName : null
* createdTime : 2020-03-24 14:10:39
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 735
* userName : 13791807752
* nickName : 刘中纲
* identifier : null
* phone : 13791807752
* email : lghiworld@126.com
* type : 2
* status : 1
* erpId : EM0903001
* roles : null
* permissionList : null
* ofDept : null
* access : null
* ofDeptRuler : 1
* roleNames : null
* deptName : null
* roleId : null
* deptId : null
*/
private int createdBy; public void setIdentifier(Object identifier) {
private Object createdByName; this.identifier = identifier;
private String createdTime; }
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private int id;
private String userName;
private String nickName;
private Object identifier;
private String phone;
private String email;
private String type;
private String status;
private String erpId;
private Object roles;
private Object permissionList;
private Object ofDept;
private Object access;
private String ofDeptRuler;
private Object roleNames;
private Object deptName;
private Object roleId;
private Object deptId;
public int getCreatedBy() { public String getPhone() {
return createdBy; return phone;
} }
public void setCreatedBy(int createdBy) { public void setPhone(String phone) {
this.createdBy = createdBy; this.phone = phone;
} }
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public String getCreatedTime() {
return createdTime;
}
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
public Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public Object getIdentifier() {
return identifier;
}
public void setIdentifier(Object identifier) {
this.identifier = identifier;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getType() { public String getEmail() {
return type; return email;
} }
public void setType(String type) { public void setEmail(String email) {
this.type = type; this.email = email;
} }
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getErpId() {
return erpId;
}
public void setErpId(String erpId) {
this.erpId = erpId;
}
public Object getRoles() {
return roles;
}
public void setRoles(Object roles) {
this.roles = roles;
}
public Object getPermissionList() {
return permissionList;
}
public void setPermissionList(Object permissionList) {
this.permissionList = permissionList;
}
public Object getOfDept() {
return ofDept;
}
public void setOfDept(Object ofDept) {
this.ofDept = ofDept;
}
public Object getAccess() {
return access;
}
public void setAccess(Object access) {
this.access = access;
}
public String getOfDeptRuler() {
return ofDeptRuler;
}
public void setOfDeptRuler(String ofDeptRuler) {
this.ofDeptRuler = ofDeptRuler;
}
public Object getRoleNames() {
return roleNames;
}
public void setRoleNames(Object roleNames) {
this.roleNames = roleNames;
}
public Object getDeptName() {
return deptName;
}
public void setDeptName(Object deptName) {
this.deptName = deptName;
}
public Object getRoleId() {
return roleId;
}
public void setRoleId(Object roleId) {
this.roleId = roleId;
}
public Object getDeptId() {
return deptId;
}
public void setDeptId(Object deptId) {
this.deptId = deptId;
}
}
public static class DeptUserListBean {
/**
* createdBy : 675
* createdByName : null
* createdTime : 2020-03-24 14:10:44
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 761
* userName : 13553070808
* nickName : 王慧
* identifier : null
* phone : 13553070808
* email :
* type : 2
* status : 1
* erpId : EM1503005
* roles : null
* permissionList : null
* ofDept : null
* access : null
* ofDeptRuler : 0
* roleNames : null
* deptName : null
* roleId : null
* deptId : null
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private int id;
private String userName;
private String nickName;
private Object identifier;
private String phone;
private String email;
private String type;
private String status;
private String erpId;
private Object roles;
private Object permissionList;
private Object ofDept;
private Object access;
private String ofDeptRuler;
private Object roleNames;
private Object deptName;
private Object roleId;
private Object deptId;
public int getCreatedBy() {
return createdBy;
}
public void setCreatedBy(int createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public String getCreatedTime() {
return createdTime;
}
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
public Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public Object getIdentifier() {
return identifier;
}
public void setIdentifier(Object identifier) {
this.identifier = identifier;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getType() { public String getType() {
return type; return type;
} }
public void setType(String type) { public void setType(String type) {
this.type = type; this.type = type;
} }
public String getStatus() { public String getStatus() {
return status; return status;
} }
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
} }
public String getErpId() { public String getErpId() {
return erpId; return erpId;
} }
public void setErpId(String erpId) { public void setErpId(String erpId) {
this.erpId = erpId; this.erpId = erpId;
} }
public Object getRoles() { public Object getRoles() {
return roles; return roles;
} }
public void setRoles(Object roles) { public void setRoles(Object roles) {
this.roles = roles; this.roles = roles;
} }
public Object getPermissionList() { public Object getPermissionList() {
return permissionList; return permissionList;
} }
public void setPermissionList(Object permissionList) { public void setPermissionList(Object permissionList) {
this.permissionList = permissionList; this.permissionList = permissionList;
} }
public Object getOfDept() { public Object getOfDept() {
return ofDept; return ofDept;
} }
public void setOfDept(Object ofDept) { public void setOfDept(Object ofDept) {
this.ofDept = ofDept; this.ofDept = ofDept;
} }
public Object getAccess() { public Object getAccess() {
return access; return access;
} }
public void setAccess(Object access) { public void setAccess(Object access) {
this.access = access; this.access = access;
} }
public String getOfDeptRuler() { public String getOfDeptRuler() {
return ofDeptRuler; return ofDeptRuler;
} }
public void setOfDeptRuler(String ofDeptRuler) { public void setOfDeptRuler(String ofDeptRuler) {
this.ofDeptRuler = ofDeptRuler; this.ofDeptRuler = ofDeptRuler;
} }
public Object getRoleNames() { public Object getRoleNames() {
return roleNames; return roleNames;
} }
public void setRoleNames(Object roleNames) { public void setRoleNames(Object roleNames) {
this.roleNames = roleNames; this.roleNames = roleNames;
} }
public Object getDeptName() { public Object getDeptName() {
return deptName; return deptName;
} }
public void setDeptName(Object deptName) { public void setDeptName(Object deptName) {
this.deptName = deptName; this.deptName = deptName;
} }
public Object getRoleId() { public Object getRoleId() {
return roleId; return roleId;
} }
public void setRoleId(Object roleId) { public void setRoleId(Object roleId) {
this.roleId = roleId; this.roleId = roleId;
} }
public Object getDeptId() { public Object getDeptId() {
return deptId; return deptId;
} }
public void setDeptId(Object deptId) { public void setDeptId(Object deptId) {
this.deptId = deptId; this.deptId = deptId;
}
} }
} }
}
app/src/main/java/com/wd/workoffice/bean/event/AddDepEvent.java
浏览文件 @ f3d987c6
package com.wd.workoffice.bean.event; package com.wd.workoffice.bean.event;
import com.wd.workoffice.bean.DepBean;
/** /**
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class AddDepEvent { public class AddDepEvent {
DepBean depBean;
public AddDepEvent() { public AddDepEvent(DepBean depBean) {
this.depBean = depBean;
}
public DepBean getDepBean() {
return depBean;
} }
public void setDepBean(DepBean depBean) {
this.depBean = depBean;
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/login/UserRegisterDepActivity.java
浏览文件 @ f3d987c6
package com.wd.workoffice.ui.activity.login; package com.wd.workoffice.ui.activity.login;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
...@@ -19,10 +15,8 @@ import com.wd.workoffice.app.BaseBean; ...@@ -19,10 +15,8 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean; import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.event.AddDepEvent; import com.wd.workoffice.bean.event.AddDepEvent;
import com.wd.workoffice.bean.event.CheckAddStockEvent;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.order.SendApplyAddActivity;
import com.wd.workoffice.ui.adapter.WorkChooseDepAdapter; import com.wd.workoffice.ui.adapter.WorkChooseDepAdapter;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -30,7 +24,6 @@ import org.greenrobot.eventbus.Subscribe; ...@@ -30,7 +24,6 @@ import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
...@@ -112,6 +105,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity { ...@@ -112,6 +105,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity {
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra("depName", dataList.get(position).getName()); intent.putExtra("depName", dataList.get(position).getName());
intent.putExtra("depId", dataList.get(position).getId()); intent.putExtra("depId", dataList.get(position).getId());
intent.putExtra("dep", JSON.toJSONString(dataList.get(position)));
setResult(10001, intent); setResult(10001, intent);
finish(); finish();
} }
...@@ -122,6 +116,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity { ...@@ -122,6 +116,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity {
protected int layoutId() { protected int layoutId() {
return R.layout.activity_register_dep; return R.layout.activity_register_dep;
} }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add, menu); getMenuInflater().inflate(R.menu.menu_add, menu);
...@@ -137,6 +132,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity { ...@@ -137,6 +132,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity {
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
...@@ -151,6 +147,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity { ...@@ -151,6 +147,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity {
@Subscribe @Subscribe
public void refresh(AddDepEvent event) { public void refresh(AddDepEvent event) {
getData(); dataList.add(0, event.getDepBean());
dataAdapter.notifyDataSetChanged();
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/login/UserRegisterDepAddActivity.java
浏览文件 @ f3d987c6
...@@ -12,6 +12,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog; ...@@ -12,6 +12,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.event.AddDepEvent; import com.wd.workoffice.bean.event.AddDepEvent;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
...@@ -53,7 +54,7 @@ public class UserRegisterDepAddActivity extends WorkToolBarActivity { ...@@ -53,7 +54,7 @@ public class UserRegisterDepAddActivity extends WorkToolBarActivity {
typeDialog.addItems(type, new DialogInterface.OnClickListener() { typeDialog.addItems(type, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
chooseType = which+1; chooseType = which + 1;
tvType.setText(type[which]); tvType.setText(type[which]);
dialog.dismiss(); dialog.dismiss();
} }
...@@ -85,29 +86,37 @@ public class UserRegisterDepAddActivity extends WorkToolBarActivity { ...@@ -85,29 +86,37 @@ public class UserRegisterDepAddActivity extends WorkToolBarActivity {
param.put("type", chooseType); param.put("type", chooseType);
param.put("name", name); param.put("name", name);
param.put("code", code); param.put("code", code);
RtfUtils.getRtf().addDep(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { DepBean depBean = new DepBean();
@Override depBean.setType(chooseType);
public void doOnSubscribe(Disposable d) { depBean.setName(name);
} depBean.setCode(code);
depBean.setOfRegisterNewDept(1);
@Override EventBus.getDefault().post(new AddDepEvent(depBean));
public void onFail(String errorMsg) { finish();
hideLoading();
toast(errorMsg); // RtfUtils.getRtf().addDep(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
} // @Override
// public void doOnSubscribe(Disposable d) {
@Override // }
public void onSuccess(BaseBean data) { //
hideLoading(); // @Override
if (data.getCode() != 0) { // public void onFail(String errorMsg) {
toast(data.getMessage()); // hideLoading();
return; // toast(errorMsg);
} // }
EventBus.getDefault().post(new AddDepEvent()); //
toast("添加成功"); // @Override
finish(); // public void onSuccess(BaseBean data) {
} // hideLoading();
}); // if (data.getCode() != 0) {
// toast(data.getMessage());
// return;
// }
// EventBus.getDefault().post(new AddDepEvent());
// toast("添加成功");
// finish();
// }
// });
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/login/UserRegisterThreeActivity.java
浏览文件 @ f3d987c6
...@@ -10,6 +10,7 @@ import android.widget.EditText; ...@@ -10,6 +10,7 @@ import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean; import com.wd.workoffice.bean.DepBean;
...@@ -53,6 +54,7 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us ...@@ -53,6 +54,7 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us
private int chooseDep = -1; private int chooseDep = -1;
private AlertDialog.Builder builder; private AlertDialog.Builder builder;
private Integer depId; private Integer depId;
private DepBean dep;
@Override @Override
protected void initView() { protected void initView() {
...@@ -126,7 +128,7 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us ...@@ -126,7 +128,7 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us
startActivityForResult(UserRegisterDepActivity.class, 10001); startActivityForResult(UserRegisterDepActivity.class, 10001);
break; break;
case R.id.btn_submit: case R.id.btn_submit:
if (depId == null) { if (dep == null) {
toast("请选择部门"); toast("请选择部门");
return; return;
} }
...@@ -137,7 +139,14 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us ...@@ -137,7 +139,14 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us
param.put("email", etEmail.getText().toString()); param.put("email", etEmail.getText().toString());
param.put("phone", getIntent().getStringExtra("phone")); param.put("phone", getIntent().getStringExtra("phone"));
// param.put("erpId", ""); // param.put("erpId", "");
param.put("deptId", depId); param.put("ofRegisterNewDept", dep.getOfRegisterNewDept());
if (dep.getOfRegisterNewDept()==1){
param.put("newDeptName", dep.getName());
param.put("newDeptErpId", dep.getCode());
param.put("newDeptType", dep.getType());
}else {
param.put("deptId", dep.getId());
}
param.put("verifyCode", getIntent().getStringExtra("code")); param.put("verifyCode", getIntent().getStringExtra("code"));
userRegisterThreePresenter.register(param); userRegisterThreePresenter.register(param);
break; break;
...@@ -179,6 +188,7 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us ...@@ -179,6 +188,7 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us
String depName = data.getStringExtra("depName"); String depName = data.getStringExtra("depName");
depId = data.getIntExtra("id", 0); depId = data.getIntExtra("id", 0);
tvProductContent.setText(depName); tvProductContent.setText(depName);
dep = JSON.parseObject(data.getStringExtra("dep"), DepBean.class);
} }
} }
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论