重新统计方法修改

廖磊
1 parent 92a30e2c
Showing 7 changed files with 52 additions and 9 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/oil/DlbService.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/oil/list_ph.html
@@ -224,4 +224,9 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 //		Ylb t=new Ylb();
 		return service.saveDlb(t);
 	}
+	
+	@RequestMapping(value = "/updateJsy",method = RequestMethod.GET)
+	public Map<String, Object> updateJsy(@RequestParam Map<String, Object> map){
+		return service.update(map);
+	}
 }
@@ -473,7 +473,8 @@ public class FormsServiceImpl implements FormsService {
 			Shifday d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(d.getJgh().equals(s.getjGh()) && d.getCarPlate().equals(s.getClZbh())){
+				if(d.getJgh().equals(s.getjGh()) && d.getCarPlate().equals(s.getClZbh())
+						&&d.getLpName().equals(s.getLpName())){
 					sList.add(s);
 					 Set<ChildTaskPlan> cts = s.getcTasks();
 			            if(cts != null && cts.size() > 0){
@@ -492,7 +493,10 @@ public class FormsServiceImpl implements FormsService {
 			double ljgl=culateMileageService.culateLjgl(list_s);
 			double sjgl=culateMileageService.culateSjgl(list_s);
 			double zyygl=Arith.add(ljgl, sjgl);
-			double jhgl=culateMileageService.culateJhgl(sList);
+			double jhyygl=culateMileageService.culateJhgl(sList);
+			double jhjccgl=culateMileageService.culateJhJccgl(sList);
+			double jhzgl=Arith.add(jhyygl, jhjccgl);
+
 			double cjgl=culateMileageService.culateLbgl(sList);
 			int jhbc=culateMileageService.culateJhbc(sList,"");
 			int cjbc=culateMileageService.culateLbbc(sList);
@@ -502,9 +506,9 @@ public class FormsServiceImpl implements FormsService {
 			d.setEmptMileage(String.valueOf(zksgl));//空驶公里
 			d.setTotalm(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
 			d.setSjbc(String.valueOf(sjbc+ljbc));
-			d.setJhlc(String.valueOf(jhgl));//计划里程
+			d.setJhlc(String.valueOf(jhzgl));//计划里程
 			d.setYygl(String.valueOf(zyygl));//运营公里
-			d.setSjjhlc(String.valueOf(sjgl));//实际计划里程
+			d.setSjjhlc(String.valueOf(jhyygl));//实际计划里程
 			d.setRemMileage(String.valueOf(cjgl));//抽减里程
 			d.setJhbc(String.valueOf(jhbc));//计划班次
 			d.setCjbc(String.valueOf(cjbc));//抽检班次
@@ -29,5 +29,8 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
  
 	Map<String, List<Dlb>> updeteHistory(List<Map<String, Object>>  list,String date,
 		String gsdm,String fgsdm,String line) ;
+	
+	Map<String, Object> update(Map<String, Object> map);
+
  
 }
@@ -40,7 +40,6 @@ import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Jdl;
 import com.bsth.entity.oil.Nylog;
-import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.entity.sys.SysUser;
@@ -489,7 +488,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					new BatchSaveUtils<Dlb>().saveList2(addList, Dlb.class); 
 				} catch (Exception e) {
 					// TODO: handle exception
-					if(e.getMessage().indexOf("PK_YLB_UK")>0){
+					if(e.getMessage().indexOf("PK_DLB_UK")>0){
 						newMap.put("fage", "存在相同数据,数据已经过滤");
 						logger.info("获取:存在相同数据,数据已经过滤");
 					}
@@ -1217,6 +1216,21 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		return mapList;
 	}
  
+	@Override
+	public Map<String, Object> update(Map<String, Object> map) {
+		if(map.get("id")!=null){
+			if(map.get("id").toString().length()>0){
+				Integer id=Integer.parseInt(map.get("id").toString());
+				String jsy=map.get("jsy").toString();
+				Dlb t=repository.findOne(id);
+				t.setJsy(jsy);
+				repository.save(t);
+				map.put("status", ResponseCode.SUCCESS);
+			}
+		}
+		return map;
+	}
+	
 }
  
 class NbbmJcsxMap implements Comparator<Map<String, Object>>{
@@ -1643,7 +1643,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			Map<String, Object> ylMap=new HashMap<String, Object>();
 			for (int x = 0; x < listpbYc.size(); x++) {
 				String type = "add";
-				Map<String, Object> maps = listpb.get(x);
+				Map<String, Object> maps = listpbYc.get(x);
 					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
 					Ylb t = new Ylb();
 					for (int k = 0; k < ylbList_upd.size(); k++) {
@@ -190,7 +190,12 @@
  
         </td>
         <td>
-            {{obj.jsy}}/{{obj.name}}
+            {{if obj.jsy=='' || obj.jsy==null }}
+			<input data-id="{{obj.id}}" style=" width:100%"  type="text"  class="in_carpark_jsy" ></input>
+			<button  class="btn btn-sm blue btn-jsyUpdate" style=" width:100%"   data-id="{{obj.id}}">填写工号</button>
+		{{else}}
+			{{obj.jsy}}/{{obj.name}}
+		{{/if}}
         </td>
         <td>
  
@@ -527,6 +532,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
                 });
                 var bodyHtm = template('dlb_list_temp', {list:data});
                 $('#datatable_dlb tbody').html(bodyHtm);
+                $('.btn-jsyUpdate').on('click', jsyUpdate);
                 layer.close(l);
             	$get('/dlb/sumYlb',params,function(returns){
             		$("#sumJzl").html(returns.jzl);
@@ -556,6 +562,17 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             });
         }
  
+        function jsyUpdate(){
+			var id = $(this).data('id');
+    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
+    		$get('/dlb/updateJsy',{id:id,jsy:jsy}, function(result){
+				layer.msg('修改成功.');
+				var params = getParamsList();
+                page = 0;
+                jsDoQuery(params, true);
+			});
+
+		}
       //页面计算防止精度丢失
 		var accAdd = function (a, b) {
 	        var c, d, e;
@@ -251,7 +251,7 @@
         <td  width="7%">
 		{{if obj.jsy=='' || obj.jsy==null }}
 			<input data-id="{{obj.id}}" style=" width:100%"  type="text"  class="in_carpark_jsy" ></input>
-			<button  class="btn btn-sm blue btn-jsyUpdate" style=" width:100%"   data-id="{{obj.id}}">填写</button>
+			<button  class="btn btn-sm blue btn-jsyUpdate" style=" width:100%"   data-id="{{obj.id}}">填写工号</button>
 		{{else}}
 			{{obj.jsy}}/{{obj.name}}
 		{{/if}}