BUG修复

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TCStatisticsService.java

@@ -89,13 +89,6 @@ public interface TCStatisticsService extends IService<TCStatistics> {
      */
     public void freshenJoinData(SysUser sysUser, Set<String> batchNoSet);
 
-    /**
-     * 删除旧的关联数据
-     *
-     * @param batchNoSet
-     */
-    public void removeOldJoinData(Set<String> batchNoSet);
-
     /**
      * 刷新数据
      *

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCStatisticsServiceImpl.java

@@ -171,6 +171,10 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
         for (String batchNo : batchNoSet) {
             List<TCStatisticsTemp> tcStatisticsTempList = tcStatisticsTempService.findByBatchNoJoin(sysUser.getSchoolId(), batchNo);
             if (Objects.nonNull(tcStatisticsTempList) && tcStatisticsTempList.size() > 0) {
+                QueryWrapper<TCStatisticsTemp> tcStatisticsTempQueryWrapper = new QueryWrapper<>();
+                tcStatisticsTempQueryWrapper.lambda().eq(TCStatisticsTemp::getBatchNo, batchNo);
+                tcStatisticsTempService.remove(tcStatisticsTempQueryWrapper);
+
                 String batchNoNew = SystemConstant.getUuid();
                 Set<Long> collegeIdSet = new HashSet<>();
                 for (TCStatisticsTemp t : tcStatisticsTempList) {
@@ -189,6 +193,10 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
                 List<TCStatisticsDto> tcStatisticsDtoList = this.findByBatchNoCountJoin(sysUser.getSchoolId(), batchNoNew, orgIds);
                 if (Objects.nonNull(tcStatisticsDtoList) && tcStatisticsDtoList.size() > 0) {
                     TCStatisticsService tcStatisticsService = SpringContextHolder.getBean(TCStatisticsService.class);
+                    QueryWrapper<TCStatistics> tcStatisticsQueryWrapper = new QueryWrapper<>();
+                    tcStatisticsQueryWrapper.lambda().eq(TCStatistics::getBatchNo, batchNo);
+                    tcStatisticsService.remove(tcStatisticsQueryWrapper);
+
                     Gson gson = new Gson();
                     List<TCStatistics> tcStatisticsList = gson.fromJson(JacksonUtil.parseJson(tcStatisticsDtoList), new TypeToken<List<TCStatistics>>() {
                     }.getType());
@@ -201,24 +209,6 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
         }
     }
 
-    /**
-     * 删除旧的关联数据
-     *
-     * @param batchNoSet
-     */
-    @Override
-    @Transactional
-    public void removeOldJoinData(Set<String> batchNoSet) {
-        QueryWrapper<TCStatisticsTemp> tcStatisticsTempQueryWrapper = new QueryWrapper<>();
-        tcStatisticsTempQueryWrapper.lambda().in(TCStatisticsTemp::getBatchNo, batchNoSet);
-        tcStatisticsTempService.remove(tcStatisticsTempQueryWrapper);
-
-        TCStatisticsService tcStatisticsService = SpringContextHolder.getBean(TCStatisticsService.class);
-        QueryWrapper<TCStatistics> tcStatisticsQueryWrapper = new QueryWrapper<>();
-        tcStatisticsQueryWrapper.lambda().in(TCStatistics::getBatchNo, batchNoSet);
-        tcStatisticsService.remove(tcStatisticsQueryWrapper);
-    }
-
     /**
      * 刷新数据
      *
@@ -238,7 +228,6 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
                 if (redisUtil.lock(SystemConstant.REDIS_LOCK_BATCH_NO_PREFIX + Math.abs(batchNoSet.toString().hashCode()),
                         SystemConstant.REDIS_LOCK_BATCH_NO_TIME_OUT)) {
                     tcStatisticsService.freshenJoinData(sysUser, batchNoSet);
-                    tcStatisticsService.removeOldJoinData(batchNoSet);
                 } else {
                     throw ExceptionResultEnum.ERROR.exception("正在刷新数据，请稍候再试！");
                 }