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

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/OfsServiceImpl.java

@@ -52,6 +52,7 @@ public class OfsServiceImpl implements OfsService {
      * @description 【146体系】竞标管理-列表
      * @Date 2021/1/22 13:38
      **/
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<BidInfoResultDTO> queryBidList(String customerId) {
         return screenBidInfoDao.selectList(customerId);

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

@@ -121,7 +121,7 @@
             LEFT JOIN screen_customer_grid cg ON cg.GRID_ID = g.GRID_ID
             WHERE g.DEL_FLAG = 0
             AND cg.AREA_CODE LIKE CONCAT(#{a.areaCode},'%')
-            AND g.DATE_ID <![CDATA[ <= ]]> #{dateId}
+            AND g.DATE_ID <![CDATA[ = ]]> #{dateId}
         </foreach>
     </select>
 

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

@@ -123,7 +123,7 @@
             LEFT JOIN screen_customer_grid cg ON cg.GRID_ID = g.GRID_ID
             WHERE g.DEL_FLAG = 0
             AND cg.AREA_CODE LIKE CONCAT(#{a.areaCode},'%')
-            AND g.MONTH_ID <![CDATA[ <= ]]> #{monthId}
+            AND g.MONTH_ID <![CDATA[ = ]]> #{monthId}
         </foreach>
     </select>