资源码调整

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/LandOneCodeServiceImpl.java

@@ -126,27 +126,45 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
             //取征转状态
             //优先获取土地供应的值
             if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName2))){
-                Tdgy tdgy = tdgyMapper.getById(nodeId);
-                globalTdgy = tdgy;
-                if(StringUtils.isNotBlank(tdgy.getHasZz())){
-                    levyStatusCode =  "是".equalsIgnoreCase(tdgy.getHasZz()) ? "1": "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0": "";
+                List<ProjectWorkflow> useProjectWorkflowList = projectWorkflowMapper.selectProjectOneNodeId(nodeId, talbeName2);
+                if (CollectionUtils.isNotEmpty(useProjectWorkflowList) && Objects.nonNull(useProjectWorkflowList.get(0))) {
+                    String useNodeId = useProjectWorkflowList.get(0).getNodeId();
+                    Tdgy tdgy = tdgyMapper.getById(useNodeId);
+                    globalTdgy = tdgy;
+                    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.isNotBlank(ydbp.getHasZz())){
-                    levyStatusCode =  "是".equalsIgnoreCase(ydbp.getHasZz()) ? "1": "否".equalsIgnoreCase(ydbp.getHasZz()) ? "0": "";
+                List<ProjectWorkflow> useProjectWorkflowList = projectWorkflowMapper.selectProjectOneNodeId(nodeId, talbeName1);
+                if (CollectionUtils.isNotEmpty(useProjectWorkflowList) && Objects.nonNull(useProjectWorkflowList.get(0))) {
+                    String useNodeId = useProjectWorkflowList.get(0).getNodeId();
+                    Ydbp ydbp = ydbpMapper.getById(useNodeId);
+                    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.isNotBlank(ydysyxz.getHasZz())){
-                    levyStatusCode =  "是".equalsIgnoreCase(ydysyxz.getHasZz()) ? "1": "否".equalsIgnoreCase(ydysyxz.getHasZz()) ? "0": "";
+                List<ProjectWorkflow> useProjectWorkflowList = projectWorkflowMapper.selectProjectOneNodeId(nodeId, talbeName0);
+                if (CollectionUtils.isNotEmpty(useProjectWorkflowList) && Objects.nonNull(useProjectWorkflowList.get(0))) {
+                    String useNodeId = useProjectWorkflowList.get(0).getNodeId();
+                    Ydysyxz ydysyxz = ydysyxzMapper.getById(useNodeId);
+                    if (StringUtils.isNotBlank(ydysyxz.getHasZz())) {
+                        levyStatusCode = "是".equalsIgnoreCase(ydysyxz.getHasZz()) ? "1" : "否".equalsIgnoreCase(ydysyxz.getHasZz()) ? "0" : "";
+                    }
                 }
             }
             if(StringUtils.isBlank(levyStatusCode)){
                 levyStatusCode = replaceCode;
             }
 
+
+
             //获取土地供应方式
             if(Objects.nonNull(globalTdgy) && StringUtils.isNotBlank(globalTdgy.getGdType())){
                 if("划拨".equalsIgnoreCase(globalTdgy.getGdType())){
@@ -184,17 +202,21 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
             Tdgy globalTdgy = null; //土地供应对象
             //取征转状态
             //优先获取土地供应的值
-            if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName2))){
-                Tdgy tdgy = tdgyMapper.getById(nodeId);
-                globalTdgy = tdgy;
-                if(StringUtils.isNotBlank(tdgy.getHasZz())){
-                    levyStatusCode =  "是".equalsIgnoreCase(tdgy.getHasZz()) ? "1": "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0": "";
+            if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName2))) {
+                //获取土地供应的nodeId;
+                List<ProjectWorkflow> useProjectWorkflowList = projectWorkflowMapper.selectProjectOneNodeId(nodeId, talbeName2);
+                if (CollectionUtils.isNotEmpty(useProjectWorkflowList) && Objects.nonNull(useProjectWorkflowList.get(0))) {
+                    String useNodeId = useProjectWorkflowList.get(0).getNodeId();
+                    Tdgy tdgy = tdgyMapper.getById(useNodeId);
+                    globalTdgy = tdgy;
+                    if (StringUtils.isNotBlank(tdgy.getHasZz())) {
+                        levyStatusCode = "是".equalsIgnoreCase(tdgy.getHasZz()) ? "1" : "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0" : "";
+                    }
                 }
             }
-            if(StringUtils.isBlank(levyStatusCode)){
+            if (StringUtils.isBlank(levyStatusCode)) {
                 levyStatusCode = replaceCode;
             }
-
             //获取土地供应方式
             if(Objects.nonNull(globalTdgy) && StringUtils.isNotBlank(globalTdgy.getGdType())){
                 if("划拨".equalsIgnoreCase(globalTdgy.getGdType())){
@@ -203,7 +225,6 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                     landSupplyModeCode = "C";
                 }
             }
-
             //获取审批环节代码
             List<String>  currentNodeTableList = workflows.stream().map(s->s.getTableName()).collect(Collectors.toList());
             RegistrationProcessType[] values = RegistrationProcessType.values();
@@ -261,7 +282,6 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                 String useNodeId = useProjectWorkflowList.get(0).getNodeId();
                 nodeLand = nodeLandMapper.selectByNodeId(useNodeId);
             }
-            logger.info("未找到项目----固定节点对应的地块信息，nodeId={}", nodeId);
         }
 
         if(Objects.isNull(nodeLand)){