调整图斑展示参数等

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/NodeAttachmentController.java

@@ -270,6 +270,15 @@ public class NodeAttachmentController extends BaseController {
 
 
 
+
+
+
+
+
+
+
+
+
     }
 
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/NodeLandController.java

@@ -116,9 +116,17 @@ public class NodeLandController extends BaseController {
     }
 
 
+    /**
+     *
+     * 获取地块图形面积信息
+     * @param projectId
+     * @param nodeId
+     * @param geomId
+     * @return
+     */
     @GetMapping("/projectGeomInfo")
     public R<Map<String, String>> getProjectGeomInfo(@RequestParam String projectId,
-                                                               @RequestParam String nodeId, @RequestParam String geomId) {
+                                                               @RequestParam(required = false) String nodeId, @RequestParam String geomId) {
         try {
             if (projectId == null || projectId.trim().isEmpty()) {
                 return R.fail(502,"projectId不能为空");

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

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

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

@@ -142,7 +142,8 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                     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" : "";
+                        levyStatusCode = "未报未征".equalsIgnoreCase(ydbp.getHasZz()) ? "0" : "已报未征".equalsIgnoreCase(ydbp.getHasZz()) ? "1" : "2";
+                        //levyStatusCode = "是".equalsIgnoreCase(ydbp.getHasZz()) ? "1" : "否".equalsIgnoreCase(ydbp.getHasZz()) ? "0" : "";
                     }
                 }
             }else if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName0))){
@@ -151,7 +152,8 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                     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" : "";
+                        levyStatusCode = "未报未征".equalsIgnoreCase(ydysyxz.getHasZz()) ? "0" : "已报未征".equalsIgnoreCase(ydysyxz.getHasZz()) ? "1" : "2";
+                        //levyStatusCode = "是".equalsIgnoreCase(ydysyxz.getHasZz()) ? "1" : "否".equalsIgnoreCase(ydysyxz.getHasZz()) ? "0" : "";
                     }
                 }
             }

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

@@ -382,11 +382,15 @@ public class NodeAttachmentImpl implements NodeAttachmentService {
                 nodeAttachment.setNodeId(nodeId);
             }
             ProjectWorkflow projectWorkflow = null;
+
+
             //根据节点获取表名
             List<ProjectWorkflow> projectWorkflowList = projectWorkflowMapper.selectByNodeId(nodeId,null);
             if(CollectionUtils.isNotEmpty(projectWorkflowList) && Objects.nonNull(projectWorkflowList.get(0))) {
                 projectWorkflow = projectWorkflowList.get(0);
             }
+
+
             if(Objects.isNull(projectWorkflow)) {
                 throw new ServiceException("未查询到节点对应的流程信息，nodeId: " + nodeId);
             }