|
@@ -122,18 +122,18 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
|
|
|
if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName2))){
|
|
|
Tdgy tdgy = tdgyMapper.getById(nodeId);
|
|
|
globalTdgy = tdgy;
|
|
|
- if(StringUtils.isNoneBlank(tdgy.getHasZz())){
|
|
|
+ if(StringUtils.isNotBlank(tdgy.getHasZz())){
|
|
|
levyStatusCode = "是".equalsIgnoreCase(tdgy.getHasZz()) ? "1": "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0": "";
|
|
|
}
|
|
|
//其次获取用地报批的值
|
|
|
} else if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName1))){
|
|
|
Ydbp ydbp = ydbpMapper.getById(nodeId);
|
|
|
- if(StringUtils.isNoneBlank(ydbp.getHasZz())){
|
|
|
+ if(StringUtils.isNotBlank(ydbp.getHasZz())){
|
|
|
levyStatusCode = "是".equalsIgnoreCase(ydbp.getHasZz()) ? "1": "否".equalsIgnoreCase(ydbp.getHasZz()) ? "0": "";
|
|
|
}
|
|
|
}else if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName0))){
|
|
|
Ydysyxz ydysyxz = ydysyxzMapper.getById(nodeId);
|
|
|
- if(StringUtils.isNoneBlank(ydysyxz.getHasZz())){
|
|
|
+ if(StringUtils.isNotBlank(ydysyxz.getHasZz())){
|
|
|
levyStatusCode = "是".equalsIgnoreCase(ydysyxz.getHasZz()) ? "1": "否".equalsIgnoreCase(ydysyxz.getHasZz()) ? "0": "";
|
|
|
}
|
|
|
}
|
|
@@ -142,7 +142,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
|
|
|
}
|
|
|
|
|
|
//获取土地供应方式
|
|
|
- if(Objects.nonNull(globalTdgy) && StringUtils.isNoneBlank(globalTdgy.getGdType())){
|
|
|
+ if(Objects.nonNull(globalTdgy) && StringUtils.isNotBlank(globalTdgy.getGdType())){
|
|
|
if("划拨".equalsIgnoreCase(globalTdgy.getGdType())){
|
|
|
landSupplyModeCode = "H";
|
|
|
} else if ("出让".equalsIgnoreCase(globalTdgy.getGdType())) {
|
|
@@ -181,7 +181,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
|
|
|
if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName2))){
|
|
|
Tdgy tdgy = tdgyMapper.getById(nodeId);
|
|
|
globalTdgy = tdgy;
|
|
|
- if(StringUtils.isNoneBlank(tdgy.getHasZz())){
|
|
|
+ if(StringUtils.isNotBlank(tdgy.getHasZz())){
|
|
|
levyStatusCode = "是".equalsIgnoreCase(tdgy.getHasZz()) ? "1": "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0": "";
|
|
|
}
|
|
|
}
|
|
@@ -190,7 +190,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
|
|
|
}
|
|
|
|
|
|
//获取土地供应方式
|
|
|
- if(Objects.nonNull(globalTdgy) && StringUtils.isNoneBlank(globalTdgy.getGdType())){
|
|
|
+ if(Objects.nonNull(globalTdgy) && StringUtils.isNotBlank(globalTdgy.getGdType())){
|
|
|
if("划拨".equalsIgnoreCase(globalTdgy.getGdType())){
|
|
|
landSupplyModeCode = "H";
|
|
|
} else if ("出让".equalsIgnoreCase(globalTdgy.getGdType())) {
|