油电氢平衡表，没有锁三天的问题修复。

娄高锋
1 parent cb8b3cb2
Showing 5 changed files with 185 additions and 56 deletions
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/hydrogen/list/list.html
src/main/resources/static/pages/oil/list_ph.html
@@ -20,6 +20,11 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	String checkJsy(Map<String, Object> map);
 	String checkDate(Map<String, Object> map);
+	
+	String getModifyRights();
+	String modifyRightsChange();
+	String getModifyRightsPj();
+	String modifyRightsChangePj();
 	List<Map<String, Object>> oilListMonth(Map<String, Object> map);
 	List<Ylb> listYlb(Map<String, Object> map);
@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.transaction.Transactional;
@@ -28,10 +29,12 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
+import com.bsth.entity.SystemParam;
 import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Dlb;
@@ -39,6 +42,7 @@ import com.bsth.entity.oil.Nylog;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.LineRepository;
@@ -92,7 +96,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	private static boolean modify_rights_close = false;		//南汇的油电修改权限（由于浦交加了限制，改为默认打开权限）
+	private static boolean modify_rights_close_pj = true;
 	/**
 	 * 获取进存油信息
@@ -109,7 +115,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			 Map<String, Boolean> carsMap=new HashMap<String, Boolean>();
 			 for (int i = 0; i < carsList.size(); i++) {
 				 Cars c=carsList.get(i);
-				 carsMap.put(c.getInsideCode(), c.getSfdc());
+				 carsMap.put(c.getInsideCode(), (c.getSfdc()!=null?c.getSfdc():false)
+							|| (c.getHydrogen()!=null?c.getHydrogen():false));//电车或氢能源车，排除这些类型就都是油车
 			}
 			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 			Date dNow = new Date();   //当前时间
@@ -119,6 +126,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
 			dBefore = calendar.getTime();   //得到前一天的时间
 			String rq=sdf.format(dBefore);
+			//保留两位小数
+			DecimalFormat df = new DecimalFormat("#.00");
 			// TODO Auto-generated method stub
 			Map<String, Object> newMap=new HashMap<String,Object>();
 			//当天YLB信息
@@ -134,14 +143,13 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", rq, "", "", "", "");
 			for(int x=0;x<listpb.size();x++){
-				boolean sfdc=true;
-				Map<String, Object> map=listpb.get(x);
-				if (carsMap.get(map.get("clZbh").toString())!=null) {
-					 sfdc= carsMap.get(map.get("clZbh").toString());
-				}else{
-					sfdc=true;
+				boolean sfyc = true;//是否油车
+				Map<String, Object> map = listpb.get(x);
+				if (carsMap.get(map.get("clZbh").toString()) != null
+						&& carsMap.get(map.get("clZbh").toString())) {
+					sfyc = false;
 				}
-				if(!sfdc){
+				if(sfyc){
 					//判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
 					Ylb t=new Ylb();
 					for(int k=0;k<ylList.size();k++){
@@ -247,7 +255,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
 			for (int i = 0; i < carsList.size(); i++) {
 				Cars c = carsList.get(i);
-				carsMap.put(c.getInsideCode(), c.getSfdc());
+				carsMap.put(c.getInsideCode(), (c.getSfdc()!=null?c.getSfdc():false)
+						|| (c.getHydrogen()!=null?c.getHydrogen():false));//电车或氢能源车，排除这些类型就都是油车
 			}
 			String rq = map2.get("rq").toString();
 			String line = "";
@@ -267,6 +276,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				nbbm=map2.get("nbbm_eq").toString();
 			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			// 保留两位小数
+			DecimalFormat df = new DecimalFormat("#.00");
 			// TODO Auto-generated method stub
 			// 当天YLB信息
 			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
@@ -344,14 +355,13 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			Map<String, Object> cMap=new HashMap<String, Object>();
 			for (int x = 0; x < listpb.size(); x++) {
 				String type = "add";
-				boolean sfdc = true;
+				boolean sfyc = true;//是否油车
 				Map<String, Object> map = listpb.get(x);
-				if (carsMap.get(map.get("clZbh").toString()) != null) {
-					sfdc = carsMap.get(map.get("clZbh").toString());
-				} else {
-					sfdc = true;
+				if (carsMap.get(map.get("clZbh").toString()) != null
+						&& carsMap.get(map.get("clZbh").toString())) {
+					sfyc = false;
 				}
-				if (!sfdc) {
+				if (sfyc) {
 					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
 					Ylb t = new Ylb();
 					for (int k = 0; k < ylList.size(); k++) {
@@ -663,8 +673,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
 					}
 //					jzl = Arith.sub(jzl, zsh);
-					// 加注量与能耗保留两位小数
-					DecimalFormat df = new DecimalFormat("0.##");
+					// 保留两位小数
+					DecimalFormat df = new DecimalFormat("#.00");
 					Double zyl = 0.0;
 					Double nextJzyl = 0.0;
 					// 保存已经计算过的车辆，相同车辆编号的车不在计算
@@ -1477,8 +1487,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //						repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
 //						ylb.getNbbm(),"jcsx");
-				// 加注量与能耗保留两位小数
-				DecimalFormat df = new DecimalFormat("0.##");
+				DecimalFormat df = new DecimalFormat("#.00");
 				Double zyl = 0.0;
 				Double nextJzyl = 0.0;
 				// 车的，进，出油量及耗油
@@ -1596,16 +1605,44 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	public String checkDate(Map<String, Object> map) {
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		
+		int days = 3; // 3天
+		
+//		Set<Role> roles = SecurityUtils.getCurrentUser().getRoles();
+//		SystemParam param = BasicData.getSystemParam().get(Constants.SPECIAL_ROLES);
+//		days = 4;
+//		if (param != null && param.getValue() != null) {
+//			for (Role role : roles) {
+//				if (param.getValue().contains(String.format(",%s,", role.getCodeName()))) {
+//					days = 5;
+//				}
+//			}
+//		}
+		
 		String rq=map.get("rq").toString();
 		String gsbm=map.get("ssgsdm_like").toString();
 		String type="1";
-		if(gsbm.equals("26")){
+		if(gsbm.equals("26") && modify_rights_close){	//南汇公司的修改权限
+			Date date=new Date();
+			try {
+				long day2=date.getTime();
+				long day1=sdf.parse(rq).getTime();
+				long d = (day2 - day1) / (24*3600*1000);  
+			    if(d >= days){
+			    	type="2";
+			    }
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		if(modify_rights_close_pj){	//浦交规定的修改权限，今天昨天前天三天可修改
 			Date date=new Date();
 			try {
 				long day2=date.getTime();
 				long day1=sdf.parse(rq).getTime();
-				long days = (day2 - day1) / (24*3600*1000);  
-			    if(days>3){
+				long d = (day2 - day1) / (24*3600*1000);  
+			    if(d > days){
 			    	type="2";
 			    }
 			} catch (ParseException e) {
@@ -1616,6 +1653,36 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return type;
 	}
+	@Override
+	public String getModifyRights(){
+		return modify_rights_close?"关闭":"打开";	//打开是可编辑(false)，关闭是不可编辑(true)
+	}
+	
+	@Override
+	public String modifyRightsChange(){
+		if(modify_rights_close){
+			modify_rights_close = false;
+		} else {
+			modify_rights_close = true;
+		}
+		return modify_rights_close?"权限关闭":"权限打开";
+	}
+	
+	@Override
+	public String getModifyRightsPj(){
+		return modify_rights_close_pj?"关闭":"打开";
+	}
+	
+	@Override
+	public String modifyRightsChangePj(){
+		if(modify_rights_close_pj){
+			modify_rights_close_pj = false;
+		} else {
+			modify_rights_close_pj = true;
+		}
+		return modify_rights_close_pj?"权限关闭":"权限打开";
+	}
+	
 	@Override
@@ -1980,8 +2047,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
 						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
 					}
-					// 加注量与能耗保留两位小数
-					DecimalFormat df = new DecimalFormat("0.##");
+					// 保留两位小数
+					DecimalFormat df = new DecimalFormat("#.00");
 					Double zyl = 0.0;
 					Double nextJzyl = 0.0;
 					for (int j = 0; j < iterator2.size(); j++) {
@@ -301,11 +301,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 				} else {
 	            	var params=getParamsList();
 	            	var par={};
-	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+// 	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+	            	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
 	            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+// 	            	par["rq"] = $("#rq").val();
+// 	            	par["ssgsdm_like"] = '26';
 	            	$get('/ylb/checkDate',par,function(status){
 	            		if(status=='2'){
-	               		 layer.msg('只能操作一天内数据.');
+	               		 layer.msg('只能操作三天内数据.');
 	               		}else{
 			                var i = layer.load(2);
 			                $get('/dlb/checkDl', params, function () {
@@ -326,11 +329,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	var par={};
-            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//             	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
             	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//             	par["rq"] = $("#rq").val();
+//             	par["ssgsdm_like"] = '26';
             	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
-               		 layer.msg('只能操作一天内数据.');
+               		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
 		                $get('/ylb/outAndIn', params, function () {
@@ -349,11 +355,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $("#saveButton").on('click',function(){
         	var params_=getParamsList();
         	var par={};
-        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//         	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
         	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//         	par["rq"] = $("#rq").val();
+//         	par["ssgsdm_like"] = '26';
         	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
-           		 layer.msg('只能操作一天内数据.');
+           		 layer.msg('只能操作三天内数据.');
            		}else{
 		        	var ylArray = [];
 		        	$('input.icheck').each(function(){
@@ -471,11 +480,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 				} else {
 	            	var params=getParamsList();
 	            	var par={};
-	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+// 	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+	            	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
 	            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+// 	            	par["rq"] = $("#rq").val();
+// 	            	par["ssgsdm_like"] = '26';
 	            	$get('/ylb/checkDate',par,function(status){
 	            		if(status=='2'){
-	               		 layer.msg('只能操作一天内数据.');
+	               		 layer.msg('只能操作三天内数据.');
 	               		}else{
 			                var i = layer.load(2);
 			                params["fgsdm_like"] = '';
@@ -638,11 +650,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	var params=getParamsList();
 			var id = $(this).data('id');
         	var par={};
-        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//         	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
         	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//         	par["rq"] = $("#rq").val();
+//         	par["ssgsdm_like"] = '26';
         	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
-           		 layer.msg('只能操作一天内数据.');
+           		 layer.msg('只能操作三天内数据.');
            		}else{
 		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
 		    		console.log(id+"修改驾驶员:"+jsy);
@@ -785,11 +800,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $('#removeButton').on('click', function () {
         	var params_=getParamsList();
         	var par={};
-        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//         	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
         	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//         	par["rq"] = $("#rq").val();
+//         	par["ssgsdm_like"] = '26';
         	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
-           		 layer.msg('只能操作一天内数据.');
+           		 layer.msg('只能操作三天内数据.');
            		}else{
 		        	var idArray = [];
 		        	var x=0;
@@ -299,8 +299,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 				} else {
 	            	var params=getParamsList();
 	            	var par={};
-	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+// 	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+	            	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
 	            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+// 	            	par["rq"] = $("#rq").val();
+// 	            	par["ssgsdm_like"] = '26';
 	            	$get('/ylb/checkDate',par,function(status){
 	            		if(status=='2'){
 	               		 layer.msg('只能操作三天内数据.');
@@ -324,8 +327,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	var par={};
-            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//             	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        		par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
             	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//             	par["rq"] = $("#rq").val();
+//             	par["ssgsdm_like"] = '26';
             	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
@@ -347,8 +353,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $("#saveButton").on('click',function(){
         	var params_=getParamsList();
         	var par={};
-        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//         	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
         	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//         	par["rq"] = $("#rq").val();
+//         	par["ssgsdm_like"] = '26';
         	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
@@ -418,8 +427,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 				} else {
 	            	var params=getParamsList();
 	            	var par={};
-	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+// 	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        			par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
 	            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+// 	            	par["rq"] = $("#rq").val();
+// 	            	par["ssgsdm_like"] = '26';
 	            	$get('/ylb/checkDate',par,function(status){
 	            		if(status=='2'){
 	               		 layer.msg('只能操作三天内数据.');
@@ -564,8 +576,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	var params=getParamsList();
 			var id = $(this).data('id');
         	var par={};
-        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//         	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
         	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//         	par["rq"] = $("#rq").val();
+//         	par["ssgsdm_like"] = '26';
         	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
@@ -711,8 +726,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $('#removeButton').on('click', function () {
         	var params_=getParamsList();
         	var par={};
-        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//         	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
         	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//         	par["rq"] = $("#rq").val();
+//         	par["ssgsdm_like"] = '26';
         	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
@@ -359,11 +359,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
        		 	var params=getParamsList();
             	var par={};
-            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	//par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        		par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
             	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//             	par["rq"] = $("#rq").val();
+//             	par["ssgsdm_like"] = '26';
             	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
-               		 layer.msg('只能操作一天内数据.');
+               		 layer.msg('只能操作三天内数据.');
                		}else{
                         var i = layer.load(2);
                         $get('/ylb/checkYl', params, function () {
@@ -384,11 +387,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	var par={};
-            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//             	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        		par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
             	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//             	par["rq"] = $("#rq").val();
+//             	par["ssgsdm_like"] = '26';
             	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
-               		 layer.msg('只能操作一天内数据.');
+               		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
 		                $get('/ylb/outAndIn', params, function () {
@@ -407,11 +413,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	var params_=getParamsList();
         	var par={};
-        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//         	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
         	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+// 			par["rq"] = $("#rq").val();
+//			par["ssgsdm_like"] = '26';
         	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
-           		 layer.msg('只能操作一天内数据.');
+           		 layer.msg('只能操作三天内数据.');
            		}else{
 		        	var ylArray = [];
 		        	$('input.icheck').each(function(){
@@ -474,11 +483,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params_=getParamsList();
             	var par={};
-            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//             	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        		par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
             	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//             	par["rq"] = $("#rq").val();
+//             	par["ssgsdm_like"] = '26';
             	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
-               		 layer.msg('只能操作一天内数据.');
+               		 layer.msg('只能操作三天内数据.');
                	}else{
 	            	//拆分前先保存全部  
 	            	var ylArray = [];
@@ -645,11 +657,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	var par={};
-            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//             	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        		par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
             	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//             	par["rq"] = $("#rq").val();
+//             	par["ssgsdm_like"] = '26';
             	$get('/ylb/checkDate',par,function(status){
 	            	if(status=='2'){
-	               		 layer.msg('只能操作一天内数据.');
+	               		 layer.msg('只能操作三天内数据.');
 	               	}else{
 		                var i = layer.load(2);
 		            	params["fgsdm_like"] = '';
@@ -815,12 +830,15 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         function jsyUpdate(){
         	var params=getParamsList();
         	var par={};
-        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//         	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
         	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//         	par["rq"] = $("#rq").val();
+//         	par["ssgsdm_like"] = '26';
         	$get('/ylb/checkDate',par,function(status){
 				var id = $(this).data('id');
 	            if(status=='2'){
-	               	layer.msg('只能操作一天内数据.');
+	               	layer.msg('只能操作三天内数据.');
 	            }else{
 		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();
 		    		$get('/ylb/updateJsy',{id:id,jsy:jsy}, function(result){
@@ -956,11 +974,14 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $('.removeButton').on('click', function () {
         	var params_=getParamsList();
         	var par={};
-        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+//         	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["rq"] = moment($("#rq").val()).format("YYYY-MM-DD");
         	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+//         	par["rq"] = $("#rq").val();
+//         	par["ssgsdm_like"] = '26';
         	$get('/ylb/checkDate',par,function(status){
 		            if(status=='2'){
-		               	layer.msg('只能操作一天内数据.');
+		               	layer.msg('只能操作三天内数据.');
 		            }else{
 		        	var idArray = [];
 		        	var x=0;