From 1199031849b7301d2b67cd763b6e3d1d91595ea5 Mon Sep 17 00:00:00 2001
From: wangmengzhao <1036088376@qq.com>
Date: 星期四, 07 十二月 2023 22:07:20 +0800
Subject: [PATCH] 小程序端用户登录创建维修单修改代码优化，在DeviceController新加接口shortListRepair对不同的用户登录后看到自己的设备20231207wmz
---
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceOrderServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceOrderServiceImpl.java b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceOrderServiceImpl.java
index 912aef6..0c70230 100644
--- a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceOrderServiceImpl.java
+++ b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceOrderServiceImpl.java
@@ -156,7 +156,7 @@
//鏅�氱敤鎴峰垱寤虹淮淇崟鐨勬椂鍊檜serid=浠栨湰韬櫥褰曠殑userid锛宑reate_userid=鑱旇惀鍟嗙殑id
//鏇存柊璁㈠崟鐨勭敤鎴蜂俊鎭�
- //鍒ゆ柇userId鏄惁澶т簬0灏辨墽琛孲ysUser sysUser = getLoginUser().getUser();deviceOrder.setCreateUserId(sysUser.getUserId());
+ //鍒ゆ柇userId鏄惁澶т簬0锛屽ぇ浜�0灏辨墽琛孲ysUser sysUser = getLoginUser().getUser();deviceOrder.setCreateUserId(sysUser.getUserId());
if (deviceOrder.getUserId() != null) {
//鐢ㄦ埛鍦ㄥ皬绋嬪簭鍒涘缓缁翠慨鍗曠殑鎯呭喌锛寀serId=2,createUserId=140
deviceOrder.setUserId(deviceOrder.getUserId());
@@ -237,7 +237,7 @@
}
return toAjax(rows);
} else {
- //鍒ゆ柇浼犺繃鏉ョ殑orderType鐨勫�兼槸鍚︿负2-缁翠慨锛屽苟涓旂淮淇崟鐨勭姸鎬佷负涓哄凡瀹屾垚锛屼慨鏀硅澶囩殑鏄惁缁翠慨涓�0-宸茬淮淇�
+ //鍒ゆ柇浼犺繃鏉ョ殑orderType鐨勫�兼槸鍚︿负2-缁翠慨锛屽苟涓旂淮淇崟鐨勭姸鎬佷负涓哄凡瀹屾垚锛屼慨鏀硅澶囩殑鏄惁缁翠慨涓�1-宸茬淮淇�
if ("2".equals(deviceOrder.getOrderType()) && deviceOrder.getState() == 3) {
//鑾峰彇淇敼璁㈠崟鐨勭敤鎴蜂俊鎭�
//鎷垮埌淇淮淇崟鐨勭敤鎴穒d
@@ -247,7 +247,7 @@
if (rows > 0) {
Device deviceRepairOrder = deviceService.selectDeviceByDeviceId(deviceOrder.getDeviceId());
device.setDeviceId(deviceOrder.getDeviceId());
- device.setRepairFlag(0);
+ device.setRepairFlag(1);
device.setStatus(deviceRepairOrder.getStatus());
deviceService.updateDevice(device);
}
--
Gitblit v1.8.0