报批调整

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

@@ -13,7 +13,7 @@ public enum AloneWorkFlowEnum {
     NODE_6("6", "土地核验与规划核实","t_tdhyhs"),
     NODE_7("7", "国有建设用地使用权及房屋所有权首次登记","t_gyjsydjfwscdj"),
     NODE_8("8", "规划条件与用地红线出具","t_tjyydhx"),
-    NODE_9("8", "用地报批","t_ydbp_data");
+    NODE_9("9", "用地报批","t_ydbp_data");
 
     private final String index;
     private final String name;

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

@@ -742,6 +742,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                     else if ("zydmj".equalsIgnoreCase(fieldName)) {
                         map.put(fieldName, null);
                     }*/
+
                     if (StringUtils.containsIgnoreCase(fieldType, "character")) {
                         map.put(fieldName, feature.GetFieldAsString(i));
                     } else if (StringUtils.containsIgnoreCase(fieldType, "integer") || StringUtils.containsIgnoreCase(fieldType, "smallint") || StringUtils.containsIgnoreCase(fieldType, "int2") || StringUtils.containsIgnoreCase(fieldType, "int4")) {

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

@@ -289,7 +289,12 @@ public class ProjectImpl implements ProjectService {
                         viewField = currentNode.get("hgzh") != null ? String.valueOf(currentNode.get("hgzh")) : "";
                     }else if (AloneWorkFlowEnum.NODE_7.getTableName().equalsIgnoreCase(tableName)) {
                         viewField = currentNode.get("ywh") != null ? String.valueOf(currentNode.get("ywh")) : "";
+                    }else if (AloneWorkFlowEnum.NODE_8.getTableName().equalsIgnoreCase(tableName)) {
+                        viewField =  currentNode.get("cjbh") != null ? String.valueOf(currentNode.get("cjbh")) : "";
+                    }else if (AloneWorkFlowEnum.NODE_9.getTableName().equalsIgnoreCase(tableName)) {
+                        viewField =  currentNode.get("name") != null ? String.valueOf(currentNode.get("name")) : "";
                     }
+
                     projectWorkflowRes.setViewField(viewField);
                 }
                 projectWorkflows.add(projectWorkflowRes);
@@ -354,6 +359,7 @@ public class ProjectImpl implements ProjectService {
             List<String> keyWords = List.of(projectFilterVo.getKeyWord().trim().split("\\s+"));
             projectFilterVo.setKeyWords(keyWords);
         }
+        projectFilterVo.setIsOnchain(true);
         // todo 这里后期可以进行优化，把查询出的项目id写入redis中，分页时候可以取缓存
         List<SearchProjectAndAttachment> projects = projectMapper.getListSearch(projectFilterVo);
         Integer count = projectMapper.getSearchCount(projectFilterVo);