From 847a7773ef1a8ad418c6934d35b5f205a97c04d0 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 06 十二月 2025 17:03:24 +0800
Subject: [PATCH] fix:在任务状态更新时，需要更新日志到旧系统
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
index 2e805b7..4205f96 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
@@ -17,6 +17,8 @@
import com.ruoyi.system.service.IDispatchOrdService;
import com.ruoyi.system.service.IPayInfoService;
import com.ruoyi.system.service.ITbOrdersService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -46,8 +48,9 @@
*/
@RestController
@RequestMapping("/system/order")
-//@DataSource(DataSourceType.SQLSERVER)
public class ServiceOrderController extends BaseController {
+
+ private static final Logger log = LoggerFactory.getLogger(ServiceOrderController.class);
@Autowired
private IServiceOrderService serviceOrderService;
@@ -92,10 +95,14 @@
* 鏍规嵁鏈嶅姟璁㈠崟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @Anonymous
+ @Anonymous(needSign = true)
@GetMapping(value = "/{serviceOrdId}")
public AjaxResult getInfo(@PathVariable Long serviceOrdId) {
TbOrders orderDetail = tbOrdersService.selectTbOrdersByOrderID(serviceOrdId);
+
+ if(orderDetail==null){
+ return AjaxResult.error("璁㈠崟涓嶅瓨鍦�");
+ }
//鏌ヨ鏈嶅姟鍗�
ServiceOrder mingServiceOrder = serviceOrderService.selectServiceOrderById(Long.valueOf(orderDetail.getServiceOrdID()));
@@ -261,17 +268,39 @@
medicalInfo.put("useVentilator", useVentilator);
- //鏀粯淇℃伅
-// List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt(orderDetail.getServiceOrdID()); //1016302788
- List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt("1016302788");
+ List<PayInfo> payInfoList = new ArrayList<>();
+ if(serviceOrdId==88801)
+ {
+ //娴嬭瘯鏁版嵁
+ payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt("1016302788");//娴嬭瘯浣跨敤
+ }
+ else{
+ payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt(orderDetail.getServiceOrdID()); //姝ｅ紡浣跨敤
+ }
+
//鍏朵粬淇℃伅
Map<String, Object> otherInfo = new HashMap<>();
//璇勪环
- otherInfo.put("serviceOrdVisit", Objects.toString(mingServiceOrder.getServiceOrdVisit(), "鏃�"));
+ otherInfo.put("serviceOrdVisit", Objects.toString(mingServiceOrder.getServiceOrdVisit(), "-"));
+
+ //鐭ユ儏鍚屾剰涔�
+ List<String> imageUrls = dispatchOrdService.selectImageUrlsByDOrdIDDt(orderDetail.getServiceOrdID()); //姝ｅ紡浣跨敤
+ otherInfo.put("imageUrls", imageUrls);
+ log.info("銆愮洃娴嬨�戠煡鎯呭悓鎰忎功:{}", imageUrls);
//鍙戠エ鑾峰彇
- Map<String, Object> invoiceInfo = payInfoService.selectLatestInvoiceInfo("1016302788");
+ Map<String, Object> invoiceInfo = new HashMap<>();
+
+ if(serviceOrdId==88801)
+ {
+ //娴嬭瘯鏁版嵁
+ invoiceInfo = payInfoService.selectLatestInvoiceInfo("1016302788");
+ }
+ else{
+ invoiceInfo = payInfoService.selectLatestInvoiceInfo(orderDetail.getServiceOrdID()); //姝ｅ紡浣跨敤
+ }
+
String invoiceStatus = "";
if (invoiceInfo != null && invoiceInfo.get("AuditStatus") != null) {
switch (String.valueOf(invoiceInfo.get("AuditStatus"))) {
--
Gitblit v1.9.1