From a2ecbf17d6ba1c7b135fe10bb4cdfefa05b75add Mon Sep 17 00:00:00 2001
From: fs-danaus <danaus314@qq.com>
Date: 星期六, 16 三月 2024 17:48:40 +0800
Subject: [PATCH] 在线交流,流程跟踪根据sql表达式设置显示与否

---
 src/com/yc/service/build/type/v2/BaseImpl.java |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/com/yc/service/build/type/v2/BaseImpl.java b/src/com/yc/service/build/type/v2/BaseImpl.java
index b2bdb71..9a43b0c 100644
--- a/src/com/yc/service/build/type/v2/BaseImpl.java
+++ b/src/com/yc/service/build/type/v2/BaseImpl.java
@@ -45,7 +45,7 @@
     protected PanelServiceIfc pIfc;
 
     public static String BEAN_INFO = "beaninfo";
-    private static String GFORM_SQL = " isTitle,formname,showdetail,isopenFuncshowpwdedit,isshowpwdedit,optype,HDTable,version,dataformid,formdatafilters,panellabellayout,CancelBtnProcName,CancelBtnExpression,CancelBtnEditStatus,CancelBtnName,RevokeBtnProcName,RevokeBtnExpression,RevokeBtnEditStatus,isShowOnlineMsg,isShowProcessTracking,autoOpen,predocstatus,procgroupaftersavedoc,dealafterdocsave,transgroupcode,dttable,isShowNewDocButton,isshowinserialbtn,inserialbtneditstatus,isshowoutserialbtn ,outserialbtneditstatus,isshowonlinepaymentbutton,isshowgridstyleforapp,popupWindowsHeightRate,isShowCycleCountSerialBtn,cycleCountSerialBtnEditStatus";//
+    private static String GFORM_SQL = " isTitle,formname,showdetail,isopenFuncshowpwdedit,isshowpwdedit,optype,HDTable,version,dataformid,formdatafilters,panellabellayout,CancelBtnProcName,CancelBtnExpression,CancelBtnEditStatus,CancelBtnName,RevokeBtnProcName,RevokeBtnExpression,RevokeBtnEditStatus,isShowOnlineMsg,isShowProcessTracking,autoOpen,predocstatus,procgroupaftersavedoc,dealafterdocsave,transgroupcode,dttable,isShowNewDocButton,isshowinserialbtn,inserialbtneditstatus,isshowoutserialbtn ,outserialbtneditstatus,isshowonlinepaymentbutton,isshowgridstyleforapp,popupWindowsHeightRate,isShowCycleCountSerialBtn,cycleCountSerialBtnEditStatus,showOnlineMsgExpression,showProcessTrackingExpression";//
     protected Map<String, Object> getGformInfo(String formid) {
         return gformIfc.getGformInfo(GFORM_SQL, Integer.parseInt(formid));
     }
@@ -303,12 +303,6 @@
                 "<script type=\"text/javascript\" src=\"/js/bootstrap/v5.1.3/js/bootstrap.bundle.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap/v5.1.3/js/bootstrap.bundle.js\")%>\"></script>\n";
         if (num != 0) {//琛ㄧず瀛樺湪鏈変笂浼犳帶浠�
             js_css +=
-//                    "<link rel=\"stylesheet\" type=\"text/css\" href=\"/js/bootstrap-upload/css/fileinput.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap-upload/css/fileinput.css\")%>\">\n" +
-//                    "<link rel=\"stylesheet\" type=\"text/css\" href=\"/js/bootstrap-upload/css/bootstrap.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap-upload/css/bootstrap.css\")%>\">\n" +
-//                    "<link rel=\"stylesheet\" type=\"text/css\" href=\"/js/bootstrap-upload/css/rotationscaling.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap-upload/css/rotationscaling.css\")%>\">\n" +
-//                    "<script type=\"text/javascript\" src=\"/js/bootstrap-upload/js/fileinput.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap-upload/js/fileinput.js\")%>\"></script>\n" +
-//                    "<script type=\"text/javascript\" src=\"/js/bootstrap-upload/js/locales/zh.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap-upload/js/locales/zh.js\")%>\"></script>\n" +
-//                    "<script type=\"text/javascript\" src=\"/shopping/view/javascript/bootstrap/js/bootstrap.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/shopping/view/javascript/bootstrap/js/bootstrap.min.js\")%>\"></script>\n";
                     "<link rel=\"stylesheet\" type=\"text/css\" href=\"/js/bootstrap/fileinput/css/fileinput.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap/fileinput/css/fileinput.css\")%>\">\n" +
                             "<link rel=\"stylesheet\" type=\"text/css\" href=\"/general/Viewer/css/viewer.min.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/general/Viewer/css/viewer.min.css\")%>\">\n" +
                             "<script type=\"text/javascript\" src=\"/js/bootstrap/fileinput/js/fileinput.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap/fileinput/js/fileinput.js\")%>\"></script>\n" +
@@ -354,25 +348,27 @@
         tmpJsp = tmpJsp.replace("[?formId]", baseBean.formID);
         tmpJsp = tmpJsp.replace("[?table]", toString(gformInfo.get("HDTable")));
         tmpJsp = tmpJsp.replace("[?formType]", baseBean.type + "");
-        tmpJsp = tmpJsp.replace("[?formName]", gformInfo.get("formName")+"");
-        tmpJsp = tmpJsp.replace("[?canelProc]",toString(gformInfo.get("CancelBtnProcName")));//鍙栨秷纭
-        tmpJsp = tmpJsp.replace("[?revokeProc]",toString(gformInfo.get("RevokeBtnProcName")));//鎾ゅ洖
-        tmpJsp= tmpJsp.replace("[?zhu]", baseBean.zhu);
+        tmpJsp = tmpJsp.replace("[?formName]", gformInfo.get("formName") + "");
+        tmpJsp = tmpJsp.replace("[?canelProc]", toString(gformInfo.get("CancelBtnProcName")));//鍙栨秷纭
+        tmpJsp = tmpJsp.replace("[?revokeProc]", toString(gformInfo.get("RevokeBtnProcName")));//鎾ゅ洖
+        tmpJsp = tmpJsp.replace("[?zhu]", baseBean.zhu);
         tmpJsp = tmpJsp.replace("[?sousuo]", baseBean.sous);
         tmpJsp = tmpJsp.replace("@doc", baseBean.doc);
         tmpJsp = tmpJsp.replace("@id_info", baseBean.id_info);
         tmpJsp = tmpJsp.replace("[?predocstatus]", gformInfo.get("predocstatus") + "");
         tmpJsp = tmpJsp.replace("[?isShowOnlineMsg]", gformInfo.get("isShowOnlineMsg") + "");
         tmpJsp = tmpJsp.replace("[?isShowProcessTracking]", gformInfo.get("isShowProcessTracking") + "");
+        tmpJsp = tmpJsp.replace("[?ShowOnlineMsgExpression]", gformInfo.get("showOnlineMsgExpression") == null ? "" : gformInfo.get("showOnlineMsgExpression") + "");
+        tmpJsp = tmpJsp.replace("[?ShowProcessTrackingExpression]", gformInfo.get("showProcessTrackingExpression") == null ? "" : gformInfo.get("showProcessTrackingExpression") + "");
         tmpJsp = tmpJsp.replace("[?isOpenFuncShowPwdEdit]", toString(gformInfo.get("isopenFuncshowpwdedit")));
         tmpJsp = tmpJsp.replace("[?version]", ("".equalsIgnoreCase(toString(gformInfo.get("version"))) ? "0" : toString(gformInfo.get("version"))));
         // 搴忓垪鍙锋壂鐮� xin 2021-8-2 17:45:43
         //鍏ュ簱
-        tmpJsp = tmpJsp.replace("[?isshowinserialbtn]", DBHelper.getValueInt(gformInfo,"isshowinserialbtn")+"");
-        tmpJsp = tmpJsp.replace("[?inserialbtneditstatus]", DBHelper.getValue(gformInfo,"inserialbtneditstatus"));
+        tmpJsp = tmpJsp.replace("[?isshowinserialbtn]", DBHelper.getValueInt(gformInfo, "isshowinserialbtn") + "");
+        tmpJsp = tmpJsp.replace("[?inserialbtneditstatus]", DBHelper.getValue(gformInfo, "inserialbtneditstatus"));
         //鍑哄簱
-        tmpJsp = tmpJsp.replace("[?isshowoutserialbtn]", DBHelper.getValueInt(gformInfo,"isshowoutserialbtn")+"");
-        tmpJsp = tmpJsp.replace("[?outserialbtneditstatus]", DBHelper.getValue(gformInfo,"outserialbtneditstatus"));
+        tmpJsp = tmpJsp.replace("[?isshowoutserialbtn]", DBHelper.getValueInt(gformInfo, "isshowoutserialbtn") + "");
+        tmpJsp = tmpJsp.replace("[?outserialbtneditstatus]", DBHelper.getValue(gformInfo, "outserialbtneditstatus"));
         //鐩樼偣
         tmpJsp = tmpJsp.replace("[?isShowCycleCountSerialBtn]", DBHelper.getValueInt(gformInfo,"isShowCycleCountSerialBtn")+"");
         tmpJsp = tmpJsp.replace("[?cycleCountSerialBtnEditStatus]", DBHelper.getValue(gformInfo,"cycleCountSerialBtnEditStatus"));

--
Gitblit v1.8.0