转码修改

src/main/java/com/jeeplus/modules/sg/audit/information/mapper/xml/InformationMapper.xml

@@ -256,6 +256,9 @@
             <if test="firstUnits != null and firstUnits != '' ">
                 AND a.first_units=#{firstUnits}
             </if>
+			<if test="projectYear !=null and projectYear != ''">
+				and a.project_year = #{projectYear}
+			</if>
         	<if test="projectType !=null and projectType != ''">
 				and a.project_type = #{projectType}
 			</if>

src/main/java/com/jeeplus/modules/sg/audit/information/web/InformationController.java

@@ -447,40 +447,40 @@ public class InformationController extends BaseController {
         String extendedTime = "";
         String hiddenSign = "";
         try {
-            projectId = request.getParameter("projectId");
-            projectId = new String(projectId.getBytes("iso8859-1"), "utf-8");
+            projectId = (String)request.getParameter("projectId");
+            projectId = URLDecoder.decode(projectId,"UTF-8");
             if (projectId.equals("")) {
 
             } else {
                 String[] strArr = projectId.split("\\s+");
                 information.setAttrs(strArr);
             }
-            projectName = request.getParameter("projectName");
-            projectName = new String(projectName.getBytes("iso8859-1"), "utf-8");
+            projectName = (String)request.getParameter("projectName");
+            projectName = URLDecoder.decode(projectName,"UTF-8");
+            projectType = (String)request.getParameter("projectType");
+            projectType = URLDecoder.decode(projectType,"UTF-8");
+            projectYear = (String)request.getParameter("projectYear");
+            projectYear = URLDecoder.decode(projectYear,"UTF-8");
+            firstUnits = (String)request.getParameter("firstUnits");
+            firstUnits = URLDecoder.decode(firstUnits,"UTF-8");
+            secondUnits = (String)request.getParameter("secondUnits");
+            secondUnits = URLDecoder.decode(secondUnits,"UTF-8");
+            firstFinish = (String)request.getParameter("firstFinish");
+            firstFinish = URLDecoder.decode(firstFinish,"UTF-8");
+            extendedStatus = (String)request.getParameter("extendedStatus");
+            extendedStatus = URLDecoder.decode(extendedStatus,"UTF-8");
+            extendedTime = (String)request.getParameter("extendedTime");
+            extendedTime = URLDecoder.decode(extendedTime,"UTF-8");
+            hiddenSign = (String)request.getParameter("hiddenSign");
+            hiddenSign = URLDecoder.decode(hiddenSign,"UTF-8");
             information.setProjectName(projectName);
-            projectType = request.getParameter("projectType");
-            projectType = new String(projectType.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectType);
-            projectYear = request.getParameter("projectYear");
-            projectYear = new String(projectYear.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectYear);
-            firstUnits = request.getParameter("firstUnits");
-            firstUnits = new String(firstUnits.getBytes("iso8859-1"), "utf-8");
             information.setFirstUnits(firstUnits);
-            secondUnits = request.getParameter("secondUnits");
-            secondUnits = new String(secondUnits.getBytes("iso8859-1"), "utf-8");
             information.setSecondUnits(secondUnits);
-            firstFinish = request.getParameter("firstFinish");
-            firstFinish = new String(firstFinish.getBytes("iso8859-1"), "utf-8");
             information.setFirstFinish(firstFinish);
-            extendedStatus = request.getParameter("extendedStatus");
-            extendedStatus = new String(extendedStatus.getBytes("iso8859-1"), "utf-8");
             information.setExtendedStatus(extendedStatus);
-            extendedTime = request.getParameter("extendedTime");
-            extendedTime = new String(extendedTime.getBytes("iso8859-1"), "utf-8");
             information.setExtendedTime(extendedTime);
-            hiddenSign = request.getParameter("hiddenSign");
-            hiddenSign = new String(hiddenSign.getBytes("iso8859-1"), "utf-8");
             information.setHiddenSign(hiddenSign);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -545,42 +545,40 @@ public class InformationController extends BaseController {
         String extendedTime = "";
         String hiddenSign = "";
         try {
-            projectId = request.getParameter("projectId");
-            projectId = new String(projectId.getBytes("iso8859-1"), "utf-8");
+            projectId = (String)request.getParameter("projectId");
+            projectId = URLDecoder.decode(projectId,"UTF-8");
             if (projectId.equals("")) {
 
             } else {
                 String[] strArr = projectId.split("\\s+");
                 information.setAttrs(strArr);
             }
-/*            projectName = request.getParameter("projectName");
-            projectName = new String(projectName.getBytes("iso8859-1"), "utf-8");*/
             projectName = (String)request.getParameter("projectName");
             projectName = URLDecoder.decode(projectName,"UTF-8");
+            projectType = (String)request.getParameter("projectType");
+            projectType = URLDecoder.decode(projectType,"UTF-8");
+            projectYear = (String)request.getParameter("projectYear");
+            projectYear = URLDecoder.decode(projectYear,"UTF-8");
+            firstUnits = (String)request.getParameter("firstUnits");
+            firstUnits = URLDecoder.decode(firstUnits,"UTF-8");
+            secondUnits = (String)request.getParameter("secondUnits");
+            secondUnits = URLDecoder.decode(secondUnits,"UTF-8");
+            firstFinish = (String)request.getParameter("firstFinish");
+            firstFinish = URLDecoder.decode(firstFinish,"UTF-8");
+            extendedStatus = (String)request.getParameter("extendedStatus");
+            extendedStatus = URLDecoder.decode(extendedStatus,"UTF-8");
+            extendedTime = (String)request.getParameter("extendedTime");
+            extendedTime = URLDecoder.decode(extendedTime,"UTF-8");
+            hiddenSign = (String)request.getParameter("hiddenSign");
+            hiddenSign = URLDecoder.decode(hiddenSign,"UTF-8");
             information.setProjectName(projectName);
-            projectType = request.getParameter("projectType");
-            projectType = new String(projectType.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectType);
-            projectYear = request.getParameter("projectYear");
-            projectYear = new String(projectYear.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectYear);
-            firstUnits = request.getParameter("firstUnits");
-            firstUnits = new String(firstUnits.getBytes("iso8859-1"), "utf-8");
             information.setFirstUnits(firstUnits);
-            secondUnits = request.getParameter("secondUnits");
-            secondUnits = new String(secondUnits.getBytes("iso8859-1"), "utf-8");
             information.setSecondUnits(secondUnits);
-            firstFinish = request.getParameter("firstFinish");
-            firstFinish = new String(firstFinish.getBytes("iso8859-1"), "utf-8");
             information.setFirstFinish(firstFinish);
-            extendedStatus = request.getParameter("extendedStatus");
-            extendedStatus = new String(extendedStatus.getBytes("iso8859-1"), "utf-8");
             information.setExtendedStatus(extendedStatus);
-            extendedTime = request.getParameter("extendedTime");
-            extendedTime = new String(extendedTime.getBytes("iso8859-1"), "utf-8");
             information.setExtendedTime(extendedTime);
-            hiddenSign = request.getParameter("hiddenSign");
-            hiddenSign = new String(hiddenSign.getBytes("iso8859-1"), "utf-8");
             information.setHiddenSign(hiddenSign);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -644,40 +642,40 @@ public class InformationController extends BaseController {
         String extendedTime = "";
         String hiddenSign = "";
         try {
-            projectId = request.getParameter("projectId");
-            projectId = new String(projectId.getBytes("iso8859-1"), "utf-8");
+            projectId = (String)request.getParameter("projectId");
+            projectId = URLDecoder.decode(projectId,"UTF-8");
             if (projectId.equals("")) {
 
             } else {
                 String[] strArr = projectId.split("\\s+");
                 information.setAttrs(strArr);
             }
-            projectName = request.getParameter("projectName");
-            projectName = new String(projectName.getBytes("iso8859-1"), "utf-8");
+            projectName = (String)request.getParameter("projectName");
+            projectName = URLDecoder.decode(projectName,"UTF-8");
+            projectType = (String)request.getParameter("projectType");
+            projectType = URLDecoder.decode(projectType,"UTF-8");
+            projectYear = (String)request.getParameter("projectYear");
+            projectYear = URLDecoder.decode(projectYear,"UTF-8");
+            firstUnits = (String)request.getParameter("firstUnits");
+            firstUnits = URLDecoder.decode(firstUnits,"UTF-8");
+            secondUnits = (String)request.getParameter("secondUnits");
+            secondUnits = URLDecoder.decode(secondUnits,"UTF-8");
+            firstFinish = (String)request.getParameter("firstFinish");
+            firstFinish = URLDecoder.decode(firstFinish,"UTF-8");
+            extendedStatus = (String)request.getParameter("extendedStatus");
+            extendedStatus = URLDecoder.decode(extendedStatus,"UTF-8");
+            extendedTime = (String)request.getParameter("extendedTime");
+            extendedTime = URLDecoder.decode(extendedTime,"UTF-8");
+            hiddenSign = (String)request.getParameter("hiddenSign");
+            hiddenSign = URLDecoder.decode(hiddenSign,"UTF-8");
             information.setProjectName(projectName);
-            projectType = request.getParameter("projectType");
-            projectType = new String(projectType.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectType);
-            projectYear = request.getParameter("projectYear");
-            projectYear = new String(projectYear.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectYear);
-            firstUnits = request.getParameter("firstUnits");
-            firstUnits = new String(firstUnits.getBytes("iso8859-1"), "utf-8");
             information.setFirstUnits(firstUnits);
-            secondUnits = request.getParameter("secondUnits");
-            secondUnits = new String(secondUnits.getBytes("iso8859-1"), "utf-8");
             information.setSecondUnits(secondUnits);
-            firstFinish = request.getParameter("firstFinish");
-            firstFinish = new String(firstFinish.getBytes("iso8859-1"), "utf-8");
             information.setFirstFinish(firstFinish);
-            extendedStatus = request.getParameter("extendedStatus");
-            extendedStatus = new String(extendedStatus.getBytes("iso8859-1"), "utf-8");
             information.setExtendedStatus(extendedStatus);
-            extendedTime = request.getParameter("extendedTime");
-            extendedTime = new String(extendedTime.getBytes("iso8859-1"), "utf-8");
             information.setExtendedTime(extendedTime);
-            hiddenSign = request.getParameter("hiddenSign");
-            hiddenSign = new String(hiddenSign.getBytes("iso8859-1"), "utf-8");
             information.setHiddenSign(hiddenSign);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -711,7 +709,7 @@ public class InformationController extends BaseController {
         }
         StringBuilder stringBuilder = new StringBuilder();
         Template template = null;
-        File path = new File(this.getClass().getResource("/").getPath() + "/freemarker");
+        File path = new File(this.getClass().getResource("/").getPath() + "/frefemarker");
         Configuration cfg = new Configuration();
         try {
             cfg.setDefaultEncoding("UTF-8");

src/main/webapp/webpage/modules/sg/audit/information/informationList.js

@@ -416,18 +416,17 @@ $(document).ready(function() {
 
 //导出物料清单
 	$("#export").click(function(){
-		var projectId = $("#projectId").val();
-		var projectName = $("#projectName").val();
-		var projectType = $("#projectType").val();
-		var projectYear = $("#projectYear").val();
-		var firstUnits = $("#firstUnits").val();
-		var secondUnits = $("#secondUnits").val();
-		var firstFinish = $("#firstFinish").val();
-		var extendedStatus = $("#extendedStatus").val();
-		var extendedTime = $("#extendedTime").val();
-		var hiddenSign = $("#hiddenSign").val();
-
-		console.log(projectId );
+		var projectId = encodeURI(encodeURI($("#projectId").val()));
+		var projectName = encodeURI(encodeURI($("#projectName").val()));
+		var projectType = encodeURI(encodeURI($("#projectType").val()));
+		var projectYear = encodeURI(encodeURI($("#projectYear").val()));
+		var firstUnits = encodeURI(encodeURI($("#firstUnits").val()));
+		var secondUnits = encodeURI(encodeURI($("#secondUnits").val()));
+		var firstFinish = encodeURI(encodeURI($("#firstFinish").val()));
+		var extendedStatus = encodeURI(encodeURI($("#extendedStatus").val()));
+		var extendedTime = encodeURI(encodeURI($("#extendedTime").val()));
+		var hiddenSign = encodeURI(encodeURI($("#hiddenSign").val()));
+/*		console.log(projectId );
 		console.log(projectName);
 		console.log(projectType);
 		console.log(projectYear);
@@ -436,24 +435,23 @@ $(document).ready(function() {
 		console.log(firstFinish);
 		console.log(extendedStatus);
 		console.log(extendedTime);
-		console.log(hiddenSign);
+		console.log(hiddenSign);*/
 		jp.downloadFile('${ctx}/sg/information/exportMaterial?projectId='+projectId+'&projectName='+projectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits+'&firstFinish='+firstFinish+'&extendedStatus='+extendedStatus+'&extendedTime='+extendedTime+'&hiddenSign='+hiddenSign);
 	});
 
 //导出项目清单
 	$("#exportMaterial").click(function(){
-		var projectId = $("#projectId").val();
-		var projectName = $("#projectName").val();
-		var projectType = $("#projectType").val();
-		var projectYear = $("#projectYear").val();
-		var firstUnits = $("#firstUnits").val();
-		var secondUnits = $("#secondUnits").val();
-		var firstFinish = $("#firstFinish").val();
-		var extendedStatus = $("#extendedStatus").val();
-		var extendedTime = $("#extendedTime").val();
-		var hiddenSign = $("#hiddenSign").val();
-		var newProjectName = encodeURI(encodeURI(projectName));
-		console.log(projectId );
+		var projectId = encodeURI(encodeURI($("#projectId").val()));
+		var projectName = encodeURI(encodeURI($("#projectName").val()));
+		var projectType = encodeURI(encodeURI($("#projectType").val()));
+		var projectYear = encodeURI(encodeURI($("#projectYear").val()));
+		var firstUnits = encodeURI(encodeURI($("#firstUnits").val()));
+		var secondUnits = encodeURI(encodeURI($("#secondUnits").val()));
+		var firstFinish = encodeURI(encodeURI($("#firstFinish").val()));
+		var extendedStatus = encodeURI(encodeURI($("#extendedStatus").val()));
+		var extendedTime = encodeURI(encodeURI($("#extendedTime").val()));
+		var hiddenSign = encodeURI(encodeURI($("#hiddenSign").val()));
+/*		console.log(projectId );
 		console.log(projectName);
 		console.log(projectType);
 		console.log(projectYear);
@@ -462,24 +460,24 @@ $(document).ready(function() {
 		console.log(firstFinish);
 		console.log(extendedStatus);
 		console.log(extendedTime);
-		console.log(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);
+		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);
 
 	});
 
 //导出说明word
 	$("#exportInformation").click(function(){
-		var projectId = $("#projectId").val();
-		var projectName = $("#projectName").val();
-		var projectType = $("#projectType").val();
-		var projectYear = $("#projectYear").val();
-		var firstUnits = $("#firstUnits").val();
-		var secondUnits = $("#secondUnits").val();
-		var firstFinish = $("#firstFinish").val();
-		var extendedStatus = $("#extendedStatus").val();
-		var extendedTime = $("#extendedTime").val();
-		var hiddenSign = $("#hiddenSign").val();
-		console.log(projectId );
+		var projectId = encodeURI(encodeURI($("#projectId").val()));
+		var projectName = encodeURI(encodeURI($("#projectName").val()));
+		var projectType = encodeURI(encodeURI($("#projectType").val()));
+		var projectYear = encodeURI(encodeURI($("#projectYear").val()));
+		var firstUnits = encodeURI(encodeURI($("#firstUnits").val()));
+		var secondUnits = encodeURI(encodeURI($("#secondUnits").val()));
+		var firstFinish = encodeURI(encodeURI($("#firstFinish").val()));
+		var extendedStatus = encodeURI(encodeURI($("#extendedStatus").val()));
+		var extendedTime = encodeURI(encodeURI($("#extendedTime").val()));
+		var hiddenSign = encodeURI(encodeURI($("#hiddenSign").val()));
+/*		console.log(projectId );
 		console.log(projectName);
 		console.log(projectType);
 		console.log(projectYear);
@@ -488,7 +486,7 @@ $(document).ready(function() {
 		console.log(firstFinish);
 		console.log(extendedStatus);
 		console.log(extendedTime);
-		console.log(hiddenSign);
+		console.log(hiddenSign);*/
 		jp.downloadFile('${ctx}/sg/information/exportInformation?projectId='+projectId+'&projectName='+projectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits+'&firstFinish='+firstFinish+'&extendedStatus='+extendedStatus+'&extendedTime='+extendedTime+'&hiddenSign='+hiddenSign);
 	});
 

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 id="finish"><input id="finishOne" type="hidden" value="${data.name}"/>${data.finishCount}</a></th>
+					<th><a class="finish"><input class="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 id="noFinish">${data.unfinishCount}</a></th>
+					<th><a class="noFinish"><input class="finishOne" type="hidden" value="${data.name}"/>${data.unfinishCount}</a></th>
 				</c:forEach>
 			</tr>
 			</thead>
@@ -121,21 +121,21 @@
 					// 使用刚指定的配置项和数据显示图表。
 					myChart.setOption(option);
 				})
-				//a连接传入参数
-				$("#finish").click(function () {
-					var conditionBe = $("#finishOne").val();
+				//点击完成的数量导出对应项目文件
+				$(".finish").on("click", function () {
+					var conditionBe = $(this).find("input").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();
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition=' + condition + '&status=0&type=0')
+				});
+				//点击为完成的数量导出对应项目文件
+				$(".noFinish").click(function () {
+					var conditionBe = $(this).find("input").val();
 					var condition = encodeURI(encodeURI(conditionBe));
 					console.log(conditionBe);
 					console.log(condition);
-					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=1&type=0')
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition=' + condition + '&status=1&type=0');
 				})
 			})
 		</script>

src/main/webapp/webpage/modules/sg/audit/report/reportList1.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=1">${data.finishCount}</a></th>
+					<th><a class="finish"><input class="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=1">${data.unfinishCount}</a></th>
+					<th><a class="noFinish"><input class="finishOne" type="hidden" value="${data.name}"/>${data.unfinishCount}</a></th>
 				</c:forEach>
 			</tr>
 			</thead>
@@ -121,6 +121,23 @@
 					// 使用刚指定的配置项和数据显示图表。
 					myChart.setOption(option);
 				})
+
+				//点击完成的数量导出对应项目文件
+				$(".finish").click(function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=0&type=1')
+				})
+				//点击为完成的数量导出对应项目文件
+				$(".noFinish").click(function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=1&type=1')
+				})
 			})
 		</script>
 	</div>

src/main/webapp/webpage/modules/sg/audit/report/reportList2.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=2">${data.finishCount}</a></th>
+					<th><a class="finish"><input class="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=2">${data.unfinishCount}</a></th>
+					<th><a class="noFinish"><input class="finishOne" type="hidden" value="${data.name}"/>${data.unfinishCount}</a></th>
 				</c:forEach>
 			</tr>
 			</thead>
@@ -121,6 +121,23 @@
 					// 使用刚指定的配置项和数据显示图表。
 					myChart.setOption(option);
 				})
+
+				//点击完成的数量导出对应项目文件
+				$(".finish").click(function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=0&type=2')
+				})
+				//点击为完成的数量导出对应项目文件
+				$(".noFinish").click(function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=1&type=2')
+				})
 			})
 		</script>
 	</div>