From c1be4333fbb7fac64e8c4f36c62a797b13a4bc5f Mon Sep 17 00:00:00 2001 From: st Date: Fri, 5 Jun 2020 14:54:59 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B5=81=E7=A8=8B=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E3=80=91=E7=BB=93=E6=9D=9F=E7=9A=84work=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=9A=E5=8A=A1=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionManageListFilterPaging.java | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/ActionManageListFilterPaging.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/ActionManageListFilterPaging.java index a51444b2c6..dad39c891e 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/ActionManageListFilterPaging.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/ActionManageListFilterPaging.java @@ -90,6 +90,41 @@ class ActionManageListFilterPaging extends BaseAction { String key = StringTools.escapeSqlLikeKey(wi.getKey()); p = cb.and(p,cb.like(root.get(WorkCompleted_.title), "%" + key + "%", StringTools.SQL_ESCAPE_CHAR)); } + + if (StringUtils.isNotBlank(wi.getStringValue01())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue01), wi.getStringValue01())); + } + if (StringUtils.isNotBlank(wi.getStringValue02())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue02), wi.getStringValue02())); + } + if (StringUtils.isNotBlank(wi.getStringValue03())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue03), wi.getStringValue03())); + } + if (StringUtils.isNotBlank(wi.getStringValue04())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue04), wi.getStringValue04())); + } + if (StringUtils.isNotBlank(wi.getStringValue05())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue05), wi.getStringValue05())); + } + if (StringUtils.isNotBlank(wi.getStringValue06())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue06), wi.getStringValue06())); + } + if (StringUtils.isNotBlank(wi.getStringValue07())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue07), wi.getStringValue07())); + } + if (StringUtils.isNotBlank(wi.getStringValue08())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue08), wi.getStringValue08())); + } + if (StringUtils.isNotBlank(wi.getStringValue09())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue09), wi.getStringValue09())); + } + if (StringUtils.isNotBlank(wi.getStringValue10())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue10), wi.getStringValue10())); + } + + + + cq.select(root).where(p).orderBy(cb.desc(root.get(WorkCompleted_.startTime))); return em.createQuery(cq).setFirstResult((adjustPage - 1) * adjustPageSize).setMaxResults(adjustPageSize) .getResultList(); @@ -133,6 +168,38 @@ class ActionManageListFilterPaging extends BaseAction { String key = StringTools.escapeSqlLikeKey(wi.getKey()); p = cb.and(p,cb.like(root.get(WorkCompleted_.title), "%" + key + "%", StringTools.SQL_ESCAPE_CHAR)); } + + if (StringUtils.isNotBlank(wi.getStringValue01())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue01), wi.getStringValue01())); + } + if (StringUtils.isNotBlank(wi.getStringValue02())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue02), wi.getStringValue02())); + } + if (StringUtils.isNotBlank(wi.getStringValue03())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue03), wi.getStringValue03())); + } + if (StringUtils.isNotBlank(wi.getStringValue04())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue04), wi.getStringValue04())); + } + if (StringUtils.isNotBlank(wi.getStringValue05())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue05), wi.getStringValue05())); + } + if (StringUtils.isNotBlank(wi.getStringValue06())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue06), wi.getStringValue06())); + } + if (StringUtils.isNotBlank(wi.getStringValue07())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue07), wi.getStringValue07())); + } + if (StringUtils.isNotBlank(wi.getStringValue08())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue08), wi.getStringValue08())); + } + if (StringUtils.isNotBlank(wi.getStringValue09())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue09), wi.getStringValue09())); + } + if (StringUtils.isNotBlank(wi.getStringValue10())){ + p = cb.and(p,cb.equal(root.get(WorkCompleted_.stringValue10), wi.getStringValue10())); + } + return em.createQuery(cq.select(cb.count(root)).where(p)).getSingleResult(); } @@ -167,6 +234,49 @@ class ActionManageListFilterPaging extends BaseAction { @FieldDescribe("关键字") private String key; + @FieldDescribe("业务数据String值01") + private String stringValue01; + @FieldDescribe("业务数据String值02") + private String stringValue02; + @FieldDescribe("业务数据String值03") + private String stringValue03; + @FieldDescribe("业务数据String值04") + private String stringValue04; + @FieldDescribe("业务数据String值05") + private String stringValue05; + @FieldDescribe("业务数据String值06") + private String stringValue06; + @FieldDescribe("业务数据String值07") + private String stringValue07; + @FieldDescribe("业务数据String值08") + private String stringValue08; + @FieldDescribe("业务数据String值09") + private String stringValue09; + @FieldDescribe("业务数据String值10") + private String stringValue10; + + public String getStringValue01() { return stringValue01; } + public String getStringValue02() { return stringValue02; } + public String getStringValue03() { return stringValue03; } + public String getStringValue04() { return stringValue04; } + public String getStringValue05() { return stringValue05; } + public String getStringValue06() { return stringValue06; } + public String getStringValue07() { return stringValue07; } + public String getStringValue08() { return stringValue08; } + public String getStringValue09() { return stringValue09; } + public String getStringValue10() { return stringValue10; } + + public void setStringValue01(String stringValue01) { this.stringValue01 = stringValue01; } + public void setStringValue02(String stringValue02) { this.stringValue02 = stringValue02; } + public void setStringValue03(String stringValue03) { this.stringValue03 = stringValue03; } + public void setStringValue04(String stringValue04) { this.stringValue04 = stringValue04; } + public void setStringValue05(String stringValue05) { this.stringValue05 = stringValue05; } + public void setStringValue06(String stringValue06) { this.stringValue06 = stringValue06; } + public void setStringValue07(String stringValue07) { this.stringValue07 = stringValue07; } + public void setStringValue08(String stringValue08) { this.stringValue08 = stringValue08; } + public void setStringValue09(String stringValue09) { this.stringValue09 = stringValue09; } + public void setStringValue10(String stringValue10) { this.stringValue10 = stringValue10; } + public List getApplicationList() { return applicationList; -- GitLab