From 7e31516ad9ea863cba1d592e2a7b5c37e74e55a0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 31 七月 2024 18:07:55 +0800
Subject: [PATCH] zjh 2024/07/31-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 7 ++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 3 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 3 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 3 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/ShenGaoTiZhongVo.java | 15 +++++++++++++++
5 files changed, 25 insertions(+), 6 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 d4fda5e..23abc8f 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
@@ -19,6 +19,7 @@
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
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.web.config.pdfutils.PDFBinaryUtil;
import io.swagger.annotations.Api;
@@ -334,7 +335,7 @@
@GetMapping("/getShenGaoTiZhong")
@ApiOperation(value = "灏忕▼搴�-浣撴鎶ュ憡鏌ヨ璇︽儏")
public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
- Map<String, Object> objectMap = new HashMap<>();
+// Map<String, Object> objectMap = new HashMap<>();
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjOrder::getTjNumber, tjNumber);
wq1.eq(TjOrder::getCheckStatus, 1);
@@ -343,7 +344,7 @@
return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
}
- List<Map<String, Object>> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
+ List<ShenGaoTiZhongVo> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
// if(null !=maps && maps.size()>0){
// for (Map<String, Object> map : maps) {
// if (map.get("") == null) {
@@ -373,7 +374,7 @@
// }
// }
// }
-
+ log.info("ltkj {}鐨勪綋妫�鎶ュ憡鏌ヨ璇︽儏"+maps,tjNumber);
return AjaxResult.success(maps);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 5d3d2f5..53e306a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import org.apache.ibatis.annotations.*;
/**
@@ -224,5 +225,5 @@
"\t\t\tOR c.pro_name LIKE '%鏀剁缉鍘�%' \n" +
"\t\tOR c.pro_name LIKE '%鑸掑紶鍘�%' \n" +
"\t)) aa ")
- List<Map<String,Object>> getShenGaoTiZhongList(String tjNum);
+ List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
index 67eb13d..06ee3ed 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -7,6 +7,7 @@
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import org.apache.ibatis.annotations.Select;
/**
@@ -115,5 +116,5 @@
- List<Map<String,Object>> getShenGaoTiZhongList(String tjNum);
+ List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index 1517ba1..70f0eac 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -7,6 +7,7 @@
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ltkj.hosp.mapper.TjOrderDetailMapper;
@@ -186,7 +187,7 @@
}
@Override
- public List<Map<String, Object>> getShenGaoTiZhongList(String tjNum) {
+ public List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum) {
return tjOrderDetailMapper.getShenGaoTiZhongList(tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/ShenGaoTiZhongVo.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/ShenGaoTiZhongVo.java
new file mode 100644
index 0000000..6b01e9c
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/ShenGaoTiZhongVo.java
@@ -0,0 +1,15 @@
+package com.ltkj.hosp.vodomain;/*
+ * @Authot:zjh
+ * @Date: 2024-07-31 16:49
+ * */
+
+import lombok.Data;
+
+@Data
+public class ShenGaoTiZhongVo {
+ private String tizhong;
+ private String tizhongzhishu;
+ private String shousuoya;
+ private String shenggao;
+ private String shuzhangya;
+}
--
Gitblit v1.8.0