From f3445e5babad91627609b898dbc9b5ed844d7cdd Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 16 七月 2024 18:09:18 +0800
Subject: [PATCH] zjh 2024/07/16-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 29 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 07fe543..be9a9cc 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
@@ -15,6 +15,8 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.mall.mallOrderUtils.TjConstants;
@@ -54,39 +56,36 @@
@Resource
private ITjReportService reportService;
-
@Resource
private ITjCustomerService customerService;
@Autowired
private ITjOrderService orderService;
-
@Autowired
private ITjOrderDetailService detailService;
-
@Resource
private ITjProjectService projectService;
-
@Resource
private ITjOrderRemarkService remarkService;
-
@Resource
private ITjStandardService standardService;
-
@Resource
private ITjAdviceService adviceService;
-
@Resource
private IDictCompService compService;
-
@Resource
private ITjReportTemplateService reportTemplateService;
-
@Value("${path.filePath}")
private String value;
@Resource
private LtkjHybgdService ltkjHybgdService;
@Resource
private LtkjHysqdService ltkjHysqdService;
+ @Resource
+ private LtkjExamJcbgdService jcbgdService;
+ @Resource
+ private LtkjExamJcsqdService jcsqdService;
+
+
/**
* 灏忕▼搴忔煡璇綋妫�鎶ュ憡鍒楄〃
*/
@@ -131,7 +130,7 @@
public AjaxResult getRelativeReportList(@RequestParam @ApiParam(value = "濮撳悕") String cusName,
@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusIdcard) {
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjCustomer::getCusName, cusName);
+ wq1.like(TjCustomer::getCusName, cusName);
wq1.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer customer = customerService.getOne(wq1);
if (null != customer) {
@@ -208,26 +207,27 @@
}
LambdaQueryWrapper<TjProject> wqqqq = new LambdaQueryWrapper<>();
wqqqq.eq(TjProject::getProId, tjOrderDetail.getProId());
+ wqqqq.eq(TjProject::getNeedReport,"Y");
tjOrderDetail.setProject(projectService.getOne(wqqqq));
- LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
- wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
- List<TjStandard> list2 = standardService.list(wq6);
- if (list2.size() == 0) {
- tjOrderDetail.setStandard(null);
- } else if (list2.size() == 1) {
- tjOrderDetail.setStandard(list2.get(0));
- } else {
- for (TjStandard tjStandard : list2) {
- LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
- if (tjStandard.getTjSex() != null) {
- wq8.eq(TjStandard::getTjSex, customer.getCusSex());
- }
- if (tjStandard.getTjType() != null) {
- wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
- }
- tjOrderDetail.setStandard(standardService.getOne(wq8));
- }
- }
+ // LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
+// wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
+// List<TjStandard> list2 = standardService.list(wq6);
+// if (list2.size() == 0) {
+// tjOrderDetail.setStandard(null);
+// } else if (list2.size() == 1) {
+// tjOrderDetail.setStandard(list2.get(0));
+// } else {
+// for (TjStandard tjStandard : list2) {
+// LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
+// if (tjStandard.getTjSex() != null) {
+// wq8.eq(TjStandard::getTjSex, customer.getCusSex());
+// }
+// if (tjStandard.getTjType() != null) {
+// wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
+// }
+// tjOrderDetail.setStandard(standardService.getOne(wq8));
+// }
+// }
}
LambdaQueryWrapper<TjAdvice> wq3 = new LambdaQueryWrapper<>();
wq3.eq(TjAdvice::getProId, remark.getProId());
@@ -299,6 +299,35 @@
}
+
+ @GetMapping("/getJcReportByTjNumber")
+ @ApiOperation(value = "灏忕▼搴�-浣撴妫�鏌ユ姤鍛婃煡璇㈣鎯�")
+ public AjaxResult getJcReportByTjNumber(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrder::getTjNumber, tjNumber);
+ wq1.eq(TjOrder::getCheckStatus, 1);
+ TjOrder one = orderService.getOne(wq1);
+ if (one == null) {
+ return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
+ }
+ List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(one.getCardId());
+ if(null !=jcsqdList && jcsqdList.size()>0){
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (LtkjExamJcsqd jcsqd : jcsqdList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("parent",jcsqd.getJcxmmc());
+ map.put("jcbx",jcsqd.getJgbx());
+ List<LtkjExamJcbgd> jcbgdList = jcbgdService.getJianJcBaoGaoDanList(jcsqd.getTmh());
+ map.put("sons",jcbgdList);
+ list.add(map);
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.success("璇ュ鎴峰湪娌℃湁浣撴椤圭洰鏁版嵁锛�");
+ }
+
+
+
/**
* 灏忕▼搴忕偣鍑讳綋妫�鎶ュ憡鏌ヨ璇︽儏,鏄剧ず韬珮浣撻噸浣撻噸鎸囨暟鏀剁缉鍘嬭垝寮犲帇
*/
--
Gitblit v1.8.0