Commit 8e6e4f0efa2dc339018056339c34bde7a9bc0a3e
1 parent
564d0ca0
update
Showing
1 changed file
with
4 additions
and
5 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
| @@ -401,7 +401,6 @@ public class ReportServiceImpl implements ReportService{ | @@ -401,7 +401,6 @@ public class ReportServiceImpl implements ReportService{ | ||
| 401 | int sj=0; | 401 | int sj=0; |
| 402 | 402 | ||
| 403 | for(int i=0;i<list.size();i++){ | 403 | for(int i=0;i<list.size();i++){ |
| 404 | - int temp = 0; | ||
| 405 | Map<String, Object> m=list.get(i); | 404 | Map<String, Object> m=list.get(i); |
| 406 | String time=m.get("fcsj").toString(); | 405 | String time=m.get("fcsj").toString(); |
| 407 | String[] times = time.split(":"); | 406 | String[] times = time.split(":"); |
| @@ -410,7 +409,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -410,7 +409,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 410 | if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){ | 409 | if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){ |
| 411 | if(m.get("bcType").equals("in")){ | 410 | if(m.get("bcType").equals("in")){ |
| 412 | if(sj!=0){ | 411 | if(sj!=0){ |
| 413 | - temp =(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj; | 412 | + yysj +=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj; |
| 414 | } | 413 | } |
| 415 | sj=0; | 414 | sj=0; |
| 416 | } | 415 | } |
| @@ -420,7 +419,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -420,7 +419,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 420 | if(sj==0){ | 419 | if(sj==0){ |
| 421 | sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]); | 420 | sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]); |
| 422 | }else{ | 421 | }else{ |
| 423 | - temp =(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj; | 422 | + yysj +=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj; |
| 424 | sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]); | 423 | sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]); |
| 425 | } | 424 | } |
| 426 | } | 425 | } |
| @@ -428,7 +427,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -428,7 +427,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 428 | if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){ | 427 | if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){ |
| 429 | if(m.get("bcType").equals("in")){ | 428 | if(m.get("bcType").equals("in")){ |
| 430 | if(sj!=0){ | 429 | if(sj!=0){ |
| 431 | - temp =Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj; | 430 | + yysj +=Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj; |
| 432 | } | 431 | } |
| 433 | sj=0; | 432 | sj=0; |
| 434 | } | 433 | } |
| @@ -438,7 +437,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -438,7 +437,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 438 | if(sj==0){ | 437 | if(sj==0){ |
| 439 | sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]); | 438 | sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]); |
| 440 | }else{ | 439 | }else{ |
| 441 | - temp =Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj; | 440 | + yysj +=Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj; |
| 442 | sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]); | 441 | sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]); |
| 443 | } | 442 | } |
| 444 | } | 443 | } |