1.维修上报报表完成

王通
1 parent bee85d6c
Showing 7 changed files with 356 additions and 1 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/report/RepairReport.java
src/main/java/com/bsth/repository/RepairReportRepository.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/repairReport.xls
src/main/resources/static/pages/forms/statement/repairReport.html
@@ -25,6 +25,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.report.RepairReport;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
@@ -718,5 +719,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.repairReport(param, true);
 	}
-	
+	@RequestMapping(value = "wxsb", method = RequestMethod.GET)
+	public List<RepairReport> repairReportList(@RequestParam String line, @RequestParam String date, @RequestParam String code, @RequestParam String type){
+		return scheduleRealInfoService.repairReportList(line, date, code, type);
+	}
 }
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 /**
  ** 维修上报信息
@@ -19,6 +20,10 @@ public class RepairReport {
 	@Id
 	@GeneratedValue
 	private Integer id;
+	// 线路编码
+	private String lineId;
+	// 线路名称
+	private String lineName;
 	// 上报用户名
 	private String reportUser;
 	// 上报姓名
@@ -33,8 +38,14 @@ public class RepairReport {
 	private String repairType;
 	// 报修时间
 	private Date reportDate;
+	// 格式化的时间字符串
+	@Transient
+	private String reportDateStr;
 	// 报修状态 0 不报 1上报成功 -1上报失败
 	private int reportState;
+	// 格式化的时间字符串
+	@Transient
+	private String reportStateStr;
 	public Integer getId() {
 		return id;
@@ -44,6 +55,22 @@ public class RepairReport {
 		this.id = id;
 	}
+	public String getLineId() {
+		return lineId;
+	}
+
+	public void setLineId(String lineId) {
+		this.lineId = lineId;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
+
 	public String getReportUser() {
 		return reportUser;
 	}
@@ -100,6 +127,14 @@ public class RepairReport {
 		this.reportDate = reportDate;
 	}
+	public String getReportDateStr() {
+		return reportDateStr;
+	}
+
+	public void setReportDateStr(String reportDateStr) {
+		this.reportDateStr = reportDateStr;
+	}
+
 	public int getReportState() {
 		return reportState;
 	}
@@ -107,4 +142,12 @@ public class RepairReport {
 	public void setReportState(int reportState) {
 		this.reportState = reportState;
 	}
+
+	public String getReportStateStr() {
+		return reportStateStr;
+	}
+
+	public void setReportStateStr(String reportStateStr) {
+		this.reportStateStr = reportStateStr;
+	}
 }
 package com.bsth.repository;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import com.bsth.entity.report.RepairReport;
@@ -23,4 +27,8 @@ import com.bsth.entity.report.RepairReport;
 @Repository
 public interface RepairReportRepository extends BaseRepository<RepairReport, Integer> {
+	@Query(value="select r from "
+			+ " RepairReport r where r.lineId = ?1 and r.reportDate between ?2 and "
+			+ "?3 and r.incode like ?4%")
+	List<RepairReport> repairReportList(String lineId,Date start,Date end,String incode);
 }
@@ -4,6 +4,7 @@ import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.report.RepairReport;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -196,4 +197,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Integer isCircleQdz(String clzbh,String sdr,String xlbm,String qdzCode);
 	Map<String, Object> repairReport(Map<String, Object> map, boolean isActive);
+	
+	List<RepairReport> repairReportList(String line,String date,String code, String type);
 }
@@ -6126,6 +6126,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		}
 		// 持久化此次上报记录
 		RepairReport rr = new RepairReport();
+		rr.setLineId(sch.getXlBm());
+		rr.setLineName(sch.getXlName());
 		rr.setReportUser(reportUser);
 		rr.setReportName(reportName);
 		rr.setSchId(id);
@@ -6139,6 +6141,92 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		return res;
     }
+    
+    @Override
+    public List<RepairReport> repairReportList(String lineId, String date, String incode, String type) {
+    	List<RepairReport> result = new ArrayList<RepairReport>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        Date start = null, end = null;
+        if (date.length() > 0) {
+            try {
+                start = sdf.parse(date + " 00:00:00");
+                end = sdf.parse(date + " 23:59:59");
+            } catch (ParseException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+
+        }
+        
+        result = repairReportRepository.repairReportList(lineId, start, end, incode);
+        Map<String, Object> dMap=new HashMap<>();
+		dMap.put("dGroup", "repairtype");
+		Map<String, String> code2name = new HashMap<String, String>();
+		for (Dictionary dic : dictionaryService.list(dMap)) {
+			code2name.put(dic.getdCode(), dic.getdName());
+		}
+		for (RepairReport rr : result) {
+			String repairType = rr.getRepairType();
+			String[] types = repairType.split(";");
+			StringBuilder sb = new StringBuilder();
+			
+			for (String t : types) {
+				sb.append(code2name.get(t)).append(";");
+			}
+			
+			rr.setRepairType(sb.toString());
+			rr.setReportDateStr(sdf.format(rr.getReportDate()));
+			switch (rr.getReportState()) {
+				case 0:
+					rr.setReportStateStr("不报");
+					break;
+				case 1:
+					rr.setReportStateStr("上报成功");
+					break;
+				case -1:
+					rr.setReportStateStr("上报失败");
+					break;
+				default:
+					break;
+			}
+		}
+        
+        if ("export".equals(type)) {
+            String lineName = BasicData.lineCode2NameMap.get(lineId);
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            ReportUtils ee = new ReportUtils();
+            List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
+            for (int i = 0; i < result.size(); i++) {
+                Map<String, Object> map = new HashMap<String, Object>();
+                RepairReport rr = result.get(i);
+                map.put("row", i + 1);
+                map.put("lineId", rr.getLineName());
+                map.put("incode", rr.getIncode());
+                map.put("departureTime", rr.getDepartureTime());
+                map.put("reportUser", rr.getReportUser());
+                map.put("reportDateStr", rr.getReportDate());
+                map.put("repairType", rr.getRepairType());
+                map.put("reportStateStr", rr.getReportStateStr());
+                newList.add(map);
+            }
+            try {
+                listI.add(newList.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/repairReport.xls",
+                        path + "export/" + sdfSimple.format(sdfMonth.parse(date))
+                                + "-" + lineName + "-维修上报记录.xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+        }
+        
+        return result;
+    }
 }
 class AccountMap implements Comparator<Map<String, Object>> {
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>维修上报记录</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form id="history" class="form-inline" action="">
+					<div style="display: inline-block;">
+						<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: 15px;">
+						<span class="item-label" style="width: 80px;">时间: </span>
+						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+					</div>
+					<div style="display: inline-block;margin-left: 15px">
+						<span class="item-label" style="width: 140px;">车辆编码： </span>
+						<select class="form-control" name="code" id="code" style="width: 180px;"></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" value="导出"/>
+					</div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr class="hidden">
+								<th>序号</th>
+								<th>线路</th>
+								<th>车辆编码</th>
+								<th>发车时间</th>
+								<th>上报人</th>
+								<th>上报时间</th>
+								<th>维修类型</th>
+								<th>上报状态</th>
+							</tr>
+						</thead>
+						<tbody>
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		$('#export').attr('disabled', "true");
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			$.get('/user/companyData', function(result){
+				debugger;
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		
+		$('#code').select2({
+			ajax: {
+				url: '/realSchedule/sreachVehic',
+				dataType: 'json',
+				delay: 150,
+				data: function(params){
+					return{nbbm: params.term};
+				},
+			    processResults: function (data) {
+			      return {
+			        results: data
+			      };
+			    },
+				cache: true
+			},
+			templateResult: function(repo){
+				if (repo.loading) return repo.text;
+				var h = '<span>'+repo.text+'</span>';
+				h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</span>':'');
+				return h;
+			},
+			escapeMarkup: function (markup) { return markup; },
+			minimumInputLength: 1,
+			templateSelection: function(repo){
+				return repo.text;
+			},
+			language: {
+		       noResults: function(){
+		           return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+		       },
+		       inputTooShort : function(e) {
+					return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+			   },
+		       searching : function() {
+					return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+			   }
+			}
+		});
+
+		var line = $("#line").val();
+		var date = $("#date").val();
+		var code = $("#code").val();
+		var lineName = $('#line option:selected').text();
+		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间");
+				return;
+			}
+			line = $("#line").val();
+			date = $("#date").val();
+			code = $("#code").val();
+			lineName = $('#line option:selected').text();
+			var type = "query";
+			$(".hidden").removeClass("hidden");
+			var i = layer.load(2);
+			$get('/realSchedule/wxsb',{line:line,date:date,code:code,type:type},function(result){
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_repair',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms tbody').html(tbodyHtml);
+				layer.close(i);
+				
+				if(result.length == 0)
+					$("#export").attr('disabled',"true");
+				else
+					$("#export").removeAttr("disabled");
+				
+			});	
+		});
+		
+		$("#export").on("click",function(){
+			var type = "export";
+			var i = layer.load(2);
+				$get('/realSchedule/wxsb', {line:line,date:date,code:code,type:type}, function(result){
+				window.open("/downloadFile/download?fileName="
+						+moment(date).format("YYYYMMDD")
+						+"-"+lineName+"-维修上报记录");
+				layer.close(i);
+			});
+		});
+		
+	});
+</script>
+<script type="text/html" id="list_repair">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.lineName}}</td>
+			<td>{{obj.incode}}</td>
+			<td>{{obj.departureTime}}</td>
+			<td>{{obj.reportUser}}</td>
+			<td>{{obj.reportDateStr}}</td>
+			<td>{{obj.repairType}}</td>
+			<td>{{obj.reportStateStr}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="8"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file