From f20eab3d08011a159e728f5dbfd3197b8ba84d09 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 17 十二月 2024 14:13:00 +0800
Subject: [PATCH] zjh202412017
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 165 +++++++++++-------------------------------------------
1 files changed, 34 insertions(+), 131 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 358ed9c..8027547 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -629,147 +629,19 @@
@ApiOperation(value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃")
public AjaxResult getOrderListOO(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "鎵撳嵃鏈墦鍗扮姸鎬� 0鏈墦鍗� 1宸叉墦鍗�") @RequestParam(defaultValue = "0") Integer dyzt,
+ @ApiParam(value = "鎵撳嵃鏈墦鍗扮姸鎬� 0鏈墦鍗� 1宸叉墦鍗�") @RequestParam(required = false) Integer dyzt,
@ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw,
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
@ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
- Map<String, Object> map = new HashMap<>();
+ /* Map<String, Object> map = new HashMap<>();
List<Long> cusIds = null;
if (StringUtil.isNotBlank(name)) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
-// if (null != customerList && !customerList.isEmpty()) {
-// List<TjOrder> list = new ArrayList<>();
-// for (TjCustomer customer : customerList) {
-// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjOrder::getUserId, customer.getCusId());
-// if (dyzt == 0) {
-// wq.isNull(TjOrder::getPrintLastTime);
-// wq.eq(TjOrder::getHeshouStatus, 1);
-// } else {
-// wq.isNotNull(TjOrder::getPrintLastTime);
-// }
-// list.addAll(tjOrderService.list(wq));
-// }
-// List<TjOrder> collect = null;
-// if (!list.isEmpty()) {
-//
-// for (int i = 0; i < list.size(); i++) {
-// TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
-// if (null == tjCustomer) {
-// list.remove(list.get(i));
-// continue;
-// }
-// list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
-// list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
-// list.get(i).setTjCustomerName(tjCustomer.getCusName());
-// list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
-// list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
-//
-// if (null != tjCustomer.getCompName()) {
-// list.get(i).setDictCompName(tjCustomer.getCompName());
-// } else {
-// String firmId = list.get(i).getFirmId();
-// if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
-// list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
-// }
-// }
-//
-// if (null != list.get(i).getPacId()) {
-// if (null != tjPackageService.getById(list.get(i).getPacId())) {
-// list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
-// }
-// if (null != dwDeptService.getById(list.get(i).getPacId())) {
-// list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
-// }
-// }
-// }
-// collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// }
-// if (null != collect) {
-// map.put("total", collect.size());
-// } else {
-// map.put("total", 0);
-// }
-// if (collect == null) collect = new ArrayList<>();
-// map.put("list", collect);
-// return AjaxResult.success(map);
-// }
-
}
-// if (StringUtil.isNotBlank(dw)) {
-// LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
-// wqq.like(TjCustomer::getCompName, dw);
-// List<TjCustomer> customerList = tjCustomerService.list(wqq);
-// List<TjOrder> list = new ArrayList<>();
-// if (null != customerList && !customerList.isEmpty()) {
-// for (TjCustomer customer : customerList) {
-// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjOrder::getUserId, customer.getCusId());
-// if (dyzt == 0) {
-// wq.isNull(TjOrder::getPrintLastTime);
-// wq.eq(TjOrder::getHeshouStatus, 1);
-// } else {
-// wq.isNotNull(TjOrder::getPrintLastTime);
-// }
-// list.addAll(tjOrderService.list(wq));
-// }
-// }
-// List<String> dwIds = iDictCompService.getdwIdByDwName(dw);
-//
-// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-// wq.in(TjOrder::getFirmId, dwIds);
-// list.addAll(tjOrderService.list(wq));
-// List<TjOrder> collect = null;
-// if (!list.isEmpty()) {
-// List<TjOrder> orders = list.stream().distinct().collect(Collectors.toList());
-// for (int i = 0; i < orders.size(); i++) {
-// TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
-// if (null == tjCustomer) {
-// list.remove(list.get(i));
-// continue;
-// }
-// list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
-// list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
-// list.get(i).setTjCustomerName(tjCustomer.getCusName());
-// list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
-// list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
-//
-// if (null != tjCustomer.getCompName()) {
-// list.get(i).setDictCompName(tjCustomer.getCompName());
-// } else {
-// String firmId = list.get(i).getFirmId();
-// if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
-// list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
-// }
-// }
-//
-// if (null != list.get(i).getPacId()) {
-// if (null != tjPackageService.getById(list.get(i).getPacId())) {
-// list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
-// }
-// if (null != dwDeptService.getById(list.get(i).getPacId())) {
-// list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
-// }
-// }
-// }
-// collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// }
-// if (null != collect) {
-// map.put("total", collect.size());
-// } else {
-// map.put("total", 0);
-// }
-// map.put("list", collect);
-// return AjaxResult.success(map);
-//
-//
-// }
-
-
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
if (dyzt == 0) {
@@ -837,7 +709,11 @@
}
}
map.put("list", list);
- map.put("total", page2.getTotal());
+ map.put("total", page2.getTotal());*/
+
+ if (djbeginTime == null) djbeginTime = "";
+ if (djendTime == null) djendTime = "";
+ Map<String, Object> map= tjOrderService.getTjBgdyList(pageNum,pageSize,dyzt,tjNum,name,dw,djbeginTime,djendTime);
return AjaxResult.success(map);
}
@@ -3403,5 +3279,32 @@
}
+
+ @PostMapping("/heshouchexiao")
+ @ApiOperation(value = "鏍告敹鎾ら攢鎺ュ彛")
+ @Transactional
+ public AjaxResult heshouchexiao(@RequestBody List<String> tjNUms) {
+
+ if(null !=tjNUms && !tjNUms.isEmpty()){
+ for (String tjNUm : tjNUms) {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+ if(null !=order){
+ order.setHeshouStatus(0);
+ order.setHeshouTime(null);
+ order.setHeshouDoctor(null);
+ order.setPrintLastTime(null);
+ order.setStatus(TjConstants.TJ_WAIT);
+ if (!tjOrderService.updateById(order)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触");
+ }
+ }
+ }
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
+ return AjaxResult.error();
+ }
+
+
}
--
Gitblit v1.8.0