Bladeren bron

编码更改

yue 5 jaren geleden
bovenliggende
commit
6c3e7d59a3

+ 5 - 2
src/main/java/com/jeeplus/modules/sg/audit/information/web/InformationController.java

@@ -4,6 +4,7 @@
 package com.jeeplus.modules.sg.audit.information.web;
 
 import java.io.*;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -552,8 +553,10 @@ public class InformationController extends BaseController {
                 String[] strArr = projectId.split("\\s+");
                 information.setAttrs(strArr);
             }
-            projectName = request.getParameter("projectName");
-            projectName = new String(projectName.getBytes("iso8859-1"), "utf-8");
+/*            projectName = request.getParameter("projectName");
+            projectName = new String(projectName.getBytes("iso8859-1"), "utf-8");*/
+            projectName = (String)request.getParameter("projectName");
+            projectName = URLDecoder.decode(projectName,"UTF-8");
             information.setProjectName(projectName);
             projectType = request.getParameter("projectType");
             projectType = new String(projectType.getBytes("iso8859-1"), "utf-8");

+ 5 - 0
src/main/java/com/jeeplus/modules/sg/audit/report/web/ReportController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -311,8 +312,12 @@ public class ReportController {
     public AjaxJson exportInformation(SgReport sgReport,HttpServletRequest request, HttpServletResponse response) {
         AjaxJson j = new AjaxJson();
         try {
+/*
             String condition =  request.getParameter("condition");
             condition = new String(condition.getBytes("iso8859-1"), "utf-8");
+*/
+            String condition = (String)request.getParameter("condition");
+            condition = URLDecoder.decode(condition,"UTF-8");
             String status =  request.getParameter("status");
             String type =  request.getParameter("type");
             sgReport.setStatus(status);

+ 3 - 1
src/main/webapp/webpage/modules/sg/audit/information/informationList.js

@@ -426,6 +426,7 @@ $(document).ready(function() {
 		var extendedStatus = $("#extendedStatus").val();
 		var extendedTime = $("#extendedTime").val();
 		var hiddenSign = $("#hiddenSign").val();
+
 		console.log(projectId );
 		console.log(projectName);
 		console.log(projectType);
@@ -451,6 +452,7 @@ $(document).ready(function() {
 		var extendedStatus = $("#extendedStatus").val();
 		var extendedTime = $("#extendedTime").val();
 		var hiddenSign = $("#hiddenSign").val();
+		var newProjectName = encodeURI(encodeURI(projectName));
 		console.log(projectId );
 		console.log(projectName);
 		console.log(projectType);
@@ -461,7 +463,7 @@ $(document).ready(function() {
 		console.log(extendedStatus);
 		console.log(extendedTime);
 		console.log(hiddenSign);
-		jp.downloadFile('${ctx}/sg/information/export?projectId='+projectId+'&projectName='+projectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits+'&firstFinish='+firstFinish+'&extendedStatus='+extendedStatus+'&extendedTime='+extendedTime+'&hiddenSign='+hiddenSign);
+		jp.downloadFile('${ctx}/sg/information/export?projectId='+projectId+'&projectName='+newProjectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits+'&firstFinish='+firstFinish+'&extendedStatus='+extendedStatus+'&extendedTime='+extendedTime+'&hiddenSign='+hiddenSign);
 
 	});
 

+ 18 - 2
src/main/webapp/webpage/modules/sg/audit/report/reportList.jsp

@@ -46,13 +46,13 @@
 			<tr>
 				<th>完成</th>
 				<c:forEach items="${list}" var="data" varStatus="index">
-					<th><a href="${ctx}/sg/report/exportInformation?condition=${data.name}&status=0&type=0">${data.finishCount}</a></th>
+					<th><a id="finish"><input id="finishOne" type="hidden" value="${data.name}"/>${data.finishCount}</a></th>
 				</c:forEach>
 			</tr>
 			<tr>
 				<th>未完成</th>
 				<c:forEach items="${list}" var="data" varStatus="index">
-					<th><a href="${ctx}/sg/report/exportInformation?condition=${data.name}&status=1&type=0">${data.unfinishCount}</a></th>
+					<th><a id="noFinish">${data.unfinishCount}</a></th>
 				</c:forEach>
 			</tr>
 			</thead>
@@ -121,6 +121,22 @@
 					// 使用刚指定的配置项和数据显示图表。
 					myChart.setOption(option);
 				})
+				//a连接传入参数
+				$("#finish").click(function () {
+					var conditionBe = $("#finishOne").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=0&type=0')
+				})
+
+				$("#noFinish").click(function () {
+					var conditionBe = $("#finishOne").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=1&type=0')
+				})
 			})
 		</script>
 	</div>