|
@@ -19,6 +19,7 @@
|
|
|
|
|
|
|
|
package com.qunzhixinxi.hnqz.admin.controller;
|
|
package com.qunzhixinxi.hnqz.admin.controller;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
@@ -254,6 +255,16 @@ public class ReportExportController {
|
|
|
@GetMapping("/exportZbReport")
|
|
@GetMapping("/exportZbReport")
|
|
|
public R exportZbReport(WmTask wmTask) throws IOException {
|
|
public R exportZbReport(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 key = String.format(CacheConstants.EXPORT_ZB_REPORT_CACHE, wmTask.getScorePackageDrugId());
|
|
|
|
|
|
|
|
String o = redisTemplate.opsForValue().get(key);
|
|
String o = redisTemplate.opsForValue().get(key);
|
shc