Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java

@@ -455,9 +455,9 @@ public class BlockReportEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TEMPLATE_STYLE {
 
-        TABLE_LEFT(1, TEMPLATE_TYPE.TABLE, "text-left", "表单左对齐"),
-        TABLE_RIGHT(2, TEMPLATE_TYPE.TABLE, "text-center", "表单右对齐"),
-        TABLE_CENTER(3, TEMPLATE_TYPE.TABLE, "text-right", "表单居中");
+        TABLE_LEFT(1, TEMPLATE_TYPE.TABLE, "text-align: left!important;", "表单左对齐"),
+        TABLE_RIGHT(2, TEMPLATE_TYPE.TABLE, "text-align: right!important;", "表单右对齐"),
+        TABLE_CENTER(3, TEMPLATE_TYPE.TABLE, "text-align: center!important;", "表单居中");
 
         private int value;
         private TEMPLATE_TYPE group;

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.report.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.report.bean.*;
@@ -76,7 +77,12 @@ public class ReportHqlPack {
 
         // 查询参数封装
         HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result);
+        if(template.getTemplateStatus() != null &&
+                template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue()){
             HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result);
+        }else {
+            HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue(),"templateStatus",result);
+        }
         HqlPack.getStringLikerPack(template.getName(),"name",result);
 
         // 添加默认排序