报表优化

impp压测接口优化
消息队列非空验证
单号管理增加状态

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java

@@ -340,7 +340,7 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
 
     @Override
     public long deleteByIds(ID[] ids) {
-        return deleteByPropertyIn("id",ids);
+        return deleteByPropertyIn("_id",ids);
     }
 
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java

@@ -82,4 +82,19 @@ public class CoreBsonPack {
 
         return bson;
     }
-}
+
+    /**
+     * 区间
+     * @param colName
+     * @param min
+     * @param max
+     * @return
+     */
+    public static Bson packBsonByInterval(String colName,Object min,Object max){
+        Bson bson = new BasicDBObject();
+
+        bson = BsonPackTool.getNumBiggerPack(min,colName,bson);
+        bson = BsonPackTool.getNumSmallerPack(max,colName,bson);
+
+        return bson;
+    }}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -552,6 +552,7 @@ public class CoreHqlPack {
 
         HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result);
         HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
+        HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(orderNoRule);
@@ -601,4 +602,14 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+
+    public static String packHqlByInterval(String columnName,Object min,Object max){
+        StringBuffer result =  new StringBuffer();
+
+        HqlPack.getNumSmallerPack(max,columnName,result);
+        HqlPack.getNumBiggerPack(min,columnName,result);
+
+        return result.toString();
+    }
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java

@@ -63,9 +63,13 @@ public class BrLayoutColumn extends BaseBean {
     private String columnStyle;
 
     @Column(name="COLUMN_SEQ")
-    @ApiParam(value ="排序")
+    @ApiParam(value ="序列")
     private Integer columnSeq;
 
+    @Column(name="COLUMN_SORT")
+    @ApiParam(value ="排序，降序")
+    private Integer columnSort;
+
     @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT")
     @ApiParam(value ="列描述")
     private String columnDescription;

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java

@@ -45,9 +45,9 @@ public class BrLayoutRow extends BaseBean {
     @ApiParam(value ="行高")
     private Integer rowHeight;
 
-    @Column(name="ROW_SEQ")
+    @Column(name="ROW_SORT")
     @ApiParam(value ="排序")
-    private Integer rowSeq;
+    private Integer rowSort;
 
     @Column(name="ROW_STYLE",columnDefinition = "TEXT")
     @ApiParam(value ="行样式")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -124,7 +124,7 @@ public class ReportHqlPack {
 
         // 查询参数封装
         HqlPack.getNumEqualPack(rowId,"layoutRowId",result);
-        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"columnSeq","modifyDatetime"},result);
+        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"columnSort","modifyDatetime"},result);
 
         return result.toString();
     }
@@ -139,7 +139,7 @@ public class ReportHqlPack {
 
         // 查询参数封装
         HqlPack.getNumEqualPack(layoutId,"layoutId",result);
-        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"rowSeq","modifyDatetime"},result);
+        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"rowSort","modifyDatetime"},result);
 
         return result.toString();
     }