油量。。

廖磊
1 parent ca3ef82c
Showing 6 changed files with 156 additions and 24 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
@@ -62,6 +62,18 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return list;
 	}
+	
+	@RequestMapping(value = "/saveYlbList",method = RequestMethod.GET)
+	public Map<String, Object> saveYlbList(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list = yblService.saveYlbList(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return list;
+	}
 	/**
 	 * 拆分油量
 	 * @param map
@@ -69,7 +81,12 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	 */
 	@RequestMapping(value = "/sort",method = RequestMethod.GET)
 	public Map<String, Object> sort(@RequestParam Map<String, Object> map){
-		Map<String, Object> list=yblService.sort(map);
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list=yblService.sort(map);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
 		return list;
 	}
@@ -97,7 +114,12 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	 */
 	@RequestMapping(value = "/checkYl",method = RequestMethod.GET)
 	public Map<String, Object> checkYl(@RequestParam Map<String, Object> map){
-		Map<String, Object> list=yblService.checkYl(map);
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list=yblService.checkYl(map);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
 		return list;
 	}
@@ -38,7 +38,7 @@ public class Ylb {
 	private String shyy;
 	private Double zlc=0.0;
 	private int yhlx;
-	private String rylx;
+	private String rylx="0";
 	private Double ns=0.0;
 	private Double fyylc=0.0;
 	private Double jhzlc=0.0;
@@ -98,4 +98,16 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and s.xlbm like %?4% "
 			+ " and s.nbbm in ?5 ")
 	List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_ylb SET " +
+				" jzyl = ?2, " +
+				" sh = ?3," +
+				" shyy = ?4," +
+				" ns = ?5," +
+				" rylx = ?6" +
+				" WHERE id = ?1", nativeQuery=true)
+	public void ylbUpdate(Integer id,double jzyl,double sh,String shyy,double ns,String rylx);
 }
@@ -8,12 +8,13 @@ import com.bsth.service.BaseService;
 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;
 	String obtainDsq() throws Exception;
-	Map<String, Object> sort(Map<String, Object> map);
+	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);
+	Map<String, Object> checkYl(Map<String, Object> map)  throws Exception;
 	Map<String, Object> sumYlb(Map<String, Object> map);
@@ -15,6 +15,7 @@ import java.util.Map;
 import javax.transaction.Transactional;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,8 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
@@ -525,7 +528,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	 */
 	@Transactional  
 	@Override
-	public Map<String, Object> sort(Map<String, Object> map) {
+	public Map<String, Object> sort(Map<String, Object> map) throws Exception{
 		// TODO Auto-generated method stub
 		Map<String, Object> newMap = new HashMap<String, Object>();
 		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
@@ -663,6 +666,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		} catch (Exception e) {
 			newMap.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
+			throw e; 
 		}
 		return newMap;
 	}
@@ -674,7 +678,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	 */
 	@Transactional
 	@Override
-	public Map<String, Object> checkYl(Map<String, Object> map) {
+	public Map<String, Object> checkYl(Map<String, Object> map) throws Exception{
 		Map<String, Object> newMap=new HashMap<String,Object>();
 //		String xlbm="";
 //		if(map.get("xlbm_like")!=null){
@@ -918,8 +922,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					String clbm=objectLists.get(i)[0].toString();
 					stringList.add(clbm);
 				}
-				
-				listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				if(stringList.size()>0){
+					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				}
 			}else{
 				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
 				for (int i = 0; i < objectLists.size(); i++) {
@@ -938,12 +943,53 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						}
 					}
 				}
-				listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				if(stringList.size()>0){
+					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				}
 			}
 		}
 		return listYlb;
 	}
+	@Transactional  
+	@Override
+	public Map<String, Object> saveYlbList(Map<String, Object> map) throws Exception {
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		try{
+		String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		
+		for (int i = 0; i < jsonArray.size(); i++) {
+//			Ylb t=new Ylb();
+			jsonObject=jsonArray.getJSONObject(i);
+			
+			Double jzyl =jsonObject.getDoubleValue("jzyl");
+			Double sh  =jsonObject.getDoubleValue("sh");
+			String shyy =jsonObject.getString("shyy");
+			Double ns = jsonObject.getDoubleValue("ns");
+			String rylx =jsonObject.getString("rylx");
+			Integer id =jsonObject.getInteger("id");
+			/*t.setJzyl(jzyl);
+			t.setSh(sh);
+			t.setShyy(shyy);
+			t.setNs(ns);
+			t.setRylx(rylx);
+			t.setId(jsonObject.getInteger("id"));*/
+			repository.ylbUpdate(id, jzyl, sh, shyy, ns, rylx);
+		}
+//		List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
+		
+		newMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+		}
+		return newMap;
+	}
+	
 }
@@ -23,7 +23,10 @@
                     <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
                     <button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button>
                     <button type="button" class="btn btn-circle blue" id="sortButton"><i class="fa fa-minus-square"></i>
-                        拆分/保存
+                                                        拆分
+                    </button>
+                    <button type="button" class="btn btn-circle blue" id="saveButton"><i class="fa fa-check-circle"></i>
+                       		 保存
                     </button>
                     <!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> -->
                     <div class="btn-group">
@@ -187,7 +190,7 @@
     {{each list as obj i}}
     <tr>
         <td style="vertical-align: middle;">
-            <input type="radio" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
+            <input type="checkbox" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
         </td>
         <td>
@@ -212,18 +215,23 @@
             {{obj.czyl}}
         </td>
         <td>
-            <a data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzyl">
-                {{obj.jzyl}}
-            </a>
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzyl" 
+type="text" value=" {{obj.jzyl}}" style=" width:40px"  onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"  
+onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')">
         </td>
         <td>
             {{obj.yh}}
         </td>
         <td>
-            {{obj.rylx}}
+			<select data-id="{{obj.id}}" class="in_carpark_rylx">
+				<option value='0' {{if obj.rylx==0}}  selected = 'selected' {{/if}}>0号柴油</option> 
+				<option value='1' {{if obj.rylx==1}}  selected = 'selected' {{/if}}>负10号柴油</option> 
+			</select>
         </td>
         <td>
-            {{obj.ns}}
+			<input data-id="{{obj.id}}" href="javascript:;" 
+class="in_carpark_ns" type="text" value=" {{obj.ns}}" style=" width:40px"  onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"  
+onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')">
         </td>
         <td>
 			<select data-id="{{obj.id}}" class="in_carpark_shyy">
@@ -239,9 +247,9 @@
 			</select>
         </td>
         <td>
-			<a data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl">
-            	{{obj.sh}}
-			</a>
+		<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl" type="text" 
+value=" {{obj.sh}}" style=" width:40px" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"  
+onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')" >
         </td>
         <td>
             {{obj.zlc}}
@@ -294,7 +302,49 @@
                 layer.msg('请选择日期.');
             }
         });
-     
+       
+        
+        //保存
+        $("#saveButton").on('click',function(){
+        	var ylArray = [];
+        	/* $('input.icheck:checked').each(function(){
+        		var map = {};
+        		var id=$(this).data('id');
+        		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').html();
+        		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').html();
+                var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
+                map['id']=id;
+                map['jzyl']=jzyl;
+                map['sh']=sh;
+                map['shyy']=shyy;
+                ylArray.push(map);
+        	}) */
+        	
+        	$('input.icheck').each(function(){
+        		var map = {};
+        		var id=$(this).data('id');
+        		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+        		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+                var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
+                var ns =  $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
+                var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
+                map['id']=id;
+                map['jzyl']=jzyl;
+                map['sh']=sh;
+                map['shyy']=shyy;
+                map['ns']=ns;
+                map['rylx']=rylx;
+                ylArray.push(map);
+        	})
+        	var params = {};
+        	params['ylbList']=JSON.stringify(ylArray);
+        	 var i = layer.load(2);
+        	 $get('/ylb/saveYlbList', params, function () {
+             	layer.close(i);
+             	var params1 =getParamsList();
+                 jsDoQuery(params1, true);
+             }); 
+        })
         //拆分
         $("#sortButton").on('click', function () {
             if ($("#rq").val() != "") {
@@ -348,7 +398,7 @@
         var page = 0, initPagination;
         var icheckOptions = {
-            radioClass: 'iradio_square-blue icheck',
+            radioClass: 'icheckbox_flat-blue',
             increaseArea: '20%'
         }
@@ -474,6 +524,7 @@
             var l = layer.load(2);
             $get('/ylb/ylbList', params, function (data) {
+            
                 $.each(data, function (i, obj) {
                     obj.rq = moment(obj.rq).format("YYYY-MM-DD");
                 });
@@ -493,8 +544,8 @@
             		$("#sumYh").html(returns.yh);
             		$("#sumSh").html(returns.sh);
         		});
-                startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
-                startOptShylLink($('#ll_oil_list .in_carpark_shyl'));
+//                 startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
+//                 startOptShylLink($('#ll_oil_list .in_carpark_shyl'));
             });
         }