From af3171b17b620eabef814aba79959d7ca13eadb3 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Thu, 12 Jul 2018 15:28:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A1.=20=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=8A=A5=E8=A1=A8=E7=B1=BB=E5=9E=8B=E5=90=8E=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=97=B6=E9=97=B4=E6=B6=88=E5=A4=B1=202.=20=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/controller/BaseController.java |  3 +++
 src/main/webapp/WEB-INF/views/report/list.jsp  | 18 +++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index a7913b70d..6287da339 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -343,6 +343,9 @@ public class BaseController {
 		if (StringUtils.isBlank(report.getReportTime())) {
 			report.setReportTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd"));
 		}
+		if (report.getReportType() == null) {
+			report.setReportType(1);
+		}
 	}
 	protected void initFormCondition(Model model){
 		List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 5ae4ecbcb..87255c12d 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -8,9 +8,9 @@
 		//筛选功能初始化
 		filterActionInit();
 		//日期类型初始化
-		changeReportType("${bean.reportType}", true);
+		changeReportType("${bean.reportType}");
 		$("#reportType").change(function(){
-			changeReportType($("#reportType", false).val());
+			changeReportType($("#reportType").val());
 		});
 		//reset
 		$("#resetBtn").on("click",function(){
@@ -89,29 +89,25 @@
 		});
 	});
 	
-	function changeReportType(reportType, init) {
+	function changeReportType(reportType) {
 		$("#intype").remove();
-		var reportTime = "";
-		if (init) {
-			reportTime = "${bean.reportTime }";
-		}
+		var	reportTime = "${bean.reportTime }";
 		if(reportType == 1){//需删除元素后重新添加，直接更改onclick会出现缓存问题
 			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy-MM-dd",isShowClear:true});>');
 		} else if(reportType == 2){
-			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy-MM",isShowClear:true});>');
+			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime.substring(0, 7) + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy-MM",isShowClear:true});>');
 		} else if(reportType == 3){
-			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy",isShowClear:true});>');
+			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime.substring(0, 4) + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy",isShowClear:true});>');
 		}
 	}
 	
 var ajaxReport=function(url,target){
-	var random=new Date().getTime();
 	loading('<spring:message code="onloading"/>');
 	$.ajax({
 		type:'post',
 		async:false,
 		cache:false,
-		url:'${ctx}'+url+"?random="+random,///report/ajaxNtcTagReport
+		url:'${ctx}'+url,// /report/ajaxNtcTagReport
 		data:{
 			"action":$('[name="action"]').val(),
 			"reportType":$('[name="reportType"]').val(),