From 4b4fb3024835a90ed5ac784c441606be79936db2 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 8 Mar 2019 10:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=20=E9=A5=BC=E5=9B=BE=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index cddf4cd..a003e66 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/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; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index ff56863..6ffb2b2 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/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); - HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",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); // 添加默认排序