From 1bcb56cdad058478be0d9687d8a8a445de17b6a3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 四月 2025 11:24:11 +0800
Subject: [PATCH] 代码初始化
---
server/src/main/java/com/doumee/core/constants/Constants.java | 2 +-
admin/src/api/business/workorder.js | 3 +++
server/src/main/java/com/doumee/api/business/WorkorderController.java | 2 +-
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 3 +--
admin/src/components/business/OperaWorkorderDetailSheWindow.vue | 38 ++++++++++++++++----------------------
5 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/admin/src/api/business/workorder.js b/admin/src/api/business/workorder.js
index 7e78dd2..b9a709e 100644
--- a/admin/src/api/business/workorder.js
+++ b/admin/src/api/business/workorder.js
@@ -26,6 +26,9 @@
}
// 鍒犻櫎
+export function getById (id) {
+ return request.get(`/business/workorder/${id}`)
+}
export function deleteById (id) {
return request.get(`/business/workorder/delete/${id}`)
}
diff --git a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
index fb1b6db..f52b961 100644
--- a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
@@ -155,6 +155,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+import {getById } from '@/api/business/workorder'
export default {
name: 'OperaWorkorderWindow',
extends: BaseOpera,
@@ -186,34 +187,27 @@
this.title = title
this.visible = true
this.info = target
+ this.getDetail()
this.type = this.info.type
},
close () {
this.visible = false
},
getDetail () {
- const { id, type } = this
- switch (type) {
- case 0:
- getVisitedDetail({ id }).then(res => {
- this.info = res
- if (this.info.approveDateVO && this.info.approveDateVO.approveList.length > 0) {
- this.info.approveDateVO.approveList.forEach(item => {
- if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
- item.title = item.approveList[0].title
- item.faceImg = item.approveList[0].faceImg
- item.memberName = item.approveList[0].memberName
- item.statusInfo = item.approveList[0].statusInfo
- item.approveList = []
- }
- })
- }
- })
- break
-
- default:
- break
- }
+ getById(this.info.id).then(res => {
+ this.info = res
+ if (this.info.logList && this.info.logList.length > 0) {
+ this.info.logList.forEach(item => {
+ if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
+ item.title = item.approveList[0].title
+ item.faceImg = item.approveList[0].faceImg
+ item.memberName = item.approveList[0].memberName
+ item.statusInfo = item.approveList[0].statusInfo
+ item.approveList = []
+ }
+ })
+ }
+ })
},
reject () { },
handleAvatarSuccess () { },
diff --git a/server/src/main/java/com/doumee/api/business/WorkorderController.java b/server/src/main/java/com/doumee/api/business/WorkorderController.java
index 5a053ad..28822c1 100644
--- a/server/src/main/java/com/doumee/api/business/WorkorderController.java
+++ b/server/src/main/java/com/doumee/api/business/WorkorderController.java
@@ -80,6 +80,6 @@
@GetMapping("/{id}")
@RequiresPermissions("business:workorder:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(workorderService.findById(id));
+ return ApiResponse.success(workorderService.getDetail(id));
}
}
diff --git a/server/src/main/java/com/doumee/core/constants/Constants.java b/server/src/main/java/com/doumee/core/constants/Constants.java
index 6230b88..6ddea9c 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -199,7 +199,7 @@
// int dcaWorkOrder= 7;
//0宸ュ崟涓婃姤 1宸ュ崟澶勭悊 2宸ュ崟杞氦
- int upload = 0;
+ int upload = 0;
int deal = 1;
int passOn = 2;
}
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index 659e1f3..b9bddd8 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -93,7 +93,6 @@
return workorder.getId();
}
-
public void dealLogData(Workorder workorder){
//澶勭悊涓婃姤鏃ュ織 DCA宸ュ崟 鏃ュ織瀛樺偍鑷冲瓙涓氬姟 涓嶅瓨鍦ㄤ簬鐖剁骇
if(!Constants.equalsInteger(workorder.getType(),Constants.ONE)){
@@ -284,7 +283,7 @@
.selectAll(Workorder.class)
.selectAs(Member::getPhone,Workorder::getMemberPhone)
.selectAs(Member::getName,Workorder::getMemberName)
- .selectAs(Workorder::getCompanyName,Workorder::getCompanyName)
+ .selectAs(Member::getCompanyName,Workorder::getCompanyName)
.select(" c3.name ",Workorder::getTypeName)
.select(" c4.name ",Workorder::getProblemName)
.leftJoin(Member.class,Member::getId,Workorder::getMemberId)
--
Gitblit v1.9.3