yonge пре 3 година
родитељ
комит
ff6c50e7e2

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexBaseMonthDataDao.java

@@ -22,7 +22,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
                                 @Param("dataType")IndexDataType dataType);
                                 @Param("dataType")IndexDataType dataType);
 
 
     int deleteWithMonthAndType(@Param("months") Collection months,
     int deleteWithMonthAndType(@Param("months") Collection months,
-                               @Param("dataType")IndexDataType dataType);
+                               @Param("dataType")IndexDataType dataType,@Param("tenantId") Integer tenantId);
 
 
     IndexBaseMonthData getOrganDataWithDayAndDataType(@Param("organId") Integer organId,
     IndexBaseMonthData getOrganDataWithDayAndDataType(@Param("organId") Integer organId,
                                                       @Param("day") String day,
                                                       @Param("day") String day,

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -608,7 +608,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			dataList.add(new IndexBaseMonthData(date, organId, tenantId));
 			dataList.add(new IndexBaseMonthData(date, organId, tenantId));
 		}
 		}
 		if(!IndexDataType.NEWLY_STUDENT_NUM.equals(indexDataType)&&!IndexDataType.QUIT_MUSIC_GROUP_STUDENT_NUM.equals(indexDataType)){
 		if(!IndexDataType.NEWLY_STUDENT_NUM.equals(indexDataType)&&!IndexDataType.QUIT_MUSIC_GROUP_STUDENT_NUM.equals(indexDataType)){
-			indexBaseMonthDataDao.deleteWithMonthAndType(Arrays.asList(dayStr), indexDataType);
+			indexBaseMonthDataDao.deleteWithMonthAndType(Arrays.asList(dayStr), indexDataType, tenantId);
 		}
 		}
 		if(!CollectionUtils.isEmpty(dataList)){
 		if(!CollectionUtils.isEmpty(dataList)){
 			indexBaseMonthDataDao.batchInsertWithDataType(dataList, indexDataType);
 			indexBaseMonthDataDao.batchInsertWithDataType(dataList, indexDataType);

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -105,7 +105,7 @@
 
 
 	<delete id="deleteWithMonthAndType">
 	<delete id="deleteWithMonthAndType">
 		DELETE FROM index_base_month_data
 		DELETE FROM index_base_month_data
-		WHERE DATE_FORMAT(month_, '%Y-%m-%d') IN
+		WHERE tenant_id_ = #{tenantId} and DATE_FORMAT(month_, '%Y-%m-%d') IN
 		<foreach collection="months" item="month" open="(" close=")" separator=",">
 		<foreach collection="months" item="month" open="(" close=")" separator=",">
 			#{month}
 			#{month}
 		</foreach>
 		</foreach>