From 3c47486c2e0643d5d713ff39a50d2040a49f7570 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期二, 19 三月 2024 18:03:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/com/yc/service/build/type/v2/BaseImpl.java | 26 +-
WebRoot/public/template/0/496/dataHead.jsp | 28 +++
src/com/yc/sdk/huaweimap/controller/HuaweiMapController.java | 25 +++
WebRoot/public/template/0/8/index.jsp | 13 -
WebRoot/public/template/0/16/index.jsp | 15 -
WebRoot/public/template/0/498/panel.jsp | 17 +
WebRoot/public/template/0/8/dataHead.jsp | 25 +++
src/com/yc/action/grid/TreeBean.java | 3
WebRoot/public/template/0/5/dataHead.jsp | 27 +++
WebRoot/public/template/0/16/dataHead.jsp | 26 +++
WebRoot/public/template/0/498/jsCssHead.jsp | 4
src/com/yc/service/build/type/v2/T_Based_Impl.java | 5
WebRoot/public/template/0/498/dataHead.jsp | 27 +++
WebRoot/public/template/0/496/panel.jsp | 13 +
src/com/yc/ionic/schedule/JPushTimer.java | 2
WebRoot/public/template/0/5/index.jsp | 13 -
src/com/yc/sdk/map/entity/SearchEntity.java | 4
WebRoot/public/template/0/8/jsCssHead.jsp | 4
src/com/yc/app/v2/entity/GformEntity.java | 4
WebRoot/public/template/0/5/panel.jsp | 26 ++
src/com/yc/sdk/map/service/AbstractMapService.java | 8 +
WebRoot/public/template/0/496/index.jsp | 12 -
src/com/yc/sdk/huaweimap/service/HuaWeiMapService.java | 35 ++++
WebRoot/public/template/0/498/index.jsp | 9 -
src/com/yc/service/grid/GridServiceImpl.java | 2
WebRoot/public/template/0/8/panel.jsp | 21 ++
src/com/yc/app/v2/service/impl/DanJunFormServiceImpl.java | 27 +++
src/com/yc/sdk/gaodemap/api/GaoDeMapService.java | 5
WebRoot/public/template/0/16/jsCssHead.jsp | 5
src/com/yc/api/schedule/AttendanceSchedule.java | 3
WebRoot/public/template/0/16/panel.jsp | 13 +
31 files changed, 331 insertions(+), 116 deletions(-)
diff --git a/WebRoot/public/template/0/16/dataHead.jsp b/WebRoot/public/template/0/16/dataHead.jsp
index 9bfd8b5..7ce310a 100644
--- a/WebRoot/public/template/0/16/dataHead.jsp
+++ b/WebRoot/public/template/0/16/dataHead.jsp
@@ -36,7 +36,31 @@
if(isshowonlinepaymentbutton==1){
online+=",(case when isnull(OnlinePaymentAmount,0) > 0 then 1 else 0 end) as isshowonlinepaymentbutton";
}
-
+//---------------鍦ㄧ嚎浜ゆ祦,娴佺▼璺熻釜 by danaus 2024-03-15 09:36
+ String isShowOnlineMsg="[?isShowOnlineMsg]";//鏄惁鏄剧ず锛�1鏄剧ず锛�0涓嶆樉绀�
+ String showOnlineMsgExpression="[?ShowOnlineMsgExpression]";//琛ㄨ揪寮�
+ String isShowProcessTracking="[?isShowProcessTracking]";
+ String showProcessTrackingExpression="[?ShowProcessTrackingExpression]";
+ //--鍦ㄧ嚎浜ゆ祦sql琛ㄨ揪寮�
+ if ("1".equals(isShowOnlineMsg)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showOnlineMsgExpression)){
+ showOnlineMsgExpression=DBHelper.getRepAll(showOnlineMsgExpression,session,null,true);
+ online+=",(case when "+showOnlineMsgExpression+" then 1 else 0 end) as isShowOnlineMsgBtn";
+ }else{
+ //娌℃湁璁剧疆琛ㄨ揪寮忥紝榛樿鏄剧ず
+ online+=",1 as isShowOnlineMsgBtn";
+ }
+ }
+ //--娴佺▼璺熻釜sql琛ㄨ揪寮�
+ if ("1".equals(isShowProcessTracking)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showProcessTrackingExpression)){
+ showProcessTrackingExpression=DBHelper.getRepAll(showProcessTrackingExpression,session,null,true);
+ online+=",(case when "+showProcessTrackingExpression+" then 1 else 0 end) as isShowProcessTrackingBtn";
+ }else{
+ online+=",1 as isShowProcessTrackingBtn";
+ }
+ }
+ //-----------
//鐢ㄦ埛浠ｇ爜
String hrCode = (String)session.getAttribute(SessionKey.HRCODE);
String userCode = (String)session.getAttribute(SessionKey.USERCODE);
diff --git a/WebRoot/public/template/0/16/index.jsp b/WebRoot/public/template/0/16/index.jsp
index 163af15..d22a114 100644
--- a/WebRoot/public/template/0/16/index.jsp
+++ b/WebRoot/public/template/0/16/index.jsp
@@ -26,22 +26,9 @@
String customURL=DBHelper.getCustomURL(request,formId,formType,"panel.jsp");
%>
<jsp:include page="<%=customURL%>" flush="true"></jsp:include><%//鏀规垚鍏煎鐢ㄦ埛鑷畾涔夋帶浠跺竷灞�鐨勫彉閲� xin 2024-1-12 16:14:05%>
-<%-- <%@ include file="panel.jsp" %>--%>
</div>
</div>
- <%
- if ("1".equals(isShowOnlineMsg)) {
- //isShowOnlineMsg瀹氫箟鍦╦sCssHead
- request.setAttribute("formId", formId + "");
- request.setAttribute("docCode", doccode);
- %>
- <jsp:include page="/general/onlineMessage.jsp" flush="true"/>
- <%
- }
- if ("1".equals(isShowProcessTracking)) {//isShowProcessTracking瀹氫箟鍦╦sCssHead
- %>
- <%@ include file="/general/processTrack.jsp" %>
- <%} %>
+
<%//鏂囧瓧棰滆壊璇存槑鏄剧ず浣嶇疆 xin 2022-5-16 14:45:39%>
[?ColorDescription]
</div>
diff --git a/WebRoot/public/template/0/16/jsCssHead.jsp b/WebRoot/public/template/0/16/jsCssHead.jsp
index 88f4b67..9868dec 100644
--- a/WebRoot/public/template/0/16/jsCssHead.jsp
+++ b/WebRoot/public/template/0/16/jsCssHead.jsp
@@ -36,10 +36,7 @@
<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>
<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>
<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>
-<%
- String isShowOnlineMsg="[?isShowOnlineMsg]";
- String isShowProcessTracking="[?isShowProcessTracking]";
-%>
+
<script type="text/javascript">
var savedFunclink16='';
var spellPath="/<%=session.getAttribute(SessionKey.DATA_BASE_ID)%>/<%=session.getAttribute(SessionKey.VERSION_ID)%>/<%=session.getAttribute(SessionKey.SYSTEM_LANGUAGE)%>/";
diff --git a/WebRoot/public/template/0/16/panel.jsp b/WebRoot/public/template/0/16/panel.jsp
index 23ede0e..dac55fd 100644
--- a/WebRoot/public/template/0/16/panel.jsp
+++ b/WebRoot/public/template/0/16/panel.jsp
@@ -264,6 +264,19 @@
<div class="panelControlDiv">
@panelDownHtml@
</div>
+ <%
+ if ("1".equals(docMap.get("isshowonlinemsgbtn"))) {
+ //isShowOnlineMsg瀹氫箟鍦╦sCssHead
+ request.setAttribute("formId", formId + "");
+ request.setAttribute("docCode", doccode);
+ %>
+ <jsp:include page="/general/onlineMessage.jsp" flush="true"/>
+ <%
+ }
+ if ("1".equals(docMap.get("isshowprocesstrackingbtn"))) {//isShowProcessTracking瀹氫箟鍦╦sCssHead
+ %>
+ <%@ include file="/general/processTrack.jsp" %>
+ <%} %>
<script type="text/javascript">
@pansetInv@
panMain[panIndex].loadSet(<%=docstatePan%>);
diff --git a/WebRoot/public/template/0/496/dataHead.jsp b/WebRoot/public/template/0/496/dataHead.jsp
index cf2bd85..85d3379 100644
--- a/WebRoot/public/template/0/496/dataHead.jsp
+++ b/WebRoot/public/template/0/496/dataHead.jsp
@@ -25,8 +25,6 @@
<%@page import="com.yc.utils.DefaultSet" %>
<%@page import="com.yc.sdk.shopping.util.SettingKey"%>
<%
- String isShowOnlineMsg="[?isShowOnlineMsg]";
- String isShowProcessTracking="[?isShowProcessTracking]";
String canelProc="[?canelProc]";//鍙栨秷纭杩囩▼
String revokeProc="[?revokeProc]";//鎾ゅ洖杩囩▼
String URL =SettingKey.getHostUrl(request);
@@ -53,7 +51,31 @@
if(isshowonlinepaymentbutton==1){
online+=",(case when isnull(OnlinePaymentAmount,0) > 0 then 1 else 0 end) as isshowonlinepaymentbutton";
}
-
+//---------------鍦ㄧ嚎浜ゆ祦,娴佺▼璺熻釜 by danaus 2024-03-15 09:36
+ String isShowOnlineMsg="[?isShowOnlineMsg]";//鏄惁鏄剧ず锛�1鏄剧ず锛�0涓嶆樉绀�
+ String showOnlineMsgExpression="[?ShowOnlineMsgExpression]";//琛ㄨ揪寮�
+ String isShowProcessTracking="[?isShowProcessTracking]";
+ String showProcessTrackingExpression="[?ShowProcessTrackingExpression]";
+ //--鍦ㄧ嚎浜ゆ祦sql琛ㄨ揪寮�
+ if ("1".equals(isShowOnlineMsg)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showOnlineMsgExpression)){
+ showOnlineMsgExpression=DBHelper.getRepAll(showOnlineMsgExpression,session,null,true);
+ online+=",(case when "+showOnlineMsgExpression+" then 1 else 0 end) as isShowOnlineMsgBtn";
+ }else{
+ //娌℃湁璁剧疆琛ㄨ揪寮忥紝榛樿鏄剧ず
+ online+=",1 as isShowOnlineMsgBtn";
+ }
+ }
+ //--娴佺▼璺熻釜sql琛ㄨ揪寮�
+ if ("1".equals(isShowProcessTracking)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showProcessTrackingExpression)){
+ showProcessTrackingExpression=DBHelper.getRepAll(showProcessTrackingExpression,session,null,true);
+ online+=",(case when "+showProcessTrackingExpression+" then 1 else 0 end) as isShowProcessTrackingBtn";
+ }else{
+ online+=",1 as isShowProcessTrackingBtn";
+ }
+ }
+ //-----------
//鐢ㄦ埛浠ｇ爜
String hrCode = (String)session.getAttribute(SessionKey.HRCODE);
String userCode = (String)session.getAttribute(SessionKey.USERCODE);
diff --git a/WebRoot/public/template/0/496/index.jsp b/WebRoot/public/template/0/496/index.jsp
index d372f2b..267dd5a 100644
--- a/WebRoot/public/template/0/496/index.jsp
+++ b/WebRoot/public/template/0/496/index.jsp
@@ -80,18 +80,6 @@
@panFou@
</div>
</div>
- <%if ("1".equals(isShowOnlineMsg)) {//isShowOnlineMsg瀹氫箟鍦╦sCssHead %>
- <%
- request.setAttribute("formId", formId + "");
- request.setAttribute("docCode", doccode);
- %>
- <jsp:include page="/general/onlineMessage.jsp" flush="true"/>
- <%
- }
- if ("1".equals(isShowProcessTracking)) {//isShowProcessTracking瀹氫箟鍦╦sCssHead
- %>
- <%@ include file="/general/processTrack.jsp" %>
- <%} %>
<%//鏂囧瓧棰滆壊璇存槑鏄剧ず浣嶇疆 xin 2022-5-16 14:45:39%>
[?ColorDescription]
</div>
diff --git a/WebRoot/public/template/0/496/panel.jsp b/WebRoot/public/template/0/496/panel.jsp
index 472c8f0..7622672 100644
--- a/WebRoot/public/template/0/496/panel.jsp
+++ b/WebRoot/public/template/0/496/panel.jsp
@@ -262,6 +262,19 @@
</div>
@include@
<div class="panelControlDiv">@panelDownHtml@</div>
+ <%
+ if ("1".equals(docMap.get("isshowonlinemsgbtn"))) {
+ //isShowOnlineMsg瀹氫箟鍦╦sCssHead
+ request.setAttribute("formId", formId + "");
+ request.setAttribute("docCode", doccode);
+ %>
+ <jsp:include page="/general/onlineMessage.jsp" flush="true"/>
+ <%
+ }
+ if ("1".equals(docMap.get("isshowprocesstrackingbtn"))) {//isShowProcessTracking瀹氫箟鍦╦sCssHead
+ %>
+ <%@ include file="/general/processTrack.jsp" %>
+ <%} %>
<script type="text/javascript">
panIndex="@index@";//闇�瑕佹浛鎹�
@pansetInv@
diff --git a/WebRoot/public/template/0/498/dataHead.jsp b/WebRoot/public/template/0/498/dataHead.jsp
index a96d07f..092a36e 100644
--- a/WebRoot/public/template/0/498/dataHead.jsp
+++ b/WebRoot/public/template/0/498/dataHead.jsp
@@ -110,7 +110,32 @@
String isNew = request.getParameter("isNew");
String fl = request.getParameter("fl");
String flag = request.getParameter("flag");
-
+ String online="";
+ //---------------鍦ㄧ嚎浜ゆ祦,娴佺▼璺熻釜 by danaus 2024-03-15 09:36
+ String isShowOnlineMsg="[?isShowOnlineMsg]";//鏄惁鏄剧ず锛�1鏄剧ず锛�0涓嶆樉绀�
+ String showOnlineMsgExpression="[?ShowOnlineMsgExpression]";//琛ㄨ揪寮�
+ String isShowProcessTracking="[?isShowProcessTracking]";
+ String showProcessTrackingExpression="[?ShowProcessTrackingExpression]";
+ //--鍦ㄧ嚎浜ゆ祦sql琛ㄨ揪寮�
+ if ("1".equals(isShowOnlineMsg)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showOnlineMsgExpression)){
+ showOnlineMsgExpression=DBHelper.getRepAll(showOnlineMsgExpression,session,null,true);
+ online+=",(case when "+showOnlineMsgExpression+" then 1 else 0 end) as isShowOnlineMsgBtn";
+ }else{
+ //娌℃湁璁剧疆琛ㄨ揪寮忥紝榛樿鏄剧ず
+ online+=",1 as isShowOnlineMsgBtn";
+ }
+ }
+ //--娴佺▼璺熻釜sql琛ㄨ揪寮�
+ if ("1".equals(isShowProcessTracking)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showProcessTrackingExpression)){
+ showProcessTrackingExpression=DBHelper.getRepAll(showProcessTrackingExpression,session,null,true);
+ online+=",(case when "+showProcessTrackingExpression+" then 1 else 0 end) as isShowProcessTrackingBtn";
+ }else{
+ online+=",1 as isShowProcessTrackingBtn";
+ }
+ }
+ //-----------
if(@doc!=null&&!@doc.equals("")){
// isNew=(isNew==null)?"1":"0";
panelEnd=(panelEnd.equals("")?"@doc='"+@doc.replaceAll("'","")+"'":panelEnd)+" and (formid in([?formId] #dataformid#)) #formdatafilters# ";
diff --git a/WebRoot/public/template/0/498/index.jsp b/WebRoot/public/template/0/498/index.jsp
index 765f935..5f0a2fb 100644
--- a/WebRoot/public/template/0/498/index.jsp
+++ b/WebRoot/public/template/0/498/index.jsp
@@ -32,15 +32,6 @@
@panFou@
</div>
</div>
- <%if ("1".equals(isShowOnlineMsg)) {//isShowOnlineMsg瀹氫箟鍦╦sCssHead %>
- <iframe style="width: 850px;height: 220px;" frameborder="0" scrolling="no"
- src="/general/onlineMessage.jsp?formId=<%=formId %>&docCode=<%=doccode %>"></iframe>
- <%
- }
- if ("1".equals(isShowProcessTracking)) {//isShowProcessTracking瀹氫箟鍦╦sCssHead
- %>
- <%@ include file="/general/processTrack.jsp" %>
- <%} %>
<%//鏂囧瓧棰滆壊璇存槑鏄剧ず浣嶇疆 xin 2022-5-16 14:45:39%>
[?ColorDescription]
</div>
diff --git a/WebRoot/public/template/0/498/jsCssHead.jsp b/WebRoot/public/template/0/498/jsCssHead.jsp
index edf5a36..98ebc87 100644
--- a/WebRoot/public/template/0/498/jsCssHead.jsp
+++ b/WebRoot/public/template/0/498/jsCssHead.jsp
@@ -1,9 +1,5 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
-<%
- String isShowOnlineMsg="[?isShowOnlineMsg]";
- String isShowProcessTracking="[?isShowProcessTracking]";
-%>
<link rel="stylesheet" type="text/css" href="/style/commons.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/style/commons.css")%>">
<link rel="stylesheet" type="text/css" href="/style/icon.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/style/icon.css")%>">
<link rel="stylesheet" type="text/css" href="/style/default/easyui.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/style/default/easyui.css")%>">
diff --git a/WebRoot/public/template/0/498/panel.jsp b/WebRoot/public/template/0/498/panel.jsp
index 60cea7f..3ae86c8 100644
--- a/WebRoot/public/template/0/498/panel.jsp
+++ b/WebRoot/public/template/0/498/panel.jsp
@@ -28,7 +28,8 @@
addUrl = " and "+temp1.substring(inds+3);
}
try{
- sql="select top 1 @selectColAll@ from ";//鍙兘鏌ヤ竴鏉�
+ // sql="select top 1 @selectColAll@ from ";//鍙兘鏌ヤ竴鏉�
+ sql="select top 1 @selectColAll@"+online+" from ";//澧炲姞鍦ㄧ嚎浜ゆ祦锛屾祦绋嬭窡韪殑鍚庡彴鎵ц鍒ゆ柇 by danaus 2024-03-15 15:48
if(sql.contains("&doccode&")){//by danaus 2011-1-25
if(doccode!=null)
sql=sql.replaceAll("&doccode&",doccode.replaceAll("'",""));
@@ -242,7 +243,19 @@
<div class="panelControlDiv">
@panelDownHtml@
</div>
-
+ <%
+ if ("1".equals(docMap.get("isshowonlinemsgbtn"))) {
+ //isShowOnlineMsg瀹氫箟鍦╦sCssHead
+ request.setAttribute("formId", formId + "");
+ request.setAttribute("docCode", doccode);
+ %>
+ <jsp:include page="/general/onlineMessage.jsp" flush="true"/>
+ <%
+ }
+ if ("1".equals(docMap.get("isshowprocesstrackingbtn"))) {//isShowProcessTracking瀹氫箟鍦╦sCssHead
+ %>
+ <%@ include file="/general/processTrack.jsp" %>
+ <%} %>
<script type="text/javascript">
@pansetInv@
panMain[panIndex].loadSet(<%=docstatePan%>);
diff --git a/WebRoot/public/template/0/5/dataHead.jsp b/WebRoot/public/template/0/5/dataHead.jsp
index 8b8a639..73e1726 100644
--- a/WebRoot/public/template/0/5/dataHead.jsp
+++ b/WebRoot/public/template/0/5/dataHead.jsp
@@ -58,8 +58,6 @@
int formType = [?formType];
int version=[?version];//褰撳墠鐨勭増鏈彿
int optype = [?formOptType];//鎿嶄綔绫诲瀷
- String isShowOnlineMsg="[?isShowOnlineMsg]";//鏄惁鎵撳紑鍦ㄧ嚎浜ゆ祦
- String isShowProcessTracking="[?isShowProcessTracking]";//鏄惁鎵撳紑娴佺▼璺熻釜
//搴忓垪鍙锋壂鐮� xin 2021-8-2 17:50:03
//鍏ュ簱
Integer isshowinserialbtn=[?isshowinserialbtn];
@@ -76,6 +74,31 @@
if(isshowonlinepaymentbutton==1){
online+=",(case when isnull(OnlinePaymentAmount,0) > 0 then 1 else 0 end) as isshowonlinepaymentbutton";
}
+ //---------------鍦ㄧ嚎浜ゆ祦,娴佺▼璺熻釜 by danaus 2024-03-15 09:36
+ String isShowOnlineMsg="[?isShowOnlineMsg]";//鏄惁鏄剧ず锛�1鏄剧ず锛�0涓嶆樉绀�
+ String showOnlineMsgExpression="[?ShowOnlineMsgExpression]";//琛ㄨ揪寮�
+ String isShowProcessTracking="[?isShowProcessTracking]";
+ String showProcessTrackingExpression="[?ShowProcessTrackingExpression]";
+ //--鍦ㄧ嚎浜ゆ祦sql琛ㄨ揪寮�
+ if ("1".equals(isShowOnlineMsg)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showOnlineMsgExpression)){
+ showOnlineMsgExpression=DBHelper.getRepAll(showOnlineMsgExpression,session,null,true);
+ online+=",(case when "+showOnlineMsgExpression+" then 1 else 0 end) as isShowOnlineMsgBtn";
+ }else{
+ //娌℃湁璁剧疆琛ㄨ揪寮忥紝榛樿鏄剧ず
+ online+=",1 as isShowOnlineMsgBtn";
+ }
+ }
+ //--娴佺▼璺熻釜sql琛ㄨ揪寮�
+ if ("1".equals(isShowProcessTracking)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showProcessTrackingExpression)){
+ showProcessTrackingExpression=DBHelper.getRepAll(showProcessTrackingExpression,session,null,true);
+ online+=",(case when "+showProcessTrackingExpression+" then 1 else 0 end) as isShowProcessTrackingBtn";
+ }else{
+ online+=",1 as isShowProcessTrackingBtn";
+ }
+ }
+ //-----------
//鐢ㄦ埛浠ｇ爜
String userCode = (String)session.getAttribute(SessionKey.USERCODE);
//鐢ㄦ埛鏉冮檺
diff --git a/WebRoot/public/template/0/5/index.jsp b/WebRoot/public/template/0/5/index.jsp
index 21514ab..9c4e186 100644
--- a/WebRoot/public/template/0/5/index.jsp
+++ b/WebRoot/public/template/0/5/index.jsp
@@ -130,21 +130,8 @@
String customURL=DBHelper.getCustomURL(request,formId,formType,"panel.jsp");
%>
<jsp:include page="<%=customURL%>" flush="true"></jsp:include><%//鏀规垚鍏煎鐢ㄦ埛鑷畾涔夋帶浠跺竷灞�鐨勫彉閲� xin 2024-1-12 16:14:05%>
-<%-- <%@ include file="panel.jsp" %>--%>
</div>
</div>
- <%
- if ("1".equals(isShowOnlineMsg)) {//isShowOnlineMsg瀹氫箟鍦╦sCssHead
- request.setAttribute("formId", formId + "");
- request.setAttribute("docCode", doccode);
- %>
- <jsp:include page="/general/onlineMessage.jsp" flush="true"/>
- <%
- }
- if ("1".equals(isShowProcessTracking)) {//isShowProcessTracking瀹氫箟鍦╦sCssHead
- %>
- <%@ include file="/general/processTrack.jsp" %>
- <%}%>
<%//鏂囧瓧棰滆壊璇存槑鏄剧ず浣嶇疆 xin 2022-5-16 14:45:39%>
[?ColorDescription]
<span id="checkIs"> </span>
diff --git a/WebRoot/public/template/0/5/panel.jsp b/WebRoot/public/template/0/5/panel.jsp
index a8c7c1f..ebc05f4 100644
--- a/WebRoot/public/template/0/5/panel.jsp
+++ b/WebRoot/public/template/0/5/panel.jsp
@@ -14,7 +14,7 @@
SqlRowSet SRS =null;//3绫诲瀷鎺т欢閬嶅巻涓嬫媺鏁版嵁
String addUrl="";//娣诲姞浼犵粰grid鐨勬潯浠讹紝闇�瑕佸垎绂�
Map<String,Object> docMap=new HashMap<String,Object>();//鏌ヨ鑾峰彇鍒扮殑鏁版嵁淇℃伅Map闆嗗悎
- List<Map<String, Object>> listInfo=new ArrayList<Map<String, Object>>();//鏌ヨ鑾峰彇鍒扮殑鏁版嵁淇℃伅List闆嗗悎
+ List<Map<String, Object>> listInfo=new ArrayList<Map<String, Object>>();//鏌ヨ鑾峰彇鍒扮殑鏁版嵁淇℃伅List闆嗗悎
if((wherePan!=null&&!wherePan.equals(""))||grid!=null){
if(wherePan.indexOf("@G@")!=-1){
int inds=wherePan.indexOf("@G@");
@@ -22,8 +22,8 @@
wherePan=temp1.substring(0,inds);
addUrl = " and "+temp1.substring(inds+3);
}
- try{
- sql="select top 1 @selectColAll@ from ";//鍙兘鏌ヤ竴鏉�
+ try{
+ sql="select top 1 @selectColAll@" + online + " from ";//鍙兘鏌ヤ竴鏉�
if(sql.contains("&doccode&")){//by danaus 2011-1-25
if(doccode!=null)
sql=sql.replaceAll("&doccode&",doccode.replaceAll("'",""));
@@ -31,7 +31,7 @@
SpObserver.setDBtoInstance("_"+request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
load.setSql(sql);
load.setSqlWhere(wherePan);
- load.setTableName(tableIs);
+ load.setTableName(tableIs);
//鍔犺浇闈㈡澘鏁版嵁淇℃伅鎴栧鍗曟椂鍊欏姞杞�
listInfo=PanelManageBo.getFormLoad(load);
if(listInfo.size()>0){
@@ -190,9 +190,21 @@
<div class="panelControlDiv">@panelHtml@</div>
<div id="tplt-grid"><%@ include file="@formId@_@customGrid@grid.jsp"%></div>
<div class="panelControlDiv">@panelDownHtml@</div>
+ <%
+ if ("1".equals(docMap.get("isshowonlinemsgbtn"))) {
+ request.setAttribute("formId", formId + "");
+ request.setAttribute("docCode", doccode);
+ %>
+ <jsp:include page="/general/onlineMessage.jsp" flush="true"/>
+ <%
+ }
+ if ("1".equals(docMap.get("isshowprocesstrackingbtn"))) {
+ %>
+ <%@ include file="/general/processTrack.jsp" %>
+ <%} %>
<script type="text/javascript">
- @pansetInv@
- panMain[panIndex].loadSet(<%=docstatePan%>);
- panMain[panIndex].keyDown('123','null');
+@pansetInv@
+panMain[panIndex].loadSet(<%=docstatePan%>);
+panMain[panIndex].keyDown('123','null');
</script>
</span>
\ No newline at end of file
diff --git a/WebRoot/public/template/0/8/dataHead.jsp b/WebRoot/public/template/0/8/dataHead.jsp
index 7da6978..2202916 100644
--- a/WebRoot/public/template/0/8/dataHead.jsp
+++ b/WebRoot/public/template/0/8/dataHead.jsp
@@ -36,6 +36,31 @@
if(isshowonlinepaymentbutton==1){
online+=",(case when isnull(OnlinePaymentAmount,0) > 0 then 1 else 0 end) as isshowonlinepaymentbutton";
}
+ //---------------鍦ㄧ嚎浜ゆ祦,娴佺▼璺熻釜 by danaus 2024-03-15 09:36
+ String isShowOnlineMsg="[?isShowOnlineMsg]";//鏄惁鏄剧ず锛�1鏄剧ず锛�0涓嶆樉绀�
+ String showOnlineMsgExpression="[?ShowOnlineMsgExpression]";//琛ㄨ揪寮�
+ String isShowProcessTracking="[?isShowProcessTracking]";
+ String showProcessTrackingExpression="[?ShowProcessTrackingExpression]";
+ //--鍦ㄧ嚎浜ゆ祦sql琛ㄨ揪寮�
+ if ("1".equals(isShowOnlineMsg)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showOnlineMsgExpression)){
+ showOnlineMsgExpression=DBHelper.getRepAll(showOnlineMsgExpression,session,null,true);
+ online+=",(case when "+showOnlineMsgExpression+" then 1 else 0 end) as isShowOnlineMsgBtn";
+ }else{
+ //娌℃湁璁剧疆琛ㄨ揪寮忥紝榛樿鏄剧ず
+ online+=",1 as isShowOnlineMsgBtn";
+ }
+ }
+ //--娴佺▼璺熻釜sql琛ㄨ揪寮�
+ if ("1".equals(isShowProcessTracking)) {
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(showProcessTrackingExpression)){
+ showProcessTrackingExpression=DBHelper.getRepAll(showProcessTrackingExpression,session,null,true);
+ online+=",(case when "+showProcessTrackingExpression+" then 1 else 0 end) as isShowProcessTrackingBtn";
+ }else{
+ online+=",1 as isShowProcessTrackingBtn";
+ }
+ }
+ //-----------
//鐢ㄦ埛浠ｇ爜
String hrCode = (String)session.getAttribute(SessionKey.HRCODE);
String userCode = (String)session.getAttribute(SessionKey.USERCODE);
diff --git a/WebRoot/public/template/0/8/index.jsp b/WebRoot/public/template/0/8/index.jsp
index c12aaba..c8277f2 100644
--- a/WebRoot/public/template/0/8/index.jsp
+++ b/WebRoot/public/template/0/8/index.jsp
@@ -27,20 +27,7 @@
String customURL=DBHelper.getCustomURL(request,formId,formType,"panel.jsp");
%>
<jsp:include page="<%=customURL%>" flush="true"></jsp:include><%//鏀规垚鍏煎鐢ㄦ埛鑷畾涔夋帶浠跺竷灞�鐨勫彉閲� xin 2024-1-12 16:14:05%>
-<%-- <%@ include file="panel.jsp" %>--%>
</div>
- <%if ("1".equals(isShowOnlineMsg)) {//isShowOnlineMsg瀹氫箟鍦╦sCssHead %>
- <%
- request.setAttribute("formId", formId + "");
- request.setAttribute("docCode", doccode);
- %>
- <jsp:include page="/general/onlineMessage.jsp" flush="true"/>
- <%
- }
- if ("1".equals(isShowProcessTracking)) {//isShowProcessTracking瀹氫箟鍦╦sCssHead
- %>
- <%@ include file="/general/processTrack.jsp" %>
- <%} %>
<%//鏂囧瓧棰滆壊璇存槑鏄剧ず浣嶇疆 xin 2022-5-16 14:45:39%>
[?ColorDescription]
</div>
diff --git a/WebRoot/public/template/0/8/jsCssHead.jsp b/WebRoot/public/template/0/8/jsCssHead.jsp
index ca92282..06d3ba0 100644
--- a/WebRoot/public/template/0/8/jsCssHead.jsp
+++ b/WebRoot/public/template/0/8/jsCssHead.jsp
@@ -1,9 +1,5 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
-<%
- String isShowOnlineMsg="[?isShowOnlineMsg]";
- String isShowProcessTracking="[?isShowProcessTracking]";
-%>
<link rel="stylesheet" type="text/css" href="/style/commons.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/style/commons.css")%>">
<link rel="stylesheet" type="text/css" href="/style/icon.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/style/icon.css")%>">
<link rel="stylesheet" type="text/css" href="/style/default/easyui.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/style/default/easyui.css")%>">
diff --git a/WebRoot/public/template/0/8/panel.jsp b/WebRoot/public/template/0/8/panel.jsp
index 37c3a98..d4fa71f 100644
--- a/WebRoot/public/template/0/8/panel.jsp
+++ b/WebRoot/public/template/0/8/panel.jsp
@@ -60,18 +60,18 @@
String temp1=wherePan;
wherePan=temp1.substring(0,inds);
addUrl = " and "+temp1.substring(inds+3);
- }
+ }
try{
- sql="select top 1 @selectColAll@ from ";//鍙兘鏌ヤ竴鏉�
+ sql="select top 1 @selectColAll@"+online+" from ";//鍙兘鏌ヤ竴鏉�
if(sql.contains("&doccode&")){//by danaus 2011-1-25
if(doccode!=null)
sql=sql.replaceAll("&doccode&",doccode.replaceAll("'",""));
}
SpObserver.setDBtoInstance("_"+request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
if(copy!=null){
- listInfo=PanelManageBo.getFromEnd(sql,tableIs,wherePan.replaceAll("_ycid_","id"),@formType@,copy,request);
+ listInfo=PanelManageBo.getFromEnd(sql,tableIs,wherePan.replaceAll("_ycid_","id"),@formType@,copy,request);
}else{
- listInfo=PanelManageBo.getFromEnd(sql,tableIs,(wherePan==null?wherePan:wherePan.replaceAll("_ycid_","id")),@formType@,request);
+ listInfo=PanelManageBo.getFromEnd(sql,tableIs,(wherePan==null?wherePan:wherePan.replaceAll("_ycid_","id")),@formType@,request);
}
}catch(Exception e){
throw e;
@@ -281,6 +281,19 @@
<div class="panelControlDiv">
@panelDownHtml@
</div>
+ <%
+ if ("1".equals(docMap.get("isshowonlinemsgbtn"))) {
+ //isShowOnlineMsg瀹氫箟鍦╦sCssHead
+ request.setAttribute("formId", formId + "");
+ request.setAttribute("docCode", doccode);
+ %>
+ <jsp:include page="/general/onlineMessage.jsp" flush="true"/>
+ <%
+ }
+ if ("1".equals(docMap.get("isshowprocesstrackingbtn"))) {//isShowProcessTracking瀹氫箟鍦╦sCssHead
+ %>
+ <%@ include file="/general/processTrack.jsp" %>
+ <%} %>
<script type="text/javascript">
@pansetInv@
panMain[panIndex].loadSet(<%=docstatePan%>);
diff --git a/src/com/yc/action/grid/TreeBean.java b/src/com/yc/action/grid/TreeBean.java
index 3e0ba16..fabbe1d 100644
--- a/src/com/yc/action/grid/TreeBean.java
+++ b/src/com/yc/action/grid/TreeBean.java
@@ -1,6 +1,5 @@
package com.yc.action.grid;
-import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -18,7 +17,7 @@
private String treeNodeFiled;//鏍戣妭鐐瑰瓧娈靛悕绉�
private String treefilterstr;//鏍戣繃婊ゆ潯浠�
public void build(String str){
- //treenodeid+sp+type+sp+nodeval+sp+treecontrol+sp+currentFormid+sp+treeFormType+sp+"1=1"+sp+detailNodeid;
+ //treenodeid+sp+type+sp+nodeval+sp+treecontrol+sp+currentFormid+sp+treeFormType+sp+"1=1"+sp+detailNodeid+sp+treefilterstr
if(str!=null&&!"".equals(str)) {
String[] temp = str.split(";");
treeNodeFiled = temp[0];
diff --git a/src/com/yc/api/schedule/AttendanceSchedule.java b/src/com/yc/api/schedule/AttendanceSchedule.java
index ace4274..1de4fea 100644
--- a/src/com/yc/api/schedule/AttendanceSchedule.java
+++ b/src/com/yc/api/schedule/AttendanceSchedule.java
@@ -96,7 +96,7 @@
extras.put("title", "鎵撳崱鎻愰啋");
List<String> alais = new ArrayList<String>();
alais.add(t180252.getTelephone());
- //alais.add(dataSourceEntity.getDbId() + "_" + usercode);
+ alais.add(dataSourceEntity.getDbId() + "_" + usercode);
try {
boolean flag = jpushAction.sendPush(
JpushAction.buildPushObject_with_extra(
@@ -173,6 +173,7 @@
extras.put("title", "鎵撳崱鎻愰啋");
List<String> alais = new ArrayList<String>();
alais.add(t180252.getTelephone());
+ alais.add(dataSourceEntity.getDbId() + "_" + usercode);
try {
boolean flag = jpushAction.sendPush(
JpushAction.buildPushObject_with_extra(
diff --git a/src/com/yc/app/v2/entity/GformEntity.java b/src/com/yc/app/v2/entity/GformEntity.java
index 9418340..706d4ae 100644
--- a/src/com/yc/app/v2/entity/GformEntity.java
+++ b/src/com/yc/app/v2/entity/GformEntity.java
@@ -715,6 +715,8 @@
private static final long serialVersionUID = 1L;
private Integer isShowCycleCountSerialBtn;
private String cycleCountSerialBtnEditStatus;
- private String excludeTablesWhenSaving;
+ private String excludeTablesWhenSaving;
+ private String showOnlineMsgExpression;
+ private String showProcessTrackingExpression;
}
diff --git a/src/com/yc/app/v2/service/impl/DanJunFormServiceImpl.java b/src/com/yc/app/v2/service/impl/DanJunFormServiceImpl.java
index fe71201..e1b261a 100644
--- a/src/com/yc/app/v2/service/impl/DanJunFormServiceImpl.java
+++ b/src/com/yc/app/v2/service/impl/DanJunFormServiceImpl.java
@@ -168,6 +168,33 @@
//娌¤缃垯鎸夐挳涓嶆樉绀�
sb.append(",0 as [RevokeBtn_Visible]");
}
+ //---------------鍦ㄧ嚎浜ゆ祦,娴佺▼璺熻釜 by danaus 2024-03-15 09:36
+ Integer isShowOnlineMsg = gformEntity.getIsshowonlinemsg();//鏄惁鏄剧ず锛�1鏄剧ず锛�0涓嶆樉绀�
+ String showOnlineMsgExpression = gformEntity.getShowOnlineMsgExpression();//琛ㄨ揪寮�
+ Integer isShowProcessTracking = gformEntity.getIsshowprocesstracking();
+ String showProcessTrackingExpression = gformEntity.getShowProcessTrackingExpression();
+ //--鍦ㄧ嚎浜ゆ祦sql琛ㄨ揪寮�
+ if (isShowOnlineMsg != null && isShowOnlineMsg == 1) {
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(showOnlineMsgExpression)) {
+ sb.append(",(case when " + showOnlineMsgExpression + " then 1 else 0 end) as [isShowOnlineMsgBtn_Visible]");
+ } else {
+ //娌℃湁璁剧疆琛ㄨ揪寮忥紝榛樿鏄剧ず
+ sb.append(",1 as [isShowOnlineMsgBtn_Visible]");
+ }
+ } else {
+ sb.append(",0 as [isShowOnlineMsgBtn_Visible]");
+ }
+ //--娴佺▼璺熻釜sql琛ㄨ揪寮�
+ if (isShowProcessTracking != null && isShowProcessTracking == 1) {
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(showProcessTrackingExpression)) {
+ sb.append(",(case when " + showProcessTrackingExpression + " then 1 else 0 end) as [isShowProcessTrackingBtn_Visible]");
+ } else {
+ sb.append(",1 as [isShowProcessTrackingBtn_Visible]");
+ }
+ } else {
+ sb.append(",0 as [isShowProcessTrackingBtn_Visible]");
+ }
+ //-----------
}
return sb.toString();
}
diff --git a/src/com/yc/ionic/schedule/JPushTimer.java b/src/com/yc/ionic/schedule/JPushTimer.java
index 819b283..382cc59 100644
--- a/src/com/yc/ionic/schedule/JPushTimer.java
+++ b/src/com/yc/ionic/schedule/JPushTimer.java
@@ -143,7 +143,7 @@
extras.put("title", companyMemo);//鍏徃鍚嶇О
List<String> alais = new ArrayList<String>();
alais.add(telephone);
- //alais.add(dataSourceEntity.getDbId() + "_" + usercode);
+ alais.add(dataSourceEntity.getDbId() + "_" + usercode);//TODO 鍏煎澶勭悊锛宎pp鎵�鏈夌増鏈兘鏇存柊鍚庯紝鍐嶇Щ闄�
queue.add(new JpushMsg(alais, topic, extras, dataSourceEntity.getDbId(), UNID, map.get("formname") + "", doccode));
}
diff --git a/src/com/yc/sdk/gaodemap/api/GaoDeMapService.java b/src/com/yc/sdk/gaodemap/api/GaoDeMapService.java
index b7a25d0..18f3557 100644
--- a/src/com/yc/sdk/gaodemap/api/GaoDeMapService.java
+++ b/src/com/yc/sdk/gaodemap/api/GaoDeMapService.java
@@ -25,6 +25,11 @@
}
@Override
+ public Object searchByText(SearchEntity searchEntity) throws Exception {
+ return null;
+ }
+
+ @Override
public Object nearbySearch(SearchEntity searchEntity) throws Exception {
return null;
}
diff --git a/src/com/yc/sdk/huaweimap/controller/HuaweiMapController.java b/src/com/yc/sdk/huaweimap/controller/HuaweiMapController.java
index 836ebce..c3ba31e 100644
--- a/src/com/yc/sdk/huaweimap/controller/HuaweiMapController.java
+++ b/src/com/yc/sdk/huaweimap/controller/HuaweiMapController.java
@@ -38,4 +38,29 @@
return callBackMessage.toJSONObject();
}
}
+
+ /**
+ * 鍏抽敭瀛楁悳绱�
+ *
+ * @param request
+ * @return 杩斿洖缁撴灉
+ */
+ @RequestMapping(value = "/app/map/searchByText.do", method = RequestMethod.POST)
+ @CrossOrigin
+ public @ResponseBody Object searchByText(@RequestBody SearchEntity searchEntity,
+ HttpServletRequest request) {
+ CallBackMessage callBackMessage = new CallBackMessage();
+ try {
+ if (searchEntity == null) {
+ throw new ApplicationException("鍙傛暟涓嶈兘涓虹┖");
+ }
+ Object result = MapService.getMapFactory().searchByText(searchEntity);
+ callBackMessage.sendSuccessMessageByDefault();
+ callBackMessage.setInfo(result);
+ return callBackMessage.toJSONObject();
+ } catch (Exception ex) {
+ callBackMessage.sendErrorMessage(this.getErrorMsg(ex));
+ return callBackMessage.toJSONObject();
+ }
+ }
}
diff --git a/src/com/yc/sdk/huaweimap/service/HuaWeiMapService.java b/src/com/yc/sdk/huaweimap/service/HuaWeiMapService.java
index 0aa893f..98e97a2 100644
--- a/src/com/yc/sdk/huaweimap/service/HuaWeiMapService.java
+++ b/src/com/yc/sdk/huaweimap/service/HuaWeiMapService.java
@@ -27,6 +27,7 @@
private static String GEOCODEURL = "https://siteapi.cloud.huawei.com/mapApi/v1/siteService/reverseGeocode";
private static String IPURL = "https://openlocation-drcn.platform.dbankcloud.com/networklocation/v1/ipLocation";
private static String SEARCHURL = "https://siteapi.cloud.huawei.com/mapApi/v1/siteService/nearbySearch";
+ private static String SEARCHBYTEXTURL = "https://siteapi.cloud.huawei.com/mapApi/v1/siteService/searchByText";
@Override
public LocationEntity getIPLocation(String ip) throws Exception {
@@ -55,6 +56,40 @@
}
@Override
+ public Object searchByText(SearchEntity searchEntity) throws Exception {
+ try {
+ if (StringUtils.isBlank(searchEntity.getQuery())) {
+ throw new ApplicationException("鎼滅储鍏抽敭瀛椾笉鑳戒负绌�");
+ }
+ HttpClient httpClient = HttpClients.createDefault();
+ HttpPost post = new HttpPost(SEARCHBYTEXTURL);
+ post.setHeader("Content-Type", "application/json;charset=utf-8");
+ post.setHeader("Authorization", "Bearer " + KEY);
+ StringEntity myEntity = new StringEntity(JSON.toJSONString(searchEntity), "UTF-8");
+ myEntity.setContentType("application/json;charset=UTF-8");
+ post.setEntity(myEntity);
+ HttpResponse response = httpClient.execute(post);
+ int statusCode = response.getStatusLine().getStatusCode();
+ if (statusCode != HttpStatus.SC_OK) {
+ throw new ApplicationException("鑾峰彇鍝嶅簲澶辫触锛岃閲嶆柊鎻愪氦-" + response.getStatusLine().getStatusCode() + "[" + response.getStatusLine().getReasonPhrase() + "]");
+ } else {
+ ReverseGeocodeResponseEntity responseEntity = JSON.parseObject(EntityUtils.toString(response.getEntity(), "UTF-8"), ReverseGeocodeResponseEntity.class);
+ if ("0".equalsIgnoreCase(responseEntity.getReturnCode())) {
+ return responseEntity;
+ } else if ("010004".equalsIgnoreCase(responseEntity.getReturnCode())) {
+ //鏌ユ壘涓嶅埌
+ return responseEntity;
+ } else {
+ throw new ApplicationException(responseEntity.getReturnDesc());
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new ApplicationException("鑾峰彇鍝嶅簲澶辫触锛岃閲嶆柊鎻愪氦" + e.getMessage());
+ }
+ }
+
+ @Override
public Object nearbySearch(SearchEntity searchEntity) throws Exception {
try {
CoordinateEntity coordinateEntity = searchEntity.getLocation();
diff --git a/src/com/yc/sdk/map/entity/SearchEntity.java b/src/com/yc/sdk/map/entity/SearchEntity.java
index fa06964..6c08116 100644
--- a/src/com/yc/sdk/map/entity/SearchEntity.java
+++ b/src/com/yc/sdk/map/entity/SearchEntity.java
@@ -7,8 +7,10 @@
public class SearchEntity {
String query;
CoordinateEntity location;
- int radius;
+ int radius = 5000;
String hwPoiType;
int pageIndex = 1;
int pageSize = 20;
+ boolean cityLimit = false;
+ String cityId;
}
diff --git a/src/com/yc/sdk/map/service/AbstractMapService.java b/src/com/yc/sdk/map/service/AbstractMapService.java
index c1f9045..f8b9966 100644
--- a/src/com/yc/sdk/map/service/AbstractMapService.java
+++ b/src/com/yc/sdk/map/service/AbstractMapService.java
@@ -33,4 +33,12 @@
*/
Object nearbySearch(SearchEntity searchEntity) throws Exception;
+ /**
+ * 鍏抽敭瀛楁悳绱�
+ *
+ * @param searchEntity
+ * @return
+ * @throws Exception
+ */
+ Object searchByText(SearchEntity searchEntity) throws Exception;
}
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"));
diff --git a/src/com/yc/service/build/type/v2/T_Based_Impl.java b/src/com/yc/service/build/type/v2/T_Based_Impl.java
index 6d0225a..211ae05 100644
--- a/src/com/yc/service/build/type/v2/T_Based_Impl.java
+++ b/src/com/yc/service/build/type/v2/T_Based_Impl.java
@@ -56,14 +56,17 @@
throw new Exception("鍑瘉瀹氫箟鏈畾涔�" + formID + "鍔熻兘鍙风殑鏈熼棿缁勭粐浠ｇ爜");
}
}
+
data = data.replaceAll("@CustomDoccode@", this.getValue(listS.get(0), "customdoccode"));
data = data.replace("#periodtype#", this.getValue(listS.get(0), "periodtype"));
data = data.replace("#comanyId#", companyId);
- data = data.replaceAll("#transgroupcode#", gformInfo.get("transgroupcode")+"");
+ data = data.replaceAll("#transgroupcode#", gformInfo.get("transgroupcode") + "");
data = data.replaceAll("#predocstatus#", gformInfo.get("predocstatus") + "");
data = data.replace("[?predocstatus]", gformInfo.get("predocstatus") + "");
data = data.replace("[?isShowOnlineMsg]", gformInfo.get("isShowOnlineMsg") + "");
data = data.replace("[?isShowProcessTracking]", gformInfo.get("isShowProcessTracking") + "");
+ data = data.replace("[?ShowOnlineMsgExpression]", gformInfo.get("showOnlineMsgExpression") == null ? "" : gformInfo.get("showOnlineMsgExpression") + "");
+ data = data.replace("[?ShowProcessTrackingExpression]", gformInfo.get("showProcessTrackingExpression") == null ? "" : gformInfo.get("showProcessTrackingExpression") + "");
buildPageCode(data, fileName, baseBean);
}
}
diff --git a/src/com/yc/service/grid/GridServiceImpl.java b/src/com/yc/service/grid/GridServiceImpl.java
index 40c92f8..b468072 100644
--- a/src/com/yc/service/grid/GridServiceImpl.java
+++ b/src/com/yc/service/grid/GridServiceImpl.java
@@ -56,7 +56,7 @@
public class GridServiceImpl extends BaseService implements GridServiceIfc {
@Autowired
Type38Ifc type38Ifc;
- private final String gform = "[formid], [formname],[isused],[formmemo],[optype],[refformid],[hdtable],[dttable],[showdetail],[fetchrecnumber],[queryform],[refreshTime],[refresh_aftersave],[frozencols],[LockGridSort],[rowcopyfields],[rowcopyformids],[rowDelFormids],[index1],[index1primary],[index2],[index2primary],[index3],[index3Primary],[dataformid],[predocstatus],[postdocstatus],[DocStatusName],[transgroupcode],[codelength],[preFixcode],[precodetype],[helpdoc_udl],[checkblncfields],[formalign],[DealAfterDocSave],[AllowEmptyRow],[Busi2fiDataView],[glcodefield],[txtinputfields],[DBCtrlRowCount],[ShowAsDetailMode],[modifytableflag],[applytableflag],[CrossInputType],[MultiTitleType],[datapooled],[glentitycode],[formdatafilters],[ProcGroupafterSavedoc], [TransTypecode],[currencyfld],[chkFormula],[GridFormatFun],[SelectChecker],[ReturnCurChecker],[ReturnCurCheckerName],[FT],[FTFormType],[FK],[SeekGroupID],[sPremissField],[dPremissField],[FKeFilter],[GridRowHeight],[GridHeight], [isShowPwdEdit], [isOpenFuncShowPwdEdit], [isShowOnlineMsg] ,[isShowProcessTracking] ,[PanelLabelLayout],[isTitle], [isTaobao],[cellAlign] ,[pageSize],[version],[reportprompts],[CancelBtnProcName],[CancelBtnExpression],[CancelBtnEditStatus],[isShowCell],[importProcName],[CancelIsSave],[CancelBtnName],[isGantt],[byGroup],[DefaultRowCount],[Expanded], [isFilter], [JNIName],[JNIDataBaseURL], [JNIPort] ,[JNIDataBaseName], [JNIUser], [JNIPwd] ,[JNISql] ,[JNITempTable],[addNewRow],[autopaging],[RevokeBtnProcName],[RevokeBtnExpression],[RevokeBtnEditStatus],[autoOpen],isExchangeDataWithHost,isShowNewDocButton,isShowMemoWhenApprovals,isshowinserialbtn,inserialbtneditstatus,isshowoutserialbtn ,outserialbtneditstatus,isShowOnlinePaymentButton,isShowGridStyleForApp ,popupWindowsHeightRate,isShowCycleCountSerialBtn,cycleCountSerialBtnEditStatus,excludeTablesWhenSaving ";//
+ private final String gform = "[formid], [formname],[isused],[formmemo],[optype],[refformid],[hdtable],[dttable],[showdetail],[fetchrecnumber],[queryform],[refreshTime],[refresh_aftersave],[frozencols],[LockGridSort],[rowcopyfields],[rowcopyformids],[rowDelFormids],[index1],[index1primary],[index2],[index2primary],[index3],[index3Primary],[dataformid],[predocstatus],[postdocstatus],[DocStatusName],[transgroupcode],[codelength],[preFixcode],[precodetype],[helpdoc_udl],[checkblncfields],[formalign],[DealAfterDocSave],[AllowEmptyRow],[Busi2fiDataView],[glcodefield],[txtinputfields],[DBCtrlRowCount],[ShowAsDetailMode],[modifytableflag],[applytableflag],[CrossInputType],[MultiTitleType],[datapooled],[glentitycode],[formdatafilters],[ProcGroupafterSavedoc], [TransTypecode],[currencyfld],[chkFormula],[GridFormatFun],[SelectChecker],[ReturnCurChecker],[ReturnCurCheckerName],[FT],[FTFormType],[FK],[SeekGroupID],[sPremissField],[dPremissField],[FKeFilter],[GridRowHeight],[GridHeight], [isShowPwdEdit], [isOpenFuncShowPwdEdit], [isShowOnlineMsg] ,[isShowProcessTracking] ,[PanelLabelLayout],[isTitle], [isTaobao],[cellAlign] ,[pageSize],[version],[reportprompts],[CancelBtnProcName],[CancelBtnExpression],[CancelBtnEditStatus],[isShowCell],[importProcName],[CancelIsSave],[CancelBtnName],[isGantt],[byGroup],[DefaultRowCount],[Expanded], [isFilter], [JNIName],[JNIDataBaseURL], [JNIPort] ,[JNIDataBaseName], [JNIUser], [JNIPwd] ,[JNISql] ,[JNITempTable],[addNewRow],[autopaging],[RevokeBtnProcName],[RevokeBtnExpression],[RevokeBtnEditStatus],[autoOpen],isExchangeDataWithHost,isShowNewDocButton,isShowMemoWhenApprovals,isshowinserialbtn,inserialbtneditstatus,isshowoutserialbtn ,outserialbtneditstatus,isShowOnlinePaymentButton,isShowGridStyleForApp ,popupWindowsHeightRate,isShowCycleCountSerialBtn,cycleCountSerialBtnEditStatus,excludeTablesWhenSaving,showOnlineMsgExpression,showProcessTrackingExpression ";//
private final String gfield = "[formid],[headflag], [fieldid],[statisid],[Lblcode],[fieldname],[datatype],[displayformat], [showongrid],[gridcaption], [gridcontroltype],[gridlength],[ft],[ftformtype],[emptyrefdata], [fk],[seekgroupid],[spremissfield],[dpremissfield],[efilter],[return_one_record],[numfieldid], [visible], [hidelabel], [controltype],[rowno],[colno],[lengthnum],[heightnum],[detailrowno],[detailcolno],[detaillength],[detailheight],[statisflag] ,[blcheckauth],[indexfld],[readonly],[datalink],[keyinput],[secretfld],[calcufield],[formula],[sumfield],[funclinkname],[activefuns] ,[initvalue] ,[checkauthmode],[PreLike],[EnterToNextRow],[tabsheetname],[passwordchar],[uppercase] ,[LinkFormDisplayFields], [dyfieldview],[copyfromlastrow],[ftlockconditionflag],[datafilterfield], [HelpKeyID] ,[MultiLangYN], [IMEactive] , [memo], [Hints],[editStatus],[isReader] ,[SqlScript],[MasterFieldShowLocation], [isCustomHTMLComponent] , [showFieldValueExpression],[HyperlinkFT],[HyperlinkFTFormType],[HyperlinkSPremissField], [HyperlinkDPremissField],[HyperlinkEFilter],[Hyperlinkmode],[isAutoSaved],[stylecss],[rowSpan] ,[isImport],[isExport],[fieldtype],[cellAlign], [isCopyExclude],[isAutoRefresh],[isLoad],[Audit],[TipsExpression],[SuggestFileds],[RelationField],[onlyOne],AppColNo,AppHeight,AppHideLabel,AppLength,AppRowNo,AppVisible,ScanCodeField,funclinkname,exportTitle,isAPPExcludeField,SqlWhere,afterBlockDividingLine,appCellAlign,isSuppressBlankLineForDropDown ";
--
Gitblit v1.8.0