From c39a2be59353641401bb04dbcaaa954efa57e06b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Aug 2020 15:22:25 +0800 Subject: [PATCH] =?UTF-8?q?screen=5Findex=5Fdata=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E4=B8=BAscreen=5Findex=5Fdata=5Fmonthly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...reenIndexDataDao.java => ScreenIndexDataMonthlyDao.java} | 2 +- ...ScreenIndexDataDao.xml => ScreenIndexDataMonthlyDao.xml} | 2 +- ...reenIndexDataDao.java => ScreenIndexDataMonthlyDao.java} | 4 ++-- ...dexDataEntity.java => ScreenIndexDataMonthlyEntity.java} | 4 ++-- ...ScreenIndexDataDao.xml => ScreenIndexDataMonthlyDao.xml} | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) rename epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/{ScreenIndexDataDao.java => ScreenIndexDataMonthlyDao.java} (95%) rename epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/{ScreenIndexDataDao.xml => ScreenIndexDataMonthlyDao.xml} (89%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/{ScreenIndexDataDao.java => ScreenIndexDataMonthlyDao.java} (92%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/{ScreenIndexDataEntity.java => ScreenIndexDataMonthlyEntity.java} (94%) rename epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/{ScreenIndexDataDao.xml => ScreenIndexDataMonthlyDao.xml} (90%) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java similarity index 95% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java index 1f038fd5b3..e43635d0aa 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java @@ -26,6 +26,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2020-08-18 */ @Mapper -public interface ScreenIndexDataDao{ +public interface ScreenIndexDataMonthlyDao{ } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml similarity index 89% rename from epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml rename to epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index f5e693fd42..ae29ff18bf 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -1,7 +1,7 @@ - + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java similarity index 92% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java index 53a413b048..c949f23a9a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java @@ -19,7 +19,7 @@ package com.epmet.dao.screen; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.screencoll.form.IndexDataFormDTO; -import com.epmet.entity.screen.ScreenIndexDataEntity; +import com.epmet.entity.screen.ScreenIndexDataMonthlyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,7 +32,7 @@ import java.util.List; * @since v1.0.0 2020-08-18 */ @Mapper -public interface ScreenIndexDataDao extends BaseDao { +public interface ScreenIndexDataMonthlyDao extends BaseDao { /** *1、指数相关 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java similarity index 94% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataEntity.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java index ed9ac7fb97..f0f3ef1fed 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java @@ -34,8 +34,8 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("screen_index_data") -public class ScreenIndexDataEntity extends BaseEpmetEntity { +@TableName("screen_index_data_monthly") +public class ScreenIndexDataMonthlyEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml similarity index 90% rename from epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 045bf7926e..9cf0ef9a41 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -1,10 +1,10 @@ - + - delete from screen_index_data + delete from screen_index_data_monthly where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} AND ORG_ID IN @@ -13,7 +13,7 @@ - insert into screen_index_data + insert into screen_index_data_monthly ( ID, CUSTOMER_ID,