From c1937d0bf5389bfd3d7696d6176e4ed5be931fdc Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Fri, 31 Aug 2018 15:49:03 +0800
Subject: [PATCH] =?UTF-8?q?1.requestinfo=E4=B8=ADrequestTitle=E5=BD=93?=
 =?UTF-8?q?=E5=81=9A=E5=87=BD=E5=8F=B7=E4=BD=BF=E7=94=A8=EF=BC=8CrequestNu?=
 =?UTF-8?q?mber=E5=BD=93=E5=81=9A=E6=9D=A5=E5=87=BD=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=202.=E4=BF=AE=E6=94=B9requestInfo=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5requestNumber=E9=95=BF=E5=BA=A6=203.=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E9=85=8D=E7=BD=AE=E4=B8=AD=E4=B8=BB=E9=A2=98=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E8=A1=A8app=5Ftopic=5Fdomain=5Fcfg=E4=B8=AD=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=9A=84=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/add_app_topic_domain_cfg_add_column20180831.sql   | 2 ++
 src/main/resources/sql/updata_request_info_20180231.sql   | 2 ++
 src/main/webapp/WEB-INF/views/cfg/requestForm.jsp         | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/requestList.jsp         | 8 ++++----
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/sql/add_app_topic_domain_cfg_add_column20180831.sql
 create mode 100644 src/main/resources/sql/updata_request_info_20180231.sql

diff --git a/src/main/resources/sql/add_app_topic_domain_cfg_add_column20180831.sql b/src/main/resources/sql/add_app_topic_domain_cfg_add_column20180831.sql
new file mode 100644
index 000000000..e1f7a45ae
--- /dev/null
+++ b/src/main/resources/sql/add_app_topic_domain_cfg_add_column20180831.sql
@@ -0,0 +1,2 @@
+alter table app_topic_domain_cfg change topic topic_id bigint(11) not null;
+alter table app_topic_domain_cfg change behav_code website_service_id bigint(11);
diff --git a/src/main/resources/sql/updata_request_info_20180231.sql b/src/main/resources/sql/updata_request_info_20180231.sql
new file mode 100644
index 000000000..204d9c36a
--- /dev/null
+++ b/src/main/resources/sql/updata_request_info_20180231.sql
@@ -0,0 +1,2 @@
+alter table request_info modify column request_title VARCHAR(512) not NULL COMMENT 'request_number字段与request_title互换使用，request_title当来函函号使用';
+alter table request_info modify column request_number VARCHAR(512)  COMMENT 'request_number字段与request_title互换使用，request_number当来函标题使用';
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
index 94ca96e4a..45d4cf998 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
@@ -25,7 +25,7 @@
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_number"></spring:message>:</label>
 								<div class="col-md-4">
-									<input type="text" class="form-control required" maxlength="64" name="requestNumber" value="${requestInfo.requestNumber}">
+									<input type="text" class="form-control required" maxlength="512" name="requestTitle" value="${requestInfo.requestTitle}"><!--requestTitle当成来函函号使用 -->
 								</div>
 							</div>
 							<div class="form-group">
@@ -44,7 +44,7 @@
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="title"></spring:message>:</label>
 								<div class="col-md-4">
-									<input type="text" class="form-control required" name="requestTitle" maxlength="512" value="${requestInfo.requestTitle}">
+									<input type="text" class="form-control required" name="requestNumber" maxlength="512" value="${requestInfo.requestNumber}"><!--requestTitle当成来函标题使用 -->
 								</div>
 							</div>
 							<div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index c65292957..712dc5d41 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -74,8 +74,8 @@
 										<div class="input-group">
                                             <div class="input-group-btn">
                                                 <form:select path="seltype" class="selectpicker select2 input-small" >
-													<form:option value="requestTitle"><spring:message code="title"></spring:message></form:option>
-													<form:option value="requestNumber"><spring:message code="request_number"></spring:message></form:option>
+													<form:option value="requestNumber"><spring:message code="title"></spring:message></form:option>
+													<form:option value="requestTitle"><spring:message code="request_number"></spring:message></form:option>
 													<form:option value="requestContent"><spring:message code="content"></spring:message></form:option>
 												</form:select>
                                             </div>
@@ -221,7 +221,7 @@
 								<tr>
 									<td><input type="checkbox" class="i-checks" id="${requestInfo.id}" value="${requestInfo.isAudit}"></td>
 									<td>${requestInfo.id }</td>
-									<td>${requestInfo.requestNumber }</td>
+									<td>${requestInfo.requestTitle }</td><!--requestTitle当成来函函号使用 -->
 									<td>${requestInfo.requestOrg }</td>
 									<td><fmt:formatDate value="${requestInfo.requestTime }" pattern="yyyy-MM-dd"/></td>
 									<td>
@@ -232,7 +232,7 @@
 											<c:when test="${requestInfo.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td>${requestInfo.requestTitle }</td>
+									<td>${requestInfo.requestNumber }</td><!--requestTitle当成来函标题使用 -->
 									<td>${requestInfo.requestContent }</td>
 									<td>${requestInfo.taskName }</td>
 									<td>${requestInfo.creatorName }</td>