diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2Count.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2Count.java index eaa8f0a338e77c0462facea0fbd806f3832860e3..7ba461154b88a82031fb71a22b17778f226830ee 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2Count.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2Count.java @@ -25,8 +25,8 @@ import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.content.Task; -import com.x.processplatform.core.entity.content.Task_; +import com.x.processplatform.core.entity.content.ReadCompleted; +import com.x.processplatform.core.entity.content.ReadCompleted_; class V2Count extends V2Base { @@ -59,16 +59,16 @@ class V2Count extends V2Base { } private Long count(Business business, Predicate predicate) throws Exception { - return business.entityManagerContainer().count(Task.class, predicate); + return business.entityManagerContainer().count(ReadCompleted.class, predicate); } private List groupByApplication(Business business, Predicate predicate) throws Exception { - EntityManager em = business.entityManagerContainer().get(Task.class); + EntityManager em = business.entityManagerContainer().get(ReadCompleted.class); CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Tuple.class); - Root root = cq.from(Task.class); - Path pathApplication = root.get(Task_.application); - Path pathApplicationName = root.get(Task_.applicationName); + Root root = cq.from(ReadCompleted.class); + Path pathApplication = root.get(ReadCompleted_.application); + Path pathApplicationName = root.get(ReadCompleted_.applicationName); cq.multiselect(pathApplication, pathApplicationName, cb.count(root)).where(predicate).groupBy(pathApplication); List os = em.createQuery(cq).getResultList(); List list = new ArrayList<>(); @@ -85,12 +85,12 @@ class V2Count extends V2Base { } private List groupByProcess(Business business, Predicate predicate) throws Exception { - EntityManager em = business.entityManagerContainer().get(Task.class); + EntityManager em = business.entityManagerContainer().get(ReadCompleted.class); CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Tuple.class); - Root root = cq.from(Task.class); - Path pathProcess = root.get(Task_.process); - Path pathProcessName = root.get(Task_.processName); + Root root = cq.from(ReadCompleted.class); + Path pathProcess = root.get(ReadCompleted_.process); + Path pathProcessName = root.get(ReadCompleted_.processName); cq.multiselect(pathProcess, pathProcessName, cb.count(root)).where(predicate).groupBy(pathProcess); List os = em.createQuery(cq).getResultList(); List list = new ArrayList<>(); @@ -107,11 +107,11 @@ class V2Count extends V2Base { } private List groupByCreatorPerson(Business business, Predicate predicate) throws Exception { - EntityManager em = business.entityManagerContainer().get(Task.class); + EntityManager em = business.entityManagerContainer().get(ReadCompleted.class); CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Tuple.class); - Root root = cq.from(Task.class); - Path pathCreatorPerson = root.get(Task_.creatorPerson); + Root root = cq.from(ReadCompleted.class); + Path pathCreatorPerson = root.get(ReadCompleted_.creatorPerson); cq.multiselect(pathCreatorPerson, cb.count(root)).where(predicate).groupBy(pathCreatorPerson); List os = em.createQuery(cq).getResultList(); List list = new ArrayList<>(); @@ -128,11 +128,11 @@ class V2Count extends V2Base { } private List groupByCreatorUnit(Business business, Predicate predicate) throws Exception { - EntityManager em = business.entityManagerContainer().get(Task.class); + EntityManager em = business.entityManagerContainer().get(ReadCompleted.class); CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Tuple.class); - Root root = cq.from(Task.class); - Path pathCreatorUnit = root.get(Task_.creatorUnit); + Root root = cq.from(ReadCompleted.class); + Path pathCreatorUnit = root.get(ReadCompleted_.creatorUnit); cq.multiselect(pathCreatorUnit, cb.count(root)).where(predicate).groupBy(pathCreatorUnit); List os = em.createQuery(cq).getResultList(); List list = new ArrayList<>(); @@ -149,11 +149,11 @@ class V2Count extends V2Base { } private List groupByStartTimeMonth(Business business, Predicate predicate) throws Exception { - EntityManager em = business.entityManagerContainer().get(Task.class); + EntityManager em = business.entityManagerContainer().get(ReadCompleted.class); CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Tuple.class); - Root root = cq.from(Task.class); - Path pathStartTimeMonth = root.get(Task_.startTimeMonth); + Root root = cq.from(ReadCompleted.class); + Path pathStartTimeMonth = root.get(ReadCompleted_.startTimeMonth); cq.multiselect(pathStartTimeMonth, cb.count(root)).where(predicate).groupBy(pathStartTimeMonth); List os = em.createQuery(cq).getResultList(); List list = new ArrayList<>(); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2List.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2List.java index 76bdbb6278a5150bd2cb86a59b86b7bf78b6c05b..b98845ab33df47d3069f55d4673e47979624a54f 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2List.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2List.java @@ -21,8 +21,8 @@ import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.content.Read; -import com.x.processplatform.core.entity.content.Read_; +import com.x.processplatform.core.entity.content.ReadCompleted; +import com.x.processplatform.core.entity.content.ReadCompleted_; class V2List extends V2Base { @@ -33,18 +33,18 @@ class V2List extends V2Base { if ((!wi.isEmptyFilter()) || ListTools.isNotEmpty(wi.getJobList()) || ListTools.isNotEmpty(wi.getIdList())) { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { Business business = new Business(emc); - EntityManager em = emc.get(Read.class); + EntityManager em = emc.get(ReadCompleted.class); CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Tuple.class); - Root root = cq.from(Read.class); + Root root = cq.from(ReadCompleted.class); Predicate p = this.toFilterPredicate(effectivePerson, business, wi); if (ListTools.isNotEmpty(wi.getJobList())) { - p = cb.and(p, root.get(Read_.job).in(wi.getJobList())); + p = cb.and(p, root.get(ReadCompleted_.job).in(wi.getJobList())); } if (ListTools.isNotEmpty(wi.getIdList())) { - p = cb.and(p, root.get(Read_.id).in(wi.getIdList())); + p = cb.and(p, root.get(ReadCompleted_.id).in(wi.getIdList())); } - wos = emc.fetch(Read.class, Wo.copier, p); + wos = emc.fetch(ReadCompleted.class, Wo.copier, p); this.relate(business, wos, wi); } } @@ -80,7 +80,7 @@ class V2List extends V2Base { public static class Wo extends AbstractWo { private static final long serialVersionUID = -4773789253221941109L; - static WrapCopier copier = WrapCopierFactory.wo(Read.class, Wo.class, - JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible); + static WrapCopier copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class, + JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible); } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreateNext.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreateNext.java index 60ea3f7797dfd31a022dc76dd7539b33cfca6050..fa2bed97fa8d6b0ff139e79e246982af6beead79 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreateNext.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreateNext.java @@ -18,8 +18,8 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.content.Read; -import com.x.processplatform.core.entity.content.Read_; +import com.x.processplatform.core.entity.content.ReadCompleted; +import com.x.processplatform.core.entity.content.ReadCompleted_; class V2ListCreateNext extends V2Base { @@ -28,11 +28,11 @@ class V2ListCreateNext extends V2Base { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { Wi wi = this.convertToWrapIn(jsonElement, Wi.class); Business business = new Business(emc); - EntityManager em = emc.get(Read.class); + EntityManager em = emc.get(ReadCompleted.class); CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Tuple.class); - Root root = cq.from(Read.class); - Predicate p = cb.equal(root.get(Read_.creatorPerson), effectivePerson.getDistinguishedName()); + Root root = cq.from(ReadCompleted.class); + Predicate p = cb.equal(root.get(ReadCompleted_.creatorPerson), effectivePerson.getDistinguishedName()); p = cb.and(p, this.toFilterPredicate(effectivePerson, business, wi)); ActionResult> result = this.standardListNext(Wo.copier, id, count, JpaObject.sequence_FIELDNAME, DESC, p); @@ -47,7 +47,7 @@ class V2ListCreateNext extends V2Base { public static class Wo extends AbstractWo { private static final long serialVersionUID = -4773789253221941109L; - static WrapCopier copier = WrapCopierFactory.wo(Read.class, Wo.class, - JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible); + static WrapCopier copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class, + JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible); } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreatePrev.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreatePrev.java index 4ddd7ad144ece55d398ad5a0fb8fee7acef7a2e6..26a35c792f6879f01a7f4cfa76f289555b6be6cc 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreatePrev.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreatePrev.java @@ -18,8 +18,8 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.content.Read; -import com.x.processplatform.core.entity.content.Read_; +import com.x.processplatform.core.entity.content.ReadCompleted; +import com.x.processplatform.core.entity.content.ReadCompleted_; class V2ListCreatePrev extends V2Base { @@ -28,11 +28,11 @@ class V2ListCreatePrev extends V2Base { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { Wi wi = this.convertToWrapIn(jsonElement, Wi.class); Business business = new Business(emc); - EntityManager em = emc.get(Read.class); + EntityManager em = emc.get(ReadCompleted.class); CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Tuple.class); - Root root = cq.from(Read.class); - Predicate p = cb.equal(root.get(Read_.creatorPerson), effectivePerson.getDistinguishedName()); + Root root = cq.from(ReadCompleted.class); + Predicate p = cb.equal(root.get(ReadCompleted_.creatorPerson), effectivePerson.getDistinguishedName()); p = cb.and(p, this.toFilterPredicate(effectivePerson, business, wi)); ActionResult> result = this.standardListPrev(Wo.copier, id, count, JpaObject.sequence_FIELDNAME, DESC, p); @@ -47,7 +47,7 @@ class V2ListCreatePrev extends V2Base { public static class Wo extends AbstractWo { private static final long serialVersionUID = -4773789253221941109L; - static WrapCopier copier = WrapCopierFactory.wo(Read.class, Wo.class, - JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible); + static WrapCopier copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class, + JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible); } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListNext.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListNext.java index fb7dbcfcfce15a032a49999201544c95705ca25d..dec4b15fb2b7a0e10c395109497af1f5c380f687 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListNext.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListNext.java @@ -13,7 +13,7 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.content.Read; +import com.x.processplatform.core.entity.content.ReadCompleted; class V2ListNext extends V2Base { @@ -36,7 +36,7 @@ class V2ListNext extends V2Base { public static class Wo extends AbstractWo { private static final long serialVersionUID = -4773789253221941109L; - static WrapCopier copier = WrapCopierFactory.wo(Read.class, Wo.class, - JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible); + static WrapCopier copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class, + JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible); } } \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPaging.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPaging.java index e84f29daad20ec5ffcf9514f62c096acea7d3f08..c9f193af99dfda98739dd9089ca6dbded071c97d 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPaging.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPaging.java @@ -13,7 +13,7 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.content.Read; +import com.x.processplatform.core.entity.content.ReadCompleted; class V2ListPaging extends V2Base { @@ -24,9 +24,9 @@ class V2ListPaging extends V2Base { ActionResult> result = new ActionResult<>(); Wi wi = this.convertToWrapIn(jsonElement, Wi.class); Predicate p = this.toFilterPredicate(effectivePerson, business, wi); - List wos = emc.fetchDescPaging(Read.class, Wo.copier, p, page, size, Read.sequence_FIELDNAME); + List wos = emc.fetchDescPaging(ReadCompleted.class, Wo.copier, p, page, size, ReadCompleted.sequence_FIELDNAME); result.setData(wos); - result.setCount(emc.count(Read.class, p)); + result.setCount(emc.count(ReadCompleted.class, p)); this.relate(business, result.getData(), wi); return result; } @@ -38,7 +38,7 @@ class V2ListPaging extends V2Base { public static class Wo extends AbstractWo { private static final long serialVersionUID = -4773789253221941109L; - static WrapCopier copier = WrapCopierFactory.wo(Read.class, Wo.class, - JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible); + static WrapCopier copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class, + JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible); } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPrev.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPrev.java index 73c7e7e1afa0ec1850f071d3f39c74a4b890bceb..d020d3a2c0333d5888001ee534111e1c9b305e4d 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPrev.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPrev.java @@ -13,7 +13,7 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.content.Read; +import com.x.processplatform.core.entity.content.ReadCompleted; class V2ListPrev extends V2Base { @@ -36,7 +36,7 @@ class V2ListPrev extends V2Base { public static class Wo extends AbstractWo { private static final long serialVersionUID = -4773789253221941109L; - static WrapCopier copier = WrapCopierFactory.wo(Read.class, Wo.class, - JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible); + static WrapCopier copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class, + JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible); } }