update...

潘钊
1 parent 70ae995a
Showing 2 changed files with 73 additions and 85 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/service/oil/YlbService.java
 package com.bsth.controller.oil;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
+import com.bsth.controller.BaseController;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.service.oil.YlbService;
+import com.bsth.util.ReportUtils;
+import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.bsth.controller.BaseController;
-import com.bsth.entity.oil.Ylb;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.oil.YlbService;
-import com.bsth.util.ReportUtils;
-import com.google.common.base.Splitter;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @RestController
 @RequestMapping("ylb")
 public class YlbController extends BaseController<Ylb, Integer>{
 	@Autowired
 	YlbService yblService;
-	
+
 	@RequestMapping(value = "/saveYlb",method = RequestMethod.POST)
 	public Map<String, Object> saveYlb(Ylb t){
 //		SysUser user = SecurityUtils.getCurrentUser();
@@ -43,8 +31,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 //		Ylb t=new Ylb();
 		return yblService.saveYlb(t);
 	}
-	
-	
+
+
 	/**
 	 * 把加油（YLXXB）的数据加入
 	 * @param map
@@ -62,8 +50,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		System.out.println();
 		return list;
 	}
-	
-	
+
+
 	@RequestMapping(value = "/saveYlbList",method = RequestMethod.POST)
 	public Map<String, Object> saveYlbList(@RequestParam Map<String, Object> map){
 		Map<String, Object> list=new HashMap<String, Object>();
@@ -90,7 +78,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		}
 		return list;
 	}
-	
+
 	/**
 	 * 进场油量等于出场油量 
 	 * @param map
@@ -104,10 +92,10 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		} catch (Exception e) {
 			// TODO: handle exception
 		}
-		
+
 		return list;
 	}
-	
+
 	/**
 	 * 核对油量（有加油没里程）
 	 * @param map
@@ -123,11 +111,11 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		}
 		return list;
 	}
-	
+
 	/**
-	 * 
-	 * @Title: list 
-	 * @Description: TODO(多条件分页查询) 
+	 *
+	 * @Title: list
+	 * @Description: TODO(多条件分页查询)
 	 * @param @param map 查询条件
 	 * @param @param page 页码
 	 * @param @param size 每页显示数量
@@ -135,10 +123,10 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	public Page<Ylb> list(@RequestParam Map<String, Object> map,
-			@RequestParam(defaultValue = "0") int page,
-			@RequestParam(defaultValue = "10") int size,
-			@RequestParam(defaultValue = "id") String order,
-			@RequestParam(defaultValue = "DESC") String direction){
+						  @RequestParam(defaultValue = "0") int page,
+						  @RequestParam(defaultValue = "10") int size,
+						  @RequestParam(defaultValue = "id") String order,
+						  @RequestParam(defaultValue = "DESC") String direction){
 		Direction d;
 		map.put("xlbm_like", map.get("xlbm_like").toString().trim());
@@ -150,7 +138,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 					map.get("nbbm_eq").toString(),lx));
 		}
 //		try {
-		
+
 		if(!(rq=="")){
 //			
 //			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -172,20 +160,20 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		else
 			d = Direction.DESC;
-        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
-        // 多个字段格式：{col1},{col2},{col3},....,{coln}
-        // 每个字段的排序方向都是一致，这个以后再看要不要改
-        List<String> list = Splitter.on(",").trimResults().splitToList(order);
-        return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
+		// 允许多个字段排序，order可以写单个字段，也可以写多个字段
+		// 多个字段格式：{col1},{col2},{col3},....,{coln}
+		// 每个字段的排序方向都是一致，这个以后再看要不要改
+		List<String> list = Splitter.on(",").trimResults().splitToList(order);
+		return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
 	}
-	
-	
-	
+
+
+
 	/**
-	 * 
-	 * @Title: list 
-	 * @Description: TODO(多条件分页查询) 
+	 *
+	 * @Title: list
+	 * @Description: TODO(多条件分页查询)
 	 * @param @param map 查询条件
 	 * @param @param page 页码
 	 * @param @param size 每页显示数量
@@ -194,37 +182,37 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	@RequestMapping(value = "/ylbList",method = RequestMethod.GET)
 	public List<Ylb> ylbList(@RequestParam Map<String, Object> map){
 		List<Ylb> ylbList=yblService.listYlb(map);
-        return ylbList;
+		return ylbList;
 	}
-	
+
 	@RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
-    public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
+	public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
 		Map<String, Object> maps=new HashMap<String, Object>();
-        try {
-        	maps= yblService.deleteIds(map);
+		try {
+			maps= yblService.deleteIds(map);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-        return maps;
-    }
+		return maps;
+	}
 	@RequestMapping(value="/oilListMonth")
-	public List<Ylb> oilListMonth(@RequestParam Map<String, Object> map){
-		return yblService.oilListMonth(map);
+	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date,@RequestParam String type){
+		return yblService.oilListMonth(line, date, type);
 	}
-	
+
 	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
 	public String checkJsy(@RequestParam Map<String, Object> map){
 		String list=yblService.checkJsy(map);
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
 	public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
 		Map<String, Object> list=yblService.sumYlb(map);
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/listExport",method = RequestMethod.POST)
 	public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -259,15 +247,15 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			String shyy ="无";
 			if(y.getShyy()!=null){
 				shyy=y.getShyy();
-				 if(shyy.equals("1")){shyy="票务用油";}
-				 else if(shyy.equals("2")){shyy="保养用油";}
-				 else if(shyy.equals("3")){shyy="报废车用油";}
-				 else if(shyy.equals("4")){shyy="其它用油";}
-				 else if(shyy.equals("5")){shyy="人保部";}
-				 else if(shyy.equals("6")){shyy="车队";}
-				 else if(shyy.equals("7")){shyy="车间(高保)";}
-				 else if(shyy.equals("8")){shyy="车间(小修)";}
-				 else{shyy ="无";}
+				if(shyy.equals("1")){shyy="票务用油";}
+				else if(shyy.equals("2")){shyy="保养用油";}
+				else if(shyy.equals("3")){shyy="报废车用油";}
+				else if(shyy.equals("4")){shyy="其它用油";}
+				else if(shyy.equals("5")){shyy="人保部";}
+				else if(shyy.equals("6")){shyy="车队";}
+				else if(shyy.equals("7")){shyy="车间(高保)";}
+				else if(shyy.equals("8")){shyy="车间(小修)";}
+				else{shyy ="无";}
 			}
 			m.put("shyy", shyy);
 			m.put("sh", y.getSh()<=0?"0":y.getSh());
@@ -280,12 +268,12 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
-				path+"export/"+map.get("rq").toString()+ "进出场存油量.xls");
-			} catch (Exception e) {
-				e.printStackTrace();
-			}	
-			
+					path+"export/"+map.get("rq").toString()+ "进出场存油量.xls");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 		return resList;
-		
+
 	}
-}
+}
 \ No newline at end of file
 package com.bsth.service.oil;
-import java.util.List;
-import java.util.Map;
-
 import com.bsth.entity.oil.Ylb;
 import com.bsth.service.BaseService;
+import java.util.List;
+import java.util.Map;
+
 public interface YlbService extends BaseService<Ylb, Integer>{
 	Map<String, Object> obtain(Map<String, Object> map) throws Exception;
 	Map<String, Object> saveYlbList(Map<String, Object> map) throws Exception;
 	Map<String, Object> saveYlb(Ylb t);
 	String obtainDsq() throws Exception;
 	Map<String, Object> sort(Map<String, Object> map)  throws Exception;
-	
+
 	Map<String, Object> outAndIn(Map<String, Object> map) throws Exception;
-	
+
 	Map<String, Object> checkYl(Map<String, Object> map)  throws Exception;
-	
+
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	String checkJsy(Map<String, Object> map);
-	List<Ylb> oilListMonth(Map<String, Object> map);
+	List<Ylb> oilListMonth(String line,String date,String type);
 	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
-	
+
 	Map<String, Object> deleteIds(Map<String, Object> map) throws Exception;
-	
-}
+
+}
 \ No newline at end of file