地址

mec-application/src/main/java/com/ym/mec/web/controller/TempDirectorTrainingCampDetailController.java

@@ -81,21 +81,7 @@ public class TempDirectorTrainingCampDetailController extends BaseController {
         }
         TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.getById(queryInfo.getTempDirectorTrainingCampId());
 
-        for (TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail record : records) {
-            record.setCityInfo(record.getProvince()+record.getCity()+record.getRegion());
-            if (StringUtils.isNotBlank(record.getPaymentStatus())) {
-                if ("PAID".equals(record.getPaymentStatus())) {
-                    record.setPaymentStatusName("已缴费");
-                } else if ("NO".equals(record.getPaymentStatus())) {
-                    record.setPaymentStatusName("未缴费");
-                } else if ("REFUND".equals(record.getPaymentStatus())) {
-                    record.setPaymentStatusName("已退费");
-                }
-            }
-            if (record.getPaymentDate() !=null) {
-                record.setPaymentDateStr(DateUtil.format(record.getPaymentDate(),DateUtil.EXPANDED_DATE_TIME_FORMAT));
-            }
-        }
+
         TempDirectorTrainingCampDetailWrapper.DownloadInfo downloadInfo = generateExportExcelFile(records, TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail.class, trainingCamp.getName()+"导出", trainingCamp.getName()+"导出");
         return succeed(downloadInfo);
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempDirectorTrainingCampDetailServiceImpl.java

@@ -307,7 +307,26 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
 
     @Override
     public IPage<TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail> queryPage(IPage<Object> page, TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetailQuery queryInfo) {
-        return baseMapper.queryPage(page,queryInfo);
+        IPage<TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail> tempDirectorTrainingCampDetailIPage = baseMapper.queryPage(page, queryInfo);
+        List<TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail> records = tempDirectorTrainingCampDetailIPage.getRecords();
+        if(CollectionUtils.isNotEmpty(records)){
+            for (TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail record : records) {
+                record.setCityInfo(record.getProvince()+"/"+record.getCity()+"/"+record.getRegion());
+                if (StringUtils.isNotBlank(record.getPaymentStatus())) {
+                    if ("PAID".equals(record.getPaymentStatus())) {
+                        record.setPaymentStatusName("已缴费");
+                    } else if ("NO".equals(record.getPaymentStatus())) {
+                        record.setPaymentStatusName("未缴费");
+                    } else if ("REFUND".equals(record.getPaymentStatus())) {
+                        record.setPaymentStatusName("已退费");
+                    }
+                }
+                if (record.getPaymentDate() !=null) {
+                    record.setPaymentDateStr(DateUtil.format(record.getPaymentDate(),DateUtil.EXPANDED_DATE_TIME_FORMAT));
+                }
+            }
+        }
+        return tempDirectorTrainingCampDetailIPage;
     }
 
     @Override