fix: export user name

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/MqConstants.java

@@ -33,17 +33,4 @@ public interface MqConstants {
 	String DIRECT_MODE_NEW_DRUG_ENT_REPORT_EXPORT_QUEUE = "direct_mode_new_drug_ent_report_export_queue";
 	String DIRECT_MODE_NEW_PERSONAL_REPORT_EXPORT_QUEUE = "direct_mode_new_personal_report_export_queue";
 	String DIRECT_MODE_NEW_EXCEL_COMMON_REPORT_EXPORT_QUEUE = "direct_mode_new_excel_common_report_export_queue";
-
-	/**
-	 * gig服务队列
-	 */
-	String DIRECT_MODE_GIG_SIGN_CERT_QUEUE = "direct_mode_gig_sign_cert_queue";
-	String DIRECT_MODE_GIG_SIGN_CERT_RES_QUEUE = "direct_mode_gig_sign_cert_res_queue";
-	String DIRECT_MODE_GIG_BANK_CARD_QUEUE = "direct_mode_gig_bank_card_queue";
-
-	/**
-	 * 订单服务队列
-	 */
-	String DIRECT_MODE_OMS_ORDER_BATCH_SUBMIT_QUEUE = "direct_mode_oms_order_batch_submit_queue";
-
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ReportExportController.java

@@ -52,7 +52,6 @@ import java.util.stream.Collectors;
  * <p>
  * 报告审核导出
  * </p>
- *
  */
 @Slf4j
 @RestController
@@ -60,798 +59,788 @@ import java.util.stream.Collectors;
 @RequestMapping("/reportExport")
 public class ReportExportController {
 
-	private final WmTaskService wmTaskService;
+    private final WmTaskService wmTaskService;
+    private final ReportExportService reportExportService;
+    private final SysDeptService sysDeptService;
+    private final WmScorePackageService wmScorePackageService;
+    private final ReportHandlerDeptRelationMapper reportHandlerDeptRelationMapper;
+    private final JavaMailSender sender;
+    private final UpmsConfig upmsConfig;
+    private final RedisTemplate<String, String> redisTemplate;
+    private final RabbitMqClient rabbitMqClient;
+
+    /**
+     * 报告导出--个人报告导出分页查询 用于BC
+     *
+     * @param page           分页对象
+     * @param wmScorePackage 积分包
+     * @return
+     */
+    @GetMapping("/getExportPackageZbTotalListForBC")
+    public R getExportPackageZbTotalListForBC(Page page, WmScorePackage wmScorePackage) {
+
+        return reportExportService.getExportPackageZbTotalList(page, wmScorePackage);
+    }
+
+    /**
+     * 报告导出--个人报告导出分页查询
+     *
+     * @param page           分页对象
+     * @param wmScorePackage 积分包
+     * @return
+     */
+    @GetMapping("/getExportPackageZbTotalList")
+    public R getExportPackageZbTotalList(Page page, WmScorePackage wmScorePackage) {
+
+        wmScorePackage.setSendPackageDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
+
+        return reportExportService.getExportPackageZbTotalList(page, wmScorePackage);
+    }
+
+    /**
+     * 报告导出--查看任务
+     *
+     * @param page   分页对象
+     * @param wmTask
+     * @return
+     */
+    @GetMapping("/getExportPackageZbTaskList")
+    public R getExportPackageZbTaskList(Page page, WmTask wmTask) {
+        if (StringUtil.isEmpty(wmTask.getScorePackageId())) {
+            return R.failed("积分包ID不能为空");
+        }
+        return reportExportService.getExportPackageZbTaskList(page, wmTask);
+    }
+
+
+    /**
+     * 结算报告管理--导出汇总或详情
+     *
+     * @param wmReport
+     * @return
+     */
+    @SysLog("报告导出exportNbReviewReport")
+    @GetMapping("/exportNbReviewReport")
+    public R exportNbReviewReport(WmReport wmReport) {
+        log.info("报告导出请求参数:{}", wmReport);
+
+        String key = String.format(CacheConstants.EXPORT_NB_REVIEW_REPORT_CACHE, wmReport.getId());
+
+        String o = redisTemplate.opsForValue().get(key);
+
+        if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)) {
+            return R.failed("已有在途生成记录，能耐心等待");
+        }
+
+
+        HnqzUser user = SecurityUtils.getUser();
+        BaseMap map = new BaseMap();
+        map.put("requestBody", JSONUtil.toJsonStr(wmReport));
+        map.put("username", user.getUsername());
+        map.put("deptId", user.getDeptId());
+        map.put("approvalOpinion", null);
+
+        rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_NB_REVIEW_QUEUE, map);
+
+        redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
+                CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
+
+        return R.ok("开始导出，请耐心等待");
+
+
+    }
+
+    /**
+     * 结算报告管理--导出汇总或详情
+     *
+     * @param wmReport
+     * @return
+     * @throws IOException
+     */
+    @GetMapping("/exportNbReviewReport/status")
+    public R exportNbReviewReportStatus(WmReport wmReport) {
+
+        String key = String.format(CacheConstants.EXPORT_NB_REVIEW_REPORT_CACHE, wmReport.getId());
+
+        String o = redisTemplate.opsForValue().get(key);
+        WmReportOpt opt = new WmReportOpt();
+
+        if (StringUtils.isNotEmpty(o)) {
+            // 生成中的
+            if ("GENERATING".equals(o)) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATING);
+            }
+            // 生成失败的
+            else if (o.startsWith("ERROR")) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+                opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
+            }
+            // 生成失败的2
+            else if (!o.startsWith("http")) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+                opt.setErrorMsg(o);
+            }
+            // 成功的
+            else {
+                Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
+                opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
+                opt.setTtl(LocalDateTime.now().plusSeconds(expire));
+                opt.setLatestUrl(o);
+            }
+
+        } else {
+            opt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);
+        }
+
+        return R.ok(opt);
+
+    }
+
+    /**
+     * 结算报告管理--导出汇总或详情
+     *
+     * @param wmReport
+     * @return
+     * @throws IOException
+     */
+    @GetMapping("/exportNbReport")
+    public R exportNbReport(WmReport wmReport) throws IOException {
+        log.info("报告导出请求参数:{}", wmReport);
+
+        String key = String.format(CacheConstants.EXPORT_NB_REPORT_CACHE, wmReport.getId());
+
+        String o = redisTemplate.opsForValue().get(key);
+
+        if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)) {
+
+            return R.failed("已有在途生成记录，能耐心等待");
+
+        }
+
+
+        HnqzUser user = SecurityUtils.getUser();
+        BaseMap map = new BaseMap();
+        map.put("requestBody", JSONUtil.toJsonStr(wmReport));
+        map.put("username", user.getUsername());
+        map.put("deptId", user.getDeptId());
+
+        rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_NB_QUEUE, map);
+
+        redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
+                CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
+
+        return R.ok("开始导出，请耐心等待");
+
+
+    }
+
+    /**
+     * 个人报告导出状态
+     *
+     * @param wmTask
+     * @return
+     * @throws IOException
+     */
+    @GetMapping("/exportZbReport/status")
+    public R exportZbReportStatus(WmTask wmTask) throws IOException {
+
+        String scorePackageDrugId = wmTask.getScorePackageDrugId();
+
+        // 判断是否是合并导出
+        if (scorePackageDrugId.contains(StrUtil.COMMA)) {
+            String[] idArr = scorePackageDrugId.split(StrUtil.COMMA);
+            scorePackageDrugId = Arrays.stream(idArr).sorted().collect(Collectors.joining(StrUtil.COMMA));
+            wmTask.setScorePackageDrugId(scorePackageDrugId);
+
+        }
+
+        String key = String.format(CacheConstants.EXPORT_ZB_REPORT_CACHE, wmTask.getScorePackageDrugId());
+
+        String o = redisTemplate.opsForValue().get(key);
+        WmReportOpt opt = new WmReportOpt();
+
+        if (StringUtils.isNotEmpty(o)) {
+            // 生成中的
+            if ("GENERATING".equals(o)) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATING);
+            }
+            // 生成失败的
+            else if (o.startsWith("ERROR")) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+                opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
+            }
+            // 生成失败的2
+            else if (!o.startsWith("http")) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+                opt.setErrorMsg(o);
+            }
+            // 成功的
+            else {
+                Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
+                opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
+                opt.setTtl(LocalDateTime.now().plusSeconds(expire));
+                opt.setLatestUrl(o);
+            }
+
+        } else {
+            opt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);
+        }
+
+        return R.ok(opt);
+
+    }
+
+    /**
+     * 个人报告导出状态
+     *
+     * @param wmTask
+     * @return
+     * @throws IOException
+     */
+    @GetMapping("/exportZbReviewReport/status")
+    public R exportZbReviewReportStatus(WmTask wmTask) {
+
+        String scorePackageDrugId = wmTask.getScorePackageDrugId();
+
+        // 判断是否是合并导出
+        if (scorePackageDrugId.contains(StrUtil.COMMA)) {
+            String[] idArr = scorePackageDrugId.split(StrUtil.COMMA);
+            scorePackageDrugId = Arrays.stream(idArr).sorted().collect(Collectors.joining(StrUtil.COMMA));
+            wmTask.setScorePackageDrugId(scorePackageDrugId);
+
+        }
+
+        String key = String.format(CacheConstants.EXPORT_ZB_REVIEW_REPORT_CACHE, wmTask.getScorePackageDrugId());
+
+        String o = redisTemplate.opsForValue().get(key);
+        WmReportOpt opt = new WmReportOpt();
+
+        if (StringUtils.isNotEmpty(o)) {
+            // 生成中的
+            if ("GENERATING".equals(o)) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATING);
+            }
+            // 生成失败的
+            else if (o.startsWith("ERROR")) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+                opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
+            }
+            // 生成失败的2
+            else if (!o.startsWith("http")) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+                opt.setErrorMsg(o);
+            }
+            // 成功的
+            else {
+                Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
+                opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
+                opt.setTtl(LocalDateTime.now().plusSeconds(expire));
+                opt.setLatestUrl(o);
+            }
+
+        } else {
+            opt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);
+        }
+
+        return R.ok(opt);
+
+    }
+
+    /**
+     * 个人报告导出--导出汇总或详情  汇总和详情合为一个模版（只导出待审核的任务）
+     *
+     * @param wmTask
+     * @return
+     * @throws IOException
+     */
+    @GetMapping("/exportZbReviewReport")
+    public R<?> exportZbReviewReport(WmTask wmTask) {
+        log.info("报告导出请求参数:{}", wmTask);
+
+        String scorePackageDrugId = wmTask.getScorePackageDrugId();
+
+        // 判断是否是合并导出
+        if (scorePackageDrugId.contains(StrUtil.COMMA)) {
+            String[] idArr = scorePackageDrugId.split(StrUtil.COMMA);
+            scorePackageDrugId = Arrays.stream(idArr).sorted().collect(Collectors.joining(StrUtil.COMMA));
+            wmTask.setScorePackageDrugId(scorePackageDrugId);
+
+        }
+
+        String key = String.format(CacheConstants.EXPORT_ZB_REVIEW_REPORT_CACHE, wmTask.getScorePackageDrugId());
+
+        String o = redisTemplate.opsForValue().get(key);
+
+        if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)) {
+
+            return R.failed("已有在途生成记录，能耐心等待");
+
+        }
+
+
+        HnqzUser user = SecurityUtils.getUser();
+        BaseMap map = new BaseMap();
+        map.put("requestBody", JSONUtil.toJsonStr(wmTask));
+        map.put("username", user.getUsername());
+        map.put("deptId", user.getDeptId());
+        map.put("taskStatus", "2");
+
+        SysDept dept = sysDeptService.getById(user.getDeptId());
+        map.put("isGuangshengtang", "913500007297027606".equals(dept.getTaxCode()));
+
+        rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_ZB_REVIEW_QUEUE, map);
+
+        redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
+                CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
+
+        return R.ok("开始导出，请耐心等待");
+
+    }
+
+    /**
+     * 个人报告导出--导出汇总或详情  汇总和详情合为一个模版
+     *
+     * @param wmTask 参数
+     * @return 导出信息
+     */
+    @GetMapping("/exportZbReport")
+    public R<String> exportZbReport(WmTask wmTask) {
+        log.info("报告导出请求参数:{}", wmTask);
+
+        String scorePackageDrugId = wmTask.getScorePackageDrugId();
+
+        // 判断是否是合并导出
+        if (scorePackageDrugId.contains(StrUtil.COMMA)) {
+            String[] idArr = scorePackageDrugId.split(StrUtil.COMMA);
+            scorePackageDrugId = Arrays.stream(idArr).sorted().collect(Collectors.joining(StrUtil.COMMA));
+            wmTask.setScorePackageDrugId(scorePackageDrugId);
+
+        }
+
+        String key = String.format(CacheConstants.EXPORT_ZB_REPORT_CACHE, wmTask.getScorePackageDrugId());
+
+        String o = redisTemplate.opsForValue().get(key);
+
+        if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)) {
+            return R.failed("已有在途生成记录，能耐心等待");
+        }
+
+        HnqzUser user = SecurityUtils.getUser();
+        BaseMap map = new BaseMap();
+        map.put("requestBody", JSONUtil.toJsonStr(wmTask));
+        map.put("username", user.getUsername());
+        map.put("deptId", user.getDeptId());
+        map.put("isGuangshengtang", false);
+
+        rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_ZB_QUEUE, map);
+
+        redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(), CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
+
+        return R.ok("开始导出，请耐心等待");
 
-	private final ReportExportService reportExportService;
+    }
+
+    /**
+     * 个人报告导出--导出汇总或详情  汇总和详情合为一个模版
+     *
+     * @param packageId 积分包id
+     * @return
+     * @throws IOException
+     */
+    @SysLog("报告导出exportHCPReport")
+    @GetMapping("/exportHCPReport")
+    public R exportHCPReport(String packageId) throws IOException {
+        log.info("报告导出请求参数:packageId={}", packageId);
+
+        if (null == packageId) {
+            return R.failed("积分包ID不能为空");
+        }
 
-	private final SysDeptService sysDeptService;
+        return reportExportService.exportHCP(packageId);
+    }
 
-	private final WmScorePackageService wmScorePackageService;
-
-	private final ReportHandlerDeptRelationMapper reportHandlerDeptRelationMapper;
-
-	private final JavaMailSender sender;
-
-	private final UpmsConfig upmsConfig;
-	private final RedisTemplate<String,String> redisTemplate;
-	private final RabbitMqClient rabbitMqClient;
-
-	/**
-	 * 报告导出--个人报告导出分页查询 用于BC
-	 *
-	 * @param page           分页对象
-	 * @param wmScorePackage 积分包
-	 * @return
-	 */
-	@GetMapping("/getExportPackageZbTotalListForBC")
-	public R getExportPackageZbTotalListForBC(Page page, WmScorePackage wmScorePackage) {
-
-		return reportExportService.getExportPackageZbTotalList(page,wmScorePackage);
-	}
-
-	/**
-	 * 报告导出--个人报告导出分页查询
-	 *
-	 * @param page           分页对象
-	 * @param wmScorePackage 积分包
-	 * @return
-	 */
-	@GetMapping("/getExportPackageZbTotalList")
-	public R getExportPackageZbTotalList(Page page, WmScorePackage wmScorePackage) {
-
-		wmScorePackage.setSendPackageDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
-
-		return reportExportService.getExportPackageZbTotalList(page,wmScorePackage);
-	}
-
-	/**
-	 * 报告导出--查看任务
-	 *
-	 * @param page           分页对象
-	 * @param wmTask
-	 * @return
-	 */
-	@GetMapping("/getExportPackageZbTaskList")
-	public R getExportPackageZbTaskList(Page page, WmTask wmTask) {
-		if(StringUtil.isEmpty(wmTask.getScorePackageId())){
-			return R.failed("积分包ID不能为空");
-		}
-		return reportExportService.getExportPackageZbTaskList(page,wmTask);
-	}
-
-
-	/**
-	 * 结算报告管理--导出汇总或详情
-	 * @param wmReport
-	 * @return
-	 * @throws IOException
-	 */
-	@SysLog("报告导出exportNbReviewReport")
-	@GetMapping("/exportNbReviewReport")
-	public R exportNbReviewReport(WmReport wmReport) {
-		log.info("报告导出请求参数:{}", wmReport);
-
-		String key = String.format(CacheConstants.EXPORT_NB_REVIEW_REPORT_CACHE, wmReport.getId());
-
-		String o = redisTemplate.opsForValue().get(key);
-
-		if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)){
-
-			return R.failed("已有在途生成记录，能耐心等待");
-
-		}
-
-
-		HnqzUser user = SecurityUtils.getUser();
-		BaseMap map = new BaseMap();
-		map.put("requestBody", JSONUtil.toJsonStr(wmReport));
-		map.put("username",user.getUsername());
-		map.put("deptId",user.getDeptId());
-		map.put("approvalOpinion", null);
-
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_NB_REVIEW_QUEUE,map);
-
-		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
-				CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
-
-		return R.ok("开始导出，请耐心等待");
-
-
-	}
-
-	/**
-	 * 结算报告管理--导出汇总或详情
-	 *
-	 * @param wmReport
-	 * @return
-	 * @throws IOException
-	 */
-	@GetMapping("/exportNbReviewReport/status")
-	public R exportNbReviewReportStatus(WmReport wmReport) {
-
-		String key = String.format(CacheConstants.EXPORT_NB_REVIEW_REPORT_CACHE, wmReport.getId());
-
-		String o = redisTemplate.opsForValue().get(key);
-		WmReportOpt opt = new WmReportOpt();
-
-		if (StringUtils.isNotEmpty(o)) {
-			// 生成中的
-			if ("GENERATING".equals(o)) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATING);
-			}
-			// 生成失败的
-			else if (o.startsWith("ERROR")) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
-				opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
-			}
-			// 生成失败的2
-			else if (!o.startsWith("http")) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
-				opt.setErrorMsg(o);
-			}
-			// 成功的
-			else {
-				Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
-				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
-				opt.setTtl(LocalDateTime.now().plusSeconds(expire));
-				opt.setLatestUrl(o);
-			}
-
-		} else {
-			opt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);
-		}
-
-		return R.ok(opt);
-
-	}
-
-	/**
-	 * 结算报告管理--导出汇总或详情
-	 * @param wmReport
-	 * @return
-	 * @throws IOException
-	 */
-	@GetMapping("/exportNbReport")
-	public R exportNbReport(WmReport wmReport ) throws IOException {
-		log.info("报告导出请求参数:{}", wmReport);
-
-		String key = String.format(CacheConstants.EXPORT_NB_REPORT_CACHE, wmReport.getId());
-
-		String o = redisTemplate.opsForValue().get(key);
-
-		if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)){
-
-			return R.failed("已有在途生成记录，能耐心等待");
-
-		}
-
-
-		HnqzUser user = SecurityUtils.getUser();
-		BaseMap map = new BaseMap();
-		map.put("requestBody", JSONUtil.toJsonStr(wmReport));
-		map.put("username",user.getUsername());
-		map.put("deptId",user.getDeptId());
-
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_NB_QUEUE,map);
-
-		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
-				CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
-
-		return R.ok("开始导出，请耐心等待");
-
-
-	}
-
-	/**
-	 * 个人报告导出状态
-	 *
-	 * @param wmTask
-	 * @return
-	 * @throws IOException
-	 */
-	@GetMapping("/exportZbReport/status")
-	public R exportZbReportStatus(WmTask wmTask) throws IOException {
-
-		String scorePackageDrugId = wmTask.getScorePackageDrugId();
-
-		// 判断是否是合并导出
-		if (scorePackageDrugId.contains(StrUtil.COMMA)) {
-			String[] idArr = scorePackageDrugId.split(StrUtil.COMMA);
-			scorePackageDrugId = Arrays.stream(idArr).sorted().collect(Collectors.joining(StrUtil.COMMA));
-			wmTask.setScorePackageDrugId(scorePackageDrugId);
-
-		}
-
-		String key = String.format(CacheConstants.EXPORT_ZB_REPORT_CACHE, wmTask.getScorePackageDrugId());
-
-		String o = redisTemplate.opsForValue().get(key);
-		WmReportOpt opt = new WmReportOpt();
-
-		if (StringUtils.isNotEmpty(o)) {
-			// 生成中的
-			if ("GENERATING".equals(o)) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATING);
-			}
-			// 生成失败的
-			else if (o.startsWith("ERROR")) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
-				opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
-			}
-			// 生成失败的2
-			else if (!o.startsWith("http")) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
-				opt.setErrorMsg(o);
-			}
-			// 成功的
-			else {
-				Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
-				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
-				opt.setTtl(LocalDateTime.now().plusSeconds(expire));
-				opt.setLatestUrl(o);
-			}
-
-		} else {
-			opt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);
-		}
-
-		return R.ok(opt);
-
-	}
-
-	/**
-	 * 个人报告导出状态
-	 *
-	 * @param wmTask
-	 * @return
-	 * @throws IOException
-	 */
-	@GetMapping("/exportZbReviewReport/status")
-	public R exportZbReviewReportStatus(WmTask wmTask) {
-
-		String scorePackageDrugId = wmTask.getScorePackageDrugId();
-
-		// 判断是否是合并导出
-		if (scorePackageDrugId.contains(StrUtil.COMMA)) {
-			String[] idArr = scorePackageDrugId.split(StrUtil.COMMA);
-			scorePackageDrugId = Arrays.stream(idArr).sorted().collect(Collectors.joining(StrUtil.COMMA));
-			wmTask.setScorePackageDrugId(scorePackageDrugId);
-
-		}
-
-		String key = String.format(CacheConstants.EXPORT_ZB_REVIEW_REPORT_CACHE, wmTask.getScorePackageDrugId());
-
-		String o = redisTemplate.opsForValue().get(key);
-		WmReportOpt opt = new WmReportOpt();
-
-		if (StringUtils.isNotEmpty(o)) {
-			// 生成中的
-			if ("GENERATING".equals(o)) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATING);
-			}
-			// 生成失败的
-			else if (o.startsWith("ERROR")) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
-				opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
-			}
-			// 生成失败的2
-			else if (!o.startsWith("http")) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
-				opt.setErrorMsg(o);
-			}
-			// 成功的
-			else {
-				Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
-				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
-				opt.setTtl(LocalDateTime.now().plusSeconds(expire));
-				opt.setLatestUrl(o);
-			}
-
-		} else {
-			opt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);
-		}
-
-		return R.ok(opt);
-
-	}
-
-	/**
-	 * 个人报告导出--导出汇总或详情  汇总和详情合为一个模版（只导出待审核的任务）
-	 * @param wmTask
-	 * @return
-	 * @throws IOException
-	 */
-	@GetMapping("/exportZbReviewReport")
-	public R<?> exportZbReviewReport(WmTask wmTask) {
-		log.info("报告导出请求参数:{}", wmTask);
-
-		String scorePackageDrugId = wmTask.getScorePackageDrugId();
-
-		// 判断是否是合并导出
-		if (scorePackageDrugId.contains(StrUtil.COMMA)){
-			String[] idArr = scorePackageDrugId.split(StrUtil.COMMA);
-			scorePackageDrugId = Arrays.stream(idArr).sorted().collect(Collectors.joining(StrUtil.COMMA));
-			wmTask.setScorePackageDrugId(scorePackageDrugId);
-
-		}
-
-		String key = String.format(CacheConstants.EXPORT_ZB_REVIEW_REPORT_CACHE, wmTask.getScorePackageDrugId());
-
-		String o = redisTemplate.opsForValue().get(key);
-
-		if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)){
-
-			return R.failed("已有在途生成记录，能耐心等待");
-
-		}
-
-
-		HnqzUser user = SecurityUtils.getUser();
-		BaseMap map = new BaseMap();
-		map.put("requestBody", JSONUtil.toJsonStr(wmTask));
-		map.put("username",user.getUsername());
-		map.put("deptId",user.getDeptId());
-		map.put("taskStatus", "2");
-
-		SysDept dept = sysDeptService.getById(user.getDeptId());
-		map.put("isGuangshengtang", "913500007297027606".equals(dept.getTaxCode()));
-
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_ZB_REVIEW_QUEUE, map);
-
-		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
-				CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
-
-		return R.ok("开始导出，请耐心等待");
-
-	}
-
-	/**
-	 * 个人报告导出--导出汇总或详情  汇总和详情合为一个模版
-	 * @param wmTask
-	 * @return
-	 * @throws IOException
-	 */
-	@GetMapping("/exportZbReport")
-	public R exportZbReport(WmTask wmTask) throws IOException {
-		log.info("报告导出请求参数:{}", wmTask);
-
-		String scorePackageDrugId = wmTask.getScorePackageDrugId();
-
-		// 判断是否是合并导出
-		if (scorePackageDrugId.contains(StrUtil.COMMA)){
-			String[] idArr = scorePackageDrugId.split(StrUtil.COMMA);
-			scorePackageDrugId = Arrays.stream(idArr).sorted().collect(Collectors.joining(StrUtil.COMMA));
-			wmTask.setScorePackageDrugId(scorePackageDrugId);
-
-		}
-
-		String key = String.format(CacheConstants.EXPORT_ZB_REPORT_CACHE, wmTask.getScorePackageDrugId());
-
-		String o = redisTemplate.opsForValue().get(key);
-
-		if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)){
-
-			return R.failed("已有在途生成记录，能耐心等待");
-
-		}
-
-
-		HnqzUser user = SecurityUtils.getUser();
-		BaseMap map = new BaseMap();
-		map.put("requestBody", JSONUtil.toJsonStr(wmTask));
-		map.put("username",user.getUsername());
-		map.put("deptId",user.getDeptId());
-
-		SysDept dept = sysDeptService.getById(user.getDeptId());
-		map.put("isGuangshengtang", "913500007297027606".equals(dept.getTaxCode()));
-
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_ZB_QUEUE,map);
-
-		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
-				CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
-
-		return R.ok("开始导出，请耐心等待");
-
-	}
-
-	/**
-	 * 个人报告导出--导出汇总或详情  汇总和详情合为一个模版
-	 * @param packageId 积分包id
-	 * @return
-	 * @throws IOException
-	 */
-	@SysLog("报告导出exportHCPReport")
-	@GetMapping("/exportHCPReport")
-	public R exportHCPReport(String packageId) throws IOException {
-		log.info("报告导出请求参数:packageId={}", packageId);
-
-		if (null == packageId) {
-			return R.failed("积分包ID不能为空");
-		}
-
-		return reportExportService.exportHCP(packageId);
-	}
-
-	/**
-	 * 个人报告导出--导出汇总或详情  汇总和详情合为一个模版
-	 * @param input
-	 * @return
-	 * @throws IOException
-	 */
-	@SysLog("报告导出exportZbInfoFormWeiNew")
-	@GetMapping("/exportZbInfoFormWeiNew")
-	public R exportZbInfoFormWeiNew(WmPackageExportApiInput input) {
-		log.info("报告导出请求参数:{}", input);
-
-		String packageId=input.getId();
-		if (null == packageId) {
-			return R.failed("积分包ID不能为空");
-		}
-		LambdaQueryWrapper<WmTask> queryWrapper=new LambdaQueryWrapper();
-		queryWrapper.in(WmTask::getScorePackageId, Arrays.asList(packageId.split(",")));
-		queryWrapper.eq(WmTask::getTaskStatus,"3");
-		queryWrapper.eq(WmTask::getDelFlag,"0");
-		queryWrapper.eq(WmTask::getEnableFlag,"0");
-		queryWrapper.eq(WmTask::getRealFlag,"0");
-		List<WmTask> taskList=wmTaskService.list(queryWrapper);
-		if(taskList.isEmpty()){
-			return R.failed("未查询到审核通过的任务");
-		}
-		String ids = taskList.stream().map(WmTask::getId).collect(Collectors.joining("," ));
-
-		WmTask wmTask = new WmTask();
-		wmTask.setScorePackageId(packageId);
-		wmTask.setId(ids);
+    /**
+     * 个人报告导出--导出汇总或详情  汇总和详情合为一个模版
+     *
+     * @param input
+     * @return
+     * @throws IOException
+     */
+    @SysLog("报告导出exportZbInfoFormWeiNew")
+    @GetMapping("/exportZbInfoFormWeiNew")
+    public R exportZbInfoFormWeiNew(WmPackageExportApiInput input) {
+        log.info("报告导出请求参数:{}", input);
+
+        String packageId = input.getId();
+        if (null == packageId) {
+            return R.failed("积分包ID不能为空");
+        }
+        LambdaQueryWrapper<WmTask> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.in(WmTask::getScorePackageId, Arrays.asList(packageId.split(",")));
+        queryWrapper.eq(WmTask::getTaskStatus, "3");
+        queryWrapper.eq(WmTask::getDelFlag, "0");
+        queryWrapper.eq(WmTask::getEnableFlag, "0");
+        queryWrapper.eq(WmTask::getRealFlag, "0");
+        List<WmTask> taskList = wmTaskService.list(queryWrapper);
+        if (taskList.isEmpty()) {
+            return R.failed("未查询到审核通过的任务");
+        }
+        String ids = taskList.stream().map(WmTask::getId).collect(Collectors.joining(","));
+
+        WmTask wmTask = new WmTask();
+        wmTask.setScorePackageId(packageId);
+        wmTask.setId(ids);
 
 //		return reportExportService.exportZb(wmTask);//报告汇总
 
-		R r = R.ok();
-		try {
-			r = reportExportService.exportZb(wmTask);//报告汇总
+        R r = R.ok();
+        try {
+            r = reportExportService.exportZb(wmTask);// 报告汇总
 
-			if (r.getCode() == 0) {
-				log.info("文件生成成功");
-			} else {
-				return r;
-			}
-			Map<String, String> resultMap = (Map<String, String>) r.getData();
+            if (r.getCode() == 0) {
+                log.info("文件生成成功");
+            } else {
+                return r;
+            }
+            Map<String, String> resultMap = (Map<String, String>) r.getData();
 
-			MimeMessage mail = sender.createMimeMessage();
-			try {
+            MimeMessage mail = sender.createMimeMessage();
+            try {
 
-				MimeMessageHelper helper = new MimeMessageHelper(mail, true);
+                MimeMessageHelper helper = new MimeMessageHelper(mail, true);
 
-				helper.setFrom(upmsConfig.getFormMail());
-				helper.setTo(input.getEmail());
+                helper.setFrom(upmsConfig.getFormMail());
+                helper.setTo(input.getEmail());
 
-				helper.setSubject("要易云平台学术信息沟通专员业绩报告");
+                helper.setSubject("要易云平台学术信息沟通专员业绩报告");
 
-				helper.setText("要易云平台学术信息沟通专员业绩报告","尊敬的学术信息沟通专员：" +
-				"<br/>&nbsp;&nbsp;&nbsp;&nbsp;感谢您使用要易平台，下载业绩报告请<a href=" + resultMap.get("url") + ">点击链接</a >");
-				/**
-				 * 附件
-				 */
+                helper.setText("要易云平台学术信息沟通专员业绩报告", "尊敬的学术信息沟通专员：" +
+                        "<br/>&nbsp;&nbsp;&nbsp;&nbsp;感谢您使用要易平台，下载业绩报告请<a href=" + resultMap.get("url") + ">点击链接</a >");
+                /**
+                 * 附件
+                 */
 //				helper.addAttachment("众包代表业绩报告明细", multipartFile);
 
-				sender.send(mail);
-			} catch (MessagingException ex) {
-				log.error("邮件发送失败");
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			return R.failed();
-		}
-		return r;
-
-
-	}
-
-
-
-	/**
-	 * 结算包-报告导出--导出汇总或详情
-	 * @param wmTask
-	 *@param exportType  1 导出汇总  2导出详情
-	 * @return
-	 * @throws IOException
-	 */
-	@SysLog("报告导出exportZbInfoJs")
-	@GetMapping("/exportZbInfoJs")
-	public R exportZbInfoJs(WmTask wmTask, String exportType) throws IOException {
-		log.info("报告导出请求参数:{}", wmTask);
-
-		String packageId=wmTask.getScorePackageDrugId();
-		if (null == packageId) {
-			return R.failed("积分包ID不能为空");
-		}
-		LambdaQueryWrapper<WmTask> queryWrapper=new LambdaQueryWrapper();
-		queryWrapper.in(WmTask::getScorePackageId, Arrays.asList(packageId.split(",")));
-		queryWrapper.eq(WmTask::getTaskStatus,"3");
-		queryWrapper.eq(WmTask::getDelFlag,"0");
-		queryWrapper.eq(WmTask::getEnableFlag,"0");
-		List<WmTask> taskList=wmTaskService.list(queryWrapper);
-		if(taskList.isEmpty()){
-			return R.failed("未查询到审核通过的任务");
-		}
-		String ids = taskList.stream().map(WmTask::getId).collect(Collectors.joining("," ));
-		wmTask.setScorePackageId(packageId);
-		wmTask.setId(ids);
-
-			return reportExportService.exportZbJs(wmTask);//报告汇总
-
-
-	}
-
-
-
-	/**
-	 * 历史数据导出报告
-	 * @param wmScorePackage
-	 * @return
-	 * @throws IOException
-	 */
-	@SysLog("报告导出exportNbaHistory")
-	@GetMapping("/exportNbaHistory")
-	public R exportNbaHistory(WmScorePackage wmScorePackage) throws IOException {
-		log.info("报告导出请求参数:{}", wmScorePackage);
-
-		String key = String.format(CacheConstants.EXPORT_NBA_HISTORY_REPORT_CACHE,wmScorePackage.getId());
-
-		String o = redisTemplate.opsForValue().get(key);
-
-		if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)){
-
-			return R.failed("已有在途生成记录，能耐心等待");
-
-		}
-
-
-		HnqzUser user = SecurityUtils.getUser();
-		BaseMap map = new BaseMap();
-		map.put("requestBody",JSONUtil.toJsonStr(wmScorePackage));
-		map.put("username",user.getUsername());
-		map.put("deptId",user.getDeptId());
-
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_NBA_HISTORY_QUEUE,map);
-
-		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
-				CacheConstants.DEF_REPORT_CREATING_TTL,TimeUnit.MILLISECONDS);
+                sender.send(mail);
+            } catch (MessagingException ex) {
+                log.error("邮件发送失败");
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.failed();
+        }
+        return r;
+
 
-		return R.ok("开始导出，请耐心等待");
+    }
 
-	}
 
+    /**
+     * 结算包-报告导出--导出汇总或详情
+     *
+     * @param wmTask
+     * @param exportType 1 导出汇总  2导出详情
+     * @return
+     * @throws IOException
+     */
+    @SysLog("报告导出exportZbInfoJs")
+    @GetMapping("/exportZbInfoJs")
+    public R exportZbInfoJs(WmTask wmTask, String exportType) throws IOException {
+        log.info("报告导出请求参数:{}", wmTask);
 
-	/**
-	 * 新版企业承接任务的导出、任务中心单的导出
-	 *
-	 * @param newReportExportDTO 参数
-	 * @return 结果
-	 */
-	@SysLog("新版企业的报告导出")
-	@GetMapping("/new-nba-export")
-	public R<?> newDrugEntExport(NewReportExportDTO newReportExportDTO) {
-		// 查询是否配置了模板
-		Integer deptId = SecurityUtils.getUser().getDeptId();
-		int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
-				.eq(ReportHandlerDeptRelation::getDetpId, deptId)
-				.eq(ReportHandlerDeptRelation::getReportType, ReportTypeEnum.NEW_DRUG_ENT.getType()));
-		if (count <= 0) {
-			return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
-		}
+        String packageId = wmTask.getScorePackageDrugId();
+        if (null == packageId) {
+            return R.failed("积分包ID不能为空");
+        }
+        LambdaQueryWrapper<WmTask> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.in(WmTask::getScorePackageId, Arrays.asList(packageId.split(",")));
+        queryWrapper.eq(WmTask::getTaskStatus, "3");
+        queryWrapper.eq(WmTask::getDelFlag, "0");
+        queryWrapper.eq(WmTask::getEnableFlag, "0");
+        List<WmTask> taskList = wmTaskService.list(queryWrapper);
+        if (taskList.isEmpty()) {
+            return R.failed("未查询到审核通过的任务");
+        }
+        String ids = taskList.stream().map(WmTask::getId).collect(Collectors.joining(","));
+        wmTask.setScorePackageId(packageId);
+        wmTask.setId(ids);
+
+        return reportExportService.exportZbJs(wmTask);// 报告汇总
+
+
+    }
+
+
+    /**
+     * 历史数据导出报告
+     *
+     * @param wmScorePackage
+     * @return
+     * @throws IOException
+     */
+    @SysLog("报告导出exportNbaHistory")
+    @GetMapping("/exportNbaHistory")
+    public R exportNbaHistory(WmScorePackage wmScorePackage) throws IOException {
+        log.info("报告导出请求参数:{}", wmScorePackage);
 
-		String key = String.format(CacheConstants.NEW_DRUG_ENT_REPORT_CACHE, newReportExportDTO.getId());
+        String key = String.format(CacheConstants.EXPORT_NBA_HISTORY_REPORT_CACHE, wmScorePackage.getId());
 
-		String o = redisTemplate.opsForValue().get(key);
+        String o = redisTemplate.opsForValue().get(key);
+
+        if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)) {
 
-		if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)){
+            return R.failed("已有在途生成记录，能耐心等待");
 
-			return R.failed("已有在途生成记录，能耐心等待");
+        }
 
-		}
-
-		BaseMap map = new BaseMap();
-		if (StrUtil.isBlank(newReportExportDTO.getTaskStatus())) {
-			newReportExportDTO.setTaskStatus("3");
-		}
-		newReportExportDTO.setDeptId(deptId);
-		map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
 
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_DRUG_ENT_REPORT_EXPORT_QUEUE, map);
+        HnqzUser user = SecurityUtils.getUser();
+        BaseMap map = new BaseMap();
+        map.put("requestBody", JSONUtil.toJsonStr(wmScorePackage));
+        map.put("username", user.getUsername());
+        map.put("deptId", user.getDeptId());
 
-		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
-				CacheConstants.DEF_REPORT_CREATING_TTL , TimeUnit.MILLISECONDS);
-
-		return R.ok("开始导出，请耐心等待");
-	}
+        rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_NBA_HISTORY_QUEUE, map);
 
-	/**
-	 * 新版个人承接任务-按积分值，个人承接任务-按任务量，个人承接任务-通用，个人报告管理-个人报告导出的导出
-	 *
-	 * @param newReportExportDTO 参数
-	 * @return 结果
-	 */
-	@SysLog("新版个人的报告导出")
-	@GetMapping("/new-personal-export")
-	public R<?> newPersonalExport(NewReportExportDTO newReportExportDTO) {
-		// 查询是否配置了模板
-		Integer deptId = SecurityUtils.getUser().getDeptId();
-		int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
-				.eq(ReportHandlerDeptRelation::getDetpId, deptId)
-				.eq(ReportHandlerDeptRelation::getReportType, ReportTypeEnum.NEW_PERSONAL.getType()));
-		if (count <= 0) {
-			return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
-		}
-
-		String key = String.format(CacheConstants.NEW_PERSONAL_REPORT_CACHE, newReportExportDTO.getId());
-
-		String o = redisTemplate.opsForValue().get(key);
-
-		if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)){
-
-			return R.failed("已有在途生成记录，能耐心等待");
-
-		}
-
-		BaseMap map = new BaseMap();
-		if (StrUtil.isBlank(newReportExportDTO.getTaskStatus())) {
-			newReportExportDTO.setTaskStatus("3");
-		}
-		newReportExportDTO.setDeptId(deptId);
-		map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
-
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_PERSONAL_REPORT_EXPORT_QUEUE, map);
-
-		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
-				CacheConstants.DEF_REPORT_CREATING_TTL , TimeUnit.MILLISECONDS);
-
-		return R.ok("开始导出，请耐心等待");
-	}
-
-	/**
-	 * 新版excel通用版的导出
-	 *
-	 * @param newReportExportDTO 参数
-	 * @return 结果
-	 */
-	@SysLog("新版excel通用版的导出")
-	@GetMapping("/new-excel-export")
-	public R<?> newExcelCommonExport(NewReportExportDTO newReportExportDTO) {
-		// 查询是否配置了模板
-		Integer deptId = SecurityUtils.getUser().getDeptId();
-		int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
-				.eq(ReportHandlerDeptRelation::getDetpId, deptId)
-				.eq(ReportHandlerDeptRelation::getReportType, ReportTypeEnum.NEW_EXCEL_COMMON.getType()));
-		if (count <= 0) {
-			return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
-		}
-
-		String key = String.format(CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE, newReportExportDTO.getId());
-
-		String o = redisTemplate.opsForValue().get(key);
-
-		if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)){
-
-			return R.failed("已有在途生成记录，能耐心等待");
-
-		}
-
-		BaseMap map = new BaseMap();
-		if (StrUtil.isBlank(newReportExportDTO.getTaskStatus())) {
-			newReportExportDTO.setTaskStatus("3");
-		}
-		newReportExportDTO.setDeptId(deptId);
-		map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
-
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_EXCEL_COMMON_REPORT_EXPORT_QUEUE, map);
-
-		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
-				CacheConstants.DEF_REPORT_CREATING_TTL , TimeUnit.MILLISECONDS);
-
-		return R.ok("开始导出，请耐心等待");
-	}
-
-	/**
-	 * 获取新版报告导出状态
-	 *
-	 * @param reportType 报告类型
-	 * @param packageId 积分包id
-	 * @return {@link WmReportOpt} 结果
-	 */
-	@GetMapping("/new-report-status")
-	public WmReportOpt getNewReportStatus(@RequestParam("reportType") ReportTypeEnum reportType,
-										  @RequestParam("id") String packageId) {
-		WmReportOpt opt = new WmReportOpt();
-
-		String reportCacheKey = null;
-		switch (reportType) {
-			case NEW_DRUG_ENT:
-				reportCacheKey = CacheConstants.NEW_DRUG_ENT_REPORT_CACHE;
-				break;
-			case NEW_PERSONAL:
-				reportCacheKey = CacheConstants.NEW_PERSONAL_REPORT_CACHE;
-				break;
-			case NEW_EXCEL_COMMON:
-				reportCacheKey = CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE;
-				break;
-			default:
-				reportCacheKey = CacheConstants.NEW_PERSONAL_REPORT_CACHE;
-		}
-
-		// 获取生成记录
-		String key = String.format(reportCacheKey, packageId);
-		String o = redisTemplate.opsForValue().get(key);
-
-		if (StrUtil.isNotEmpty(o)) {
-
-			if (StrUtil.contains(o, "https")) {
-				// 临时解决url 前出现的字符~
-				Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
-				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
-				opt.setTtl(LocalDateTime.now().plusSeconds(expire));
-				opt.setLatestUrl(o.substring(o.indexOf("https")));
-			} else if (StrUtil.contains(o, "ERROR")) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
-				opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
-			}
-			// 生成中的
-			else if ("GENERATING".equals(o)) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATING);
-			}
-			// 生成失败的
-			else if (o.startsWith("ERROR")) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
-				opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
-			}
-			// 生成失败的2
-			else if (!o.startsWith("http")) {
-				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
-				opt.setErrorMsg(o);
-			}
-			// 成功的
-			else {
-				Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
-				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
-				opt.setTtl(LocalDateTime.now().plusSeconds(expire));
-				// o = "https://pre.yaoyi.net/admin/sys-file/wmkj/兼职学术信息沟通专员业绩报告(2249)-20211116191527.doc";
-				opt.setLatestUrl(o);
-			}
-
-		} else {
-			opt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);
-		}
-
-		return opt;
-	}
-
-	/**
-	 * 获取所有个人报告导出状态
-	 *
-	 * @param packageId 积分包id
-	 * @return {@link WmReportOpt} 结果
-	 */
-	@GetMapping("/all-personal-report-status")
-	public R<Map<String, WmReportOpt>> getAllPersonalReportStatus(@RequestParam("id") String packageId) {
-		Map<String, WmReportOpt> result = new HashMap<>();
-
-		WmScorePackage scorePackage = new WmScorePackage();
-		scorePackage.setId(packageId);
-		scorePackage.setReportMqName(CacheConstants.EXPORT_ZB_REPORT_CACHE);
-		wmScorePackageService.getReportOpt(scorePackage);
-		result.put("reportOpt", scorePackage.getReportOpt());
-
-		// 封装excel报告状态
-		wmScorePackageService.getExcelReportOpt(scorePackage, CacheConstants.EXCEL_EXPORT_ZB_REPORT_CACHE);
-		result.put("excelReportOpt", scorePackage.getExcelReportOpt());
-
-		// 封装新版报告状态
-		WmReportOpt newReportOpt = wmScorePackageService.getNewReportOpt(scorePackage, CacheConstants.NEW_PERSONAL_REPORT_CACHE);
-		result.put("newReportOpt", newReportOpt);
-
-		// 封装新版excel报告状态
-		WmReportOpt newExcelReportOpt = wmScorePackageService.getNewReportOpt(scorePackage, CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE);
-		result.put("newExcelReportOpt", newExcelReportOpt);
-
-		return R.ok(result);
-	}
+        redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
+                CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
+
+        return R.ok("开始导出，请耐心等待");
+
+    }
+
+
+    /**
+     * 新版企业承接任务的导出、任务中心单的导出
+     *
+     * @param newReportExportDTO 参数
+     * @return 结果
+     */
+    @SysLog("新版企业的报告导出")
+    @GetMapping("/new-nba-export")
+    public R<?> newDrugEntExport(NewReportExportDTO newReportExportDTO) {
+        // 查询是否配置了模板
+        Integer deptId = SecurityUtils.getUser().getDeptId();
+        int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
+                .eq(ReportHandlerDeptRelation::getDetpId, deptId)
+                .eq(ReportHandlerDeptRelation::getReportType, ReportTypeEnum.NEW_DRUG_ENT.getType()));
+        if (count <= 0) {
+            return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
+        }
+
+        String key = String.format(CacheConstants.NEW_DRUG_ENT_REPORT_CACHE, newReportExportDTO.getId());
+
+        String o = redisTemplate.opsForValue().get(key);
+
+        if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)) {
+
+            return R.failed("已有在途生成记录，能耐心等待");
+
+        }
+
+        BaseMap map = new BaseMap();
+        if (StrUtil.isBlank(newReportExportDTO.getTaskStatus())) {
+            newReportExportDTO.setTaskStatus("3");
+        }
+        newReportExportDTO.setDeptId(deptId);
+        map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
+
+        rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_DRUG_ENT_REPORT_EXPORT_QUEUE, map);
+
+        redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
+                CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
+
+        return R.ok("开始导出，请耐心等待");
+    }
+
+    /**
+     * 新版个人承接任务-按积分值，个人承接任务-按任务量，个人承接任务-通用，个人报告管理-个人报告导出的导出
+     *
+     * @param newReportExportDTO 参数
+     * @return 结果
+     */
+    @SysLog("新版个人的报告导出")
+    @GetMapping("/new-personal-export")
+    public R<?> newPersonalExport(NewReportExportDTO newReportExportDTO) {
+        // 查询是否配置了模板
+        Integer deptId = SecurityUtils.getUser().getDeptId();
+        int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
+                .eq(ReportHandlerDeptRelation::getDetpId, deptId)
+                .eq(ReportHandlerDeptRelation::getReportType, ReportTypeEnum.NEW_PERSONAL.getType()));
+        if (count <= 0) {
+            return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
+        }
+
+        String key = String.format(CacheConstants.NEW_PERSONAL_REPORT_CACHE, newReportExportDTO.getId());
+
+        String o = redisTemplate.opsForValue().get(key);
+
+        if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)) {
+
+            return R.failed("已有在途生成记录，能耐心等待");
+
+        }
+
+        BaseMap map = new BaseMap();
+        if (StrUtil.isBlank(newReportExportDTO.getTaskStatus())) {
+            newReportExportDTO.setTaskStatus("3");
+        }
+        newReportExportDTO.setDeptId(deptId);
+        map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
+
+        rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_PERSONAL_REPORT_EXPORT_QUEUE, map);
+
+        redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
+                CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
+
+        return R.ok("开始导出，请耐心等待");
+    }
+
+    /**
+     * 新版excel通用版的导出
+     *
+     * @param newReportExportDTO 参数
+     * @return 结果
+     */
+    @SysLog("新版excel通用版的导出")
+    @GetMapping("/new-excel-export")
+    public R<?> newExcelCommonExport(NewReportExportDTO newReportExportDTO) {
+        // 查询是否配置了模板
+        Integer deptId = SecurityUtils.getUser().getDeptId();
+        int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
+                .eq(ReportHandlerDeptRelation::getDetpId, deptId)
+                .eq(ReportHandlerDeptRelation::getReportType, ReportTypeEnum.NEW_EXCEL_COMMON.getType()));
+        if (count <= 0) {
+            return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
+        }
+
+        String key = String.format(CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE, newReportExportDTO.getId());
+
+        String o = redisTemplate.opsForValue().get(key);
+
+        if (StringUtils.isNotEmpty(o) && WmReportOpt.WmReportOptStatus.GENERATING.name().equals(o)) {
+
+            return R.failed("已有在途生成记录，能耐心等待");
+
+        }
+
+        BaseMap map = new BaseMap();
+        if (StrUtil.isBlank(newReportExportDTO.getTaskStatus())) {
+            newReportExportDTO.setTaskStatus("3");
+        }
+        newReportExportDTO.setDeptId(deptId);
+        map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
+
+        rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_EXCEL_COMMON_REPORT_EXPORT_QUEUE, map);
+
+        redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
+                CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
+
+        return R.ok("开始导出，请耐心等待");
+    }
+
+    /**
+     * 获取新版报告导出状态
+     *
+     * @param reportType 报告类型
+     * @param packageId  积分包id
+     * @return {@link WmReportOpt} 结果
+     */
+    @GetMapping("/new-report-status")
+    public WmReportOpt getNewReportStatus(@RequestParam("reportType") ReportTypeEnum reportType,
+                                          @RequestParam("id") String packageId) {
+        WmReportOpt opt = new WmReportOpt();
+
+        String reportCacheKey = null;
+        switch (reportType) {
+            case NEW_DRUG_ENT:
+                reportCacheKey = CacheConstants.NEW_DRUG_ENT_REPORT_CACHE;
+                break;
+            case NEW_PERSONAL:
+                reportCacheKey = CacheConstants.NEW_PERSONAL_REPORT_CACHE;
+                break;
+            case NEW_EXCEL_COMMON:
+                reportCacheKey = CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE;
+                break;
+            default:
+                reportCacheKey = CacheConstants.NEW_PERSONAL_REPORT_CACHE;
+        }
+
+        // 获取生成记录
+        String key = String.format(reportCacheKey, packageId);
+        String o = redisTemplate.opsForValue().get(key);
+
+        if (StrUtil.isNotEmpty(o)) {
+
+            if (StrUtil.contains(o, "https")) {
+                // 临时解决url 前出现的字符~
+                Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
+                opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
+                opt.setTtl(LocalDateTime.now().plusSeconds(expire));
+                opt.setLatestUrl(o.substring(o.indexOf("https")));
+            } else if (StrUtil.contains(o, "ERROR")) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+                opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
+            }
+            // 生成中的
+            else if ("GENERATING".equals(o)) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATING);
+            }
+            // 生成失败的
+            else if (o.startsWith("ERROR")) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+                opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
+            }
+            // 生成失败的2
+            else if (!o.startsWith("http")) {
+                opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
+                opt.setErrorMsg(o);
+            }
+            // 成功的
+            else {
+                Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
+                opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
+                opt.setTtl(LocalDateTime.now().plusSeconds(expire));
+                // o = "https://pre.yaoyi.net/admin/sys-file/wmkj/兼职学术信息沟通专员业绩报告(2249)-20211116191527.doc";
+                opt.setLatestUrl(o);
+            }
+
+        } else {
+            opt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);
+        }
+
+        return opt;
+    }
+
+    /**
+     * 获取所有个人报告导出状态
+     *
+     * @param packageId 积分包id
+     * @return {@link WmReportOpt} 结果
+     */
+    @GetMapping("/all-personal-report-status")
+    public R<Map<String, WmReportOpt>> getAllPersonalReportStatus(@RequestParam("id") String packageId) {
+        Map<String, WmReportOpt> result = new HashMap<>();
+
+        WmScorePackage scorePackage = new WmScorePackage();
+        scorePackage.setId(packageId);
+        scorePackage.setReportMqName(CacheConstants.EXPORT_ZB_REPORT_CACHE);
+        wmScorePackageService.getReportOpt(scorePackage);
+        result.put("reportOpt", scorePackage.getReportOpt());
+
+        // 封装excel报告状态
+        wmScorePackageService.getExcelReportOpt(scorePackage, CacheConstants.EXCEL_EXPORT_ZB_REPORT_CACHE);
+        result.put("excelReportOpt", scorePackage.getExcelReportOpt());
+
+        // 封装新版报告状态
+        WmReportOpt newReportOpt = wmScorePackageService.getNewReportOpt(scorePackage, CacheConstants.NEW_PERSONAL_REPORT_CACHE);
+        result.put("newReportOpt", newReportOpt);
+
+        // 封装新版excel报告状态
+        WmReportOpt newExcelReportOpt = wmScorePackageService.getNewReportOpt(scorePackage, CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE);
+        result.put("newExcelReportOpt", newExcelReportOpt);
+
+        return R.ok(result);
+    }
 }

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/mq/ReportExportReceiver.java

@@ -3,10 +3,8 @@ package com.qunzhixinxi.hnqz.report.mq;
 import cn.hutool.json.JSONUtil;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.constant.MqConstants;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.ReportTypeEnum;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.report.service.ReportExportService;
-import com.qunzhixinxi.hnqz.report.service.ReportHandlerDeptRelationService;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.entity.BaseMap;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -33,11 +31,7 @@ import java.util.Map;
 @RabbitMqComponent(value = "reportExportReceiver")
 public class ReportExportReceiver extends BaseRabbiMqHandler<BaseMap> {
 
-    private final ReportHandlerDeptRelationService reportHandlerDeptRelationService;
-
-//    private final ReportExportService reportExportService;
-//    private final WmReportExportRecordService wmReportExportRecordService;
-//    private final ReportExportForGuangshengtangService reportExportForGuangshengtangService;
+    private final ReportExportService reportExportService;
 
     @RabbitHandler
     public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
@@ -47,21 +41,11 @@ public class ReportExportReceiver extends BaseRabbiMqHandler<BaseMap> {
             log.info("直接队列：zb报告导出，手动ACK，接收消息TAG:{},消息内容：{}", deliveryTag, baseMap);
             String requestBody = map.get("requestBody").toString();
             String username = map.get("username").toString();
-            Integer deptId = map.get("deptId");
-
-//            Integer exportRecordId = Integer.valueOf(map.get("recordId").toString());
             WmTask wmTask = JSONUtil.toBean(requestBody, WmTask.class);
             String key = String.format(CacheConstants.EXPORT_ZB_REPORT_CACHE, wmTask.getScorePackageDrugId());
             String resStr = "ERROR_未知错误，请联系管理员";
 
-//            int exportStatus = WmReportOpt.WmReportOptStatus.GENERATED.ordinal();
-//            String name = "无";
-//            String title = "无";
-
             try {
-                // 根据企业获取对应报告处理类
-                ReportExportService reportExportService =
-                        reportHandlerDeptRelationService.getHandlerClass(ReportTypeEnum.ZB.getType(), deptId);
 
                 R r = reportExportService.newExportZb(wmTask, username);
 
@@ -70,12 +54,9 @@ public class ReportExportReceiver extends BaseRabbiMqHandler<BaseMap> {
                     Map<String,String> data = (Map<String, String>) r.getData();
                     log.info("result-map:{}",data);
                     resStr = data.get("url") ;
-//                    name = data.get("fileName");
-//                    title = data.get("orgFileNmae");
                 } else {
                     // error msg
                     resStr = r.getMsg();
-//                    exportStatus = WmReportOpt.WmReportOptStatus.ERROR.ordinal();
                 }
             } catch (Exception e) {
                 log.error("zb报告导出异常", e);
@@ -83,15 +64,6 @@ public class ReportExportReceiver extends BaseRabbiMqHandler<BaseMap> {
                 Map<String,String> res = new HashMap<>(2);
                 res.put("key",key);
                 res.put("res",resStr);
-
-//                WmReportExportRecord byId = wmReportExportRecordService.getById(exportRecordId);
-//                byId.setExportStatus(exportStatus);
-//                byId.setUrl(resStr);
-//                byId.setTitle(title);
-//                byId.setReportNum(name);
-//                byId.setFinishTime(LocalDateTime.now());
-//                wmReportExportRecordService.updateById(byId);
-
                 return res;
             }
         });

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/ReportExportService.java

@@ -23,12 +23,12 @@ public interface ReportExportService {
     /**
      * 个人承接任务-按积分值，个人承接任务-按任务量，个人承接任务-通用，个人报告管理-个人报告导出的导出
      *
-     * @param wmTask
-     * @param username
-     * @return
-     * @throws IOException
+     * @param wmTask   参数信息
+     * @param username 操作人
+     * @return 上传信息
+     * @throws IOException 异常
      */
-    R newExportZb(WmTask wmTask, String username) throws IOException;
+    R<Map<String, String>> newExportZb(WmTask wmTask, String username) throws IOException;
 
     /**
      * 企业承接任务的导出、任务中心单的导出

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/SysFileService.java

@@ -8,6 +8,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.util.Map;
 
 /**
  * 文件管理
@@ -17,15 +18,21 @@ import java.io.InputStream;
  */
 public interface SysFileService extends IService<SysFile> {
 
-	/**
-	 * 上传文件流
-	 *
-	 * @param fileName    文件名
-	 * @param inputStream 输入流
-	 * @return {@link R} 结果
-	 */
-	R uploadFileAllUrlRealName(String fileName, FileInputStream inputStream);
+    /**
+     * 上传文件流
+     *
+     * @param fileName    文件名
+     * @param inputStream 输入流
+     * @return {@link R} 结果
+     */
+    R uploadFileAllUrlRealName(String fileName, FileInputStream inputStream);
 
-	R uploadFileAllUrlRealName(MultipartFile file,String username) ;
+    /**
+     * 上传文件
+     *
+     * @param file 文件
+     * @return 信息
+     */
+    R<Map<String, String>> uploadFileAllUrlRealName(MultipartFile file, String username);
 
 }

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/impl/ReportExportServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent;
@@ -66,6 +67,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 
@@ -801,28 +803,28 @@ public class ReportExportServiceImpl implements ReportExportService {
     /**
      * 个人承接按积分制
      *
-     * @param wmTask
-     * @param username
-     * @return
-     * @throws IOException
+     * @param wmTask   参数
+     * @param username 操作人
+     * @return 上传参数
+     * @throws IOException 异常
      */
     @Override
-    public R newExportZb(WmTask wmTask, String username) throws IOException {
+    public R<Map<String, String>> newExportZb(WmTask wmTask, String username) throws IOException {
         String packageId = wmTask.getScorePackageDrugId();
-        if (null == packageId) {
+        if (StrUtil.isBlank(packageId)) {
             return R.failed("积分包ID不能为空");
         }
-        LambdaQueryWrapper<WmTask> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.in(WmTask::getScorePackageId, Arrays.asList(packageId.split(",")));
+        LambdaQueryWrapper<WmTask> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(WmTask::getScorePackageId, Arrays.asList(packageId.split(StrUtil.COMMA)));
         queryWrapper.eq(WmTask::getTaskStatus, "3");
-        queryWrapper.eq(WmTask::getDelFlag, "0");
-        queryWrapper.eq(WmTask::getEnableFlag, "0");
-        queryWrapper.eq(WmTask::getRealFlag, "0");
+        queryWrapper.eq(WmTask::getDelFlag, CommonConstants.STATUS_NORMAL);
+        queryWrapper.eq(WmTask::getEnableFlag, CommonConstants.STATUS_NORMAL);
+        queryWrapper.eq(WmTask::getRealFlag, CommonConstants.STATUS_NORMAL);
         List<WmTask> taskList = wmTaskService.list(queryWrapper);
         if (taskList.isEmpty()) {
             return R.failed("未查询到审核通过的任务");
         }
-        String ids = taskList.stream().map(WmTask::getId).collect(Collectors.joining(","));
+        String ids = taskList.stream().map(WmTask::getId).collect(Collectors.joining(StrUtil.COMMA));
         wmTask.setScorePackageId(packageId);
         wmTask.setId(ids);
         return exportZb(wmTask, username);
@@ -831,11 +833,11 @@ public class ReportExportServiceImpl implements ReportExportService {
     /**
      * 个人报告导出--众包代表业绩报告
      *
-     * @param wmTask
-     * @return
-     * @throws IOException
+     * @param wmTask 参数
+     * @return 上传信息
+     * @throws IOException 异常
      */
-    private R exportZb(WmTask wmTask, String username) throws IOException {
+    private R<Map<String, String>> exportZb(WmTask wmTask, String username) throws IOException {
 
         WmTask wmTaskparam = wmTask;
         String packageId = wmTask.getScorePackageId();  // 获取积分包ID
@@ -855,7 +857,7 @@ public class ReportExportServiceImpl implements ReportExportService {
         }
 
         List<Map<String, Object>> infoList = exportZbInfo(wmTaskparam);
-        if (null != infoList && infoList.size() > 0) {
+        if (CollUtil.isNotEmpty(infoList)) {
             excelMap.put("infoList", infoList);
         }
         // 区分全职兼职学术推广员模版
@@ -865,26 +867,20 @@ public class ReportExportServiceImpl implements ReportExportService {
         String scoreIds = wmScorePackages.stream().map(WmScorePackage::getScorePackageName).collect(Collectors.joining(","));
         excelMap.put("scoreId", StrUtil.isBlank(scoreIds) ? wmScorePackage1.getScorePackageName() : scoreIds);
 
-        File f = null;
-        if (wmScorePackage1.getPackageType1().equals("1")) {// 定额
-            f = ExportReport.main_bulidTemplate1(excelMap, 2, upmsConfig.getBasePath());
-        } else {// 定量
-            f = ExportReport.main_bulidTemplate2(excelMap, 2, upmsConfig.getBasePath());
-        }
+        // 1是定额 2是定量
+        File f = "1".equals(wmScorePackage1.getPackageType1()) ? ExportReport.main_bulidTemplate1(excelMap, 2, upmsConfig.getBasePath()) : ExportReport.main_bulidTemplate2(excelMap, 2, upmsConfig.getBasePath());
 
         FileInputStream input = new FileInputStream(f);
 
-        String fileNamePrefix = "";
+        String fileName = "(" + packageId + ")";
         if (StrUtil.equals(wmScorePackage1.getTypeid(), "3")) {
-            fileNamePrefix = "全职学术信息沟通专员业绩报告";
+            fileName = "全职学术信息沟通专员业绩报告" + fileName;
         } else if (StrUtil.equals(wmScorePackage1.getTypeid(), "5")) {
-            fileNamePrefix = "招商经理业绩报告";
+            fileName = "招商经理业绩报告" + fileName;
         } else if (StrUtil.equals(wmScorePackage1.getTypeid(), "4")) {
-            fileNamePrefix = "兼职学术信息沟通专员业绩报告";
+            fileName = "兼职学术信息沟通专员业绩报告" + fileName;
         }
-
-        MultipartFile multipartFile = new MockMultipartFile(fileNamePrefix + "(" + packageId + ")", "兼职学术推广员业绩报告(" + packageId + ").doc", "text/plain", IOUtils
-                .toByteArray(input));
+        MultipartFile multipartFile = new MockMultipartFile(fileName, "兼职学术推广员业绩报告(" + packageId + ").doc", "text/plain", IOUtils.toByteArray(input));
         return sysFileService.uploadFileAllUrlRealName(multipartFile, username);
 
     }
@@ -1174,9 +1170,9 @@ public class ReportExportServiceImpl implements ReportExportService {
     /**
      * 个人报告导出--报告详情
      *
-     * @param wmTask
-     * @return
-     * @throws IOException
+     * @param wmTask 参数
+     * @return 导出信息
+     * @throws IOException 异常
      */
     @Override
     public List<Map<String, Object>> exportZbInfo(WmTask wmTask) throws IOException {
@@ -1189,9 +1185,6 @@ public class ReportExportServiceImpl implements ReportExportService {
             return null;
         }
 
-        Map<String, Object> excelMap = new HashMap<>();
-
-
         wmTask.setScorePackageId(null);
         wmTask.setScorePackageDrugId(null);
         wmTask.setScorePackageId(packageId);
@@ -1224,10 +1217,10 @@ public class ReportExportServiceImpl implements ReportExportService {
 
             Map<String, BufferedImage> imgs = new HashMap<>(emptyImgTasks.size());
             for (WmTask task : emptyImgTasks) {
+
                 try {
                     Thread.sleep(100);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
+                } catch (InterruptedException ignored) {
                 }
                 String taskUrl = upmsConfig.getApiUrl() + "/h5/#/pages/task/task-detail/index?id=" + task.getId();
                 log.warn("获取任务图片: [{}]:[{}]", task.getId(), taskUrl);
@@ -1239,16 +1232,28 @@ public class ReportExportServiceImpl implements ReportExportService {
                 imgs.put(task.getId(), image);
             }
 
+            Set<Integer> uIds = wmTaskList.stream().map(WmTask::getTaskUserId).filter(StrUtil::isNotBlank).mapToInt(Integer::valueOf).boxed().collect(Collectors.toSet());
+            Map<Integer, List<SysUser>> uId2uListMap = sysUserService.listByIds(uIds).stream().collect(Collectors.groupingBy(SysUser::getUserId));
+
+            DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             for (WmTask wmTask1 : wmTaskList) {
 
                 WmTaskType taskType = wmTaskTypeService.getById(wmTask1.getTaskTypeId());
                 Map<String, Object> map = new HashMap<>();
                 map.put("taskIndex", num++);
                 map.put("taskType", taskType.getTaskTypeName());
-                DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
                 String strDate2 = dtf2.format(wmTask1.getCreateTime());
                 map.put("taskTime", strDate2);
-                map.put("taskUser", sysUserService.getByIdIgnore(wmTask1.getTaskUserId()).getRealname());
+                String taskUserName;
+                List<SysUser> users = uId2uListMap.get(Integer.valueOf(wmTask1.getTaskUserId()));
+                if (CollUtil.isNotEmpty(users)) {
+                    taskUserName = users.get(0).getRealname();
+                } else {
+                    taskUserName = "";
+                }
+
+                map.put("taskUser", taskUserName);
                 map.put("taskTypeId", wmTask1.getTaskTypeId());
                 map.put("taskNumber", wmTask1.getTaskNumber());
                 map.put("imgWidth", taskType.getUpdateUser());

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/impl/SysFileServiceImpl.java

@@ -19,8 +19,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.FileInputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -45,6 +45,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
 
     /**
      * 上传文件
+     *
      * @return
      */
     @Override
@@ -53,12 +54,9 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
         Map<String, String> resultMap = new HashMap<>(4);
         resultMap.put("bucketName", ossProperties.getBucketName());
         resultMap.put("fileName", fileName);
-        resultMap.put("url", String.format("%s/admin/sys-file/%s/%s",upmsConfig.getClientUrl(), ossProperties.getBucketName(), fileName));
+        resultMap.put("url", String.format("%s/admin/sys-file/%s/%s", upmsConfig.getClientUrl(), ossProperties.getBucketName(), fileName));
 
         try {
-//            minioTemplate.putObject(ossProperties.getBucketName(), fileName, inputStream);
-//            PutObjectRequest putObjectRequest = new PutObjectRequest(ossProperties.getBucketName(), fileName, inputStream);
-//            aliyunOss.putObject(putObjectRequest);
 
             minioClient.putObject(
                     PutObjectArgs.builder().bucket(ossProperties.getBucketName()).object(fileName)
@@ -66,8 +64,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
                                     inputStream, inputStream.available(), -1)
                             .build());
 
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             log.error("上传失败", e);
             return R.failed(e.getLocalizedMessage());
         }
@@ -77,32 +74,28 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
     /**
      * 上传文件
      *
-     * @param file
-     * @return
+     * @param file 文件
+     * @return 信息
      */
     @Override
-    public R uploadFileAllUrlRealName(MultipartFile file, String username) {
-        Date date = new Date();
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
-        String idStr = format.format(date);
+    public R<Map<String, String>> uploadFileAllUrlRealName(MultipartFile file, String username) {
+
+        String idStr = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now());
         String fileName = FileUtil.getName(file.getName()) + "-" + idStr + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
+
         Map<String, String> resultMap = new HashMap<>(4);
+
         resultMap.put("bucketName", ossProperties.getBucketName());
         resultMap.put("fileName", fileName);
-        resultMap.put("orgFileNmae", file.getOriginalFilename());
-        resultMap.put("url", String.format("%s/admin/sys-file/%s/%s",
-                upmsConfig.getClientUrl(), ossProperties.getBucketName(), fileName));
+        resultMap.put("orgFileName", file.getOriginalFilename());
+        resultMap.put("url", String.format("%s/admin/sys-file/%s/%s", upmsConfig.getClientUrl(), ossProperties.getBucketName(), fileName));
 
         try {
             minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
             // 文件管理数据记录,收集管理追踪文件
             fileLog(file, fileName, username);
-        } catch (CommunicationsException e){
-            log.error("记录文件信息失败");
-            e.printStackTrace();
         } catch (Exception e) {
             log.error("上传失败", e);
-            e.printStackTrace();
             return R.failed(e.getLocalizedMessage());
         }
         return R.ok(resultMap);