From ac544c1d85c53e7f51e4ea76aa2489a14aef03d9 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 20 六月 2025 18:57:45 +0800 Subject: [PATCH] zjh20250620 --- ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 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 cfe4fd7..5e95ec5 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 @@ -3,9 +3,12 @@ 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.ITjOrderService; import com.ltkj.web.controller.system.TjCheckController; import com.ltkj.web.controller.system.TjReportController; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +38,8 @@ private TjCheckController tjCheckController; @Autowired private TjCustomerMapper tjCustomerMapper; + @Autowired + private ITjOrderService tjOrderService; /** * 鎻愪緵缁欎笁鏂硅皟鐢ㄧ殑鎶ュ憡鏌ョ湅鎺ュ彛 @@ -45,6 +50,13 @@ public void viewReport(HttpServletResponse response, @RequestBody String json) throws IOException { 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; + } tjReportController.preview(response,true,tjNum); } @@ -56,6 +68,13 @@ @PostMapping("/reportData") public AjaxResult reportData(@RequestBody String json){ String tjNum = JSONUtil.parseObj(json).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("鏆傛棤鏁版嵁锛侊紒"); + } JSONObject entries = JSONUtil.parseObj(tjCheckController.updateCheckType(tjNum)); removeNullFields(entries); return JSONUtil.toBean(entries, AjaxResult.class); -- Gitblit v1.8.0