展示先不展示报告

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/GdbhHandleService.java

@@ -116,25 +116,26 @@ public class GdbhHandleService {
             }
             insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护" + mx.getBsmmc() + "分析结束。。。", "info");
         }
-        insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成开始。。。", "info");
-        RequestResult res_1 = gdbhJgService.gdbhAnalysisHandle(gdbhDto.getBsm());
-        if (res_1.isError()) {
-            insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成失败。。。", "error");
-            updateGdbg(gdbhDto.getBsm(), 3, null, new Date(), null);
-            return;
-        }
-        Map jdMap_0 = (Map) res_1.get(RequestResult.DATA_TAG);
-        RequestResult res_2 = analyseService.gdbhGenerateDocx(jdMap_0);
-        if (res_2.isError()) {
-            insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成失败。。。", "error");
-            updateGdbg(gdbhDto.getBsm(), 3, null, new Date(), null);
-            return;
-        }
-        String path_0 = (String) res_2.get(RequestResult.DATA_TAG);
-        System.out.println("path_0:"+path_0);
+//        insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成开始。。。", "info");
+//        RequestResult res_1 = gdbhJgService.gdbhAnalysisHandle(gdbhDto.getBsm());
+//        if (res_1.isError()) {
+//            insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成失败。。。", "error");
+//            updateGdbg(gdbhDto.getBsm(), 3, null, new Date(), null);
+//            return;
+//        }
+//        Map jdMap_0 = (Map) res_1.get(RequestResult.DATA_TAG);
+//        RequestResult res_2 = analyseService.gdbhGenerateDocx(jdMap_0);
+//        if (res_2.isError()) {
+//            insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成失败。。。", "error");
+//            updateGdbg(gdbhDto.getBsm(), 3, null, new Date(), null);
+//            return;
+//        }
+//        String path_0 = (String) res_2.get(RequestResult.DATA_TAG);
+//        System.out.println("path_0:"+path_0);
         insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成结束。。。", "info");
 
-        updateGdbg(gdbhDto.getBsm(), 2, null, new Date(), path_0);
+//        updateGdbg(gdbhDto.getBsm(), 2, null, new Date(), path_0);
+        updateGdbg(gdbhDto.getBsm(), 2, null, new Date(), null);
         insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析结束。。。", "info");
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/qytdzz/TdzzyjHandleService.java

@@ -119,17 +119,18 @@ public class TdzzyjHandleService {
 //        intersectionDataStore(tTdzzyj.getGeom(), "TB_GHDK", tTdzzyj.getBsm(), "GHDK", null, columnsghdk, null);
 //        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析规划地块分析结束。。。", "info");
 
-        RequestResult res_2 = analyseService.qytdzzGenerateDocx(tdzzyjAnalysisJg(tTdzzyj));
-        if (res_2.isError()) {
-            insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析报告生成失败。。。", "error");
-            updateTdzzyj(tTdzzyj.getBsm(), 3, null, new Date(), null);
-            return;
-        }
-        String path_0 = (String) res_2.get(RequestResult.DATA_TAG);
-        System.out.println("path_0:" + path_0);
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析报告生成结束。。。", "info");
+//        RequestResult res_2 = analyseService.qytdzzGenerateDocx(tdzzyjAnalysisJg(tTdzzyj));
+//        if (res_2.isError()) {
+//            insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析报告生成失败。。。", "error");
+//            updateTdzzyj(tTdzzyj.getBsm(), 3, null, new Date(), null);
+//            return;
+//        }
+//        String path_0 = (String) res_2.get(RequestResult.DATA_TAG);
+//        System.out.println("path_0:" + path_0);
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析报告生成结束。。。", "info");
 
-        updateTdzzyj(tTdzzyj.getBsm(), 2, null, new Date(), path_0);
+//        updateTdzzyj(tTdzzyj.getBsm(), 2, null, new Date(), path_0);
+        updateTdzzyj(tTdzzyj.getBsm(), 2, null, new Date(), null);
         insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析结束。。。", "info");
 
     }