From 7e622820bca4011788ed676e9a2af74a7b0d0e7d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 04 六月 2025 17:36:20 +0800
Subject: [PATCH] 查报告增加时间范围以及配置
---
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
index bbfe4cb..b6e6a79 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -1,15 +1,18 @@
package com.ltkj.web.controller.api;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.mapper.TjCustomerMapper;
import com.ltkj.hosp.service.ITjOrderDetailService;
import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.controller.system.TjCheckController;
import com.ltkj.web.controller.system.TjReportController;
import io.swagger.annotations.ApiOperation;
@@ -18,8 +21,12 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -44,6 +51,8 @@
private ITjOrderService tjOrderService;
@Autowired
private ITjOrderDetailService detailService;
+ @Autowired
+ private ISysConfigService sysConfigService;
/**
* 鎻愪緵缁欎笁鏂硅皟鐢ㄧ殑鎶ュ憡鏌ョ湅鎺ュ彛
@@ -62,6 +71,23 @@
return;
}
tjReportController.preview(response,true,tjNum);
+ }
+
+ @PostMapping("/viewReportUrl")
+ public AjaxResult viewReportUrl(@RequestBody String json){
+ JSONObject entries = JSONUtil.parseObj(json);
+ String tjNum = entries.getStr("tjNum");
+ LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjOrder::getHeshouStatus,1);
+ wrapper.eq(TjOrder::getTjNumber,tjNum);
+ List<TjOrder> list = tjOrderService.list(wrapper);
+ if (list.isEmpty()){
+ return AjaxResult.error();
+ }
+ TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNum);
+ TjCustomer tjCustomer = tjCustomerMapper.selectById( tjOrder.getUserId());
+ String filePath = tjCustomer.getCusId() + tjNum + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
+ return AjaxResult.success(filePath);
}
/**
@@ -95,8 +121,18 @@
JSONObject entries = JSONUtil.parseObj(json);
String card = entries.getStr("card");
// TjCustomer customer = tjCustomerMapper.getCusInfo(card);
- List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoList(card);
- return AjaxResult.success(customer);
+ String key = sysConfigService.selectConfigByKey("h5OrXcxQueryDate");
+ if (StrUtil.isBlank(key)){
+ key = "2025-05-01";
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ Date date = sdf.parse(key);
+ List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoList(card,date);
+ return AjaxResult.success(customer);
+ } catch (ParseException e) {
+ return AjaxResult.error();
+ }
}
/**
@@ -110,6 +146,15 @@
JSONObject entries = JSONUtil.parseObj(json);
String card = entries.getStr("card");
String name = entries.getStr("name");
+ if (StrUtil.isBlank(name)){
+ LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjCustomer::getCusIdcard,card);
+ wrapper.orderByDesc(TjCustomer::getCusId);
+ wrapper.last("LIMIT 1");
+ TjCustomer customer = tjCustomerMapper.selectOne(wrapper);
+ if (customer == null) return AjaxResult.error();
+ name = customer.getCusName();
+ }
List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoListByCardAndName(card,name);
return AjaxResult.success(customer);
}
--
Gitblit v1.8.0