From 5dc142ba3459a35872606257db53460f4b12929a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 7 Sep 2020 09:56:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=902719=2006=201.1.10=09=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=96=87=E6=A1=A3=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=96=B0=E5=A2=9E=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b89b62b..c7e88b6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6382,7 +6382,7 @@ public class WmsEnumUtil { BIGDECIMAL_FORMAT(9, "Bigdecimal", "BigDecimal格式"), BLOB_FORMAT(10, "Blob", "BLOB格式"), CLOB_FORMAT(11, "Clob", "CLOB格式"), - TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式") + TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式"); private int value; private String code; From 193cff013f0e38a62199bb6eb539d1b87e60b83b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 8 Sep 2020 10:26:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=902737=2009=201.2.1.9.1=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E6=96=B0=E5=A2=9E=E5=BA=93=E4=BD=8D=E5=88=AB=E5=90=8D?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 2779b7f..3a2c1e7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -190,6 +190,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") private Integer upY; + @Column(name = "LOCATE_ALIAS") + @ApiParam(value = "库位别名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String locateAlias; + // 导入用 @ApiParam(value = "工厂") @Transient From ab608c0919f9421065be50b4712cbcd527154a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 10 Sep 2020 22:02:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 + .../pojo/model/platform/UserExportModel.java | 172 +++++++++++++++++++++ .../i3plus/pojo/platform/bean/SysRefUserRole.java | 2 +- 3 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 64cd8a5..d2c673a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -494,6 +494,10 @@ public class CommonEnumUtil { return tmp; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java new file mode 100644 index 0000000..c3d4274 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java @@ -0,0 +1,172 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-09 + * @Modify: + **/ +@Data +@ApiModel +public class UserExportModel extends BaseBean { + + private static final long serialVersionUID = -6597413958814715617L; + + @ApiModelProperty(value ="姓名" , access ="名称") + private String infoName; + + @ApiModelProperty(value ="工号") + private String infoEmpNo; + + @ApiModelProperty(value ="角色名称" , access ="角色名称") + private String roleNameRdd; + + @ApiModelProperty(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @ApiModelProperty(value ="邮箱" , access ="邮箱") + private String userEmail; + + @ApiModelProperty(value ="手机号" , access ="手机号") + private String userPhone; + + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String departmentNameRdd; + + @ApiModelProperty(value ="岗位名称" , access ="岗位名称") + private String positionNameRdd; + + @ApiModelProperty(value ="组织名称" , access ="组织名称") + private String organizeNameRdd; + + @ApiModelProperty(value ="员工类型", access ="实习、试用期、正式") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE) + private Integer infoEmployeeType; + + @ApiModelProperty(value ="员工等级") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE) + private Integer infoGrade; + + @ApiModelProperty(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_SEX) + private Integer infoSex; + + @ApiModelProperty(value ="婚姻" , example ="1" , access ="性别（1.未知，2.已婚,3未婚）") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE) + private Integer infoMarriage; + + @ApiModelProperty(value ="证件类型") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE) + private Integer infoCardType; + + @ApiModelProperty(value ="证件编号") + private String infoCardNumber; + + @ApiModelProperty(value ="毕业专业") + private String infoSchoolProfession; + + @ApiModelProperty(value ="毕业院校") + private String infoSchool; + + @ApiModelProperty(value ="学历") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EDUCATION) + private Integer infoSchoolEducation; + + @ApiModelProperty(value ="毕业时间") + private String infoSchoolLeaveDate; + + @ApiModelProperty(value ="籍贯") + private String infoBirthplace; + + @ApiModelProperty(value ="种族") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY) + private Integer infoRace; + + @ApiModelProperty(value ="紧急联系人") + private String infoEmergencyContact; + + @ApiModelProperty(value ="紧急联系人-电话") + private String infoEmergencyPhone; + + @ApiModelProperty(value ="入职日期" , access ="默认当前时间") + private String infoJoinDate; + + @ApiModelProperty(value ="离职日期" , access ="默认当前时间") + private String infoResignationDate; + + @ApiModelProperty(value ="出生日期") + private String infoBornDate; + + @ApiModelProperty(value ="政治面貌") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS) + private Integer infoPoliticalStatus; + + @ApiModelProperty(value ="兴趣爱好") + private String infoHobby; + + @ApiModelProperty(value ="家庭地址") + private String infoFamilyAddress; + + @ApiModelProperty(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) + private Integer userStatus; + + @ApiModelProperty(value ="用户状态" , example ="-1") + private Integer infoStatus; + + public UserExportModel() { + } + + public UserExportModel(SysUser sysUser, SysUserInfo sysUserInfo) { + setSysUser(sysUser); + setSysUserInfo(sysUserInfo); + } + + public UserExportModel setSysUser(SysUser sysUser){ + this.userLoginName=sysUser.getUserLoginName(); + this.userPhone=sysUser.getUserPhone(); + this.userEmail=sysUser.getUserEmail(); + this.infoEmpNo=sysUser.getUserEmpNo(); + return this; + } + + public UserExportModel setSysUserInfo(SysUserInfo sysUserInfo){ + this.infoName=sysUserInfo.getName(); + this.departmentNameRdd=sysUserInfo.getDepartmentNameRdd(); + this.positionNameRdd=sysUserInfo.getPositionNameRdd(); + this.organizeNameRdd=sysUserInfo.getOrganizeNameRdd(); + this.infoEmployeeType=sysUserInfo.getUserEmployeeType(); + this.infoGrade=sysUserInfo.getUserGrade(); + this.infoSex=sysUserInfo.getUserSex(); + this.infoMarriage=sysUserInfo.getUserMarriage(); + this.infoCardType=sysUserInfo.getUserCardType(); + this.infoCardNumber=sysUserInfo.getUserCardNumber(); + this.infoSchoolProfession=sysUserInfo.getUserSchoolProfession(); + this.infoSchool=sysUserInfo.getUserSchool(); + this.infoSchoolEducation=sysUserInfo.getUserSchoolEducation(); + this.infoSchoolLeaveDate=sysUserInfo.getUserSchoolLeaveDate(); + this.infoBirthplace=sysUserInfo.getUserBirthplace(); + this.infoRace=sysUserInfo.getUserRace(); + this.infoEmergencyContact=sysUserInfo.getUserEmergencyContact(); + this.infoEmergencyPhone=sysUserInfo.getUserEmergencyPhone(); + this.infoJoinDate=sysUserInfo.getUserJoinDate(); + this.infoResignationDate=sysUserInfo.getUserResignationDate(); + this.infoBornDate=sysUserInfo.getUserBornDate(); + this.infoPoliticalStatus=sysUserInfo.getUserPoliticalStatus(); + this.infoHobby=sysUserInfo.getUserHobby(); + this.infoFamilyAddress=sysUserInfo.getUserFamilyAddress(); + return this; + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java index b6bdcc9..8b2bd9f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java @@ -37,7 +37,7 @@ public class SysRefUserRole extends BaseBean { private Long userId; @Column(name="USER_NAME_RDD") - @ApiParam(value ="角色名称") + @ApiParam(value ="用户名称") private String userNameRdd; @Column(name="ROLE_ID") From 130d3a97922c6e5991e4d0c705fc4aa5ec721024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 10 Sep 2020 22:03:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E5=AD=97=E5=85=B8=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=81=E8=AE=B8=E5=80=BC=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 15 +++++++++++++-- .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 9a6e187..926f68f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -254,18 +254,29 @@ public class DdlPreparedPack { } /** - * 封装String对象成equal语句 + * 封装String对象成equal语句,不封装空值，空字符串 * * @param columnName 列名 * @param packBean */ public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val); + getStringEqualAndAllowBlankPack(val, columnName, packBean); } } /** + * 封装String对象成equal语句,封装空值，空字符串 + * + * @param val 条件 + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualAndAllowBlankPack(String val, String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val); + } + + /** * 封装String对象成equal语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index a92c56f..e0c1886 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -662,7 +662,7 @@ public class CoreHqlPack { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result); + DdlPreparedPack.getStringEqualAndAllowBlankPack(dictionary.getDictionaryValue(), "dictionaryValue", result); DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not