Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml

@@ -56,6 +56,7 @@
                 DEL_FLAG = '0'
           AND data_type = #{dataType}
           AND CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
           AND ALL_PARENT_INDEX_CODE = #{allIndexCodePath,jdbcType=VARCHAR}
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml

@@ -54,6 +54,7 @@
         WHERE
                 DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
           AND ALL_PARENT_INDEX_CODE = #{allIndexCodePath,jdbcType=VARCHAR}
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml

@@ -79,6 +79,7 @@
         WHERE
                 DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
           AND ALL_PARENT_INDEX_CODE = #{allIndexCodePath,jdbcType=VARCHAR}
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml

@@ -86,6 +86,7 @@
         WHERE
                 DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}
+            AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
                 AND ALL_PARENT_INDEX_CODE = #{allIndexCodePath,jdbcType=VARCHAR}
     </select>
 </mapper>