From 5088a26c75c2af8b7b0ff1e6ce9d7cde7ad2b5c9 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Wed, 7 Sep 2022 09:28:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84insert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/smtweb/framework/core/db/EntityDao.java | 30 +++------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java index 89c66c2..9124332 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java @@ -139,40 +139,18 @@ public class EntityDao extends AbstractEntityDao { * 批量插入单行数据 * * @param entities PO对象列表 - * @return 更新数量 - */ - public int[] batchInsertEntity(Collection entities) { - return batchInsertEntity(entities, null); - } - - - /** - * 批量插入单行数据 - * - * @param entities PO对象列表 * @param fields 逗号分隔的字段列表 * @return 更新数量 */ - public int[] batchInsertEntity(Collection entities, String fields) { + public int[] batchInsertEntity(Collection entities) { StringBuilder sql = new StringBuilder(); sql.append("insert into ").append(modelTable.getSchemaTableName()).append("("); - - List listFields = adjustFields(fields, SwEnum.FieldType.CREATE_TIME.value, SwEnum.FieldType.LAST_TIME.value); List insertColumns = new ArrayList<>(this.columns.size()); - if (listFields == null) { - for (EntityColumn column : this.columns.values()) { - sql.append(column.getField().getName()).append(","); - insertColumns.add(column); - } - } else { - - for (String name : listFields) { - EntityColumn column = this.columns.get(name.trim()); - sql.append(column.getField().getName()).append(","); - insertColumns.add(column); - } + for (EntityColumn column : this.columns.values()) { + sql.append(column.getField().getName()).append(","); + insertColumns.add(column); } sql.setCharAt(sql.length() - 1, ')'); From d2f875f77120702e69847f7e1f65a29f78e2b11d Mon Sep 17 00:00:00 2001 From: zhenggm Date: Wed, 7 Sep 2022 09:42:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84insert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/src/main/java/cc/smtweb/framework/core/db/DbEngine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/DbEngine.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/DbEngine.java index b474d0f..c22d19d 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/DbEngine.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/DbEngine.java @@ -278,7 +278,7 @@ public class DbEngine extends JdbcEngine { if (entities == null || entities.isEmpty()) { return null; } - return findDao((Class) entities.get(0).getClass()).batchInsertEntity(entities, null); + return findDao((Class) entities.get(0).getClass()).batchInsertEntity(entities); } /** @@ -293,7 +293,7 @@ public class DbEngine extends JdbcEngine { if (entities == null || entities.isEmpty()) { return null; } - return findDao((Class) entities.get(0).getClass()).batchInsertEntity(entities, fields); + return findDao((Class) entities.get(0).getClass()).batchInsertEntity(entities); } From 8e0392548b0187dc37b753ddd470be65d5025696 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Wed, 7 Sep 2022 09:42:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84insert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cc/smtweb/framework/core/db/DbEngine.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/DbEngine.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/DbEngine.java index c22d19d..4e419f7 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/DbEngine.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/DbEngine.java @@ -280,21 +280,4 @@ public class DbEngine extends JdbcEngine { } return findDao((Class) entities.get(0).getClass()).batchInsertEntity(entities); } - - /** - * 批量插入单行数据 - * - * @param entities PO对象列表 - * @param fields 逗号分隔的字段列表 - * @param 实体类型 - * @return 更新数量 - */ - public int[] batchInsertEntity(List entities, String fields) { - if (entities == null || entities.isEmpty()) { - return null; - } - return findDao((Class) entities.get(0).getClass()).batchInsertEntity(entities); - } - - } From e7332ac991b7156267a59e78754ab5b59f8dd696 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Wed, 7 Sep 2022 10:13:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84insert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/src/main/java/cc/smtweb/system/bpm/web/login/AuthService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/login/AuthService.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/login/AuthService.java index 5e6cb6e..2a89666 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/login/AuthService.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/login/AuthService.java @@ -50,7 +50,7 @@ public class AuthService { UserSession userSession = null; try { if ("admin".equals(loginPO.getUsername())) { - userSession = new UserSession(1); + userSession = UserSession.createSys(); // user=new User(); // return new UserSession(1); } else { From be57d46d8d4c59c75d234fdf51a8d9f7ede65381 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Wed, 7 Sep 2022 10:29:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0selTaskId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/smtweb/system/bpm/web/design/flow/ModelProcService.java | 8 +++++++- .../java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java | 1 + .../cc/smtweb/system/bpm/web/engine/flow/entity/ProcInst.java | 7 +++++++ .../engine/model/flow/listcard/single/FlowSingleLoadHandler.java | 5 +++-- .../engine/model/flow/listcard/single/FlowSingleSaveHandler.java | 2 +- .../web/engine/model/flow/listcard/single/FlowTransHandler.java | 3 ++- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcService.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcService.java index be6679a..91dfb3c 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcService.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcService.java @@ -62,7 +62,13 @@ public class ModelProcService extends AbstractCompService { ModelFormHelper.buildFieldInfo(table, field, col); ret.add(col); } - + SwMap col = new SwMap(); + col.put("name", "selTaskId"); + col.put("dataType", SwEnum.DataType.ID.value); + col.put("title", "选中的任务id"); + col.put("table", table.getId()); + col.put("table_text", table.getTitle()); + ret.add(col); return R.success(ret); } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java index 13f83cd..500244e 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java @@ -318,6 +318,7 @@ public class FlowInstance { * 返回页面前的设置 */ public void setPageRetExtra(SwMap ret) { + procInst.setSelTaskId(actInst.getId()); SwMap extra = ret.computeMapIfAbsent("extra", k -> new SwMap()); List listTask = adjustTasks(); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/entity/ProcInst.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/entity/ProcInst.java index 9d9defc..c982958 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/entity/ProcInst.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/entity/ProcInst.java @@ -232,4 +232,11 @@ public class ProcInst extends DefaultEntity { public void setUrl(String pri_url) { put("pri_url", pri_url); } + + /** + * 当前选择的任务 + */ + public void setSelTaskId(long selTaskId) { + put("selTaskId", selTaskId); + } } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java index 6800305..e6d63d9 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java @@ -28,9 +28,10 @@ public class FlowSingleLoadHandler extends LCSingleLoad bean.setEntityId(flowInstance.getProcInst().getId()); ret.put(cardDataset.name, DynRetBean.createBean(bean)); + + flowInstance.setPageRetExtra(ret); ret.put(FlowHelper.DATASET_NAME_FLOW, DynRetBean.createBean(flowInstance.getProcInst())); ret.put(FlowHelper.DATASET_NAME_COMMENT, DynRetBean.createList(SwListData.EMPTY)); - flowInstance.setPageRetExtra(ret); } @Override @@ -47,9 +48,9 @@ public class FlowSingleLoadHandler extends LCSingleLoad //加载流程信息 flowInstance = FlowInstance.createById(us, this, id, taskId); + flowInstance.setPageRetExtra(ret); ret.put(FlowHelper.DATASET_NAME_FLOW, DynRetBean.createBean(flowInstance.getProcInst())); ret.put(FlowHelper.DATASET_NAME_COMMENT, DynRetBean.createList(SwListData.create(flowInstance.loadComment(), 0))); - flowInstance.setPageRetExtra(ret); afterLoad(ret, bean); return R.success(ret); } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleSaveHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleSaveHandler.java index c4c968e..82c05af 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleSaveHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleSaveHandler.java @@ -55,9 +55,9 @@ public class FlowSingleSaveHandler extends LCSingleSave @Override protected void afterSave(SwMap ret, T bean) { super.afterSave(ret, bean); + flowInstance.setPageRetExtra(ret); ret.put(FlowHelper.DATASET_NAME_FLOW, DynRetBean.createBean(flowInstance.getProcInst())); ret.put(FlowHelper.DATASET_NAME_COMMENT, DynRetBean.createList(SwListData.EMPTY)); - flowInstance.setPageRetExtra(ret); } //单据编号，新增保存时调用 diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowTransHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowTransHandler.java index d9602e0..0616a41 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowTransHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowTransHandler.java @@ -34,9 +34,10 @@ public class FlowTransHandler extends AbstractDynPageHa private SwMap buildRetData() { SwMap ret = new SwMap(); ret.put(LCSingleHelper.DATASET_NAME_CARD, DynRetBean.createBean(bean)); + + flowInstance.setPageRetExtra(ret); ret.put(FlowHelper.DATASET_NAME_FLOW, DynRetBean.createBean(flowInstance.getProcInst())); ret.put(FlowHelper.DATASET_NAME_COMMENT, DynRetBean.createList(SwListData.EMPTY)); - flowInstance.setPageRetExtra(ret); return ret; }