潘钊 / bsth_control · Commits

Commit 6aa8893ae9f75212a1671d66675a62240c2e6f90

Authored by 廖磊
1 parent 806da7ab

修改公里过滤没实发的方法，油量一车多单，一车一单赛选，统计日报烂班班次的修改

Inline Side-by-side
Showing 7 changed files with 127 additions and 42 deletions
src/main/java/com/bsth/repository/oil/YlbRepository.java
  View file @6aa8893
... ... @@ -86,7 +86,7 @@ public interface YlbRepository extends BaseRepository<Ylb, Integer>{
86 86 + " ssgsdm like %?2% "
87 87 + " and fgsdm like %?3%"
88 88 + " and xlbm like %?4% and nbbm like %?5% "
89   - + " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
  89 + + " group by nbbm,rq,ssgsdm,fgsdm",nativeQuery=true)
90 90 List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
91 91  
92 92  
... ...
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
  View file @6aa8893
... ... @@ -291,7 +291,8 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
291 291 + "from bsth_c_ylb where to_days(rq)= to_days('"+rq+"' ) "
292 292 + " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"' group by nbbm "+
293 293 " ) c on a.nbbm=c.nbbm "
294   - + "where a.nbbm like '%"+nbbm+"%' and a.gsdm='"+gsdm+"' and a.fgsdm ='"+fgsdm+"'";
  294 + + "where a.nbbm like '%"+nbbm+"%' and a.gsdm='"+gsdm+"' and a.fgsdm ='"+fgsdm+"'"
  295 + + " order by a.nbbm";
295 296  
296 297 List<Ylxxb> yList= jdbcTemplate.query(sql,
297 298 new RowMapper<Ylxxb>(){
... ...
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @6aa8893
... ... @@ -1000,6 +1000,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1000 1000 return sumMap;
1001 1001 }
1002 1002  
  1003 +
  1004 +
1003 1005 @Override
1004 1006 public List<Ylb> listYlb(Map<String, Object> map) {
1005 1007 // TODO Auto-generated method stub
... ... @@ -1013,7 +1015,19 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1013 1015 String sxtj=map.get("sxtj").toString();
1014 1016 if(nbbm.trim()!=""){
1015 1017 stringList.add(nbbm);
1016   - listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
  1018 + List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
  1019 + int cs=Integer.parseInt(objectLists.get(0)[1].toString());
  1020 + if(sxtj.equals("1")){
  1021 + if(cs==1){
  1022 + listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
  1023 + }
  1024 + }
  1025 +
  1026 + if(sxtj.equals("2")){
  1027 + if(cs>1){
  1028 + listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
  1029 + }
  1030 + }
1017 1031 }else{
1018 1032 //全部
1019 1033 if(sxtj.equals("0")){
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @6aa8893
... ... @@ -819,8 +819,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
819 819 List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
820 820 for (int i = 0; i < scheduleRealInfos.size(); i++) {
821 821 ScheduleRealInfo s=scheduleRealInfos.get(i);
822   - if(s.getZdsjActual()!=null){
823   - lists.add(s);
  822 + Set<ChildTaskPlan> cts = s.getcTasks();
  823 + if(cts != null && cts.size() > 0){
  824 + lists.add(s);
  825 + }else{
  826 + if(s.getZdsjActual()!=null){
  827 + lists.add(s);
  828 + }
824 829 }
825 830 }
826 831 DecimalFormat format = new DecimalFormat("0.00");
... ... @@ -1667,8 +1672,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1667 1672 List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
1668 1673 for (int i = 0; i < list.size(); i++) {
1669 1674 ScheduleRealInfo s=list.get(i);
1670   - if(s.getZdsjActual()!=null){
1671   - lists.add(s);
  1675 + Set<ChildTaskPlan> cts = s.getcTasks();
  1676 + if(cts != null && cts.size() > 0){
  1677 + lists.add(s);
  1678 + }else{
  1679 + if(s.getZdsjActual()!=null){
  1680 + lists.add(s);
  1681 + }
1672 1682 }
1673 1683 }
1674 1684 double ksgl=culateService.culateKsgl(list);
... ... @@ -1953,8 +1963,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1953 1963 List<ScheduleRealInfo> lists =new ArrayList<ScheduleRealInfo>();
1954 1964 for (int i = 0; i < list_s.size(); i++) {
1955 1965 ScheduleRealInfo s=list_s.get(i);
1956   - if(s.getZdsjActual()!=null){
1957   - lists.add(s);
  1966 + Set<ChildTaskPlan> cts = s.getcTasks();
  1967 + if(cts != null && cts.size() > 0){
  1968 + lists.add(s);
  1969 + }else{
  1970 + if(s.getZdsjActual()!=null){
  1971 + lists.add(s);
  1972 + }
1958 1973 }
1959 1974 }
1960 1975 Map<String, Object> map = new HashMap<String, Object>();
... ... @@ -2556,8 +2571,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2556 2571 List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
2557 2572 for(int i=0;i<list.size();i++){
2558 2573 ScheduleRealInfo s=list.get(i);
2559   - if(s.getZdsjActual()!=null){
2560   - lists.add(s);
  2574 + Set<ChildTaskPlan> cts = s.getcTasks();
  2575 + if(cts != null && cts.size() > 0){
  2576 + lists.add(s);
  2577 + }else{
  2578 + if(s.getZdsjActual()!=null){
  2579 + lists.add(s);
  2580 + }
2561 2581 }
2562 2582 }
2563 2583 Map<String, Object> map = new HashMap<String, Object>();
... ... @@ -2631,8 +2651,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2631 2651 }
2632 2652 for (int i = 0; i < list.size(); i++) {
2633 2653 ScheduleRealInfo s=list.get(i);
2634   - if(s.getZdsjActual()!=null){
2635   - list_s.add(s);
  2654 + Set<ChildTaskPlan> cts = s.getcTasks();
  2655 + if(cts != null && cts.size() > 0){
  2656 + list_s.add(s);
  2657 + }else{
  2658 + if(s.getZdsjActual()!=null){
  2659 + list_s.add(s);
  2660 + }
2636 2661 }
2637 2662 }
2638 2663 List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
... ... @@ -4235,8 +4260,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4235 4260 List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
4236 4261 for (int i = 0; i < scheduleRealInfos.size(); i++) {
4237 4262 ScheduleRealInfo s=scheduleRealInfos.get(i);
4238   - if(s.getZdsjActual()!=null){
4239   - lists.add(s);
  4263 + Set<ChildTaskPlan> cts = s.getcTasks();
  4264 + if(cts != null && cts.size() > 0){
  4265 + lists.add(s);
  4266 + }else{
  4267 + if(s.getZdsjActual()!=null){
  4268 + lists.add(s);
  4269 + }
4240 4270 }
4241 4271 }
4242 4272 DecimalFormat format = new DecimalFormat("0.00");
... ...
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @6aa8893
... ... @@ -568,8 +568,16 @@ public class CulateMileageServiceImpl implements CulateMileageService{
568 568 //有子任务
569 569 if (cts != null && cts.size() > 0) {
570 570 for(ChildTaskPlan c : cts){
571   - if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
572   - sum = Arith.add(sum, c.getMileage());
  571 + if(item.equals("其他")){
  572 + if(c.isDestroy() &&
  573 + ((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
  574 + (c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
  575 + sum = Arith.add(sum, c.getMileage());
  576 + }else{
  577 + if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
  578 + sum = Arith.add(sum, c.getMileage());
  579 + }
  580 +
573 581 }
574 582 }
575 583 else if(isInOut(sch))
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @6aa8893
... ... @@ -1167,7 +1167,8 @@ public class ReportServiceImpl implements ReportService{
1167 1167 for (int i = 0; i < sList.size(); i++) {
1168 1168 ScheduleRealInfo scheduleRealInfo = sList.get(i);
1169 1169 if (!(scheduleRealInfo.getBcType().equals("in")
1170   - || scheduleRealInfo.getBcType().equals("out"))) {
  1170 + || scheduleRealInfo.getBcType().equals("out")
  1171 + ||scheduleRealInfo.getBcType().equals("ldks"))) {
1171 1172 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
1172 1173 if (childTaskPlans.isEmpty()) {
1173 1174 Map<String, Object> newMap = new HashMap<String, Object>();
... ... @@ -1195,32 +1196,62 @@ public class ReportServiceImpl implements ReportService{
1195 1196  
1196 1197 } else {
1197 1198 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
1198   - while (it.hasNext()) {
1199   - ChildTaskPlan childTaskPlan = it.next();
1200   - if (childTaskPlan.isDestroy()) {
1201   - String destroyReason = "";
1202   - if ( childTaskPlan.getDestroyReason() == null) {
1203   - destroyReason = "其他";
1204   - }else if(childTaskPlan.getDestroyReason().equals("")){
1205   - destroyReason = "其他";
1206   - } else {
1207   - destroyReason = childTaskPlan.getDestroyReason();
  1199 + if (scheduleRealInfo.getStatus() == -1) {
  1200 + while (it.hasNext()) {
  1201 + ChildTaskPlan childTaskPlan = it.next();
  1202 + if (childTaskPlan.isDestroy()) {
  1203 + String destroyReason = "";
  1204 + if ( childTaskPlan.getDestroyReason() == null) {
  1205 + destroyReason = "其他";
  1206 + }else if(childTaskPlan.getDestroyReason().equals("")){
  1207 + destroyReason = "其他";
  1208 + } else {
  1209 + destroyReason = childTaskPlan.getDestroyReason();
  1210 + }
  1211 + Map<String, Object> newMap = new HashMap<String, Object>();
  1212 + newMap.put("nr", destroyReason);
  1213 + newMap.put("lp", scheduleRealInfo.getLpName());
  1214 + newMap.put("nbbm", scheduleRealInfo.getClZbh());
  1215 + newMap.put("jgh", scheduleRealInfo.getjGh());
  1216 + newMap.put("dz", childTaskPlan.getStartStationName());
  1217 + newMap.put("sj", childTaskPlan.getStartDate());
  1218 + newMap.put("gzf", " ");
  1219 + newMap.put("lbbc", 1);
  1220 + newMap.put("lblc", childTaskPlan.getMileage());
  1221 + newMap.put("jyqp", childTaskPlan.getRemarks());
  1222 + list.add(newMap);
  1223 +
1208 1224 }
1209   - Map<String, Object> newMap = new HashMap<String, Object>();
1210   - newMap.put("nr", destroyReason);
1211   - newMap.put("lp", scheduleRealInfo.getLpName());
1212   - newMap.put("nbbm", scheduleRealInfo.getClZbh());
1213   - newMap.put("jgh", scheduleRealInfo.getjGh());
1214   - newMap.put("dz", childTaskPlan.getStartStationName());
1215   - newMap.put("sj", childTaskPlan.getStartDate());
1216   - newMap.put("gzf", " ");
1217   - newMap.put("lbbc", 0);
1218   - newMap.put("lblc", childTaskPlan.getMileage());
1219   - newMap.put("jyqp", childTaskPlan.getRemarks());
1220   - list.add(newMap);
  1225 + }
  1226 + }else{
  1227 + while (it.hasNext()) {
  1228 + ChildTaskPlan childTaskPlan = it.next();
  1229 + if (childTaskPlan.isDestroy()) {
  1230 + String destroyReason = "";
  1231 + if ( childTaskPlan.getDestroyReason() == null) {
  1232 + destroyReason = "其他";
  1233 + }else if(childTaskPlan.getDestroyReason().equals("")){
  1234 + destroyReason = "其他";
  1235 + } else {
  1236 + destroyReason = childTaskPlan.getDestroyReason();
  1237 + }
  1238 + Map<String, Object> newMap = new HashMap<String, Object>();
  1239 + newMap.put("nr", destroyReason);
  1240 + newMap.put("lp", scheduleRealInfo.getLpName());
  1241 + newMap.put("nbbm", scheduleRealInfo.getClZbh());
  1242 + newMap.put("jgh", scheduleRealInfo.getjGh());
  1243 + newMap.put("dz", childTaskPlan.getStartStationName());
  1244 + newMap.put("sj", childTaskPlan.getStartDate());
  1245 + newMap.put("gzf", " ");
  1246 + newMap.put("lbbc", 0);
  1247 + newMap.put("lblc", childTaskPlan.getMileage());
  1248 + newMap.put("jyqp", childTaskPlan.getRemarks());
  1249 + list.add(newMap);
1221 1250  
  1251 + }
1222 1252 }
1223 1253 }
  1254 +
1224 1255 }
1225 1256 }
1226 1257 }
... ... @@ -1272,7 +1303,8 @@ public class ReportServiceImpl implements ReportService{
1272 1303 for (int i = 0; i < sList.size(); i++) {
1273 1304 ScheduleRealInfo scheduleRealInfo=sList.get(i);
1274 1305 if (!(scheduleRealInfo.getBcType().equals("in")
1275   - || scheduleRealInfo.getBcType().equals("out"))) {
  1306 + || scheduleRealInfo.getBcType().equals("out")
  1307 + || scheduleRealInfo.getBcType().equals("ldks"))) {
1276 1308 // Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
1277 1309 // if(childTaskPlans.isEmpty()){
1278 1310 if(scheduleRealInfo.isSflj()){
... ...
src/main/resources/static/pages/forms/statement/account.html
  View file @6aa8893
... ... @@ -149,7 +149,7 @@
149 149 code = $("#code").val();
150 150 var type = "query";
151 151 $(".hidden").removeClass("hidden");
152   - $post('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName,type:type},function(result){
  152 + $get('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName,type:type},function(result){
153 153 $.each(result, function(i, obj) {
154 154 obj.requestType = reqCodeMap[obj.requestType];
155 155 });
... ...