From 37de2f4b0f732ca5c19582d4a340ad7c987925b5 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 05 十一月 2025 22:40:47 +0800
Subject: [PATCH] feat: 部门管理多个车辆
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
index 1c907a9..d22458c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -146,8 +146,16 @@
Calendar calendar = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂�
+
+ if(tbOrders.getPatientName() != null && !tbOrders.getPatientName().equals(""))
+ {
+ model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
+ }
+ else
+ {
+ model.setPtName("鎮ｈ��"); // 闅忔満鐢熸垚鎮ｈ�呭鍚�
+ }
- model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�
@@ -222,16 +230,42 @@
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
- model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
+
+ if(tbOrders.getLinkPerson() != null && !tbOrders.getLinkPerson().equals(""))
+ {
+ model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
+ }
+ else
+ {
+ model.setCoName("鑱旂郴浜�"); // 闅忔満鐢熸垚鎮ｈ�呭鍚�
+ }
+
// model.setCoTies("瀹跺睘"); // 闅忔満璁剧疆瀹㈡埛鑱旂郴浜轰笌鎮ｈ�呭叧绯�
// 璁剧疆棰勭害鏃堕棿涓轰竴澶╁悗
Calendar calendar = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂�
- model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
- model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
- model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
+ if(tbOrders.getPatientName() != null && !tbOrders.getPatientName().equals(""))
+ {
+ model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
+ }
+ else
+ {
+ model.setPtName("鎮ｈ��"); // 闅忔満鐢熸垚鎮ｈ�呭鍚�
+ }
+
+
+
+ if(tbOrders.getAge()!=null && !tbOrders.getAge().equals(""))
+ {
+ model.setPtAge(tbOrders.getAge()); // 鎮ｈ�呭勾榫�
+ }
+ else {
+ model.setPtAge("骞撮緞");
+ }
+
+ model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�");
// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�
model.setOutHosp(tbOrders.getLocalAddress()); // 璁剧疆杞嚭鍖婚櫌
model.setInHosp(tbOrders.getSendAddress()); // 璁剧疆杞叆鍖婚櫌
@@ -305,6 +339,7 @@
model.setAPPID(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
model.setServiceOrdID(cancelVo.getThirdOrderNo()); // 璁剧疆绗笁鏂硅鍗曞彿
model.setDELRemarks(cancelVo.getReason()); // 璁剧疆鍙栨秷鍘熷洜
+ logger.info("鍙栨秷璁㈠崟-{}",cancelVo.getThirdOrderNo());
ServiceOrderDelResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());
@@ -314,6 +349,7 @@
tbOrders.setOrderID(cancelVo.getOrderID());
tbOrders.setOrderStatus(2); // 2鏄彇娑�
tbOrdersService.updateTbOrders(tbOrders);
+ logger.info("璁㈠崟鍙栨秷鎴愬姛锛�");
return AjaxResult.success(result);
} else {
return AjaxResult.error("鍙栨秷璁㈠崟澶辫触",result);
--
Gitblit v1.9.1