Merge branch 'minhang' into pudong

潘钊
2 parents b7e2a432 98de694d
Showing 11 changed files with 117 additions and 35 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/forms/mould/list.xls
src/main/resources/static/pages/forms/statement/account.html
@@ -148,12 +148,12 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
-			m.put("cdl", y.getCdl());
-			m.put("czcd", y.getCzcd()+"%");
-			m.put("jzcd", y.getJzcd()+"%");
-			m.put("czlc", y.getCzlc());
-			m.put("jzlc", y.getJzlc());
-			m.put("hd", y.getHd());
+			m.put("cdl", y.getCdl()<=0?"0":y.getCdl());
+			m.put("czcd", y.getCzcd()<=0?"0":y.getCzcd()+"%");
+			m.put("jzcd", y.getJzcd()<=0?"0":y.getJzcd()+"%");
+			m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
+			m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
+			m.put("hd", y.getHd()<=0?"0":y.getHd());
 			String shyy ="无";
 			if(y.getShyy()!=null){
 				 if(shyy.equals("1")){shyy="票务用油";}
@@ -166,22 +166,23 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 				 else if(shyy.equals("8")){shyy="车间(小修)";}
 				 else{shyy ="无";}
 			}
-			m.put("ns", y.getNs());
+			m.put("ns", y.getNs()<=0?"0":y.getNs());
 			m.put("shyy", shyy);
-			m.put("sh", y.getSh());
-			m.put("zlc", y.getZlc());
+			m.put("sh", y.getSh()<=0?"0":y.getSh());
+			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
 			m.put("rdlx", "");
 			m.put("bglyh", y.getBglyh());
 			resList.add(m);
 		}
 		try {
+			map.put("sheetName", map.get("rq"));
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls",
 				path+"export/"+map.get("rq").toString()+ "进出场存电量.xls");
 			} catch (Exception e) {
 				e.printStackTrace();
-			}	
+			}
 		return resList;
@@ -236,19 +236,19 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
 		for (Ylb y : ylb) {
 			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("rq", y.getRq());
+			m.put("rq", sdfMonth.format(y.getRq()));
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
 			m.put("xlname", y.getXlname()==null?"":y.getXlname());
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
-			m.put("jzl", y.getJzl());
-			m.put("czlc", y.getCzlc());
-			m.put("jzlc", y.getJzlc());
-			m.put("czyl", y.getCzyl());
-			m.put("jzyl", y.getJzyl());
-			m.put("yh", y.getYh());
+			m.put("jzl", y.getJzl()<=0?"0":y.getJzl());
+			m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
+			m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
+			m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl());
+			m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl());
+			m.put("yh", y.getYh()<=0?"0":y.getYh());
 			String rylx="";
 			if(y.getRylx()!=null){
 				if(y.getRylx().equals("0")){rylx="0号柴油";}
@@ -270,12 +270,13 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 				 else{shyy ="无";}
 			}
 			m.put("shyy", shyy);
-			m.put("sh", y.getSh());
-			m.put("zlc", y.getZlc());
+			m.put("sh", y.getSh()<=0?"0":y.getSh());
+			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
 			m.put("bglyh", y.getBglyh());
 			resList.add(m);
 		}
 		try {
+			map.put("sheetName", map.get("rq"));
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
@@ -309,6 +309,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
 		return scheduleRealInfoService.account(line, date, code, xlName, type);
 	}
+	
+	@RequestMapping(value = "/accountPx")
+	public List<Map<String,Object>> accountPx(@RequestParam String line, @RequestParam String date,
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String px) {
+		return scheduleRealInfoService.accountPx(line, date, code, xlName, px);
+	}
 	@RequestMapping(value = "/correctForm")
 	public List<ScheduleRealInfo> correctForm(@RequestParam String line, @RequestParam String startDate,
@@ -332,7 +332,7 @@ public class Dlb {
 	public String getBglyh() {
 		if(this.getZlc()==0){
-			return "0.00";
+			return "0";
 		}else{
 			DecimalFormat df = new DecimalFormat("0.00");
 			return df.format(this.getHd()/this.getZlc()*100);
@@ -278,7 +278,7 @@ public class Ylb {
 	public String getBglyh() {
 		if(this.getZlc()==0){
-			return "0.00";
+			return "0";
 		}else{
 			DecimalFormat df = new DecimalFormat("0.00");
 			return df.format(this.getYh()/this.getZlc()*100);
@@ -506,7 +506,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									long l=Math.round(nextJzyl);
 									double ylxs=l*100/100;
 //									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-									yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
 									t.setYh(yh);
 									t.setJzyl(ylxs);
 									nextJzyl=ylxs;
@@ -531,7 +531,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 										ylxs=l*100/100;
 									}
-									yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
 //									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
 									t.setYh(yh);
@@ -1218,8 +1218,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							t.setShyy(shyy);
 						}
 						czyl=t.getCzyl();
-//						Double jcyl = t.getCzyl();
-						zyl =  jzl;
+						Double jcyl = t.getCzyl();
+						zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
 						Double yh = 0.0;
 						if (zlc > 0 && t.getZlc() > 0) {
 							yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
@@ -1229,7 +1229,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							long l=Math.round(nextJzyl);
 							double ylxs=l*100/100;
 //							nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-							yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+							yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
 							t.setYh(yh);
 							t.setJzyl(ylxs);
 							nextJzyl=ylxs;
@@ -1252,12 +1252,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								long l=0l;
 								double ylxs=0.0;
 								if(i==iterator2.size()-1){
-									ylxs=czyl;
+									ylxs=yl;
 								}else{
 									l=Math.round(nextJzyl);
 									ylxs=l*100/100;
 								}
-								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+								yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
 								t.setYh(yh);
 								t.setJzyl(ylxs);
 								nextJzyl=ylxs;
@@ -1269,7 +1269,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							}
 					}
 					repository.save(t);
-					/*for (int z = 0; z < cylList.size(); z++) {
+					for (int z = 0; z < cylList.size(); z++) {
 						Cyl cyl = cylList.get(z);
 						if (t.getNbbm().equals(cyl.getNbbm())) {
 							cyl.setCyl(t.getJzyl());
@@ -1277,7 +1277,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							break;
 						}
 						cylRepository.save(cyl);
-					}*/
+					}
 				}
 				newMap.put("status", ResponseCode.SUCCESS);
 			}
@@ -1289,6 +1289,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return newMap;
 	}
+	
 	@Override
 	public String checkJsy(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -101,6 +101,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,String>> findLpName(String lpName);
 	List<Map<String,Object>> account(String line,String date,String code,String xlName, String type);
+	List<Map<String,Object>> accountPx(String line,String date,String code,String xlName, String px);
+
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code, String type);
@@ -1811,6 +1811,46 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
+    public List<Map<String, Object>> accountPx(String line, String date,
+                                             String code, String xlName, String px) {
+//        List<Object[]> lsitObj = scheduleRealInfoRepository.accountPx(line, date, code,px);
+        List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+       String sql= "SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T') as date,"
+		+ "c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c "
+		+ "ON c.equipment_code = r.device_id where "
+		+ "FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = '"+date +"'"
+		+ "and r.line_id = "+line+" and c.inside_code like '%"+code+"%'"
+				+ "  order by c.inside_code "+px;
+        Map<String, Object> map;
+        List<Object[]> lsitObj = jdbcTemplate.query(sql,
+                new RowMapper<Object[]>() {
+                    @Override
+                    public Object[] mapRow(ResultSet rs, int rowNum) throws SQLException {
+                    	Object[] t = new Object[4];
+                    	t[0]=rs.getString("company");
+                    	t[1]=rs.getString("request_code");
+                    	t[2]=rs.getString("date");
+                    	t[3]=rs.getString("inside_code");
+                        return t;
+                    }
+                });
+        int i = 1;
+        for (Object[] obj : lsitObj) {
+            if (obj != null) {
+                map = new HashMap<String, Object>();
+                map.put("num", i++);
+                map.put("xlName", xlName);
+                map.put("clZbh", obj[3]);
+                map.put("company", obj[0]);
+                map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1] + "")).toUpperCase());
+                map.put("requestTime", obj[2]);
+                listMap.add(map);
+            }
+        }
+
+        return listMap;
+    }
+    @Override
     public List<Map<String, Object>> account(String line, String date,
                                              String code, String xlName, String type) {
         List<Object[]> lsitObj = scheduleRealInfoRepository.account(line, date, code);
@@ -47,6 +47,10 @@ public class ReportUtils {
 			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
 					sourcePath));
 			HSSFWorkbook wb = new HSSFWorkbook(fs);
+			Map<String, Object> m = (Map<String, Object>)tArray[0];
+			if(m.containsKey("sheetName") && m.get("sheetName")!=null
+					&& m.get("sheetName").toString().trim().length()!=0)
+				wb.setSheetName(0, m.get("sheetName").toString());
 			HSSFSheet sheet = wb.getSheetAt(0);
 			HSSFRow row;
 			HSSFCell cell = null;
@@ -55,7 +55,7 @@
 							<tr>
 								<th>序号</th>
 								<th>线路</th>
-								<th>车辆</th>
+								<th class="nbbmPx">车辆</th>
 								<th>所属公司</th>
 								<th>请求类型</th>
 								<th>请求时间</th>
@@ -140,10 +140,37 @@
             }
         });
 	}
-		var line = $("#line").val();
-		var xlName = $("#select2-line-container").html();
-		var date = $("#date").val();
-		var code = $("#code").val();
+	var line = $("#line").val();
+	var xlName = $("#select2-line-container").html();
+	var date = $("#date").val();
+	var code = $("#code").val();
+	var px="desc";
+	$(".nbbmPx").on("click",function(){
+		if($("#date").val() == null || $("#date").val().trim().length == 0){
+			layer.msg("请选择时间");
+			return;
+		}
+		if(px=="desc"){
+			px="asc";
+		}else{
+			px="desc";
+		}
+		line = $("#line").val();
+		xlName = $("#select2-line-container").html();
+		date = $("#date").val();
+		code = $("#code").val();
+		
+		$get('/realSchedule/accountPx',{line:line,date:date,code:code,xlName:xlName,px:px},function(result){
+			$.each(result, function(i, obj) {
+				obj.requestType = reqCodeMap[obj.requestType];
+            });
+			// 把数据填充到模版中
+			var tbodyHtml = template('list_account',{list:result});
+			// 把渲染好的模版html文本追加到表格中
+			$('#forms tbody').html(tbodyHtml);
+		});	
+	})
+		
 		$("#query").on("click",function(){
 			if($("#date").val() == null || $("#date").val().trim().length == 0){
 				layer.msg("请选择时间");