枚举类调整，赋码规则调整

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/RegistrationProcessType.java

@@ -9,10 +9,12 @@ public enum RegistrationProcessType {
     Registration02(2,"02", "规划条件与用地红线出具","t_tjyydhx"),
     Registration03(3,"03", "用地报批","t_ydbp"),
     Registration04(4,"04", "土地供应","t_tdgy"),
-    Registration05A(5,"05", "建设用地规划许可","t_jsydghxk"),
-    Registration05B(6,"05", "建设工程规划许可","t_jsgcghxk"),
-    Registration06(7,"06", "土地核验与规划核实","t_tdhyhs"),
-    Registration00(8,"00", "全部办结","");
+    Registration05(5,"05", "国有建设用地使用权及房屋所有权首次登记","t_gyjsydjfwscdj"),
+    Registration06(6,"06", "建设用地规划许可","t_jsydghxk"),
+    Registration07(7,"07", "建设工程规划许可","t_jsgcghxk"),
+    Registration08(8,"08", "土地核验与规划核实","t_tdhyhs"),
+    Registration09(9,"09", "国有建设用地使用权及房屋所有权首次登记","t_gyjsydjfwscdj"),
+    Registration10(10,"10", "全部办结","");
 
     private final Integer index;
     private final String name;

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

@@ -112,7 +112,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
         String talbeName6 = "t_jsgcghxk";//建设工程规划许可
 
         String levyStatusCode = "0";
-        String landSupplyModeCode = "W";
+        String landSupplyModeCode = "0";
 
         String approvalProcessCode = replaceCode;
         String registrationProcessCode = "0";
@@ -130,11 +130,10 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                     Tdgy tdgy = tdgyMapper.getById(useNodeId);
                     globalTdgy = tdgy;
                     if (StringUtils.isNotBlank(tdgy.getHasZz())) {
-                        levyStatusCode = "是".equalsIgnoreCase(tdgy.getHasZz()) ? "1" : "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0" : "";
+                        levyStatusCode = "是".equalsIgnoreCase(tdgy.getHasZz()) ? "2" : "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0" : "";
                     }
                 }
 
-
              //其次获取用地报批的值
             } else if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName1))){
                 List<ProjectWorkflow> useProjectWorkflowList = projectWorkflowMapper.selectProjectOneNodeId(nodeId, talbeName1);
@@ -160,14 +159,21 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
             }
 
             //获取土地供应方式
+            /*
             if(Objects.nonNull(globalTdgy) && StringUtils.isNotBlank(globalTdgy.getGdType())){
                 if("划拨".equalsIgnoreCase(globalTdgy.getGdType())){
                     landSupplyModeCode = "H";
                 } else if  ("出让".equalsIgnoreCase(globalTdgy.getGdType())) {
                     landSupplyModeCode = "C";
                 }
+            }*/
+            //获取土地供应方式 ，这里需要根据出让合同编号，出让合同日期来判断供应状态，已供，未供
+            //获取土地供应(如果出让合同编号，出让合同日期都存在)
+            if(Objects.nonNull(globalTdgy)){
+                if(StringUtils.isNotBlank(globalTdgy.getHbcrhtbh()) && StringUtils.isNotBlank(globalTdgy.getHbcrhtDate())){
+                    landSupplyModeCode = "1";
+                }
             }
-
             //获取审批环节代码
             List<String>  currentNodeTableList = workflows.stream().map(s->s.getTableName()).collect(Collectors.toList());
             RegistrationProcessType[] values = RegistrationProcessType.values();
@@ -180,11 +186,12 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
             }
 
             //获取登记环节编码
-            if(currentNodeTableList.contains(talbeName4)){
-                registrationProcessCode = "2";
-            } else if(currentNodeTableList.contains(talbeName3)){
-                registrationProcessCode = "1";
-            }
+            //新的编码规范，不需要这个
+//            if(currentNodeTableList.contains(talbeName4)){
+//                registrationProcessCode = "2";
+//            } else if(currentNodeTableList.contains(talbeName3)){
+//                registrationProcessCode = "1";
+//            }
 
             //许可分期编码
             if(currentNodeTableList.contains(talbeName6)){
@@ -204,7 +211,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                     Tdgy tdgy = tdgyMapper.getById(useNodeId);
                     globalTdgy = tdgy;
                     if (StringUtils.isNotBlank(tdgy.getHasZz())) {
-                        levyStatusCode = "是".equalsIgnoreCase(tdgy.getHasZz()) ? "1" : "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0" : "";
+                        levyStatusCode = "是".equalsIgnoreCase(tdgy.getHasZz()) ? "2" : "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0" : "";
                     }
                 }
             }
@@ -212,13 +219,21 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                 levyStatusCode = replaceCode;
             }
             //获取土地供应方式
-            if(Objects.nonNull(globalTdgy) && StringUtils.isNotBlank(globalTdgy.getGdType())){
-                if("划拨".equalsIgnoreCase(globalTdgy.getGdType())){
-                    landSupplyModeCode = "H";
-                } else if  ("出让".equalsIgnoreCase(globalTdgy.getGdType())) {
-                    landSupplyModeCode = "C";
+//            if(Objects.nonNull(globalTdgy) && StringUtils.isNotBlank(globalTdgy.getGdType())){
+//                if("划拨".equalsIgnoreCase(globalTdgy.getGdType())){
+//                    landSupplyModeCode = "H";
+//                } else if  ("出让".equalsIgnoreCase(globalTdgy.getGdType())) {
+//                    landSupplyModeCode = "C";
+//                }
+//            }
+            //获取土地供应方式 ，这里需要根据出让合同编号，出让合同日期来判断供应状态，已供，未供
+            //获取土地供应(如果出让合同编号，出让合同日期都存在)
+            if(Objects.nonNull(globalTdgy)){
+                if(StringUtils.isNotBlank(globalTdgy.getHbcrhtbh()) && StringUtils.isNotBlank(globalTdgy.getHbcrhtDate())){
+                    landSupplyModeCode = "1";
                 }
             }
+
             //获取审批环节代码
             List<String>  currentNodeTableList = workflows.stream().map(s->s.getTableName()).collect(Collectors.toList());
             RegistrationProcessType[] values = RegistrationProcessType.values();
@@ -231,11 +246,12 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
             }
 
             //获取登记环节编码
-            if(currentNodeTableList.contains(talbeName4)){
-                registrationProcessCode = "2";
-            } else if(currentNodeTableList.contains(talbeName3)){
-                registrationProcessCode = "1";
-            }
+            //新的编码规范，不需要这个 注释
+//            if(currentNodeTableList.contains(talbeName4)){
+//                registrationProcessCode = "2";
+//            } else if(currentNodeTableList.contains(talbeName3)){
+//                registrationProcessCode = "1";
+//            }
 
             //许可分期编码
             if(currentNodeTableList.contains(talbeName6)){
@@ -244,8 +260,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                 licenseStagesCode = "1";
             }
         }
-
-       returnCode = levyStatusCode+landSupplyModeCode+approvalProcessCode+registrationProcessCode+licenseStagesCode;
+       returnCode = levyStatusCode+landSupplyModeCode+approvalProcessCode+licenseStagesCode;
        return returnCode;
     }