From 236dbc4f66a0b116bd0c2b384c630cefb49be8f1 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 7 Dec 2018 18:49:29 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AEpom=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BAdev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index da0fd4a..a2edb7a 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-SNAPSHOT-DEV ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 3ee81da..59a7b13 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-SNAPSHOT-DEV ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index c369e12..0cc25e0 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-SNAPSHOT-DEV ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index de63812..12de98e 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-SNAPSHOT-DEV ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index ba27b81..5b73b9a 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-SNAPSHOT-DEV ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index bcf0ef5..56bf184 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-SNAPSHOT-DEV modules/i3plus-pojo-base From e0f3118296e65d357d873f65337883d0c5b2664e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 7 Dec 2018 19:44:43 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=8F=91=E5=B8=83=20=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=89=88=E6=9C=AC=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a2edb7a..888e1bd 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT-DEV + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 59a7b13..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT-DEV + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 0cc25e0..485fdd6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT-DEV + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 12de98e..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT-DEV + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 5b73b9a..7409467 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT-DEV + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 56bf184..ead6373 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT-DEV + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base From 8e25a0c4376c0402d8c046dfac735f7a10a660a7 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sat, 8 Dec 2018 22:11:37 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=8D=95=E5=8F=B7=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86excel=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 10 ++++++++ .../i3plus/pojo/platform/bean/SysOrderNoRule.java | 27 ++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index ae21e54..38b454c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -120,6 +120,16 @@ public class CommonEnumUtil { } return tmp; } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index e086d41..a76db1f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -1,6 +1,8 @@ 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; @@ -13,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 单号规则 @@ -58,20 +61,36 @@ public class SysOrderNoRule extends BaseBean { private Long serialNoLength; @Column(name = "IS_CYCLE") - @ApiParam(value = "达到最大值后是否循环",example = "1") + @ApiParam(value = "达到最大值后是否循环",example = "1",hidden = true) private Integer isCycle; + @Transient + @ApiParam(value = "达到最大值后是否循环",example = "否") + private String isCycleName; + + public String getIsCycleName() { + if(isCycle != null){ + CommonEnumUtil.TRUE_OR_FALSE.valueOf(isCycle); + } + return isCycleName; + } + + public void setIsCycleName(String isCycleName) { + this.isCycleName = isCycleName; + this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName); + } + @Column(name = "SERIAL_NO") - @ApiParam(value = "当前流水号",example = "-1") + @ApiParam(value = "当前流水号",example = "-1",hidden = true) @JsonSerialize(using = ToStringSerializer.class) private Long serialNo; @Column(name = "ORDER_NO") - @ApiParam(value = "当前单号") + @ApiParam(value = "当前单号",hidden = true) private String orderNo; @Column(name = "ORDER_NO_RULE_STATUS") - @ApiParam(value = "单号规则状态") + @ApiParam(value = "单号规则状态",hidden = true) private Integer orderNoRuleStatus; @Column(name="ORDER_NO_RULE_DESCRIPTION") From 8b3434b27cbba7f5fb545a1518014399c8d75b74 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 10 Dec 2018 10:02:49 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 8aeed96..cea4ff6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -35,7 +35,7 @@ public class WmsMoveMaster extends BaseBean { /** * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 + * MI=移库入库,MO=移库出库,SO=发运1 */ @Column(name="ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") From 7ba903a4302cf1cc98526a94058cc7b5d4cd87a1 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 10 Dec 2018 10:27:25 +0800 Subject: [PATCH 05/11] Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-wms into test # Conflicts: # modules/i3plus-wms-api/pom.xml # modules/i3plus-wms-apiservice/pom.xml # pom.xml --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java index dcfe3bd..814ba4f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java @@ -29,9 +29,9 @@ public class SysFactoryStore extends BaseBean { @Column(name="store_code") @ApiParam("仓库代码") - public String storeCode; + private String storeCode; @Column(name="store_name") @ApiParam("仓库名称") - public String storeName; + private String storeName; } From 263384eaaa03193448b8ee32d75f459ff3c36b24 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Mon, 10 Dec 2018 10:30:16 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java index eabefdf..494586d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java @@ -41,5 +41,4 @@ public class CheckPointModel { *实际抽点数量【从前端输入获取】 */ private Integer actQty; - } From 2a451b36a7496468a8d00c255953ec9d36b5515d Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 10 Dec 2018 10:40:03 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 62774b3..c466a30 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -18,6 +18,7 @@ import javax.persistence.Table; * @Author : hansen.ke * @CreateDate : 2018-11-28 15:20 * @Modify: + * 2018-12-10 10:39:46 **/ @Data @Entity From 10939f8087afa6b45eda814bddcf8047813f66c3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 10 Dec 2018 10:45:23 +0800 Subject: [PATCH 08/11] Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test # Conflicts: # modules/i3plus-pojo-base/pom.xml # modules/i3plus-pojo-mes/pom.xml # modules/i3plus-pojo-model/pom.xml # modules/i3plus-pojo-platform/pom.xml # modules/i3plus-pojo-wms/pom.xml # pom.xml --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index c466a30..601953a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -18,7 +18,7 @@ import javax.persistence.Table; * @Author : hansen.ke * @CreateDate : 2018-11-28 15:20 * @Modify: - * 2018-12-10 10:39:46 + * 2018-12-10 10:39:46 Test **/ @Data @Entity From afa644d5c7bde0d420c60353029126fd23349d4f Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 10 Dec 2018 11:56:53 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java index fd86ecd..1788009 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.Date; +import java.util.List; /** * @Description : 抽点比例表 @@ -17,6 +18,6 @@ import java.util.Date; public interface WmsIbCheckPlanRepository extends BaseRepository { @Query("select icp from WmsIbCheckPlan icp where icp.partNo =:partNo and icp.organizeCode=:organizeCode and icp.startDate<=:date and icp.endDate>=:date") - WmsIbCheckPlan findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("organizeCode") String organizeCode, @Param("date") String date); + List findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("organizeCode") String organizeCode, @Param("date") String date); } From f3d6ab4302b515170131fca8b08c9052173c83fa Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 10 Dec 2018 13:27:22 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=8A=BD=E7=82=B9=E3=80=81=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=8A=BD=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java index 1788009..430e521 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java @@ -10,7 +10,7 @@ import java.util.List; /** * @Description : 抽点比例表 - * @Reference : + * @Reference :1 * @Author : jimmy.zeng * @CreateDate : 2018-11-07 11:17 * @Modify: From cab08786f397ff3cd597e92499e56210b2b816d8 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 10 Dec 2018 20:50:15 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java | 4 ++++ .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 12 ++++++++++++ 2 files changed, 16 insertions(+) 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 84781e3..84d5d02 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 @@ -113,6 +113,10 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="登录次数",example = "0") private Integer userLoginNum; + @Column(name="USER_NUM") + @ApiParam(value ="用户账号数",example = "0") + private Integer userNum; + @Transient @ApiParam(value ="用户所有部门信息") private List departmentList; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 1b0d73a..f77920e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.lang3.StringUtils; +import java.util.List; + /** * @Description : 平台对象封装 * @Reference : @@ -113,6 +115,16 @@ public class CoreHqlPack { return result.toString(); } + public static String packHqlSysOrganize(Long[] ids, Integer typeId){ + StringBuffer result = new StringBuffer(); + + // 查询参数封装 + HqlPack.getInPack(StringUtils.join(ids,","),"id",result); + HqlPack.getNumEqualPack(typeId,"organizeType",result); + + return result.toString(); + } + /** * 部门复杂查询 * @param department