From 719899898f53f2ee7bd156efba4247c86cdf5c1d Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 20 Nov 2018 15:46:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 a43b074..c5c9c3c 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 @@ -230,6 +230,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result); HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); + HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result); HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result); From f0cb40891f8131b2cceb599e56141d3d1ab8cbed Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 20 Nov 2018 18:46:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=B5=84=E6=BA=90=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java | 14 +++++++++----- .../estsh/i3plus/pojo/platform/bean/SysLocaleResource.java | 2 +- .../estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java index 6e0999b..ab75d98 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java @@ -20,19 +20,23 @@ import javax.persistence.Table; @Data @Entity @EqualsAndHashCode(callSuper = true) -@Table(name="sys_locale_language") +@Table(name="SYS_LOCALE_LANGUAGE") @Api(value="系统语言表",description = "对系统语言进行匹配。") public class SysLocaleLanguage extends BaseBean { - @Column(name="language_name") + @Column(name="LANGUAGE_NAME") @ApiParam(value = "语言名称",example = "前台显示的名称") private String languageName; - @Column(name="language_code") + @Column(name="LANGUAGE_CODE") @ApiParam(value = "语言代码",example = "使用浏览器语言代码，参考java.util.Locale中的代码。CN/zh，TW/zh，HK/zh，US/en, FR/en,GB/en,JP/en,DE/en,KR/en") private String languageCode; - @Column(name="is_default") - @ApiParam(value = "是否默认",example = "1") + @Column(name="IS_DEFAULT") + @ApiParam(value = "是否默认",example = "2") private Integer isDefault; + + @Column(name = "LANGUAGE_STATUS") + @ApiParam(value = "语言状态",example = "1") + private Integer languageStatus; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index a9ec7bd..0de27ad 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -60,5 +60,5 @@ public class SysLocaleResource extends BaseBean { //系统自带需要有初始化表，只能修改value，无法删除。 @Column(name="is_system") @ApiParam(value = "是否系统参数",example = "2") - private Integer isSystem; + private Integer isSystem = 2; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index 3e835da..9350790 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -59,7 +59,7 @@ public class CoreBsonPack { Bson bson = new BasicDBObject(); bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(),"excModule",bson); - bson = BsonPackTool.getStringLikerPack(sysLogException.getExcClassName(),"excClassName",bson); + bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(),"excMessage",bson); bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(),"createDatetime",bson,false,false); return bson;