I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/dev' into test

Browse Source
yun-zuoyi
Silliter 6 years ago
parent 8fa14247f5 b4e1d97d10
commit a4d59caaeb
16 changed files with 552 additions and 89 deletions
Show Stats Download Patch File Download Diff File

34
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -1446,7 +1446,8 @@ public class WmsEnumUtil {
public enum ACTION_MOUDULE_PARAM_TYPE {
CHECKLIST(1, "可选列表"),
NUMBER(10, "数字"),
STRING(20, "字符串");
STRING(20, "字符串"),
OUT_OR_UNNECESSARY(30, "出参或者不必需的参数");
private int value;
private String description;
@ -1837,5 +1838,36 @@ public class WmsEnumUtil {
}
}
/**
* 可选项类型枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OPTION_TYPE {
OPTIONS(10, "OPTIONS", "可选项"),
BUTTON(20, "BUTTON", "按钮");
private String code;
private String description;
int value;
OPTION_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
}

202
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java
Unescape Escape View File

@ -0,0 +1,202 @@
package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-12-22 17:29
* @Modify:
**/
@Data
public class UserDetailModel extends BaseBean {
@ApiParam(value ="账号ID")
private String userId;
@ApiParam(value ="用户ID")
private String userInfoId;
@ApiParam(value ="用户语言")
private String userLanguageCode;
@ApiParam(value ="登陆名称" , access ="登陆名称")
private String userLoginName;
@ApiParam(value ="登陆密码")
private String userLoginPassword;
@ApiParam(value ="邮箱" , access ="邮箱")
private String userEmail;
@ApiParam(value ="手机号" , access ="手机号")
private String userPhone;
@ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
private Integer userStatus;
@ApiParam(value ="组织ID 集合")
private List<String> userOrganizeIdList;
@ApiParam(value ="部门ID")
private String userDepartmentId;
@ApiParam(value ="部门ID 集合")
private List<String> userDepartmentIdList;
@ApiParam(value ="角色ID 集合")
private List<String> userRoleIdList;
@ApiParam(value ="姓名" , access ="名称")
private String infoName;
@ApiParam(value ="工号")
private String infoEmpNo;
@ApiParam(value ="员工类型", access ="实习、试用期、正式")
private Integer infoEmployeeType;
@ApiParam(value ="员工等级")
private Integer infoGrade;
@ApiParam(value ="入职日期" , access ="默认当前时间")
private String infoJoinDate;
@ApiParam(value ="离职日期" , access ="默认当前时间")
private String infoResignationDate;
@ApiParam(value ="证件类型")
private Integer infoCardType;
@ApiParam(value ="证件编号")
private String infoCardNumber;
@ApiParam(value ="毕业院校")
private String infoSchool;
@ApiParam(value ="毕业专业")
private String infoSchoolProfession;
@ApiParam(value ="毕业时间")
private String infoSchoolLeaveDate;
@ApiParam(value ="学历")
private Integer infoSchoolEducation;
@ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）")
private Integer infoSex;
@ApiParam(value ="籍贯")
private String infoBirthplace;
@ApiParam(value ="种族")
private Integer infoRace;
@ApiParam(value ="婚姻" , example ="1" , access ="性别（1.未知，2.已婚,3未婚）")
private Integer infoMarriage;
@ApiParam(value ="紧急联系人")
private String infoEmergencyContact;
@ApiParam(value ="紧急联系人-电话")
private String infoEmergencyPhone;
@ApiParam(value ="家庭地址")
private String infoFamilyAddress;
@ApiParam(value ="出生日期")
private String infoBornDate;
@ApiParam(value ="政治面貌")
private Integer infoPoliticalStatus;
@ApiParam(value ="兴趣爱好")
private String infoHobby;
@ApiParam(value ="用户状态" , example ="-1")
private Integer infoStatus;
@ApiParam(value ="用户图像" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private String infoImageId;
@ApiParam(value ="部门ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private String infoDepartmentId;
@ApiParam(value ="岗位ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private String infoPositionId;
@ApiParam(value ="组织ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private String infoOrganizeId;
@ApiParam(value ="用户所有部门信息")
private List<String> infoDepartmentIdList;
@ApiParam(value ="用户所有岗位信息")
private List<String> infoPositionIdList;
@ApiParam(value ="用户所有组织信息")
private List<String> infoOrganizeIdList;
public SysUser getSysUser(){
SysUser user = new SysUser();
user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null);
user.setUserInfoId(!StringUtils.isBlank(this.userInfoId) ? Long.parseLong(this.userInfoId) : null);
user.setUserLoginName(this.userLoginName);
user.setUserEmpNo(this.infoEmpNo);
user.setUserName(this.infoName);
user.setUserEmail(this.userEmail);
user.setUserPhone(this.userPhone);
user.setUserLoginPassword(this.userLoginPassword);
user.setLanguageCode(this.userLanguageCode);
return user;
}
public SysUserInfo getSysUserInfo(){
SysUserInfo info = new SysUserInfo();
info.setId(!StringUtils.isAnyBlank(this.userInfoId)? Long.parseLong(this.userInfoId) : null);
info.setUserId(!StringUtils.isAnyBlank(this.userId)? Long.parseLong(this.userId) : null);
info.setUserImageId(!StringUtils.isAnyBlank(this.infoImageId)? Long.parseLong(this.infoImageId) : null);
info.setPositionId(!StringUtils.isAnyBlank(this.infoPositionId)? Long.parseLong(this.infoPositionId) : null);
info.setName(this.infoName);
info.setUserEmpNo(this.infoEmpNo);
info.setUserJoinDate(this.infoJoinDate);
info.setUserResignationDate(this.infoResignationDate);
info.setUserCardType(this.infoCardType);
info.setUserCardNumber(this.infoCardNumber);
info.setUserSchool(this.infoSchool);
info.setUserSchoolProfession(this.infoSchoolProfession);
info.setUserSchoolLeaveDate(this.infoSchoolLeaveDate);
info.setUserSchoolEducation(this.infoSchoolEducation);
info.setUserSex(this.infoSex);
info.setUserBirthplace(this.infoBirthplace);
info.setUserRace(this.infoRace);
info.setUserMarriage(this.infoMarriage);
info.setUserEmergencyContact(this.infoEmergencyContact);
info.setUserEmergencyPhone(this.infoEmergencyPhone);
info.setUserFamilyAddress(this.infoFamilyAddress);
info.setUserBornDate(this.infoBornDate);
info.setUserHobby(this.infoHobby);
info.setUserPoliticalStatus(this.infoPoliticalStatus);
info.setUserGrade(this.infoGrade);
info.setUserEmployeeType(this.infoEmployeeType);
return info;
}
}

11
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java
Unescape Escape View File

@ -17,4 +17,15 @@ public class OptionModel {
private String name;
private Integer value;
/**
* 10=复选框，20=按钮，显示到查看历史左侧
*/
private Integer type;
/**
* 当Type=20时，此值代表需要跳转的步骤，前台要把此值放到
* OperationBean. barcode字段并反馈给后台，流程管家使用此值处理
*/
private String content;
}

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java
Unescape Escape View File

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description : 操作人对象，用于登陆，非持久化

2
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java
Unescape Escape View File

@ -28,7 +28,7 @@ import java.text.DecimalFormat;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_REF_USER_DEPARTMENT")
@Api(value="关系-用户部门",description = "关系-用户部门")
@Api(value="关系-账号部门",description = "关系-账号部门")
public class SysRefUserDepartment extends BaseBean {
@Column(name="USER_ID")

69
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java
Unescape Escape View File

@ -0,0 +1,69 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 关系-用户部门
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.239
* @Modify :
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_REF_USER_INFO_DEPARTMENT")
@Api(value="关系-用户部门",description = "关系-用户部门")
public class SysRefUserInfoDepartment extends BaseBean {
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name="USER_NAME")
@ApiParam(value ="用户名称")
private String userNameRdd;
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称")
private String departmentNameRdd;
@Column(name="ORGANIZE_ID")
@ApiParam(value ="组织ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
@Column(name="ORGANIZE_NAME_RDD")
@ApiParam(value ="组织名称")
private String organizeNameRdd;
public SysRefUserInfoDepartment() {
}
public SysRefUserInfoDepartment(Long userId, String userName, Long departmentId, String departmentNameRdd) {
this.userId = userId;
this.userNameRdd = userName;
this.departmentId = departmentId;
this.departmentNameRdd = departmentNameRdd;
}
}

102
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
Unescape Escape View File

@ -17,7 +17,7 @@ import javax.persistence.Transient;
import java.util.List;
/**
* @Description : 用户登陆表
* @Description : 账号登陆表
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-10-11 11:02
@ -28,37 +28,38 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="sys_user")
@Api(value="用户登陆表",description = "用户登陆系统账户。")
@Table(name="SYS_USER")
@Api(value="账号登陆表",description = "账号登陆系统账户。")
public class SysUser extends BaseBean {
private static final long serialVersionUID = 1L;
@Column(name="USER_INFO_ID")
@ApiParam(value ="用户ID" , example = "0")
@ApiParam(value ="人员ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userInfoId;
@Column(name="LANGUAGE_CODE")
@ApiParam(value ="用户语言")
private String languageCode;
@Column(name="USER_NAME_RDD")
@ApiParam(value ="用户名称" , access ="用户名称")
@ApiParam(value ="用户名称" , access ="账号名称")
private String userName;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="登陆名称" , access ="登陆名称")
private String userLoginName;
@Column(name="USER_EMP_NO")
@ApiParam(value ="工号")
private String userEmpNo;
@Column(name="USER_LOGIN_PASSWORD")
@ApiParam(value ="登陆密码")
private String userLoginPassword;
@Column(name="ROLE_ID")
@ApiParam(value ="角色ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
@Column(name="ROLE_NAME_RDD")
@ApiParam(value ="角色名称" , access ="角色名称")
private String roleNameRdd;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
private Integer userType;
@Column(name="USER_EMAIL")
@ApiParam(value ="邮箱" , access ="邮箱")
@ -69,35 +70,86 @@ public class SysUser extends BaseBean {
private String userPhone;
@Column(name="USER_STATUS")
@ApiParam(value ="用户状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
@ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
private Integer userStatus;
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="用户最后登录时间")
private String userLoginLastDateTime;
@Column(name="USER_LOGIN_NUM")
@ApiParam(value ="登录次数",example = "0")
private Integer userLoginNum;
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="账号最后登录时间")
private String userLoginLastDateTime;
/********************************** 关系信息 ********************************/
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
@Column(name="ORGANIZE_ID")
@ApiParam(value ="组织ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
/********************************** 冗余信息 ********************************/
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称" , access ="部门名称")
private String departmentNameRdd;
@Column(name="USER_TYPE")
@ApiParam(value ="用户类型（枚举，待定）" , example ="-1")
private Integer userType;
@Column(name="ORGANIZE_NAME_RDD")
@ApiParam(value ="组织名称" , access ="组织名称")
private String organizeNameRdd;
@Column(name="ROLE_NAMES_RDD",columnDefinition = "TEXT")
@ApiParam(value ="角色名称集合")
private String roleNamesRdd;
@Column(name="DEPARTMENT_NAMES_RDD",columnDefinition = "TEXT")
@ApiParam(value ="部门名称集合")
private String departmentNamesRdd;
@Column(name="ORGANIZE_NAMES_RDD",columnDefinition = "TEXT")
@ApiParam(value ="组织名称集合")
private String organizeNamesRdd;
/********************************** 非数据库信息 ********************************/
@Transient
@ApiParam(value ="用户部门信息")
private SysDepartment department;
@Transient
@ApiParam(value ="用户组织信息")
private SysOrganize organize;
@Transient
@ApiParam(value ="用户所有角色信息")
@ApiParam(value ="账号所有操作组织信息")
private List<SysOrganize> organizeList;
@Transient
@ApiParam(value ="账号所有操作部门信息")
private List<SysDepartment> departmentList;
@Transient
@ApiParam(value ="角色ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private String roleId;
@Transient
@ApiParam(value ="角色ID集合" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private List<Long> roleIdList;
@Transient
@ApiParam(value ="账号所有角色信息")
private List<SysRole> roleList;
@Transient
@ApiParam(value ="用户所有权限信息")
@ApiParam(value ="账号所有操作权限信息")
private List<SysMenu> menuList;
}

169
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
Unescape Escape View File

@ -33,6 +33,11 @@ import java.util.List;
@Api(value="用户详细",description = "用户详细")
public class SysUserInfo extends BaseBean {
@Column(name="USER_ID")
@ApiParam(value ="账号ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;
@ -41,22 +46,104 @@ public class SysUserInfo extends BaseBean {
@ApiParam(value ="工号")
private String userEmpNo;
@Column(name="LANGUAGE_CODE")
@ApiParam(value ="用户语言")
private String languageCode;
@Column(name="USER_EMPLOYEE_TYPE")
@ApiParam(value ="员工类型", access ="实习、试用期、正式")
private Integer userEmployeeType;
@Column(name="USER_IMAGE_ID")
@ApiParam(value ="用户图像" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userImageId;
@Column(name="USER_GRADE")
@ApiParam(value ="员工等级")
private Integer userGrade;
@Column(name="USER_JOIN_DATE")
@ApiParam(value ="入职日期" , access ="默认当前时间")
private String userJoinDate;
@Column(name="USER_RESIGNATION_DATE")
@ApiParam(value ="离职日期" , access ="默认当前时间")
private String userResignationDate;
@Column(name="USER_CARD_TYPE")
@ApiParam(value ="证件类型")
private Integer userCardType;
@Column(name="USER_CARD_NUMBER")
@ApiParam(value ="证件编号")
private String userCardNumber;
@Column(name="USER_SCHOOL")
@ApiParam(value ="毕业院校")
private String userSchool;
@Column(name="USER_SCHOOL_PROFESSION")
@ApiParam(value ="毕业专业")
private String userSchoolProfession;
@Column(name="USER_SCHOOL_LEAVE_DATE")
@ApiParam(value ="毕业时间")
private String userSchoolLeaveDate;
@Column(name="user_School_Education")
@ApiParam(value ="学历")
private Integer userSchoolEducation;
@Column(name="USER_SEX")
@ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）")
private Integer userSex;
@Column(name="USER_AGE")
@ApiParam(value ="年龄" , example ="1" , access ="年龄")
private Integer userAge;
@Column(name="USER_BIRTHPLACE")
@ApiParam(value ="籍贯")
private String userBirthplace;
@Column(name="USER_RACE")
@ApiParam(value ="种族")
private Integer userRace;
@Column(name="USER_MARRIAGE")
@ApiParam(value ="婚姻" , example ="1" , access ="性别（1.未知，2.已婚,3未婚）")
private Integer userMarriage;
@Column(name="USER_EMERGENCY_CONTACT")
@ApiParam(value ="紧急联系人")
private String userEmergencyContact;
@Column(name="USER_EMERGENCY_PHONE")
@ApiParam(value ="紧急联系人-电话")
private String userEmergencyPhone;
@Column(name="USER_FAMILY_ADDRESS")
@ApiParam(value ="家庭地址")
private String userFamilyAddress;
@Column(name="USER_BORN_DATE")
@ApiParam(value ="出生日期")
private String userBornDate;
@Column(name="USER_POLITICAL_STATUS")
@ApiParam(value ="政治面貌")
private Integer userPoliticalStatus;
@Column(name="USER_HOBBY")
@ApiParam(value ="兴趣爱好")
private String userHobby;
@Column(name="USER_INFO_STATUS")
@ApiParam(value ="用户状态" , example ="-1")
private Integer userInfoStatus;
@Column(name="USER_LOGIN_NUM")
@ApiParam(value ="登录次数",example = "0")
private Integer userLoginNum;
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="用户最后登录时间")
private String userLoginLastDateTime;
/********************************** 关系信息 ********************************/
@Column(name="USER_IMAGE_ID")
@ApiParam(value ="用户图像" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userImageId;
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example ="-1")
@ -73,76 +160,48 @@ public class SysUserInfo extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
/********************************** 冗余信息 ********************************/
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称" , access ="部门名称")
private String departmentNameRdd;
@Column(name="DEPARTMENT_NAMES_RDD")
@ApiParam(value ="部门集合" , access ="部门集合")
private String departmentNamesRdd;
@Column(name="POSITION_NAMES_RDD")
@ApiParam(value ="岗位集合" , access ="岗位集合")
private String positionNamesRdd;
@Column(name="ORGANIZE_NAMES_RDD")
@ApiParam(value ="组织集合" , access ="组织集合")
private String organizeNamesRdd;
@Column(name="POSITION_NAME_RDD")
@ApiParam(value ="岗位名称" , access ="岗位名称")
private String positionNameRdd;
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称" , access ="部门名称")
private String departmentNameRdd;
@Column(name="POSITION_NAMES_RDD")
@ApiParam(value ="岗位集合" , access ="岗位集合")
private String positionNamesRdd;
@Column(name="ORGANIZE_NAME_RDD")
@ApiParam(value ="组织名称" , access ="组织名称")
private String organizeNameRdd;
@Column(name="USER_ONLINE_STATUS")
@ApiParam(value ="是否在线(枚举：1.在线，2.离线)" , example ="-1")
private Integer userOnlineStatus;
@Column(name="USER_INFO_STATUS")
@ApiParam(value ="用户状态" , example ="-1")
private Integer userInfoStatus;
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="用户最后登录时间")
private String userLoginLastDateTime;
@Column(name="USER_LOGIN_NUM")
@ApiParam(value ="登录次数",example = "0")
private Integer userLoginNum;
@Column(name="ORGANIZE_NAMES_RDD")
@ApiParam(value ="组织集合" , access ="组织集合")
private String organizeNamesRdd;
@Column(name="USER_NUM")
@ApiParam(value ="用户账号数",example = "0")
private Integer userNum;
/********************************** 非数据库信息 ********************************/
@Transient
@ApiParam(value ="用户所有部门信息")
private List<SysDepartment> departmentList;
@Transient
@ApiParam("用户的部门ID信息集合")
private List<String> departmentIdList;
@Transient
@ApiParam(value ="用户所有岗位信息")
private List<SysPosition> positionList;
@Transient
@ApiParam("用户的岗位ID信息")
private List<String> positionIdList;
@Transient
@ApiParam(value ="用户所有组织信息")
private List<SysOrganize> organizeList;
@Transient
@ApiParam("用户的组织ID信息集合")
private List<String> organizeIdList;
@Transient
@ApiParam(value ="用户岗位信息")
@ApiParam(value ="用户部门信息")
private SysDepartment department;
@Transient
@ -150,11 +209,7 @@ public class SysUserInfo extends BaseBean {
private SysOrganize organize;
@Transient
@ApiParam(value = "岗位信息",access = "用户主岗位信息")
@ApiParam(value = "岗位信息")
private SysPosition position;
@Transient
@JsonIgnore
@ApiParam(value ="用户详细信息")
private SysUser user;
}

2
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserDepartmentRepository.java
Unescape Escape View File

@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
/**
* @Description : 关系-用户部门
* @Description : 关系-账号部门
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 12:03:00.596

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserInfoDepartmentRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserInfoDepartment;
/**
* @Description : 关系-用户部门
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 12:03:00.596
* @Modify :
**/
public interface SysRefUserInfoDepartmentRepository extends BaseRepository<SysRefUserInfoDepartment, Long> {
}

9
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -323,10 +323,14 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer();
// And X = X
HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result);
HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result);
HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
if(user.getRoleIdList() != null){
HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result);
}
// And Like % %
HqlPack.getStringLikerPack(user.getUserName(),"userName",result);
HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
@ -377,6 +381,7 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer();
// And
HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result);
HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
Unescape Escape View File

@ -73,5 +73,13 @@ public class WmsActionGroupDetails extends BaseBean {
@ApiParam(value = "流程名称")
private String agName;
@Column(name = "GOTO_BTN_CODE")
@ApiParam(value = "跳转按钮代码")
private String goToBtnCode;
@Column(name = "GOTO_BTN_NAME")
@ApiParam(value = "跳转按钮名称")
private String goToBtnName;
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java
Unescape Escape View File

@ -101,6 +101,14 @@ public class WmsActionLogDetails extends BaseBean {
@ApiParam(value = "结束执行时间")
public String endTime;
@Column(name = "GOTO_BTN_CODE")
@ApiParam(value = "跳转按钮代码")
private String goToBtnCode;
@Column(name = "GOTO_BTN_NAME")
@ApiParam(value = "跳转按钮名称")
private String goToBtnName;
public WmsActionLogDetails() {
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
Unescape Escape View File

@ -30,7 +30,7 @@ public class WmsActionResponseBean<Obj> {
public Map<String, Obj> barCode;
@ApiParam("进度")
public String percent ="0";
public String percent ="消息提示：";
@ApiParam("当前步骤")
public Integer currentStep;

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
Unescape Escape View File

@ -122,4 +122,10 @@ public class WmsMoveDetails extends BaseBean {
this.waitingCounts = waitingCounts;
this.finishedCounts = finishedCounts;
}
public WmsMoveDetails(String partNo, double qty ,double transQty){
this.partNo = partNo;
this.qty = qty;
this.transQty = transQty;
}
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -68,7 +68,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
getStringBuilderPack(wmsDocMovementDetails, result);

Write Preview
Loading…
Cancel
Save