添加是否为营运线路和全部分公司的筛选

娄高锋
1 parent 5bfe7ebd
Showing 4 changed files with 79 additions and 50 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/commandState.html
src/main/resources/static/pages/forms/statement/workDaily.html
@@ -1237,6 +1237,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		s.setYwlc(Arith.add(s.getYwlc()!=null?s.getYwlc():0, s_.getYwlc()));
 		s.setQtlc(Arith.add(s.getQtlc()!=null?s.getQtlc():0, s_.getQtlc()));
 		s.setLjlc(Arith.add(s.getLjlc()!=null?s.getLjlc():0, s_.getLjlc()));
+		if(s_.getLjkslc() == null){
+			s_.setLjkslc(0d);
+		}
 		s.setLjkslc(Arith.add(s.getLjkslc()!=null?s.getLjkslc():0, s_.getLjkslc()));
 		s.setJhbcq(s.getJhbcq() + s_.getJhbcq());
 		s.setJhbcz(s.getJhbcz() + s_.getJhbcz());
@@ -55,6 +55,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(subCompany.length() != 0)
 				sql += " and fgs_bm = '"+subCompany+"'";
+			sql += " order by gs_bm, fgs_bm, xl_bm";
+			
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
@@ -62,6 +64,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
 					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
+					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
 					schedule.setBcType(rs.getString("bc_type"));
@@ -325,7 +328,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		Set<String> lineSet = getNotOperation();
 		DecimalFormat df = new DecimalFormat("###0.##");
-		String company = "", subCompany = "";
+		String sfyy = "", company = "", subCompany = "";
+		if(map.get("sfyy")!=null)
+			sfyy = map.get("sfyy").toString();
 		if(map.get("company")!=null)
 			company = map.get("company").toString();
 		if(map.get("subCompany")!=null)
@@ -338,9 +343,27 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 		}
-		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, date);
+		List<ScheduleRealInfo> schedules = this.getSchedule(company, subCompany, line, date);
+		Map<String, Boolean> lineNature = lineService.lineNature();
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
+		
+		//是否营运
+		for(ScheduleRealInfo schedule : schedules){
+			String xlbm = schedule.getXlBm();
+			if(sfyy.length() == 0 || sfyy.equals("0")){
+				list.add(schedule);
+			} else if(sfyy.equals("1")){
+				if(lineNature.containsKey(xlbm) && lineNature.get(xlbm)){
+					list.add(schedule);
+				}
+			} else {
+				if(lineNature.containsKey(xlbm) && !lineNature.get(xlbm)){
+					list.add(schedule);
+				}
+			}
+		}
 		for(ScheduleRealInfo schedule : list){
 			String key = schedule.getXlName();
 			if(key == null || key.trim().equals("") || lineSet.contains(key))
@@ -1317,20 +1340,16 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			String xlbm = s.getXlBm();
 			boolean flag = false;
-			if(sfyy.length() != 0){
-				if(sfyy.equals("0")){
+			if(sfyy.length() == 0 || sfyy.equals("0")){
+				flag = true;
+			} else if(sfyy.equals("1")){
+				if(lineNature.containsKey(xlbm) && lineNature.get(xlbm)){
 					flag = true;
-				} else if(sfyy.equals("1")){
-					if(lineNature.containsKey(xlbm) && lineNature.get(xlbm)){
-						flag = true;
-					}
-				} else {
-					if(lineNature.containsKey(xlbm) && !lineNature.get(xlbm)){
-						flag = true;
-					}
 				}
 			} else {
-				flag = true;
+				if(lineNature.containsKey(xlbm) && !lineNature.get(xlbm)){
+					flag = true;
+				}
 			}
 			if(!flag){
 				continue;
@@ -1596,20 +1615,16 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			boolean flag = false;
 			String xlbm = s.getXlBm();
-			if(sfyy.length() != 0){
-				if(sfyy.equals("0")){
+			if(sfyy.length() == 0 || sfyy.equals("0")){
+				flag = true;
+			} else if(sfyy.equals("1")){
+				if(lineNature.containsKey(xlbm) && lineNature.get(xlbm)){
 					flag = true;
-				} else if(sfyy.equals("1")){
-					if(lineNature.containsKey(xlbm) && lineNature.get(xlbm)){
-						flag = true;
-					}
-				} else {
-					if(lineNature.containsKey(xlbm) && !lineNature.get(xlbm)){
-						flag = true;
-					}
 				}
 			} else {
-				flag = true;
+				if(lineNature.containsKey(xlbm) && !lineNature.get(xlbm)){
+					flag = true;
+				}
 			}
 			if(!flag){
 				continue;
@@ -2137,19 +2152,20 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String sql_="select * from bsth_c_s_sp_info_real "
 				+ " WHERE schedule_date_str = '"+date+"' ";
-		if(line.equals("")){
-			if(company.length() != 0)
-				sql_ += " and gs_bm='"+company+"'";
-			if(subCompany.length() != 0)
-				sql_ += " and fgs_bm='"+subCompany+"'";
-		}else{
+		if(!line.equals("")){
 			sql_ += " and xl_bm = '"+line+"'";
 		}
+		if(company.length() != 0){
+			sql_ += " and gs_bm='"+company+"'";
+		}
+		if(subCompany.length() != 0){
+			sql_ += " and fgs_bm='"+subCompany+"'";
+		}
 		String sql="SELECT r.id,r.schedule_date_str,r.xl_name,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.fcsj,"
 				+ " r.gs_name,r.fgs_name,CONCAT(r.xl_bm,'_',r.id) as line_sch FROM ("+sql_+") AS r"
-				+ " order by r.xl_name,r.id ";
+				+ " order by r.gs_bm,r.fgs_bm,r.xl_bm,r.id ";
 		List<Map<String, Object>> tempList = jdbcTemplate.query(sql,
 				new RowMapper<Map<String, Object>>(){
@@ -2184,20 +2200,16 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 		for(Map<String, Object> m : tempList){
 			String xlbm = m.get("xlbm").toString();
-			if(sfyy.length() != 0){
-				if(sfyy.equals("0")){
+			if(sfyy.length() == 0 || sfyy.equals("0")){
+				list.add(m);
+			} else if(sfyy.equals("1")){
+				if(lineNature.containsKey(xlbm) && lineNature.get(xlbm)){
 					list.add(m);
-				} else if(sfyy.equals("1")){
-					if(lineNature.containsKey(xlbm) && lineNature.get(xlbm)){
-						list.add(m);
-					}
-				} else {
-					if(lineNature.containsKey(xlbm) && !lineNature.get(xlbm)){
-						list.add(m);
-					}
 				}
 			} else {
-				list.add(m);
+				if(lineNature.containsKey(xlbm) && !lineNature.get(xlbm)){
+					list.add(m);
+				}
 			}
 		}
@@ -176,7 +176,7 @@
 		$("#company").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#company').val();
-			var options = '';
+			var options = '<option value="">全部分公司</option>';
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
@@ -219,7 +219,8 @@
 				var temp = tempData[$("#line").val()].split(":");
 				$("#company").val(temp[0]);
 				updateCompany();
-				$("#subCompany").val(temp[1]);
+// 				$("#subCompany").val(temp[1]);
+				$("#subCompany").val("");
 				$("#company").attr("disabled", true);
 // 				$("#subCompany").attr("disabled", true);
 			}
@@ -28,11 +28,11 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form id="history" class="form-inline" action="">
-					<div style="display: inline-block; margin-left: 10px;" id="company1">
+					<div style="display: inline-block; margin-left: 33px;" id="company1">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
 					</div>
-					<div style="display: inline-block; margin-left: 10px;" id="subCompany1">
+					<div style="display: inline-block; margin-left: 5px;" id="subCompany1">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
 					</div>
@@ -40,11 +40,20 @@
 						<span class="item-label" style="width: 80px;">线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
 					</div>
-					<div style="display: inline-block;margin-left: 10px;">
+					<div style="margin-top: 10px"></div>
+					<div style="display: inline-block; margin-left: 5px">
+						<span class="item-label" style="width: 80px;">是否营运: </span>
+						<select class="form-control" name="sfyy" id="sfyy" style="width: 160px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+					</div>
+					<div style="display: inline-block;margin-left: 19px;">
 						<span class="item-label" style="width: 80px;">时间: </span>
-						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+						<input class="form-control" type="text" id="date" style="width: 160px;"/>
 					</div>
-					<div class="form-group">
+					<div class="form-group" style="margin-left: 10px;">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
 					</div>
@@ -185,7 +194,7 @@
 				updateCompany();
 				$("#subCompany").val(temp[1]);
 				$("#company").attr("disabled", true);
-				$("#subCompany").attr("disabled", true);
+// 				$("#subCompany").attr("disabled", true);
 			}
 		});
@@ -194,6 +203,7 @@
 		$("#query").on("click",jsDoQuery);
+		var sfyy = $("#sfyy").val();
 		var line = $("#line").val();
 		var date = $("#date").val();
 		var company = $("#company").val();
@@ -205,6 +215,7 @@
 				return;
 			}
 			var params = {};
+			sfyy = $("#sfyy").val();
 			line = $("#line").val();
 			date = $("#date").val();
 			company = $("#company").val();
@@ -214,6 +225,7 @@
 				lineName = $('#subCompany option:selected').text();
 			if(line == " ")
 				line = "";
+			params['sfyy'] = sfyy;
 			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "query";
@@ -237,6 +249,7 @@
 		$("#export").on("click",function(){
 			var params = {};
+			params['sfyy'] = sfyy;
 			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "export";