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 a8f259c..fcbfc0a 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 @@ -26,6 +26,7 @@ public class CommonEnumUtil { WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"), SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"), QMS(5, 0, 0, 0, "i3qms", "质量管理软件"), + TMS(101, 8250, 24, 118000000L, "i3tms", "运输管理系统"), /** * Mes 服务 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 5d6120a..dbb1e2e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2776,7 +2776,7 @@ public class MesEnumUtil { ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), END_CHECK(30, "END_CHECK", "末检"), RC_CHECK(40, "RC_CHECK", "发货检验"), - OUTSOURCE_CHECK(50, "工序外协检"); + OUTSOURCE_CHECK(50, "OUTSOURCE_CHECK","工序外协检"); private int value; private String code; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java index debc6fc..3a81030 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java @@ -17,8 +17,8 @@ import javax.persistence.Column; * @create 2021/7/21 0021 上午 10:20 */ @Data -@ApiModel -public class UserInfoImportModel extends BaseBean { +@ApiModel(value = "userImportTemplate") +public class UserInfoImportModel { private static final long serialVersionUID = -6597413958814715617L; @ApiModelProperty(value = "姓名", access = "名称") @@ -29,26 +29,24 @@ public class UserInfoImportModel extends BaseBean { @AnnoOutputColumn() private String infoEmpNo; - @ApiModelProperty(value = "员工类型", access = "实习、试用期、正式") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE) + @AnnoOutputColumn(required = false, name = "员工类型", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE) private Integer infoEmployeeType; @ApiModelProperty(value = "员工等级") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE) + @AnnoOutputColumn(required = false, name = "员工等级", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE) private Integer infoGrade; - @ApiModelProperty(value = "性别(1.男,2.女)", example = "1", access = "性别(1.男,2.女)") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_SEX) + @ApiModelProperty(value = "性别", example = "1", access = "性别(1.男,2.女)") + @AnnoOutputColumn(required = false,name = "性别", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_SEX) private Integer infoSex; @ApiModelProperty(value = "婚姻", example = "1", access = "性别(1.未知,2.已婚,3未婚)") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE) + @AnnoOutputColumn(required = false, name = "婚姻",refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE) private Integer infoMarriage; - @ApiModelProperty(value = "证件类型") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE) + @AnnoOutputColumn(required = false, name = "证件类型", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE) private Integer infoCardType; @ApiModelProperty(value = "证件编号") @@ -61,27 +59,25 @@ public class UserInfoImportModel extends BaseBean { private String infoSchool; @ApiModelProperty(value = "学历") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EDUCATION) + @AnnoOutputColumn(required = false,name = "学历", 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(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY) + @AnnoOutputColumn(required = false,name = "种族", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY) private Integer infoRace; - @ApiModelProperty(value = "紧急联系人") - private String userEmergencyContact; - - @ApiModelProperty(value = "紧急联系人-电话") - private String userEmergencyPhone; +// @ApiModelProperty(value = "紧急联系人") +// private String userEmergencyContact; +// +// @ApiModelProperty(value = "紧急联系人-电话") +// private String userEmergencyPhone; @ApiModelProperty(value = "紧急联系人") @@ -90,29 +86,33 @@ public class UserInfoImportModel extends BaseBean { @ApiModelProperty(value = "紧急联系人-电话") private String infoEmergencyPhone; - @ApiModelProperty(value = "入职日期", access = "默认当前时间") + @ApiModelProperty(value = "入职日期") private String infoJoinDate; - @ApiModelProperty(value = "离职日期", access = "默认当前时间") + @ApiModelProperty(value = "离职日期") private String infoResignationDate; @ApiModelProperty(value = "政治面貌") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS) + @AnnoOutputColumn(required = false, name = "政治面貌", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS) private Integer infoPoliticalStatus; @ApiModelProperty(value = "出生日期") private String infoBornDate; - @ApiModelProperty(value = "部门名称", access = "部门名称") + @ApiModelProperty(value = "部门", access = "部门") + @AnnoOutputColumn private String infoDepartmentNameRdds; - @ApiModelProperty(value = "岗位", access = "岗位") - private String positionNameRdds; - @ApiModelProperty(value = "主部门", access = "主部门") + @AnnoOutputColumn private String infoDepartmentNameRdd; + @ApiModelProperty(value = "岗位", access = "岗位") + @AnnoOutputColumn + private String positionNameRdds; + @ApiModelProperty(value = "主岗位", access = "主岗位") + @AnnoOutputColumn private String positionNameRdd; @ApiModelProperty(value = "家庭地址") @@ -130,9 +130,9 @@ public class UserInfoImportModel extends BaseBean { @ApiModelProperty(value = "用户语言") private String languageCode; - @ApiParam(value = "登陆密码") - @AnnoOutputColumn - private String userLoginPassword; +// @ApiParam(value = "登陆密码") +// @AnnoOutputColumn +// private String userLoginPassword; @ApiModelProperty(value = "角色名称", access = "角色名称") @@ -156,8 +156,5 @@ public class UserInfoImportModel extends BaseBean { @ApiModelProperty(value = "微信号") private String userWeChatNo; - @ApiModelProperty(value = "组织名称", access = "组织名称") - private String organizeNameRdd; - }