Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java

@@ -0,0 +1,96 @@
+package cn.estsh.i3plus.pojo.base.bean;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.ApiParam;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 基本返回结果
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-11-14 15:58
+ * @Modify:
+ **/
+public class BaseResultBean<Obj> {
+
+    @ApiParam("是否成功")
+    public boolean success;
+
+    @ApiParam("信息代码-国际化")
+    public String code;
+
+    @ApiParam("操作消息")
+    public String msg;
+
+    @ApiParam("错误消息")
+    public String errorMsg;
+
+    @ApiParam("http路径")
+    public String url;
+
+    @ApiParam("List结果集")
+    public List<Obj> resultList;
+
+    @ApiParam("单个结果")
+    public Obj resultObject;
+
+    @ApiParam("翻页和结果集")
+    public ListPager<Obj> listPager;
+
+    @ApiParam("Map结果集")
+    public Map<String, Object> resultMap;
+
+    @ApiParam("翻页操作")
+    public Pager pager;
+
+    @ApiParam("总记录数")
+    public int totalCount;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public List<Obj> getResultList() {
+        return resultList;
+    }
+
+    public Obj getResultObject() {
+        return resultObject;
+    }
+
+    public ListPager<Obj> getListPager() {
+        return listPager;
+    }
+
+    public Map<String, Object> getResultMap() {
+        return resultMap;
+    }
+
+    public Pager getPager() {
+        return pager;
+    }
+
+    public int getTotalCount() {
+        return totalCount;
+    }
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -19,9 +19,9 @@ public class CommonEnumUtil {
         IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"),
         CENTER(99,"CENTER","注册服务中心");
 
-        private int value;
+        public int value;
-        private String code;
+        public String code;
-        private String description;
+        public String description;
 
         private SOFT_TYPE(int value, String code, String description) {
             this.value = value;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java

@@ -104,4 +104,127 @@ public class TaskTime extends BaseBean {
     @ApiParam(value ="最后运行时间" , access ="最后运行时间")
     private String lastRunDateTime;
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public void setTimeExpressionId(Long timeExpressionId) {
+        this.timeExpressionId = timeExpressionId;
+    }
+
+    public String getTimeExpressionNameRdd() {
+        return timeExpressionNameRdd;
+    }
+
+    public void setTimeExpressionNameRdd(String timeExpressionNameRdd) {
+        this.timeExpressionNameRdd = timeExpressionNameRdd;
+    }
+
+    public String getTimeExpressionContentRdd() {
+        return timeExpressionContentRdd;
+    }
+
+    public void setTimeExpressionContentRdd(String timeExpressionContentRdd) {
+        this.timeExpressionContentRdd = timeExpressionContentRdd;
+    }
+
+    public Integer getTaskNumSum() {
+        return taskNumSum;
+    }
+
+    public void setTaskNumSum(Integer taskNumSum) {
+        this.taskNumSum = taskNumSum;
+    }
+
+    public Integer getTaskNumRun() {
+        return taskNumRun;
+    }
+
+    public void setTaskNumRun(Integer taskNumRun) {
+        this.taskNumRun = taskNumRun;
+    }
+
+    public Integer getTaskTypeId() {
+        return taskTypeId;
+    }
+
+    public void setTaskTypeId(Integer taskTypeId) {
+        this.taskTypeId = taskTypeId;
+    }
+
+    public Integer getTaskMethodTypeId() {
+        return taskMethodTypeId;
+    }
+
+    public void setTaskMethodTypeId(Integer taskMethodTypeId) {
+        this.taskMethodTypeId = taskMethodTypeId;
+    }
+
+    public String getTaskPackage() {
+        return taskPackage;
+    }
+
+    public void setTaskPackage(String taskPackage) {
+        this.taskPackage = taskPackage;
+    }
+
+    public String getTaskClass() {
+        return taskClass;
+    }
+
+    public void setTaskClass(String taskClass) {
+        this.taskClass = taskClass;
+    }
+
+    public String getTaskStartDateTimeRdd() {
+        return taskStartDateTimeRdd;
+    }
+
+    public void setTaskStartDateTimeRdd(String taskStartDateTimeRdd) {
+        this.taskStartDateTimeRdd = taskStartDateTimeRdd;
+    }
+
+    public String getTaskEndDateTimeRdd() {
+        return taskEndDateTimeRdd;
+    }
+
+    public void setTaskEndDateTimeRdd(String taskEndDateTimeRdd) {
+        this.taskEndDateTimeRdd = taskEndDateTimeRdd;
+    }
+
+    public String getTaskDescription() {
+        return taskDescription;
+    }
+
+    public void setTaskDescription(String taskDescription) {
+        this.taskDescription = taskDescription;
+    }
+
+    public Integer getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(Integer taskStatus) {
+        this.taskStatus = taskStatus;
+    }
+
+    public String getLastRunDateTime() {
+        return lastRunDateTime;
+    }
+
+    public void setLastRunDateTime(String lastRunDateTime) {
+        this.lastRunDateTime = lastRunDateTime;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -169,7 +169,6 @@ public class WmsHqlPack {
 
         HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
-        HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDatetime", result, true);
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);