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

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

Browse Source
yun-zuoyi
汪云昊 6 years ago
parent dc78cf114f 46c710e559
commit 1c98f0a3c4
7 changed files with 101 additions and 43 deletions
Show Stats Download Patch File Download Diff File

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

@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
import java.util.Date;
/**
* @Description : 模块表单枚举类
* @Reference :
@ -831,8 +833,9 @@ public class BlockFormEnumUtil {
TEXT(200, "TEXT", "文本"),
NUMBER(210, "NUMBER", "数字"),
PASSWORD(230, "PASSWORD", "密码"),
DATE(300, "DATE", "日期(yyyy-MM-dd)"),
DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
DATE_TIME(300, "DATE", "日期"),
// DATE(300, "DATE", "日期(yyyy-MM-dd)"),
// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
// ELEMENT(700, "DICT_SELECT", "元素"),
DICTIONARY(800, "DICT_SELECT", "字典"),
CASCADE(900, "CASCADE", "级联");
@ -973,7 +976,8 @@ public class BlockFormEnumUtil {
NUM_ADD(20, "ADD", "加法计算",Double.class),
NUM_LESS(30, "MIN", "减法计算",Double.class),
NUM_MAKE(40, "MUL", "乘法计算",Double.class),
NUM_DIVISION(50, "DIVISION", "除法计算",Double.class);
NUM_DIVISION(50, "DIVISION", "除法计算",Double.class),
JOIN_TABLE(60, "JOIN_TABLE", "连表查询",String.class);
private int value;
private String code;
@ -1162,16 +1166,16 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_TYPE {
STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,null),
CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""),
CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""),
INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null);
// DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null);
BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss");
/**
* 属性类型值
@ -1204,11 +1208,28 @@ public class BlockFormEnumUtil {
private SQL_WHERE defaultWhere;
/**
* 默认 格式化 方式
*/
private String defaultFormat;
/**
* 默认查询关系
*/
private String defaultValue;
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
this.value = value;
this.code = code;
this.description = description;
@ -1217,6 +1238,20 @@ public class BlockFormEnumUtil {
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
public int getValue() {
@ -1247,6 +1282,14 @@ public class BlockFormEnumUtil {
return defaultWhere;
}
public String getDefaultFormat() {
return defaultFormat;
}
public String getDefaultValue() {
return defaultValue;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -2377,7 +2420,8 @@ public class BlockFormEnumUtil {
LIKE(7, "LIKE", "全模糊"),
START_LIKE(7, "LIKE", "前模糊"),
END_LIKE(7, "LIKE", "后模糊"),
IN(8, "in", "in");
IN(8, "in", "in"),
BETWEEN(9, "BETWEEN", "区间查询(逗号区分)"),;
private int value;
private String code;

5
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
Unescape Escape View File

@ -70,6 +70,11 @@ public class BfElementPropertyVirtual extends BaseBean {
@ApiParam(value = "提示信息")
private String propertyLabelText;
@Lob
@ApiParam(value = "自定义执行SQL")
@Column(name = "PROPERTY_EXECUTE_SQL")
private String propertyExecuteSql;
@Column(name = "PROPERTY_SORT")
@ApiParam(value = "显示顺序")
private Integer propertySort;

4
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
Unescape Escape View File

@ -37,6 +37,10 @@ public class BfMenu extends BaseBean {
@ApiParam(value ="菜单名称")
private String menuName;
@Column(name="MENU_CODE")
@ApiParam(value ="功能代码(唯一校验，路径跳转使用)")
private String menuCode;
@Column(name="PARENT_ID")
@ApiParam(value ="父级菜单id")
@JsonSerialize(using = ToStringSerializer.class)

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

@ -105,20 +105,20 @@ public class SysUser extends BaseBean {
@ApiParam(value ="组织名称" , access ="组织名称")
private String organizeNameRdd;
@Lob
@Column(name="ROLE_NAMES_RDD")
@ApiParam(value ="角色名称集合")
private String roleNamesRdd;
@Lob
@Column(name="DEPARTMENT_NAMES_RDD")
@ApiParam(value ="部门名称集合")
private String departmentNamesRdd;
@Lob
@Column(name="ORGANIZE_NAMES_RDD")
@ApiParam(value ="组织名称集合")
private String organizeNamesRdd;
// @Lob
// @Column(name="ROLE_NAMES_RDD")
// @ApiParam(value ="角色名称集合")
// private String roleNamesRdd;
//
// @Lob
// @Column(name="DEPARTMENT_NAMES_RDD")
// @ApiParam(value ="部门名称集合")
// private String departmentNamesRdd;
//
// @Lob
// @Column(name="ORGANIZE_NAMES_RDD")
// @ApiParam(value ="组织名称集合")
// private String organizeNamesRdd;
/********************************** 非数据库信息 ********************************/

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

@ -183,28 +183,28 @@ public class SysUserInfo extends BaseBean {
@ApiParam(value ="部门名称" , access ="部门名称")
private String departmentNameRdd;
@Column(name="DEPARTMENT_NAMES_RDD")
@ApiParam(value ="部门集合" , access ="部门集合")
@AnnoOutputColumn(hidden = true)
private String departmentNamesRdd;
// @Column(name="DEPARTMENT_NAMES_RDD")
// @ApiParam(value ="部门集合" , access ="部门集合")
// @AnnoOutputColumn(hidden = true)
// private String departmentNamesRdd;
@Column(name="POSITION_NAME_RDD")
@ApiParam(value ="岗位名称" , access ="岗位名称")
private String positionNameRdd;
@Column(name="POSITION_NAMES_RDD")
@ApiParam(value ="岗位集合" , access ="岗位集合")
@AnnoOutputColumn(hidden = true)
private String positionNamesRdd;
// @Column(name="POSITION_NAMES_RDD")
// @ApiParam(value ="岗位集合" , access ="岗位集合")
// @AnnoOutputColumn(hidden = true)
// private String positionNamesRdd;
@Column(name="ORGANIZE_NAME_RDD")
@ApiParam(value ="组织名称" , access ="组织名称")
private String organizeNameRdd;
@Column(name="ORGANIZE_NAMES_RDD")
@ApiParam(value ="组织集合" , access ="组织集合")
@AnnoOutputColumn(hidden = true)
private String organizeNamesRdd;
// @Column(name="ORGANIZE_NAMES_RDD")
// @ApiParam(value ="组织集合" , access ="组织集合")
// @AnnoOutputColumn(hidden = true)
// private String organizeNamesRdd;
/********************************** 非数据库信息 ********************************/

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

@ -143,10 +143,14 @@ public class WmsTransQuan extends BaseBean {
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;
@Transient
@ApiParam("交易类型")
@Column(name="TRANS_TYPE_NAME")
@ApiParam(value ="交易名称")
private String transTypeName;
/*@Transient
@ApiParam("交易类型")
private String transTypeName;*/
@Transient
@ApiParam("仓库名称")
private String warehouseName;

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

@ -334,7 +334,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
@ -922,6 +922,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransTypeName(), "transTypeName", result);
getStringBuilderPack(wmsTransQuan, result);

Write Preview
Loading…
Cancel
Save