fix 重修数

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/UserProfileController.java

@@ -112,11 +112,6 @@ public class UserProfileController extends BaseController {
     @Log(title = "客户端用户", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<UserProfileExportVo> export(UserProfileQueryBo bo) {
-        startPage();
-        //1为资料审核
-        bo.setTypeStatus(1L);
-        List<UserProfileExportVo> list = iUserProfileService.export(bo);
-        ExcelUtil<UserProfileExportVo> util = new ExcelUtil<UserProfileExportVo>(UserProfileExportVo.class);
         String fileName = "";
         if(bo.getStatus().get(0)==0){
             fileName="全部";
@@ -130,6 +125,16 @@ public class UserProfileController extends BaseController {
         if(bo.getStatus().get(0)==3){
             fileName="不通过";
         }
+        startPage();
+        //1为资料审核
+        bo.setTypeStatus(1L);
+        if(bo.getStatus().get(0)==0){
+            bo.getStatus().remove(0);
+            bo.setStatus(bo.getStatus());
+        }
+        List<UserProfileExportVo> list = iUserProfileService.export(bo);
+        ExcelUtil<UserProfileExportVo> util = new ExcelUtil<UserProfileExportVo>(UserProfileExportVo.class);
+
         String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         return util.exportExcel(list, "填写资料审核-"+fileName+"-学员数据-"+timeStr);
     }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/UserProfileStampController.java

@@ -99,11 +99,6 @@ public class UserProfileStampController extends BaseController {
     @Log(title = "客户端用户", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<UserProfileExportGaiVo> export(UserProfileQueryBo bo) {
-        startPage();
-        //2为资料审核
-        bo.setTypeStatus(2L);
-        List<UserProfileExportGaiVo> list = iUserProfileService.exportPo(bo);
-        ExcelUtil<UserProfileExportGaiVo> util = new ExcelUtil<UserProfileExportGaiVo>(UserProfileExportGaiVo.class);
         String fileName = "";
         if(bo.getStatus().get(0)==0){
             fileName="全部";
@@ -117,6 +112,16 @@ public class UserProfileStampController extends BaseController {
         if(bo.getStatus().get(0)==3){
             fileName="不通过";
         }
+        startPage();
+        //2为资料审核
+        bo.setTypeStatus(2L);
+        if(bo.getStatus().get(0)==0){
+            bo.getStatus().remove(0);
+            bo.setStatus(bo.getStatus());
+        }
+        List<UserProfileExportGaiVo> list = iUserProfileService.exportPo(bo);
+        ExcelUtil<UserProfileExportGaiVo> util = new ExcelUtil<UserProfileExportGaiVo>(UserProfileExportGaiVo.class);
+
         String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         return util.exportExcel(list, "填写盖章审核-"+fileName+"-学员数据-"+timeStr);
     }