潘钊 / bsth_control · Commits

Commit e0f4b2b18dc14cd24c98908488228a9d64b6e2ee

Authored by 廖磊
1 parent 10983d1d

定时中不在计算班次准点率 

临加空驶公里计算
Inline Side-by-side
Showing 5 changed files with 43 additions and 18 deletions
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
  View file @e0f4b2b
@@ -44,7 +44,7 @@ public class CalcOilThread extends Thread{ @@ -44,7 +44,7 @@ public class CalcOilThread extends Thread{
44 dlbService.obtainDsq(); 44 dlbService.obtainDsq();
45 logger.info("计算路单里程加注量结束！"); 45 logger.info("计算路单里程加注量结束！");
46 logger.info("开始计算班次准点率...."); 46 logger.info("开始计算班次准点率....");
47 - sheetService.saveSheetList(""); 47 + //sheetService.saveSheetList("");
48 logger.info("计算班次准点率结束！"); 48 logger.info("计算班次准点率结束！");
49 49
50 logger.info("开始保存重新统计数据...."); 50 logger.info("开始保存重新统计数据....");
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @e0f4b2b
@@ -1647,22 +1647,47 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -1647,22 +1647,47 @@ public class CulateMileageServiceImpl implements CulateMileageService{
1647 } 1647 }
1648 }else{ 1648 }else{
1649 Set<ChildTaskPlan> childTaskPlans = t.getcTasks(); 1649 Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
1650 - if(!childTaskPlans.isEmpty()){  
1651 - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();  
1652 - while (it.hasNext()) {  
1653 - ChildTaskPlan childTaskPlan = it.next();  
1654 - if(childTaskPlan.getCcId()==null){  
1655 - if("empty".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){  
1656 - if (!childTaskPlan.isDestroy()) {  
1657 - Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();  
1658 - ljks=Arith.add(ljks,jhgl);  
1659 - } 1650 + if(isInOut(t)){
  1651 + if(childTaskPlans.isEmpty()){
  1652 + double jhlc=t.getJhlc()==null?0:t.getJhlc();
  1653 + double jhlcOrig=t.getJhlcOrig()==null?0:t.getJhlcOrig();
  1654 + double zjlc=Arith.sub(jhlc, jhlcOrig);
  1655 + if(zjlc>0){
  1656 + ljks=Arith.add(zjlc, ljks);
  1657 + }
  1658 + }else{
  1659 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  1660 + while (it.hasNext()) {
  1661 + ChildTaskPlan childTaskPlan = it.next();
  1662 + if(childTaskPlan.getCcId()==null){
  1663 + if("empty".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
  1664 + if (!childTaskPlan.isDestroy()) {
  1665 + Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  1666 + ljks=Arith.add(ljks,jhgl);
  1667 + }
  1668 + }
1660 } 1669 }
1661 - }  
1662 - } 1670 + }
  1671 + }
  1672 +
  1673 + }else{
  1674 + if(!childTaskPlans.isEmpty()){
  1675 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  1676 + while (it.hasNext()) {
  1677 + ChildTaskPlan childTaskPlan = it.next();
  1678 + if(childTaskPlan.getCcId()==null){
  1679 + if("empty".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
  1680 + if (!childTaskPlan.isDestroy()) {
  1681 + Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  1682 + ljks=Arith.add(ljks,jhgl);
  1683 + }
  1684 + }
  1685 + }
  1686 + }
  1687 + }
1663 } 1688 }
1664 -  
1665 } 1689 }
  1690 +
1666 } 1691 }
1667 return ljks; 1692 return ljks;
1668 } 1693 }
src/main/resources/static/pages/forms/mould/statisticsDaily_3.xls 0 → 100644
View file @e0f4b2b
No preview for this file type
src/main/resources/static/pages/forms/statement/statisticsDaily.html
  View file @e0f4b2b
@@ -307,7 +307,7 @@ @@ -307,7 +307,7 @@
307 }else if(time2<time1){ 307 }else if(time2<time1){
308 layer.msg('结束日期不能小于开始日期.'); 308 layer.msg('结束日期不能小于开始日期.');
309 }else{ 309 }else{
310 - if((time2-time1>2678400000){ 310 + if((time2-time1)>2678400000){
311 layer.msg('查询超过一个月请点击【统计查询】.'); 311 layer.msg('查询超过一个月请点击【统计查询】.');
312 }else{ 312 }else{
313 $("#tjrq").html(date+"至"+date2); 313 $("#tjrq").html(date+"至"+date2);
@@ -351,7 +351,7 @@ @@ -351,7 +351,7 @@
351 params['xlName'] = xlName; 351 params['xlName'] = xlName;
352 params['nature'] = nature; 352 params['nature'] = nature;
353 params['type'] = "export"; 353 params['type'] = "export";
354 - if(time2-time1>2678400000){ 354 + if((time2-time1)>2678400000){
355 layer.msg('查询超过一个月请点击【统计查询】.'); 355 layer.msg('查询超过一个月请点击【统计查询】.');
356 }else{ 356 }else{
357 var i = layer.load(2); 357 var i = layer.load(2);
src/main/resources/static/pages/mforms/singledatas/singledata.html
  View file @e0f4b2b
@@ -192,8 +192,8 @@ @@ -192,8 +192,8 @@
192 var temp = tempData[$("#line").val()].split(":"); 192 var temp = tempData[$("#line").val()].split(":");
193 $("#gsdmSing").val(temp[0]); 193 $("#gsdmSing").val(temp[0]);
194 updateCompany(); 194 updateCompany();
195 -// $("#fgsdmSing").val(temp[1]);  
196 - $("#fgsdmSing").val(""); 195 + $("#fgsdmSing").val(temp[1]);
  196 +// $("#fgsdmSing").val("");
197 $("#gsdmSing").attr("disabled", true); 197 $("#gsdmSing").attr("disabled", true);
198 // $("#fgsdmSing").attr("disabled", true); 198 // $("#fgsdmSing").attr("disabled", true);
199 } 199 }