feat: 新版报告导出参数调整

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

@@ -637,6 +637,9 @@ public class ReportExportController {
 		}
 
 		BaseMap map = new BaseMap();
+		if (StrUtil.isBlank(newReportExportDTO.getTaskStatus())) {
+			newReportExportDTO.setTaskStatus("3");
+		}
 		map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
 
 		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_DRUG_ENT_REPORT_EXPORT_QUEUE, map);
@@ -655,7 +658,7 @@ public class ReportExportController {
 	 */
 	@SysLog("新版个人的报告导出")
 	@GetMapping("/new-personal-export")
-	public R<?> newPersonalExport(@Validated NewReportExportDTO newReportExportDTO) {
+	public R<?> newPersonalExport(NewReportExportDTO newReportExportDTO) {
 		// 查询是否配置了模板
 		Integer deptId = SecurityUtils.getUser().getDeptId();
 		int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
@@ -676,6 +679,9 @@ public class ReportExportController {
 		}
 
 		BaseMap map = new BaseMap();
+		if (StrUtil.isBlank(newReportExportDTO.getTaskStatus())) {
+			newReportExportDTO.setTaskStatus("3");
+		}
 		map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
 
 		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_PERSONAL_REPORT_EXPORT_QUEUE, map);
@@ -694,7 +700,7 @@ public class ReportExportController {
 	 */
 	@SysLog("新版excel通用版的导出")
 	@GetMapping("/new-excel-export")
-	public R<?> newExcelCommonExport(@Validated NewReportExportDTO newReportExportDTO) {
+	public R<?> newExcelCommonExport(NewReportExportDTO newReportExportDTO) {
 		// 查询是否配置了模板
 		Integer deptId = SecurityUtils.getUser().getDeptId();
 		int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
@@ -715,6 +721,9 @@ public class ReportExportController {
 		}
 
 		BaseMap map = new BaseMap();
+		if (StrUtil.isBlank(newReportExportDTO.getTaskStatus())) {
+			newReportExportDTO.setTaskStatus("3");
+		}
 		map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
 
 		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_EXCEL_COMMON_REPORT_EXPORT_QUEUE, map);