潘钊 / bsth_control · Commits

Commit dc0d588dbc3da58725b553bed4cd9b36cecdc7ef

Authored by 游瑞烽
1 parent 0fc4bdad
build: skipped

班次修正报表修改 

Signed-off-by: yrf123456 <463058651@qq.com>
Inline Side-by-side
Showing 1 changed file with 6 additions and 8 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @dc0d588
... ... @@ -4077,8 +4077,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4077 4077 Long zdsjActual_=Long.parseLong(zdsjActual_s[0])*60+Long.parseLong(zdsjActual_s[1]);
4078 4078 if((zdsj_-zdsjActual_)>0){
4079 4079 zdsjk =String.valueOf(zdsj_-zdsjActual_);
4080   - }
4081   - if(((zdsj_-zdsjActual_)<0)){
  4080 + }else{
4082 4081 zdsjm =String.valueOf(zdsjActual_-zdsj_);
4083 4082 }
4084 4083 }
... ... @@ -4105,8 +4104,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4105 4104 Long fcsjActural_=Long.parseLong(fcsjActural_s[0])*60+Long.parseLong(fcsjActural_s[1]);
4106 4105 if((zdsj_-fcsjActural_)>0){
4107 4106 fcsjk =String.valueOf(zdsj_-fcsjActural_);
4108   - }
4109   - if((zdsj_-fcsjActural_)<0){
  4107 + }else{
4110 4108 fcsjm =String.valueOf(fcsjActural_-zdsj_);
4111 4109 }
4112 4110 }
... ... @@ -4671,8 +4669,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4671 4669 mr.setSjyygl(rs.getDouble("sjyygl"));
4672 4670 mr.setSjksgl(rs.getDouble("sjksgl"));
4673 4671 mr.setZgl(rs.getDouble("zyygl"));
4674   - mr.setZddfgl(rs.getDouble("sddfgl"));
4675   - mr.setSddfgl(rs.getDouble("zddfgl"));
  4672 + mr.setZddfgl(rs.getDouble("zddfgl"));
  4673 + mr.setSddfgl(rs.getDouble("sddfgl"));
4676 4674 mr.setWqwxhgl(rs.getDouble("wqwxhgl"));
4677 4675 mr.setBfwxhgl(rs.getDouble("bfwxhgl"));
4678 4676 mr.setPygl(rs.getDouble("pygl"));
... ... @@ -4765,8 +4763,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4765 4763 sReport.setSjyybc(rs.getInt("sjyybc"));
4766 4764 sReport.setSjksbc(rs.getInt("sjksbc"));
4767 4765 sReport.setZbc(rs.getInt("zyybc"));
4768   - sReport.setZddfbc(rs.getInt("sddfbc"));
4769   - sReport.setSddfbc(rs.getInt("zddfbc"));
  4766 + sReport.setZddfbc(rs.getInt("zddfbc"));
  4767 + sReport.setSddfbc(rs.getInt("sddfbc"));
4770 4768 sReport.setWqwxhbc(rs.getInt("wqwxhbc"));
4771 4769 sReport.setBfwxhbc(rs.getInt("bfwxhbc"));
4772 4770 sReport.setPybc(rs.getInt("pybc"));
... ...