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

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

@@ -84,7 +84,7 @@ public interface CacheConstants {
 	String EXPORT_NB_REPORT_CACHE = "export:nb_report:%s";
 	String EXPORT_NB_REVIEW_REPORT_CACHE = "export:nb_review_report:%s";
 
-	String NEW_NBA_REPORT_CACHE = "new_export:nba_report:%s";
+	String NEW_DRUG_ENT_REPORT_CACHE = "new_export:drug_ent_report:%s";
 	String NEW_PERSONAL_REPORT_CACHE = "new_export:personal_report:%s";
 
 	/**
@@ -97,7 +97,7 @@ public interface CacheConstants {
 	String EXCEL_EXPORT_NB_REPORT_CACHE = "excel_export:nb_report:%s";
 	String EXCEL_EXPORT_NB_REVIEW_REPORT_CACHE = "excel_export:nb_review_report:%s";
 
-	String NEW_EXCEL_NBA_REPORT_CACHE = "new_excel_export:nba_report:%s";
+	String NEW_EXCEL_COMMON_REPORT_CACHE = "new_excel_export:common_report:%s";
 
 
 	Long DEF_REPORT_CREATING_TTL = 24L * 60 * 60 * 1000;

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

@@ -622,7 +622,7 @@ public class ReportExportController {
 			return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
 		}
 
-		String key = String.format(CacheConstants.NEW_NBA_REPORT_CACHE, wmScorePackage.getId());
+		String key = String.format(CacheConstants.NEW_DRUG_ENT_REPORT_CACHE, wmScorePackage.getId());
 
 		String o = redisTemplate.opsForValue().get(key);
 
@@ -698,7 +698,7 @@ public class ReportExportController {
 			return R.failed("该企业尚未配置新模版，请联系客服人员进行模版配置");
 		}
 
-		String key = String.format(CacheConstants.NEW_EXCEL_NBA_REPORT_CACHE, wmScorePackage.getId());
+		String key = String.format(CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE, wmScorePackage.getId());
 
 		String o = redisTemplate.opsForValue().get(key);
 

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

@@ -56,7 +56,6 @@ import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
@@ -300,6 +299,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			// 封装excel报告状态
 			this.getExcelReportOpt(scorePackage, CacheConstants.EXCEL_EXPORT_ZB_REPORT_CACHE);
 
+			//
+
 		}
 
 
@@ -2724,11 +2725,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		this.getExcelReportOpt(wmScorePackage, CacheConstants.EXCEL_EXPORT_NBA_REPORT_CACHE);
 
 		// 封装新版报告状态
-		WmReportOpt newReportOpt = this.getNewReportOpt(wmScorePackage, CacheConstants.NEW_NBA_REPORT_CACHE);
+		WmReportOpt newReportOpt = this.getNewReportOpt(wmScorePackage, CacheConstants.NEW_DRUG_ENT_REPORT_CACHE);
 		wmScorePackage.setNewReportOpt(newReportOpt);
 
 		// 封装新版excel报告状态
-		WmReportOpt newExcelReportOpt = this.getNewReportOpt(wmScorePackage, CacheConstants.NEW_EXCEL_NBA_REPORT_CACHE);
+		WmReportOpt newExcelReportOpt = this.getNewReportOpt(wmScorePackage, CacheConstants.NEW_EXCEL_COMMON_REPORT_CACHE);
 		wmScorePackage.setNewExcelReportOpt(newExcelReportOpt);
 
 		// 企业大包终止条件判断