样例数据入库3

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/third/DealExcelController.java

@@ -67,12 +67,12 @@ public class DealExcelController extends BaseController {
             File file = filePath.toFile();
             Map<String, List<Map<String, String>>> dataMap = readExcelWithMergedHeaders(file);
 
-            String res = dealExcelService.checkExcelDataToDb(dataMap);
-            logger.info("检查数据结果{}",res);
+//            String res = dealExcelService.checkExcelDataToDb(dataMap);
+//            logger.info("检查数据结果{}",res);
 
 
-            //String res = dealExcelService.addExcelDataToDb(dataMap);
-            //logger.info("新增数据结果{}",res);
+            String res = dealExcelService.addExcelDataToDb(dataMap);
+            logger.info("新增数据结果{}",res);
 
 //            for (Map.Entry<String, List<Map<String, String>>> entry : dataMap.entrySet()) {
 //                logger.info("分类 [{}] 共 {} 条数据", entry.getKey(), entry.getValue().size());

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

@@ -604,9 +604,12 @@ public class DealExcelServiceImpl {
 
             String projectName = xm.get("项目名称");
             if (StringUtils.isBlank(projectName)) {
-                projectName = "xxxxx" + System.currentTimeMillis();
+                projectName = "xxxx_" + System.currentTimeMillis();
                 log.warn("项目名称为空，默认设置为{}", projectName);
+            }else {
+                projectName = "pro_" + projectName;
             }
+
             projectVo.setName(projectName);
 
             String code = xm.get("项目代码");
@@ -675,6 +678,7 @@ public class DealExcelServiceImpl {
                 tdgyVo.setHbcrhtbh(hbcrhtbh);
 
                 String hbcrhtDate = tdgyExcel.get("划拨决定书/出让合同日期");
+                hbcrhtDate = parseChineseDate(hbcrhtDate);
                 tdgyVo.setHbcrhtDate(hbcrhtDate);
                 String id = tdgyService.add(tdgyVo);
 
@@ -687,6 +691,9 @@ public class DealExcelServiceImpl {
                 //矢量数据处理  -- 数据治理文件名
                 String dzjgh = jdMap.get("划拨决定书/出让合同电子监管号");
                 dealCurrentNodeGeom(dzjgh, id);
+
+                tdgyService.updateHasOnchain(id, projectId,true);
+
             }
             // -----------------第二部分增加项目关联的（土地供应）环节结束-------------------------------
 
@@ -726,6 +733,7 @@ public class DealExcelServiceImpl {
                     String zsbh = excel.get("证书编号（必填）");
                     String fzDate = excel.get("发证日期（必填）");
                     if (StringUtils.isNotBlank(zsbh) && StringUtils.isNotBlank(fzDate) && isValidChineseDate(fzDate)) {
+                        fzDate = parseChineseDate(fzDate);
                         JsydghxkVo vo = new JsydghxkVo();
                         vo.setProjectId(projectId);
                         vo.setZsbh(zsbh);
@@ -755,6 +763,7 @@ public class DealExcelServiceImpl {
                     String zsbh = excel.get("证书编号（必填）");
                     String fzDate = excel.get("发证日期（必填）");
                     if (StringUtils.isNotBlank(zsbh) && StringUtils.isNotBlank(fzDate) && isValidChineseDate(fzDate)) {
+                        fzDate = parseChineseDate(fzDate);
                         JsgcghxkVo vo = new JsgcghxkVo();
                         vo.setProjectId(projectId);
                         vo.setZsbh(zsbh);
@@ -784,6 +793,7 @@ public class DealExcelServiceImpl {
                     String hgzh = excel.get("合格证号（必填）");
                     String fzDate = excel.get("发证日期（必填）");
                     if (StringUtils.isNotBlank(hgzh) && StringUtils.isNotBlank(fzDate) && isValidChineseDate(fzDate)) {
+                        fzDate = parseChineseDate(fzDate);
                         TdhyhsVo vo = new TdhyhsVo();
                         vo.setProjectId(projectId);
                         vo.setHgzh(hgzh);
@@ -833,6 +843,7 @@ public class DealExcelServiceImpl {
                     String pfwh = excel.get("批复文号（必填）");
                     String pfDate = excel.get("批复日期（必填）");
                     if (StringUtils.isNotBlank(pfwh) && StringUtils.isNotBlank(pfDate) && isValidChineseDate(pfDate)) {
+                        pfDate = parseChineseDate(pfDate);
                         YdbpVo vo = new YdbpVo();
                         vo.setProjectId(projectId);
                         vo.setPfwh(pfwh);
@@ -865,6 +876,7 @@ public class DealExcelServiceImpl {
                     String zzwh = excel.get("证书文号");
                     String fzDate = excel.get("发证日期");
                     if (StringUtils.isNotBlank(zzwh) && StringUtils.isNotBlank(fzDate) && isValidChineseDate(fzDate)) {
+                        fzDate = parseChineseDate(fzDate);
                         YdysyxzVo vo = new YdysyxzVo();
                         vo.setProjectId(projectId);
                         vo.setZzwh(zzwh);
@@ -895,6 +907,7 @@ public class DealExcelServiceImpl {
                     String cjbh = excel.get("出具编号");
                     String cjDate = excel.get("出具日期");
                     if (StringUtils.isNotBlank(cjbh) && StringUtils.isNotBlank(cjDate) && isValidChineseDate(cjDate)) {
+                        cjDate = parseChineseDate(cjDate);
                         TjyydhxVo vo = new TjyydhxVo();
                         vo.setProjectId(projectId);
                         vo.setCjbh(cjbh);