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

发版 2018年12月28日

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent a4d59caaeb d30a3685d1
commit 3f6b281912
16 changed files with 318 additions and 160 deletions
Show Stats Download Patch File Download Diff File

29
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java
Unescape Escape View File

@ -41,12 +41,17 @@ public class Pager {
*/
public Pager(int totalRows) {
this.totalRows = totalRows;
totalPages = totalRows / pageSize;
int mod = totalRows % pageSize;
if (mod > 0) {
totalPages++;
if(pageSize != 0) {
totalPages = totalRows / pageSize;
int mod = totalRows % pageSize;
if (mod > 0) {
totalPages++;
}
}else{
totalPages = 0;
}
currentPage = 1;
startRow = 0;
resetEndRow();
@ -56,12 +61,16 @@ public class Pager {
this.totalRows = totalRows;
this.pageSize = pageSize;
totalPages = totalRows / pageSize;
int mod = totalRows % pageSize;
if (mod > 0) {
totalPages++;
if(pageSize != 0) {
totalPages = totalRows / pageSize;
int mod = totalRows % pageSize;
if (mod > 0) {
totalPages++;
}
}else{
totalPages = 0;
}
currentPage = 1;
startRow = 0;
resetEndRow();

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

@ -87,7 +87,7 @@ public class ImppEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_METHOD_TYPE{
TYPE_GROUP(1,"类方法","Java Class 方法");
CLASS_METHOD(1,"类方法","Java Class 方法");
// TYPE_COMPANY(2,"链接","Http URL"),
// TYPE_FACTORY(3,"权限CODE","权限CODE");
@ -826,4 +826,74 @@ public class ImppEnumUtil {
return tmp;
}
}
/**
* 系统参数值类型
* 1. String
* 2. Number
* 3. Date
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYS_CONFIG_VALUE_TYPE {
STRING(1,"text","文本值"),
NUMBER(2,"number","数字值"),
DATE(3,"date","时间值"),
BOOLEAN(4,"switch","布尔值"),
SELECT(5,"select","多选值");
private int value;
private String name;
private String description;
SYS_CONFIG_VALUE_TYPE() {
}
SYS_CONFIG_VALUE_TYPE(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getName() {
return name;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].name;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -1554,7 +1554,8 @@ public class WmsEnumUtil {
RESET(30, "重置按钮"),
CHECK_DETAILS(40, "查看明细"),
DELETE_DETAILS(50, "明细(删除)"),
CLEAR_DETAILS(60, "明细（清空）");
CLEAR_DETAILS(60, "明细（清空）"),
CUSTOM_BUTTON(70, "自定义按钮");
private int value;
private String description;

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -40,6 +41,11 @@ public class SysConfig extends BaseBean {
@ApiParam(value ="配置代码")
private String configCode;
// 枚举 ImppEnumUtil.SYS_CONFIG_VALUE_TYPE
@Column(name="CONFIG_VALUE_TYPE")
@ApiParam(value ="配置值类型")
private String configValueType;
@Column(name="CONFIG_VALUE")
@ApiParam(value ="配置值")
private String configValue;

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

@ -26,20 +26,20 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_REF_EXPRESSION_TRIGGER")
@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器")
public class SysRefExpressionTrigger extends BaseBean {
@Table(name="SYS_REF_TASK_CYCLE_PLAN")
@Api(value="关系-任务周期与计划",description = "关系-任务周期与计划")
public class SysRefTaskCyclePlan extends BaseBean {
@Column(name="EXPRESSION_ID")
@ApiParam(value ="表达式_ID" ,example = "-1")
@Column(name="TASK_CYCLE_ID")
@ApiParam(value ="任务周期id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long expressionId;
private Long taskCycleId;
@Column(name="TRIGGER_NAME")
@ApiParam(value ="触发器名称")
private String triggerName;
@Column(name="TASK_PLAN_NAME")
@ApiParam(value ="任务计划名称")
private String taskPlanName;
@Column(name="TRIGGER_GROUP_NAME")
@ApiParam(value ="触发器名称")
private String triggerGroupName;
@Column(name="TASK_PLAN_GROUP_NAME")
@ApiParam(value ="任务计划组名称")
private String taskPlanGroupName;
}

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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 : yunhao
* @CreateDate : 2018-12-26 20:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK")
@Api(value="任务",description = "任务")
public class SysTask extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="TASK_PACKAGE")
@ApiParam(value ="任务包名")
private String taskPackage;
@Column(name="TASK_CLASS")
@ApiParam(value ="任务类名")
private String taskClass;
@Column(name="TASK_DESCRIPTION")
@ApiParam(value ="任务描述" , access ="任务描述")
private String taskDescription;
}

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

@ -14,7 +14,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 定时任务时间表达式
* @Description : 任务周期
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.801
@ -25,29 +25,29 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK_TIME_EXPRESSION")
@Api(value="任务表达式",description = "任务表达式")
public class SysTaskTimeExpression extends BaseBean {
@Table(name="SYS_TASK_CYCLE")
@Api(value="任务周期",description = "任务周期")
public class SysTaskCycle extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="EXPRESSION_CONTENT")
@ApiParam(value ="表达式内容")
private String expressionContent;
@Column(name="TASK_CYCLE_EXPS")
@ApiParam(value ="任务周期表达式")
private String taskCycleExps;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name="expression_start_date")
@Column(name="TASK_CYCLE_START_DATE")
@ApiParam(value ="开始时间")
private String expressionStartDatetime;
private String taskCycleStartDatetime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name="expression_end_date")
@Column(name="TASK_CYCLE_END_DATE")
@ApiParam(value ="结束时间")
private String expressionEndDatetime;
private String taskCycleEndDatetime;
@Column(name="TIME_DESCRIPTION")
@ApiParam(value ="表达式描述")
private String expressionDescription;
@Column(name="TASK_CYCLE_DESCRIPTION")
@ApiParam(value ="描述")
private String taskCycleDescription;
}

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

@ -0,0 +1,93 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
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.952
* @Modify :
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK_PLAN")
@Api(value="任务计划",description = "任务计划")
public class SysTaskPlan extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="GROUP_NAME")
@ApiParam(value ="组名称")
private String groupName;
@Column(name="TASK_CYCLE_ID")
@ApiParam(value ="任务周期ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskCycleId;
@Column(name="TASK_CYCLE_NAME_RDD")
@ApiParam(value ="任务周期名称")
private String taskCycleNameRdd;
@Column(name="TASK_CYCLE_EXPS_RDD")
@ApiParam(value ="任务周期表达式")
private String taskCycleExpsRdd;
@Column(name="TASK_PLAN_EXEC_NUM")
@ApiParam(value ="定时任务运行次数" , example ="0")
private Integer taskPlanExecNum;
// 枚举 ImppEnumUtil.TASK_METHOD_TYPE.CLASS_METHOD
@Column(name="TASK_METHOD_TYPE")
@ApiParam(value ="任务执行类型" ,example = "-1")
private Integer taskMethodType;
@Column(name="TASK_ID")
@ApiParam(value ="定时任务id")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@Column(name="TASK_NAME_RDD")
@ApiParam(value ="定时任务名称")
private String taskNameRdd;
@Column(name="TASK_CYCLE_START_DATE_TIME_RDD")
@ApiParam(value ="任务开始时间")
private String taskCycleStartDateTimeRdd;
@Column(name="TASK_CYCLE_END_DATE_TIME_RDD")
@ApiParam(value ="任务结束时间")
private String taskCycleEndDateTimeRdd;
@Column(name="TASK_PLAN_DESCRIPTION")
@ApiParam(value ="任务计划描述" , access ="任务计划描述")
private String taskPlanDescription;
@Column(name="TASK_PLAN_STATUS")
@ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1")
private Integer taskPlanStatus;
@Column(name="LAST_RUN_DATE_TIME")
@ApiParam(value ="最后运行时间" , access ="最后运行时间")
private String lastRunDateTime;
}

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

@ -1,97 +0,0 @@
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.952
* @Modify :
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK_TIME")
@Api(value="定时任务",description = "定时任务")
public class SysTaskTime extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="GROUP_NAME")
@ApiParam(value ="名称")
private String groupName;
@Column(name="TIME_EXPRESSION_ID")
@ApiParam(value ="时间表达式ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long timeExpressionId;
@Column(name="TIME_NAME_Rdd")
@ApiParam(value ="时间表达式名称")
private String timeExpressionNameRdd;
@Column(name="TIME_EXPRESSION_CONTENT_RDD")
@ApiParam(value ="时间表达式")
private String timeExpressionContentRdd;
@Column(name="TASK_NUM_SUM")
@ApiParam(value ="执行总次数" , example ="0")
private Integer taskNumSum;
@Column(name="TASK_NUM_RUN")
@ApiParam(value ="执行次数" , example ="0")
private Integer taskNumRun;
@Column(name="TASK_TYPE")
@ApiParam(value ="任务类型（枚举：1.定时任务）" , example ="-1")
private Integer taskType;
@Column(name="TASK_METHOD_TYPE")
@ApiParam(value ="任务执行类型" ,example = "-1")
private Integer taskMethodType;
@Column(name="TASK_PACKAGE")
@ApiParam(value ="任务包名")
private String taskPackage;
@Column(name="TASK_CLASS")
@ApiParam(value ="任务类名")
private String taskClass;
@Column(name="TASK_START_DATE_TIME_RDD")
@ApiParam(value ="任务开始时间")
private String taskStartDateTimeRdd;
@Column(name="TASK_END_DATE_TIME_RDD")
@ApiParam(value ="任务结束时间")
private String taskEndDateTimeRdd;
@Column(name="TASK_DESCRIPTION")
@ApiParam(value ="任务描述" , access ="任务描述")
private String taskDescription;
@Column(name="TASK_STATUS")
@ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1")
private Integer taskStatus;
@Column(name="LAST_RUN_DATE_TIME")
@ApiParam(value ="最后运行时间" , access ="最后运行时间")
private String lastRunDateTime;
}

18
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
Unescape Escape View File

@ -38,18 +38,18 @@ public class SysLogTaskTime extends BaseBean {
@ApiParam(value ="任务组名称")
private String groupName;
@Column(name="TIME_TASK_ID")
@ApiParam(value ="任务编号" , example = "-1")
@Column(name="TASK_PLAN_ID")
@ApiParam(value ="任务计划id" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long timeTaskId;
private Long taskPlanId;
@Column(name="TIME_EXPRESSION_NAME_Rdd")
@ApiParam(value ="时间表达式名称")
private String timeExpressionNameRdd;
@Column(name="TASK_CYCLE_NAME_RDD")
@ApiParam(value ="任务周期名称")
private String taskCycleNameRdd;
@Column(name="TIME_EXPRESSION_CONTENT_RDD")
@ApiParam(value ="时间表达式")
private String timeExpressionContentRdd;
@Column(name="TASK_CYCLE_EXPS_RDD")
@ApiParam(value ="任务周期表达式")
private String taskCycleExpsRdd;
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefExpressionTriggerRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefTaskCyclePlanRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysRefExpressionTrigger;
import cn.estsh.i3plus.pojo.platform.bean.SysRefTaskCyclePlan;
/**
* @Description : 关系-表达式与触发器
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.SysRefExpressionTrigger;
* @CreateDate : 2018-11-14 13:36
* @Modify:
**/
public interface SysRefExpressionTriggerRepository extends BaseRepository<SysRefExpressionTrigger, Long> {
public interface SysRefTaskCyclePlanRepository extends BaseRepository<SysRefTaskCyclePlan, Long> {
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeExpressionRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskCycleRepository.java
Unescape Escape View File

@ -1,14 +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.SysTaskTimeExpression;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
/**
* @Description : 定时任务时间表达式
* @Description : 任务周期
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 12:03:01.252
* @Modify :
**/
public interface SysTaskTimeExpressionRepository extends BaseRepository<SysTaskTimeExpression, Long> {
public interface SysTaskCycleRepository extends BaseRepository<SysTaskCycle, Long> {
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskPlanRepository.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.SysTaskPlan;
/**
* @Description : 任务计划
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-12-26 21:13
* @Modify:
**/
public interface SysTaskPlanRepository extends BaseRepository<SysTaskPlan, Long> {
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskRepository.java
Unescape Escape View File

@ -1,14 +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.SysTaskTime;
import cn.estsh.i3plus.pojo.platform.bean.SysTask;
/**
* @Description : 定时任务
* @Description : 任务
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 12:03:01.372
* @Modify :
**/
public interface SysTaskTimeRepository extends BaseRepository<SysTaskTime, Long> {
public interface SysTaskRepository extends BaseRepository<SysTask, Long> {
}

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

@ -263,6 +263,7 @@ public class CoreHqlPack {
HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result);
HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false);
HqlPack.getNumEqualPack(message.getMessageSenderId(),"messageSenderId",result);
return result.toString();
}
@ -276,7 +277,7 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(file.getName(),"name",result);
HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result);
HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result);
HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result);
HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false);
@ -285,11 +286,11 @@ public class CoreHqlPack {
}
/**
* 任务表达式复杂查询
* 任务周期复杂查询
* @param taskTimeExpression
* @return
*/
public static String packHqlSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) {
public static String packHqlSysTaskCycle(SysTaskCycle taskTimeExpression) {
StringBuffer result = new StringBuffer();
// hql拼接
@ -303,13 +304,13 @@ public class CoreHqlPack {
* @param taskTime
* @return
*/
public static String packHqlSysTaskTime(SysTaskTime taskTime){
public static String packHqlSysTaskPlan(SysTaskPlan taskTime){
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(taskTime.getName(),"name",result);
HqlPack.getNumEqualPack(taskTime.getTaskStatus(),"taskStatus",result);
HqlPack.getNumEqualPack(taskTime.getTimeExpressionId(),"timeExpressionId",result);
HqlPack.getNumEqualPack(taskTime.getTaskPlanStatus(),"taskPlanStatus",result);
HqlPack.getNumEqualPack(taskTime.getTaskCycleId(),"taskCycleId",result);
return result.toString();
}
@ -366,6 +367,7 @@ public class CoreHqlPack {
// and
HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
// not
HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
@ -488,7 +490,21 @@ public class CoreHqlPack {
HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result);
HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result);
HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result);
return result.toString();
}
/**
* 任务复杂查询
* @param sysTask
* @return
*/
public static String packHqlSysTask(SysTask sysTask){
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(sysTask.getName(),"name",result);
return result.toString();
}
}
}

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

@ -41,7 +41,7 @@ public class WmsCSOrderMaster extends BaseBean {
public Integer orderType;
@Column(name="ORDER_STATUS")
@ApiParam(value = "状态", example = "1" )
@ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1" )
public Integer orderStatus;
@Column(name="ACTION_PERSENT")

Write Preview
Loading…
Cancel
Save