From 69f9d6930ce3a7c3b7019b5d3368155b9001811e Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Fri, 26 Aug 2022 11:31:25 +0800
Subject: [PATCH] loadProcInstFields

---
 .../bpm/web/design/flow/ModelProcService.java       | 21 ++++++++++++++++++---
 .../bpm/web/design/form/ModelFormLoadHandler.java   |  1 +
 2 files changed, 19 insertions(+), 3 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 4bf424b..d671148 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
@@ -3,6 +3,8 @@ package cc.smtweb.system.bpm.web.design.flow;
 import cc.smtweb.framework.core.annotation.SwBody;
 import cc.smtweb.framework.core.annotation.SwService;
 import cc.smtweb.framework.core.common.R;
+import cc.smtweb.framework.core.common.SwConsts;
+import cc.smtweb.framework.core.common.SwEnum;
 import cc.smtweb.framework.core.common.SwMap;
 import cc.smtweb.framework.core.db.cache.ModelTableCache;
 import cc.smtweb.framework.core.db.vo.ModelField;
@@ -12,12 +14,15 @@ import cc.smtweb.framework.core.mvc.service.AbstractHandler;
 import cc.smtweb.framework.core.mvc.service.DefaultDelHandler;
 import cc.smtweb.framework.core.mvc.service.DefaultListHandler;
 import cc.smtweb.framework.core.session.UserSession;
+import cc.smtweb.system.bpm.web.design.form.ModelForm;
+import cc.smtweb.system.bpm.web.design.form.ModelFormCache;
 import cc.smtweb.system.bpm.web.design.form.ModelFormHelper;
 import cc.smtweb.system.bpm.web.engine.flow.entity.Comment;
 import cc.smtweb.system.bpm.web.engine.flow.entity.ProcInst;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Created by Akmm at 2022/3/22 9:12
@@ -52,7 +57,7 @@ public class ModelProcService extends AbstractCompService {
 
     //加载工作流的列表字段
     public R loadProcInstFields(@SwBody SwMap params, UserSession us) {
-        ModelTable table = ModelTableCache.getInstance().get(ProcInst.ENTITY_NAME);
+        ModelTable table = ModelTableCache.getInstance().getByName(ProcInst.ENTITY_NAME);
         if (table == null) return R.error("没有找到表定义信息(table=" + ProcInst.ENTITY_NAME + ")！");
 
         List<SwMap> ret = new ArrayList<>();
@@ -67,7 +72,7 @@ public class ModelProcService extends AbstractCompService {
 
     //加载审批意见的列表字段
     public R loadCommentFields(@SwBody SwMap params, UserSession us) {
-        ModelTable table = ModelTableCache.getInstance().get(Comment.ENTITY_NAME);
+        ModelTable table = ModelTableCache.getInstance().getByName(Comment.ENTITY_NAME);
         if (table == null) return R.error("没有找到表定义信息(table=" + Comment.ENTITY_NAME + ")！");
 
         List<SwMap> ret = new ArrayList<>();
@@ -76,7 +81,17 @@ public class ModelProcService extends AbstractCompService {
             ModelFormHelper.buildFieldInfo(table, field, col);
             ret.add(col);
         }
-
+        ret.add(buildField("cmt_act_code", SwEnum.DataType.CODE.value, "活动编号"));
+        ret.add(buildField("cmt_act_text", SwEnum.DataType.NAME.value, "活动名称"));
         return R.success(ret);
     }
+
+    private SwMap buildField(String name, String dataType, String title) {
+        SwMap col = new SwMap();
+        col.put("name", name);
+        col.put("dataType", dataType);
+        col.put("title", title);
+        col.put("editor", SwEnum.EditorType.INPUT.value);
+        return col;
+    }
 }
diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
index 204e0c4..e47862a 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
@@ -38,6 +38,7 @@ public class ModelFormLoadHandler extends DefaultLoadHandler<ModelForm> {
         if (billType > 0L) {
             SwMap opts = bean.getOpts();
             opts.put(ModelFormHelper.KEY_BILL_TYPE + SwConsts.TEXT_SUFFIX, BillTypeCache.getInstance().getName(billType));
+            bean.setOption(JsonUtil.encodeString(opts));
         }
 
         return bean;