From 372d916d0f5f95938c9883c0d949fe69585f1e6e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 22 Nov 2018 13:28:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index def0ca7..24e1dde 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -30,7 +30,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="SYS_USER_INFO") @Api(value="用户详细",description = "用户详细") -public class SysUserInfo extends BaseBean { +public class SysUserInfo extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") @@ -115,6 +115,9 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="用户所有部门信息") private transient List departmentList; + @ApiParam("用户的部门ID信息") + private transient List departmentIdList; + @ApiParam(value ="用户所有岗位信息") private transient List positionList; From 37c8e3e212f95543e49fd681478ae9100fe9f047 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 22 Nov 2018 20:13:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsActionStepCallRepository.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java index 6987eb6..d1f658c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java @@ -2,8 +2,6 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import java.util.List; @@ -15,8 +13,4 @@ import java.util.List; * @Modify: **/ public interface WmsActionStepCallRepository extends BaseRepository { - - @Query("from WmsActionStepCall was, WmsActionStep wass where was.amId = wass.id ") - List findWmsActionStepCallByAmid(@Param("id") long id); - } From 6977e11090b78ec10533a8eeb9ecc41c61e2e897 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 22 Nov 2018 20:59:53 +0800 Subject: [PATCH 3/4] bug --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index a29ad39..c0b3799 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1039,4 +1039,36 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤处理组件查询条件封装 + * + * @param wmsActionModuleParam + * @return + */ + public static String packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + getStringBuilderPack(wmsActionModuleParam, result); + + return result.toString(); + } + + /** + * 作业步骤处理组件参数查询条件封装 + * + * @param wmsActionModule + * @return + */ + public static String packHqlWmsActionModule(WmsActionModule wmsActionModule) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + getStringBuilderPack(wmsActionModule, result); + + return result.toString(); + } } From 5dbf1bb2e8a5949c014ecdb28136e73d5b0c88f2 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 22 Nov 2018 21:59:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E4=BF=A1=E6=81=AFBug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index cf31941..7df2552 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -687,7 +687,7 @@ public class ImppEnumUtil { * 1.SYSTEM：系统参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MESSAGE_CONTENT_TYPE{ + public enum MESSAGE_TYPE_CONTENT { HTML(1,"HTML","text/plain;charset=UTF-8"), TEXT(2,"TEXT","text/plain;charset=UTF-8"); @@ -696,10 +696,10 @@ public class ImppEnumUtil { private String name; private String description; - MESSAGE_CONTENT_TYPE() { + MESSAGE_TYPE_CONTENT() { } - MESSAGE_CONTENT_TYPE(int value, String name, String description) { + MESSAGE_TYPE_CONTENT(int value, String name, String description) { this.value = value; this.name = name; this.description = description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index bbd57cd..3b7d26b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -72,8 +72,8 @@ public class SysFile extends BaseBean { @ApiParam(value ="文件大小(KB)" , example ="0") private Integer fileSize; - @Column(name="DOWNLOADS") + @Column(name="DOWNLOAD_NUM") @ApiParam(value ="下载次数" , example ="0") - private Integer downloads; + private Integer downloadNum; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index e805f03..a3d87b2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -38,8 +38,8 @@ public class SysMessage extends BaseBean { @ApiParam(value ="消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") private Integer messageType; - @Column(name="MESSAGE_CONTENT_TYPE") - @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_CONTENT_TYPE)" , example ="-1") + @Column(name="MESSAGE_TYPE_CONTENT") + @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)" , example ="-1") private Integer messageContentType; @Column(name="MESSAGE_CONTENT")