fix: 新版报告导出调整

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

@@ -21,7 +21,7 @@ public interface MqConstants {
 	String DIRECT_MODE_REPORT_EXPORT_NB_QUEUE = "direct_mode_report_export_nb_queue";
 	String DIRECT_MODE_REPORT_EXPORT_NB_REVIEW_QUEUE = "direct_mode_report_export_nb_review_queue";
 
-	String DIRECT_MODE_NEW_NBA_REPORT_EXPORT_QUEUE = "direct_mode_new_nba_report_export_queue";
+	String DIRECT_MODE_NEW_DRUG_ENT_REPORT_EXPORT_QUEUE = "direct_mode_new_drug_ent_report_export_queue";
 
 	// excel报告导出队列
 	String DIRECT_MODE_EXCEL_REPORT_EXPORT_ZB_QUEUE = "direct_mode_excel_report_export_zb_queue";

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

@@ -611,12 +611,12 @@ public class ReportExportController {
 	/**
 	 * 新版企业承接任务的导出、任务中心单的导出
 	 *
-	 * @param wmScorePackage 积分包
+	 * @param newReportExportDTO 参数
 	 * @return 结果
 	 */
 	@SysLog("新版企业的报告导出")
 	@GetMapping("/new-nba-export")
-	public R<?> newDrugEntExport(WmScorePackage wmScorePackage) {
+	public R<?> newDrugEntExport(NewReportExportDTO newReportExportDTO) {
 		// 查询是否配置了模板
 		Integer deptId = SecurityUtils.getUser().getDeptId();
 		int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
@@ -626,7 +626,7 @@ public class ReportExportController {
 			return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
 		}
 
-		String key = String.format(CacheConstants.NEW_DRUG_ENT_REPORT_CACHE, wmScorePackage.getId());
+		String key = String.format(CacheConstants.NEW_DRUG_ENT_REPORT_CACHE, newReportExportDTO.getId());
 
 		String o = redisTemplate.opsForValue().get(key);
 
@@ -637,9 +637,9 @@ public class ReportExportController {
 		}
 
 		BaseMap map = new BaseMap();
-		map.put("requestBody", JSONUtil.toJsonStr(wmScorePackage));
+		map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
 
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_NBA_REPORT_EXPORT_QUEUE, map);
+		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);