From dadbd2659a23784c0fb95f954d5a9ca749f55320 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 29 二月 2024 18:06:25 +0800
Subject: [PATCH] zjh 本地 2024/02/29 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index 37c8d1a..8e13670 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -10,16 +10,14 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.domain.TjOrder;
-import com.ltkj.hosp.domain.TjOrderRemark;
-import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.ConvertingCursor;
@@ -82,6 +80,11 @@
private LtkjHisUserService hisUserService;
@Resource
private ITjProjectService tjProjectService;
+ @Autowired
+ private ITjOrderDetailService tjOrderDetailService;
+ @Resource
+ private ITjOrderRemarkService tjOrderRemarkService;
+
@GetMapping("/getTjHyBgList")
@ApiOperation(value = "鏌ヨlis鏁版嵁搴撻」鐩俊鎭帴鍙�")
@@ -415,7 +418,7 @@
@GetMapping("/getTjYxjcList")
@ApiOperation(value = "鏌ヨ褰卞搷妫�鏌ラ」鐩�")
public AjaxResult getTjYxjcList() {
- List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList("鏉ㄤ簯浜�",null,null,null);
+ List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList("鏉ㄤ簯浜�",null,null);
return AjaxResult.success(tjYxjcList);
}
@@ -439,4 +442,17 @@
}
+ @GetMapping("/getHuaYanProByTjNum")
+ @ApiOperation(value = "鏍规嵁浣撴鍙锋煡璇㈠寲楠岄」鐩帴鍙�")
+ public AjaxResult getHuaYanProByTjNum(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+ Map<String,Object> map=new HashMap<>();
+
+ List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanTable(tjNumber);
+ List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanTable(tjNumber);
+ map.put("tjOrderDetails",tjOrderDetails);
+ map.put("tjOrderRemarks",tjOrderRemarks);
+ return AjaxResult.success(map);
+ }
+
+
}
--
Gitblit v1.8.0