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 | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 17 deletions(-)
diff --git a/src/com/yc/service/build/type/v2/BaseImpl.java b/src/com/yc/service/build/type/v2/BaseImpl.java
index b7ac4c8..9a43b0c 100644
--- a/src/com/yc/service/build/type/v2/BaseImpl.java
+++ b/src/com/yc/service/build/type/v2/BaseImpl.java
@@ -2,6 +2,8 @@
import com.yc.action.grid.GridUtils;
import com.yc.action.grid.TreeGridIfc;
+import com.yc.api.bean.T9685Entity;
+import com.yc.api.service.ApiServiceIfc;
import com.yc.service.BaseService;
import com.yc.service.build.BuildFuncIfc;
import com.yc.service.build.top.v2.BuildTopIfc;
@@ -36,13 +38,14 @@
protected GformIfc gformIfc;
@Autowired
private BuildTopIfc buildTopIfc;
+ @Autowired
+ private ApiServiceIfc apiServiceIfc;
@Autowired
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,onlinepaymentbtneditstatus ";
-
+ 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));
}
@@ -143,6 +146,9 @@
// ----------------
Map<String, String> map = pIfc.getPanelHtml(Integer.parseInt(baseBean.formID), baseBean.type, data, gformInfo);
buildPageCode(map.get("panHTML"), fileName, baseBean);
+ if (StringUtils.isNotBlank(map.get("customPanHTML"))) {//瀹㈡埛鑷畾涔夋帶浠跺竷灞�鏂囦欢 xin 2024-1-12 17:27:12
+ buildPageCode(map.get("customPanHTML"), baseBean.getUsrCode() + fileName, baseBean);
+ }
buildPageCode(map.get("panelControl"), "panelControl" + baseBean.formID + ".jsp", baseBean);
if(map!=null&&map.get("zhu")!=null){
baseBean.zhu=map.get("zhu");
@@ -200,6 +206,25 @@
//--------浠巊form琛ㄨ幏鍙栨槸鍚︽樉绀哄ぇ鏍囬瀛楁鍊�(isTitle)鍒ゆ柇鏄惁鏄剧ず澶ф爣棰橈紝骞舵浛鎹㈡爣璇嗙-2012-02-20-syz-----[end]-------------------------//
+ //-------------鏂囧瓧棰滆壊璇存槑---------xin 2022-5-18 16:09:54-----------//
+ StringBuilder colorText =new StringBuilder();//鏂囧瓧棰滆壊璇存槑
+ if(StringUtils.isNotBlank(baseBean.formID)) {
+ List<T9685Entity> colorList = apiServiceIfc.get9685List(Integer.parseInt(baseBean.formID));
+ if (colorList != null && colorList.size() > 0) {
+ colorText.append("<div class=\"colorDescriptionContainer\">");
+ colorText.append("<div class=\"colorDescriptionTitle\">鏂囧瓧棰滆壊璇存槑</div>");
+ colorText.append("<div class=\"colorDescription\">");
+ for (T9685Entity t : colorList) {
+ colorText.append("<div><span title=\"" + t.getItemMemo() + "\" class=\"spanColor\" " +
+ "style=\"background-color: " + t.getHexColor() + "\"></span>" +
+ "<span class=\"spanText\" style=\"color: " + t.getHexColor() + "\">" +
+ t.getColorName() + "</span></div>");
+ }
+ colorText.append("</div></div>");
+ }
+ }
+ //鏂囧瓧棰滆壊璇存槑 xin 2022-5-18 15:53:13
+ data = data.replace("[?ColorDescription]",colorText);
// ----------------
data = data.replace("[?title]", gformInfo.get("formname") + "");
data = data.replaceAll("@gridJsp@", baseBean.formID + "_grid.jsp");
@@ -227,6 +252,9 @@
*/
public void buildGrid(BaseBean baseBean) throws Exception {
treeGrid.createGrid(baseBean.type, Integer.parseInt(baseBean.formID), baseBean.URI, "app/" + baseBean.gPath + "/", new String[]{baseBean.formID + "_grid.jsp"}, getTemPath(baseBean), "/" + baseBean.formID + "/" + baseBean.type + "/", null, baseBean.dataBaseId);
+ if(baseBean.isCustomLayout()){//鑷畾涔夋帶浠跺竷灞�
+ treeGrid.createGrid(baseBean.type, Integer.parseInt(baseBean.formID), baseBean.URI, "app/" + baseBean.gPath + "/", new String[]{baseBean.formID + "_"+baseBean.getUsrCode()+"grid.jsp"}, getTemPath(baseBean), "/" + baseBean.formID + "/" + baseBean.type + "/", null, baseBean.dataBaseId);
+ }
}
/**
@@ -268,18 +296,20 @@
SqlRowSet row = this.getRowSet(" set nocount on ; select count(1) as a from gfield where formid=" + baseBean.formID + " and (gridcontroltype in(9,19,40) or controltype in(9,19,40))");
row.next();
int num = row.getInt(1);
+ String js_css = "<!--Bootstrap鎻掍欢鍖咃紙鍖呭惈fileInput锛�,bootstrap鐗堟湰鏄�5.1.3-->\n";
+ js_css += "<link rel=\"stylesheet\" type=\"text/css\" href=\"/js/bootstrap/v5.1.3/css/bootstrap.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap/v5.1.3/css/bootstrap.css\")%>\">\n" +
+ "<link rel=\"stylesheet\" type=\"text/css\" href=\"/js/bootstrap/v5.1.3/icons/font/bootstrap-icons.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap/v5.1.3/icons/font/bootstrap-icons.css\")%>\">\n" +
+ "<script type=\"text/javascript\" src=\"/js/bootstrap/v5.1.3/js/bootstrap.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap/v5.1.3/js/bootstrap.js\")%>\"></script>\n" +
+ "<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) {//琛ㄧず瀛樺湪鏈変笂浼犳帶浠�
- String js_css = "<!--涓婁紶鎺т欢-->\n" +
- "<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";
- data = data.replace("@_add_js_css_@", js_css);
- } else {
- data = data.replace("@_add_js_css_@", "");
+ js_css +=
+ "<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" +
+ "<script type=\"text/javascript\" src=\"/js/bootstrap/fileinput/js/locales/zh.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/js/bootstrap/fileinput/js/locales/zh.js\")%>\"></script>\n" +
+ "<script type=\"text/javascript\" src=\"/general/Viewer/js/viewer.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/general/Viewer/js/viewer.min.js\")%>\"></script>";
}
+ data = data.replace("@_add_js_css_@", js_css);
if (!file.exists() || !file.isDirectory()) file.mkdirs();
file = new File(file.getPath() + File.separator + targetFileName);
FileUtils.writeStringToFile(file, data, "utf-8");
@@ -318,20 +348,35 @@
tmpJsp = tmpJsp.replace("[?formId]", baseBean.formID);
tmpJsp = tmpJsp.replace("[?table]", toString(gformInfo.get("HDTable")));
tmpJsp = tmpJsp.replace("[?formType]", baseBean.type + "");
- 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("[?isStartupSerialNumber]", DBHelper.getValueInt(gformInfo,"isStartupSerialNumber")+"");
- tmpJsp = tmpJsp.replace("[?SerialNumberBtnEditStatus]", DBHelper.getValue(gformInfo,"SerialNumberBtnEditStatus"));
+ //鍏ュ簱
+ 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("[?isShowCycleCountSerialBtn]", DBHelper.getValueInt(gformInfo,"isShowCycleCountSerialBtn")+"");
+ tmpJsp = tmpJsp.replace("[?cycleCountSerialBtnEditStatus]", DBHelper.getValue(gformInfo,"cycleCountSerialBtnEditStatus"));
+
+ //鍐滆鏀粯鏀朵粯娆炬帶鍒� xin 2021-8-23 14:30:39
+ //鍦ㄧ嚎鏀�
+ tmpJsp = tmpJsp.replace("[?isshowonlinepaymentbutton]", DBHelper.getValueInt(gformInfo,"isshowonlinepaymentbutton")+"");
+
//--鎿嶄綔绫诲瀷
if (gformInfo.get("optype") != null && !StringUtils.isBlank(gformInfo.get("optype").toString())) {
tmpJsp = tmpJsp.replace("[?formOptType]", gformInfo.get("optype").toString().equalsIgnoreCase("0") ? "-1" : gformInfo.get("optype").toString());
--
Gitblit v1.8.0