diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 7582a6b..da0fd4a 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -31,6 +31,10 @@
com.alibaba
fastjson
+
+ com.alibaba
+ fastjson
+
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index 6e44e58..40a7d22 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -56,11 +56,11 @@ public abstract class BaseBean implements Serializable {
@ApiParam(value = "有效性",example = "1")
public Integer isValid; //EnumUtil.isValid;
- @Column(name="create_user")
+ @Column(name="create_user",updatable = false)
@ApiParam(value = "创建用户")
public String createUser;
- @Column(name="create_date")
+ @Column(name="create_date",updatable = false)
@ApiParam(value = "创建日期")
public String createDatetime;
@@ -89,11 +89,11 @@ public abstract class BaseBean implements Serializable {
public transient String modifyDateTimeEnd;
@ApiParam(value = "排序属性")
- public transient String orderByParam;
+ public transient String orderByParam = "";
@ApiParam(value = "排序属性",example = "1")
//CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc
- public transient int ascOrDesc;
+ public transient int ascOrDesc = 1;
//排序方式
public String orderBy(){
@@ -109,7 +109,4 @@ public abstract class BaseBean implements Serializable {
return result;
}
- public String getOrderByParam() {
- return this.orderByParam == null ? "" : this.orderByParam;
- }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java
index 8f574cc..692e9ff 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java
@@ -43,6 +43,9 @@ public class PagerHelper {
}
private static Pager getPager(int pageSize, int currentPage, int totalRows) {
+ // TODO 10可用系统参数替换
+ pageSize = pageSize == 0 ? 10 : pageSize;
+
Pager pager = new Pager();
pager.setPageSize(pageSize);
pager.setTotalRows(totalRows);
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
index 66fbd7f..b0c41a1 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
@@ -83,6 +83,13 @@ public interface BaseRepository extends JpaReposito
public void deleteByIds(Long[] ids);
/**
+ * 批量删除 指定列名
+ * @param propName
+ * @param ids
+ */
+ public void deleteByTypeLong(String propName, Long[] ids);
+
+ /**
* 通过多单属性进行单个值更新
* @param conditionName
* @param conditionValue
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index 55249c3..7f78c9a 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -145,14 +145,19 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public void deleteByIds(Long[] ids) {
- if(ids != null && ids.length > 0){
- String hql = "delete from " + persistentClass.getName() + " model where model.id in(:ids) ";
+ deleteByTypeLong("id", ids);
+ }
+
+ @Override
+ public void deleteByTypeLong(String propName, Long[] ids) {
+ if ((propName != null && propName.length() > 0) && (ids != null && ids.length > 0)) {
+ String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:ids) ";
Query query = entityManager.createQuery(hql);
query.setParameter("ids", Arrays.asList(ids));
query.executeUpdate();
}else{
- throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! ids:" + ids);
+ throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! "+propName+":" + ids);
}
}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
index db5a166..283c823 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
@@ -77,6 +77,4 @@ public class SysRole extends BaseBean {
@ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1")
private Integer roleStatusId;
-
-
}
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 dc5588b..3214b6b 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
@@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.platform.sqlpack;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.*;
@@ -172,6 +173,10 @@ public class CoreHqlPack {
// hql拼接
HqlPack.getStringLikerPack(sysDictionary.getName(),"name",result);
HqlPack.getStringLikerPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result);
+ // 默认查询非顶级字典
+ if(sysDictionary.getParentId() == null || sysDictionary.getParentId() < 1){
+ HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(),"parentId",result);
+ }
HqlPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",result);
return result.toString();
@@ -301,4 +306,15 @@ public class CoreHqlPack {
return result.toString();
}
+ public static String packHqlSysDictionaryCode(SysDictionary sysDictionary){
+ StringBuffer result = new StringBuffer();
+
+ // and
+ HqlPack.getStringEqualPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result);
+ // not
+ HqlPack.getNumNOEqualPack(sysDictionary.getId(),"id",result);
+
+ return result.toString();
+ }
+
}
\ No newline at end of file
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 638df10..8365904 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
@@ -101,6 +101,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
+ HqlPack.getNumEqualPack(wmsTransType.getIsValid(),"isValid",result);
HqlPack.getStringLikerPack(wmsTransType.getTransCode(),"transCode",result);
HqlPack.getStringLikerPack(wmsTransType.getTransName(),"transName",result);