From 0e0ad3bf66d96ea0a05bb40622c872d1278472f9 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 30 Nov 2023 14:57:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../harmonic/pojo/po/dim/RDimObjTargetM.java  |  7 +--
 .../harmonic/pojo/po/dim/RDimObjTargetY.java  |  7 +--
 .../prepare/executor/OrgPointExecutor.java    | 56 +++++++++----------
 .../dim/impl/RDimObjGlobalMServiceImpl.java   |  4 +-
 .../dim/impl/RDimObjGlobalYServiceImpl.java   |  4 +-
 .../dim/impl/RDimObjTargetMServiceImpl.java   |  4 +-
 .../dim/impl/RDimObjTargetYServiceImpl.java   |  4 +-
 7 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetM.java
index 4230564ab..ca8f4c9b9 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetM.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetM.java
@@ -2,12 +2,11 @@ package com.njcn.harmonic.pojo.po.dim;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDate;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  *
@@ -19,7 +18,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_obj_target_m")
-public class RDimObjTargetM extends BaseEntity {
+public class RDimObjTargetM  {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetY.java
index 9a0fa232e..3c405a994 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetY.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetY.java
@@ -2,12 +2,11 @@ package com.njcn.harmonic.pojo.po.dim;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDate;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  *
@@ -19,7 +18,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_obj_target_y")
-public class RDimObjTargetY extends BaseEntity {
+public class RDimObjTargetY  {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java
index 52dc324d5..666e32c15 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java
@@ -450,34 +450,34 @@ public class OrgPointExecutor extends BaseExecutor{
 
 
 
-    /**
-     * 河北主网新增算法表r_dim_station_target_d/m/y
-     */
-    @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rDimStationTarget", nodeType = NodeTypeEnum.COMMON)
-    public boolean processRDimStationTargetAccess(NodeComponent bindCmp) {
-        return isAccess(bindCmp);
-    }
-    @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rDimStationTarget", nodeType = NodeTypeEnum.COMMON)
-    public void processRDimStationTargetProcess(NodeComponent bindCmp) {
-        String tag = bindCmp.getTag();
-        CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = bindCmp.getRequestData();
-        if (tag.equalsIgnoreCase("r_dim_station_target_d")) {
-            //日表
-            rDimStationTargetDPOService.handleDay(calculatedParam);
-        } else if (tag.equalsIgnoreCase("r_dim_station_target_m")) {
-            //数据补招不执行非日表算法
-            if (!calculatedParam.isRepair()) {
-                //月表
-                rDimStationTargetMPOService.handleMonth(calculatedParam);
-            }
-        }else if (tag.equalsIgnoreCase("r_dim_station_target_y")) {
-            //数据补招不执行非日表算法
-            if (!calculatedParam.isRepair()) {
-                //年表
-                rDimStationTargetYPOService.handleYear(calculatedParam);
-            }
-        }
-    }
+//    /**
+//     * 河北主网新增算法表r_dim_station_target_d/m/y
+//     */
+//    @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rDimStationTarget", nodeType = NodeTypeEnum.COMMON)
+//    public boolean processRDimStationTargetAccess(NodeComponent bindCmp) {
+//        return isAccess(bindCmp);
+//    }
+//    @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rDimStationTarget", nodeType = NodeTypeEnum.COMMON)
+//    public void processRDimStationTargetProcess(NodeComponent bindCmp) {
+//        String tag = bindCmp.getTag();
+//        CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = bindCmp.getRequestData();
+//        if (tag.equalsIgnoreCase("r_dim_station_target_d")) {
+//            //日表
+//            rDimStationTargetDPOService.handleDay(calculatedParam);
+//        } else if (tag.equalsIgnoreCase("r_dim_station_target_m")) {
+//            //数据补招不执行非日表算法
+//            if (!calculatedParam.isRepair()) {
+//                //月表
+//                rDimStationTargetMPOService.handleMonth(calculatedParam);
+//            }
+//        }else if (tag.equalsIgnoreCase("r_dim_station_target_y")) {
+//            //数据补招不执行非日表算法
+//            if (!calculatedParam.isRepair()) {
+//                //年表
+//                rDimStationTargetYPOService.handleYear(calculatedParam);
+//            }
+//        }
+//    }
 
     /**
      * 河北主网新增算法表r_dim_bus_target_d/m/y
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalMServiceImpl.java
index f1b63ae15..e0b414aec 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalMServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalMServiceImpl.java
@@ -52,8 +52,8 @@ public class RDimObjGlobalMServiceImpl extends MppServiceImpl<RDimObjGlobalMMapp
     public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimObjGlobalM> rDimObjGlobalMS = new ArrayList<>();
 
-        String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
-        String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
+        String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
+        String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
         LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
 
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalYServiceImpl.java
index 1dbd4b540..f2f780623 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalYServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalYServiceImpl.java
@@ -52,8 +52,8 @@ public class RDimObjGlobalYServiceImpl extends MppServiceImpl<RDimObjGlobalYMapp
     public void handleYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimObjGlobalY> rDimObjGlobalYS = new ArrayList<>();
 
-        String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
-        String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
+        String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
+        String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
         LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
 
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetMServiceImpl.java
index 2ec2c63fa..9eecb4c82 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetMServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetMServiceImpl.java
@@ -52,8 +52,8 @@ public class RDimObjTargetMServiceImpl extends MppServiceImpl<RDimObjTargetMMapp
     public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimObjTargetM> rdiObjTargetMs = new ArrayList<>();
 
-        String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
-        String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
+        String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
+        String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
         LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
 
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetYServiceImpl.java
index bd62ffdaf..d1a8392c1 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetYServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetYServiceImpl.java
@@ -52,8 +52,8 @@ public class RDimObjTargetYServiceImpl extends MppServiceImpl<RDimObjTargetYMapp
     public void handleYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimObjTargetY> rdiObjTargetys = new ArrayList<>();
 
-        String begin = LocalDateTimeUtil.format(DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
-        String end = LocalDateTimeUtil.format(DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
+        String begin = LocalDateTimeUtil.format(DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
+        String end = LocalDateTimeUtil.format(DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATE_PATTERN);
         LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
 
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(