换人换车

廖磊
1 parent f66adf3d
Showing 6 changed files with 48 additions and 45 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/forms/mould/changetochange.xls
src/main/resources/static/pages/mforms/changetochanges/changetochange.html
@@ -303,12 +303,10 @@ public class ExportController {
 			m.put("fssj", l.getFssj());
 			m.put("xgsj", l.getXgsj());
 			m.put("pcch", l.getPcch());
-			m.put("pcry", l.getPcry());
-			m.put("jhch", l.getJhch());
-			m.put("jhgh", l.getJhgh());
 			m.put("sjch", l.getSjch());
+			m.put("fcgh", l.getPcry());
 			m.put("sjgh", l.getSjgh());
-			m.put("yy", l.getYy());
+			m.put("yy", l.getYy()==null?"":l.getYy());
 			m.put("xgr", l.getXgr());
 			resList.add(m);
 		}
@@ -66,7 +66,7 @@ public class MCY_FormsController {
 	}
 	// 换人换车情况统计表
-	@RequestMapping(value = "/changetochange", method = RequestMethod.POST)
+	@RequestMapping(value = "/changetochange", method = RequestMethod.GET)
 	public List<Changetochange> changetochange(@RequestParam Map<String, Object> map) {
 		return formsService.changetochange(map);
@@ -407,7 +407,19 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " select c.*,l.line_code   from bsth_c_chtoch c LEFT JOIN bsth_c_line l on c.xl=l.name WHERE 1=1  ";
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String gs="";
+		if(map.get("gsdm")!=null){
+			gs=map.get("gsdm").toString();
+		}
+		String fgs="";
+		if(map.get("fgsdm")!=null){
+			fgs =map.get("fgsdm").toString();
+		}
+		/*String sql = " select c.*,l.line_code   from bsth_c_chtoch c LEFT JOIN bsth_c_line l on c.xl=l.name WHERE 1=1  ";
 		if (!map.get("startDate").toString().equals(" ") && !map.get("endDate").toString().equals(" ")) {
 			sql += "and DATE_FORMAT( c.rq,'%Y-%m-%d') BETWEEN  '" + map.get("startDate").toString() + "'  and '"
 					+ map.get("endDate").toString() + "'";
@@ -419,18 +431,28 @@ public class FormsServiceImpl implements FormsService {
 			sql += " and c.pcch!=c.pcry";
 		} else if (map.get("sel").equals("1")) {
 			sql += " and c.jhgh!=c.sjgh";
-		}
+		}*/
+		String sql="select * from bsth_c_chtoch where rq BETWEEN '"+ map.get("startDate").toString()+"' "
+				+ " and '"+map.get("endDate").toString() +"'";
+		
+		if(!line.equals("")){
+			sql +=" and xl= '"+line+"'";
+		}else{
+			sql += " and gs= '"+gs+"' and fgs= '"+fgs+"'";
+		}
+		
+		sql +=" order by rq";
 		List<Changetochange> list = jdbcTemplate.query(sql, new RowMapper<Changetochange>() {
 			@Override
 			public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Changetochange chan = new Changetochange();
-				chan.setRq(rq);
-				chan.setGs(arg0.getString("gs"));
-				chan.setFgs(arg0.getString("fgs"));
-				chan.setXl(arg0.getString("xl"));
+				chan.setRq(arg0.getString("rq"));
+				chan.setGs(BasicData.businessCodeNameMap.get(arg0.getString("gs")));
+				chan.setFgs(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs")+"_"+arg0.getString("gs")));
+				chan.setXl(BasicData.lineCode2NameMap.get(arg0.getString("xl")));
 				chan.setLp(arg0.getString("lp"));
 				chan.setFssj(arg0.getString("fssj"));
 				chan.setXgsj(arg0.getString("xgsj"));
@@ -558,7 +558,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for(ChildTaskPlan c : cts){
-                    if(c.isDestroy() && c.getDestroyReason().equals(item))
+                    if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
                         sum = Arith.add(sum, c.getMileage());
                 }
             }
@@ -70,14 +70,14 @@
 							class="form-control" type="text" id="endDate"
 							style="width: 140px;" />
 					</div>
-					<div style="display: inline-block; margin-left: 10px;">
-						<span class="item-label" style="width: 120px;">类型: </span> <select
-							class="form-control" id="sel">
-							<option value="">请选择</option>
-							<option value="1">换人</option>
-							<option value="2">换车</option>
-						</select>
-					</div>
+<!-- 					<div style="display: inline-block; margin-left: 10px;"> -->
+<!-- 						<span class="item-label" style="width: 120px;">类型: </span> <select -->
+<!-- 							class="form-control" id="sel"> -->
+<!-- 							<option value="">请选择</option> -->
+<!-- 							<option value="1">换人</option> -->
+<!-- 							<option value="2">换车</option> -->
+<!-- 						</select> -->
+<!-- 					</div> -->
 					<div class="form-group">
 						<input class="btn btn-default" type="button" id="query" value="筛选" />
 						<input class="btn btn-default" type="button" id="export"
@@ -117,10 +117,8 @@
 							<tr>
 								<td>车号</td>
 								<td>车号</td>
-								<td>工号</td>
-								<td>人员</td>
-								<td>工号</td>
-								<td>人员</td>
+								<td colspan="2">工号/人员</td>
+								<td colspan="2">工号/人员</td>
 							</tr>
 						</thead>
 						<tbody>
@@ -188,6 +186,7 @@
 		$("#fgsdmChange").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id: " ", text: "请选择"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -223,29 +222,15 @@
 					var gsdmChange= $("#gsdmChange").val();
 				    var fgsdmChange= $("#fgsdmChange").val();
 					if (startDate1 != '' && endDate1 != '') {
-						$post('/mcy_forms/changetochange', {
+						$get('/mcy_forms/changetochange', {
 							sel : sel,
 							line : line,
 							startDate : $("#startDate").val(),
 							endDate : $("#endDate").val(),
+							gsdm:gsdmChange,
+							fgsdm:fgsdmChange,
 							type : 'query'
 						}, function(result) {
-							startDate = $("#startDate").val();
-							endDate = $("#endDate").val();
-							$("#sDate").text(startDate);
-							$("#eDate").text(endDate);
-							var temp = {};
-							var today_account = 0;
-							temp["line"] = $("#line").text();
-							$.each(result, function(i, obj) {
-								if (moment(obj.schedule_date_str).format(
-										"YYYY-MM-DD") == moment(obj.startDate)
-										.format("YYYY-MM-DD")) {
-									today_account++;
-								}
-								obj.updateDate = moment(obj.startDate).format(
-										"YYYY-MM-DD HH:mm:ss");
-							});
 							// 把数据填充到模版中
 							var tbodyHtml = template('changetochange', {
 								list : result
@@ -294,11 +279,9 @@
 			<td>{{obj.fssj}}</td>
 			<td>{{obj.xgsj}}</td>
 			<td>{{obj.pcch}}</td>
-			<td>{{obj.pcry}}</td>
-			<td>{{obj.jhgh}}</td>
-			<td>{{obj.jhch}}</td>
-			<td>{{obj.sjgh}}</td>
 			<td>{{obj.sjch}}</td>
+			<td colspan="2">{{obj.pcry}}</td>
+			<td colspan="2">{{obj.sjgh}}</td>
 			<td>{{obj.yy}}</td>
 			<td>{{obj.xgr}}</td>
 		</tr>