Merge remote-tracking branch 'origin/dev_temp' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -232,7 +232,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
      * @date 2021.03.04 23:35
      */
     @Override
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX)
     public int checkIfExisted(String customerId) {
         return baseDao.checkIfExisted(customerId);
     }
@@ -245,7 +245,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
      * @date 2021.03.08 09:32
      */
     @Override
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX)
     public List<ScreenProjectDataDTO> getPending(ScreenProjectDataDTO param,String dateId) {
         param.setDataEndTime(dateId);
         return baseDao.selectPending(param);
@@ -259,7 +259,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
      * @date 2021.03.09 17:36
      */
     @Override
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX)
     public void insertOrUpdateBatch(String customerId, String dateId, List<ScreenProjectDataDTO> meta, List<ScreenProjectDataDTO> orient) {
         //内部数据抽取的逻辑是，不管dateId指定的哪一天，只要在抽取时，目标数据库中没有相应数据
         //就抽取指定日期及其之前的所有数据，因此在删除时只需对指定日期删除即可，上述情况是因为

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@@ -153,7 +153,7 @@
             </trim>
 
             <trim prefix="DATA_END_TIME = " suffix=",">
-                #{dataEndTime}
+                #{dateId}
             </trim>
             <trim prefix="updated_time = " suffix=",">
                 now()