screen_index_data变更为screen_index_data_monthly

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataDao.java → 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{
 	
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml → epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenIndexDataDao">
+<mapper namespace="com.epmet.datareport.dao.screen.ScreenIndexDataMonthlyDao">
 
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataDao.java → 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<ScreenIndexDataEntity> {
+public interface ScreenIndexDataMonthlyDao extends BaseDao<ScreenIndexDataMonthlyEntity> {
 
     /**
      *1、指数相关

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataEntity.java → 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")
+@TableName("screen_index_data_monthly")
-public class ScreenIndexDataEntity extends BaseEpmetEntity {
+public class ScreenIndexDataMonthlyEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataDao.xml → epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.screen.ScreenIndexDataDao">
+<mapper namespace="com.epmet.dao.screen.ScreenIndexDataMonthlyDao">
 
     <delete id="deleteIndexData">
-        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
         <foreach item="item" collection="orgIds" open="(" separator="," close=")">
@@ -13,7 +13,7 @@
     </delete>
 
     <insert id="batchInsertIndexData" parameterType="java.util.List">
-        insert into screen_index_data
+        insert into screen_index_data_monthly
         (
         ID,
         CUSTOMER_ID,