Commit be8bf801a9adb9c4af0a2bd7f2e75dc528ebe299

Authored by 廖磊
1 parent 5c65c170

油 电 重新统计修改

src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
@@ -20,6 +20,7 @@ import java.util.Map; @@ -20,6 +20,7 @@ import java.util.Map;
20 import javax.transaction.Transactional; 20 import javax.transaction.Transactional;
21 21
22 import org.apache.commons.lang3.StringEscapeUtils; 22 import org.apache.commons.lang3.StringEscapeUtils;
  23 +import org.apache.commons.lang3.StringUtils;
23 import org.slf4j.Logger; 24 import org.slf4j.Logger;
24 import org.slf4j.LoggerFactory; 25 import org.slf4j.LoggerFactory;
25 import org.springframework.beans.factory.annotation.Autowired; 26 import org.springframework.beans.factory.annotation.Autowired;
@@ -1330,7 +1331,7 @@ public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbS @@ -1330,7 +1331,7 @@ public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbS
1330 for (int j = 0; j < dlbList.size(); j++) { 1331 for (int j = 0; j < dlbList.size(); j++) {
1331 Dlb t=dlbList.get(j); 1332 Dlb t=dlbList.get(j);
1332 boolean fage=true; 1333 boolean fage=true;
1333 - if(t.getLp().isEmpty()){ 1334 + if(StringUtils.isEmpty(t.getLp())){
1334 fage=false; 1335 fage=false;
1335 }else{ 1336 }else{
1336 for (int i = 0; i < listpbDc.size(); i++) { 1337 for (int i = 0; i < listpbDc.size(); i++) {
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
@@ -16,6 +16,7 @@ import java.util.Map; @@ -16,6 +16,7 @@ import java.util.Map;
16 import javax.transaction.Transactional; 16 import javax.transaction.Transactional;
17 17
18 import org.apache.commons.lang3.StringEscapeUtils; 18 import org.apache.commons.lang3.StringEscapeUtils;
  19 +import org.apache.commons.lang3.StringUtils;
19 import org.slf4j.Logger; 20 import org.slf4j.Logger;
20 import org.slf4j.LoggerFactory; 21 import org.slf4j.LoggerFactory;
21 import org.springframework.beans.factory.annotation.Autowired; 22 import org.springframework.beans.factory.annotation.Autowired;
@@ -2039,7 +2040,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -2039,7 +2040,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
2039 for (int j = 0; j < ylbList.size(); j++) { 2040 for (int j = 0; j < ylbList.size(); j++) {
2040 Ylb t=ylbList.get(j); 2041 Ylb t=ylbList.get(j);
2041 boolean fage=true; 2042 boolean fage=true;
2042 - if(t.getLp().isEmpty()){ 2043 + if(StringUtils.isEmpty(t.getLp())){
2043 fage=false; 2044 fage=false;
2044 }else{ 2045 }else{
2045 for (int i = 0; i < listpbYc.size(); i++) { 2046 for (int i = 0; i < listpbYc.size(); i++) {
@@ -2402,7 +2403,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -2402,7 +2403,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
2402 for (int j = 0; j < ylbList.size(); j++) { 2403 for (int j = 0; j < ylbList.size(); j++) {
2403 Ylb t=ylbList.get(j); 2404 Ylb t=ylbList.get(j);
2404 boolean fage=true; 2405 boolean fage=true;
2405 - if(t.getLp().isEmpty()){ 2406 + if(StringUtils.isEmpty(t.getLp())){
2406 fage=false; 2407 fage=false;
2407 }else{ 2408 }else{
2408 for (int i = 0; i < listpbYc.size(); i++) { 2409 for (int i = 0; i < listpbYc.size(); i++) {