From 92db9e7f8e1f79f5b61266382149843159907157 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 12 八月 2025 18:03:00 +0800
Subject: [PATCH] zjh20250812
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 21 ----------
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 81 +++++++++++++++++++++++++++++-----------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 6 +--
3 files changed, 62 insertions(+), 46 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index 17af177..f55d1d1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -4,15 +4,11 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
-import com.ltkj.common.core.page.TableDataInfo;
-import com.ltkj.common.utils.SecurityUtils;
-import com.ltkj.common.utils.StringUtils;
-import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
@@ -20,21 +16,16 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
-import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
+import com.ltkj.web.controller.system.TjReportController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.One;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.impl.CTJcImpl;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.session.InMemoryWebSessionStore;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -43,7 +34,6 @@
import java.net.URL;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/lige
@@ -88,6 +78,8 @@
private LtkjExamJcsqdService jcsqdService;
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private TjReportController tjReportController;
/**
@@ -415,15 +407,6 @@
@GetMapping("/preview/{flag}/{TjNumber}")
@ApiOperation(value = "涓嬭浇浣撴鎶ュ憡")
public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
- //淇敼order琛ㄤ腑鐨勪笅杞芥姤鍛婃椂闂翠负褰撳墠鏃堕棿
-// LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
-// updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
-// updateWrapper.set(TjOrder::getPrintLastTime, new Date());
-// updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
-// updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
-// orderService.update(updateWrapper);
-
-
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = orderService.getOne(wq1);
@@ -532,4 +515,58 @@
}
return AjaxResult.success("鎮ㄨ繕娌℃湁浣撴璁板綍锛�");
}
+
+
+ @PostMapping("/tijianjilu")
+ @ApiOperation("灏忕▼搴忎綋妫�璁板綍")
+ public AjaxResult tijianjilu(@RequestBody String json) {
+ cn.hutool.json.JSONObject entries = JSONUtil.parseObj(json);
+ String idCard = entries.getStr("idCard");
+ String kssj = entries.getStr("kssj");
+ String jssj = entries.getStr("jssj");
+ TjCustomer tjCustomer = customerService.getTjCustomerByCusIdCard(idCard);
+ if (null != tjCustomer) {
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrder::getUserId, tjCustomer.getCusId());
+ wq.eq(TjOrder::getCheckStatus, 1);
+ wq.eq(TjOrder::getHeshouStatus, 1);
+ wq.isNotNull(TjOrder::getReportTime);
+ wq.isNotNull(TjOrder::getHeshouTime);
+ if(StringUtil.isNotBlank(kssj) && StringUtil.isNotBlank(jssj)){
+ wq.between(TjOrder::getCreateTime, kssj, jssj);
+ }else {
+ DateTime start = DateUtil.beginOfMonth(DateUtil.date());
+ DateTime end = DateUtil.beginOfMonth(DateUtil.offsetMonth(DateUtil.date(), 1));
+ wq.between(TjOrder::getCreateTime, start, end);
+ }
+ List<TjOrder> list = orderService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ for (TjOrder order : list) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("tjNumber", order.getTjNumber());
+ map.put("status", "宸插畬鎴�");
+ map.put("cusName", tjCustomer.getCusName());
+ map.put("cusSex", tjCustomer.getCusSex());
+ map.put("age", tjCustomer.getAge());
+ map.put("tjTime",order.getCreateTime());
+ mapList.add(map);
+ }
+ return AjaxResult.success(mapList);
+ }
+ }
+
+ return AjaxResult.error("鏆傛棤浣撴璁板綍");
+ }
+
+
+ @PostMapping("/preview")
+ @ApiOperation(value = "涓嬭浇浣撴鎶ュ憡")
+ public void preview(HttpServletResponse response,@RequestBody String json) {
+ cn.hutool.json.JSONObject entries = JSONUtil.parseObj(json);
+ String tjNumber = entries.getStr("tjNumber");
+ tjReportController.preview(response, true, tjNumber);
+ }
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 8ec252f..325f7d0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -497,11 +497,9 @@
return AjaxResult.error("鎵嬫満鍙烽敊璇�,璇锋鏌ユ墜鏈哄彿鏄惁鏈夋晥!");
}
- LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
- wq.eq(TjCustomer::getCusIdcard, cusIdcard);
- TjCustomer customer = tjCustomerService.getOne(wq);
+ TjCustomer customer = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
if (customer != null) {
- return AjaxResult.error("璇ヤ汉鍛樺凡瀛樺湪");
+ return AjaxResult.success(customer);
}
String substring = cusIdcard.substring(cusIdcard.length() - 6);
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 80b6b28..792f564 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -1741,15 +1741,6 @@
public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
-// LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
-// we.eq(TjReport::getTjNumber, tjNumber);
-// we.eq(TjReport::getType, "浣撴鎶ュ憡");
-// TjReport one = tjReportService.getOne(we);
-// if (one == null) {
-// return;
-// }
-// String userId = SecurityUtils.getLoginUser().getUsername();
-// PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
String value = configService.selectConfigByKey("path_filePath");
String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
File f = new File(filePath);
@@ -1781,17 +1772,7 @@
while ((len = br.read(bs)) > 0) {
out.write(bs, 0, len);
}
-// if(null !=tjOrder.getHeshouTime() && tjOrder.getHeshouStatus()==1){
-// TjReportPrint print=new TjReportPrint();
-// print.setTjNumber(tjNumber);
-// print.setPrintBy(SecurityUtils.getLoginUser().getUser().getNickName());
-// print.setPrintTime(date);
-// print.setPrintStatus("宸叉墦鍗�");
-// if (printService.save(print)) {
-// tjOrder.setPrintLastTime(date);
-// tjOrderService.updateById(tjOrder);
-// }
-// }
+
out.flush();
out.close();
br.close();
--
Gitblit v1.8.0