From 8a0469c97262be9ecbc5eae38d812da789635c81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 17:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/dispatchReview.vue | 6 +++---
server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java | 3 ++-
company/src/components/business/dispatchUnitDetailsPlat.vue | 18 +++++++++---------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/company/src/components/business/dispatchReview.vue b/company/src/components/business/dispatchReview.vue
index 207d2c7..431b072 100644
--- a/company/src/components/business/dispatchReview.vue
+++ b/company/src/components/business/dispatchReview.vue
@@ -41,9 +41,9 @@
<el-table-column
label="鐘舵��">
<template slot-scope="{row}">
- <span v-if="row.status === 0">寰呭鏍�</span>
- <span v-if="row.status === 1">瀹℃牳閫氳繃</span>
- <span v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
+ <span :class="'du-status'+row.status" v-if="row.status === 0">寰呭鏍�</span>
+ <span :class="'du-status'+row.status" v-if="row.status === 1">瀹℃牳閫氳繃</span>
+ <span :class="'du-status'+row.status" v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
</el-table>
diff --git a/company/src/components/business/dispatchUnitDetailsPlat.vue b/company/src/components/business/dispatchUnitDetailsPlat.vue
index b73dd8b..a074359 100644
--- a/company/src/components/business/dispatchUnitDetailsPlat.vue
+++ b/company/src/components/business/dispatchUnitDetailsPlat.vue
@@ -23,13 +23,13 @@
</div>
<div class="info_list_item">
<div class="info_list_item_label">娲鹃仯鍗曚綅鐘舵�侊細</div>
- <div class="info_list_item_val" style="color:#2E68EC;" v-if="form.unitStatus === 0">寰呭鏍�</div>
- <div class="info_list_item_val" v-if="form.unitStatus === 1">
- <span style="color:#2E68EC;" v-if="form.worktypeStatus ==null||form.worktypeStatus === 0">宸ョ寰呭</span>
- <span style="color: green" v-if="form.worktypeStatus === 1">瀹℃牳閫氳繃</span>
- <span style="color: red;" v-if="form.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+ <div class="info_list_item_val" :class="'du-status'+row.status" v-if="form.unitStatus === 0">寰呭鏍�</div>
+ <div class="info_list_item_val" v-if="form.unitStatus === 1">
+ <span :class="'du-status'+row.worktypeStatus" style="color:#2E68EC;" v-if="form.worktypeStatus ==null||form.worktypeStatus === 0">宸ョ寰呭</span>
+ <span :class="'du-status'+row.worktypeStatus" v-if="form.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+ <span :class="'du-status'+row.worktypeStatus" v-if="form.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
</div>
- <div class="info_list_item_val" style="color: red;" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
+ <div class="info_list_item_val" :class="'du-status'+row.status" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">娲鹃仯鍗曚綅璇﹁堪锛�</div>
@@ -67,9 +67,9 @@
<el-table-column
label="鐘舵��">
<template slot-scope="{row}">
- <span style="color:#2E68EC" v-if="row.status === 0">寰呭鏍�</span>
- <span style="color:green" v-if="row.status === 1">瀹℃牳閫氳繃</span>
- <span style="color:red" v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
+ <span :class="'du-status'+row.status" v-if="row.status === 0">寰呭鏍�</span>
+ <span :class="'du-status'+row.status" v-if="row.status === 1">瀹℃牳閫氳繃</span>
+ <span :class="'du-status'+row.status" v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
<!-- <el-table-column
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
index 68c17f2..73b4e79 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
@@ -896,11 +896,12 @@
// .selectAs(DuSolution::getId,DispatchUnit::getDuSolutionId)
// .leftJoin(DuSolution.class,DuSolution::getDispatchUnitId,DispatchUnit::getId)
.eq(DispatchUnit::getIsdeleted,Constants.ZERO)
+ .select("(select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+dispatchUnitQueryDTO.getSolutionId()+" limit 1) as du_solution_id" )
.eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
.eq(DispatchUnit::getStatus,Constants.ZERO)
//.eq(DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType())
.eq(DispatchUnit::getDataType,Constants.TWO)
- .exists("select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id" )
+ .exists("select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+dispatchUnitQueryDTO.getSolutionId() )
// .eq(!Objects.isNull(dispatchUnitQueryDTO.getSolutionId()),DuSolution::getSolutionId,dispatchUnitQueryDTO.getSolutionId())
.exists(!Objects.isNull(dispatchUnitQueryDTO.getApplyId()),
" select 1 from apply_detail ad where ad.isdeleted = 0 and ad.apply_id = "+dispatchUnitQueryDTO.getApplyId()+" " +
--
Gitblit v1.9.3