feat: 新版个人报告导出接口3

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

@@ -15,6 +15,7 @@ import com.qunzhixinxi.hnqz.admin.entity.ReportHandlerDeptRelation;
 import com.qunzhixinxi.hnqz.admin.entity.WmReport;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.entity.WmTask;
+import com.qunzhixinxi.hnqz.admin.entity.dto.NewReportExportDTO;
 import com.qunzhixinxi.hnqz.admin.entity.input.WmPackageExportApiInput;
 import com.qunzhixinxi.hnqz.admin.enums.ReportTypeEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.ReportHandlerDeptRelationMapper;
@@ -32,6 +33,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -646,11 +648,11 @@ public class ReportExportController {
 	/**
 	 * 新版个人承接任务-按积分值，个人承接任务-按任务量，个人承接任务-通用，个人报告管理-个人报告导出的导出
 	 *
-	 * @param wmScorePackage 积分包
+	 * @param newReportExportDTO 参数
 	 * @return 结果
 	 */
 	@GetMapping("/new-personal-export")
-	public R<?> newPersonalExport(WmScorePackage wmScorePackage) {
+	public R<?> newPersonalExport(@Validated NewReportExportDTO newReportExportDTO) {
 		// 查询是否配置了模板
 		Integer deptId = SecurityUtils.getUser().getDeptId();
 		int count = reportHandlerDeptRelationMapper.selectCount(Wrappers.<ReportHandlerDeptRelation>lambdaQuery()
@@ -660,7 +662,7 @@ public class ReportExportController {
 			return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
 		}
 
-		String key = String.format(CacheConstants.NEW_PERSONAL_REPORT_CACHE, wmScorePackage.getId());
+		String key = String.format(CacheConstants.NEW_PERSONAL_REPORT_CACHE, newReportExportDTO.getId());
 
 		String o = redisTemplate.opsForValue().get(key);
 
@@ -671,7 +673,7 @@ 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_PERSONAL_REPORT_EXPORT_QUEUE, map);
 
@@ -682,7 +684,7 @@ public class ReportExportController {
 	}
 
 	/**
-	 * 新版excel版的导出 TODO 报告部分下个版本实现
+	 * 新版excel版的导出
 	 *
 	 * @param wmScorePackage 积分包
 	 * @return 结果

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/dto/NewReportExportDTO.java

@@ -0,0 +1,30 @@
+package com.qunzhixinxi.hnqz.admin.entity.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 新版报告导出参数
+ *
+ * @author lixuesong
+ * @date 2023/12/18
+ */
+@Data
+public class NewReportExportDTO implements Serializable {
+	private static final long serialVersionUID = 7981252103869889992L;
+
+	/**
+	 * 积分包id
+	 */
+	@NotBlank(message = "积分包id必填")
+	private String id;
+
+	/**
+	 * 任务状态(2-待审核,3-审核通过)
+	 */
+	@NotBlank(message = "任务状态必填")
+	private String taskStatus;
+}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -299,7 +299,13 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			// 封装excel报告状态
 			this.getExcelReportOpt(scorePackage, CacheConstants.EXCEL_EXPORT_ZB_REPORT_CACHE);
 
-			//
+			// 封装新版报告状态
+			WmReportOpt newReportOpt = this.getNewReportOpt(wmScorePackage, CacheConstants.NEW_PERSONAL_REPORT_CACHE);
+			wmScorePackage.setNewReportOpt(newReportOpt);
+
+			// 封装新版excel报告状态
+			WmReportOpt newExcelReportOpt = this.getNewReportOpt(wmScorePackage, CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE);
+			wmScorePackage.setNewExcelReportOpt(newExcelReportOpt);
 
 		}
 
@@ -2545,6 +2551,14 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		// 封装excel报告状态
 		this.getExcelReportOpt(scorePackage, CacheConstants.EXCEL_EXPORT_ZB_REPORT_CACHE);
 
+		// 封装新版报告状态
+		WmReportOpt newReportOpt = this.getNewReportOpt(scorePackage, CacheConstants.NEW_DRUG_ENT_REPORT_CACHE);
+		scorePackage.setNewReportOpt(newReportOpt);
+
+		// 封装新版excel报告状态
+		WmReportOpt newExcelReportOpt = this.getNewReportOpt(scorePackage, CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE);
+		scorePackage.setNewExcelReportOpt(newExcelReportOpt);
+
 		// 接单对象范围名称
 		if (StrUtil.isNotBlank(scorePackage.getPackageUserScope())) {
 			String packageUserScopeName = wmTeamService.getPackageUserScopeName(scorePackage.getPackageUserScope());