From 03fe15e2f4d7fbf9804697e77a24cbd318bd87b1 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 11 Mar 2019 13:12:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java | 8 ++++---- .../cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 11 ++++++----- 2 files changed, 10 insertions(+), 9 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 cc02e4e..e8a2dbd 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 @@ -533,10 +533,10 @@ public class BlockReportEnumUtil { LIKE_LEFT(6, "LIKE", "左模糊"), LIKE_RIGHT(7, "LIKE", "右模糊"), EQUAL(8, "=", "等于"), - EQUAL_NOT(9, "!=", "不等于"), - AND(10, "AND", "AND"), - OR(11, "OR", "OR"), - NOT(12, "NOT", "NOT"), + EQUAL_NOT(9, "<>", "不等于"), +// AND(10, "AND", "AND"), +// OR(11, "OR", "OR"), +// NOT(12, "NOT", "NOT"), IS_NULL(13, "IS NULL", "IS NULL"), IS_NOT_NULL(14, "IS NOT NULL", "IS NOT NULL"); 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 bfa9604..db477bd 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 @@ -77,11 +77,12 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); - if(template.getTemplateStatus() != null && - template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){ - HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result); - }else { - HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); + if(template.getTemplateStatus() != null){ + if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){ + HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); + }else { + HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); + } } HqlPack.getStringLikerPack(template.getName(),"name",result); From 2943bfcf9fd7c7c9e0a878a5b32f1a2148116566 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 11 Mar 2019 19:57:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java index 9e2eff3..58f2528 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java @@ -35,6 +35,11 @@ public class SysRefTaskCyclePlan extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskCycleId; + @Column(name="TASK_PLAN_ID") + @ApiParam(value ="任务计划id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskPlanId; + @Column(name="TASK_PLAN_NAME") @ApiParam(value ="任务计划名称") private String taskPlanName;