优化入库程序-批次报批入库并上链

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

@@ -157,14 +157,16 @@ public class DealExcelServiceImpl {
             }
 
             String projectName = xm.get("项目名称");
+            String newProjectName = "";
+
             if (StringUtils.isBlank(projectName)) {
-                projectName = "xxxx3_" + System.currentTimeMillis();
+                newProjectName = "xxxx3_" + System.currentTimeMillis();
                 log.warn("项目名称为空，默认设置为{}", projectName);
             }else {
-                projectName = "pro3_" + projectName;
+                newProjectName = "pro3_" + projectName;
             }
 
-            projectVo.setName(projectName);
+            projectVo.setName(newProjectName);
 
             String code = xm.get("项目代码");
             projectVo.setCode(code);
@@ -279,17 +281,16 @@ public class DealExcelServiceImpl {
                 Map<String, String> excel = ydbpList.get(i);
                 if (!isAllFieldsEmpty(excel)) {
                     String pfwh = excel.get("批复文号（必填）");
-
                     String pfDate = excel.get("批复日期（必填）");
                     pfDate = this.parseChineseDate(pfDate);
 
                     if (StringUtils.isNotBlank(pfwh) && StringUtils.isNotBlank(pfDate) && isValidChineseDate(pfDate)) {
-                        pfDate = parseChineseDate(pfDate);
                         YdbpVo vo = new YdbpVo();
                         vo.setProjectId(projectId);
                         vo.setPfwh(pfwh);
                         vo.setPfDate(pfDate);
-                        vo.setTdyt(excel.get("土地用途"));
+                        String tdyt = excel.get("土地用途");
+                        vo.setTdyt(getTdytCodeByName(tdyt));
                         vo.setYdArea(parseFloatField(excel.get("用地面积"), "用地报批-用地面积"));
                         vo.setYdUnit(validateAreaUnit(excel.get("用地面积"), excel.get("用地面积单位"), "用地面积", "用地面积单位"));
                         vo.setZsArea(parseFloatField(excel.get("征收面积"), "用地报批-征收面积"));
@@ -306,9 +307,7 @@ public class DealExcelServiceImpl {
                         String nodeId = ydbpService.add(vo);
 
                         //附件处理
-                        if (CollectionUtils.isNotEmpty(jdList) && i < jdList.size()) {
-                            dealCurrentNodeAttachmentV3(projectId, nodeId, projectName,rootPathAll_YDBP, "01用地报批阶段", null);
-                        }
+                        dealCurrentNodeAttachmentV3(projectId, nodeId, projectName,rootPathAll_YDBP, "02用地报批阶段", null);
 
                         //矢量处理
                         if (StringUtils.isNotBlank(projectName)) {
@@ -330,7 +329,7 @@ public class DealExcelServiceImpl {
                             //这里更新上链
                             NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(nodeId);
                             if(Objects.nonNull(nodeLand)){
-                                tdgyService.updateHasOnchain(nodeId, projectId,true);
+                                ydbpService.updateHasOnchain(nodeId,true);
                                 // 更新项目表的上链数量
                                 projectService.countOnChinaNum(projectId);
                                 //这里生成资源吗
@@ -371,8 +370,7 @@ public class DealExcelServiceImpl {
                         vo.setJsyj(excel.get("项目建设依据"));
                         vo.setXmjsyj(excel.get("项目规模及内容"));
                         String nodeId = ydysyxzService.add(vo);
-
-                        dealCurrentNodeAttachmentV3(projectId, nodeId, projectName, rootPathAll_YDYSYXZ,"00用地预审与选址阶段", null);
+                        dealCurrentNodeAttachmentV3(projectId, nodeId, projectName, rootPathAll_YDYSYXZ,"01用地预审与选址意见书阶段", null);
                     }
                 }
             }
@@ -390,18 +388,20 @@ public class DealExcelServiceImpl {
                         vo.setCjbh(cjbh);
                         vo.setCjDate(cjDate);
                         vo.setDkbm(excel.get("地块编码"));
-                        vo.setArea(parseFloatField(excel.get("用地面积"), "规划条件与用地红线出具-用地面积"));
-                        vo.setAreaUnit(validateAreaUnit(excel.get("用地面积"), excel.get("面积单位"), "用地面积", "面积单位"));
-                        vo.setYdxz(excel.get("用地性质"));
+                        vo.setArea(parseFloatField(excel.get("用地面积（亩）"), "规划条件与用地红线出具-用地面积（亩）"));
+                        vo.setAreaUnit(validateAreaUnit(excel.get("用地面积（亩）"), excel.get("面积单位"), "用地面积（亩）", "面积单位"));
+                        String ydxz = excel.get("用地性质");
+                        vo.setYdxz(getTdytCodeByName(ydxz));
                         vo.setYdwz(excel.get("用地位置"));
                         vo.setCjyj(excel.get("出具依据"));
 
                         String nodeId = tjyydhxService.add(vo);
                         //附件处理
-                        dealCurrentNodeAttachmentV3(projectId, nodeId, cjbh, rootPathAll_TJYYDHX,"09规划条件与用地红线出具阶段", null);
+                        dealCurrentNodeAttachmentV3(projectId, nodeId, cjbh, rootPathAll_TJYYDHX,"01规划条件与用地红线出具阶段", null);
                     }
                 }
             }
+            log.info("====这里到第几条======数字{}",i);
             i++;
         }
         return "successs";
@@ -1014,7 +1014,7 @@ public class DealExcelServiceImpl {
         // 匹配中文格式：2019年9月4日 或 2019年09月04日
         //   斜杠格式：2019/9/10   或 2019/09/10
         return dateStr.matches("^\\d{4}年\\d{1,2}月\\d{1,2}日$")
-                || dateStr.matches("^\\d{4}/\\d{1,2}/\\d{1,2}$");
+                || dateStr.matches("^\\d{4}/\\d{1,2}/\\d{1,2}$") ||  dateStr.matches("^\\d{4}-\\d{1,2}-\\d{1,2}$");
     }
 
 
@@ -1110,8 +1110,14 @@ public class DealExcelServiceImpl {
             log.info("数据治理文件名称--附件材料：{}", projectFileName);
             return;
         }
-        //这里先初始化项目
-        //nodeAttachmentService.addDefaultAttachment(projectId, nodeId,gdType);
+
+        if("用地规划设计条件(2018)赣新经第27号".equalsIgnoreCase(projectFileName)){
+            int xx= 1010;
+            log.info("数据治理文件名称--附件材料：{}，不进行处理", projectFileName);
+        }
+
+        //这里先初始化项目(因为如果没有初始化，这里没有附件信息，将会造成前端附件数据无任何展示)
+        nodeAttachmentService.addDefaultAttachment(projectId, nodeId,gdType);
         String fullFilePath ="";
 
         Path filePath = Paths.get(outPath+"\\" +projectFileName);