From 8fc9e2cb7c40ff840ca40e0491124bc1d166a15e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 六月 2025 10:20:23 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 3 +++
h5/packagesMine/confirmAppointment/confirmAppointment.vue | 2 +-
h5/pages/staff/meetingCalendar.vue | 2 +-
h5/pages/staff/meetingSubOrder.vue | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 3 +--
admin/src/views/business/visits.vue | 6 ++++++
admin/src/views/meeting/components/OperaBookingsDetailWindow.vue | 4 ++++
admin/src/views/meeting/bookings.vue | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 1 +
admin/src/views/meeting/components/OperaBookingsWindow.vue | 4 ++--
h5/pages/staff/meetingManager.vue | 2 +-
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 1 +
12 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index e70dc07..87bfc92 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -97,6 +97,12 @@
<span v-if="row.status === 9" style="color: gray">宸插け鏁�</span>
</template>
</el-table-column>
+ <el-table-column label="鍦ㄥ洯鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.status == 7 && row.retentionNum && row.retentionNum >0 ">鏄�</span>
+ <span v-else >鍚�</span>
+ </template>
+ </el-table-column>
<el-table-column prop="remark" label="涓嬪彂澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="170px"></el-table-column>
<el-table-column label="鎿嶄綔"
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 6f7de89..6f44d68 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -93,8 +93,8 @@
<!-- {{ row.status==0 ? '姝ｅ父' : '鍙栨秷' }} -->
</template>
</el-table-column>
+ <el-table-column prop="remark" label="浼氳闇�姹�" align="center" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="150px"></el-table-column>
- <!-- <el-table-column prop="content" label="浼氳鍐呭" min-width="100px"></el-table-column> -->
<el-table-column v-if="
containPermissions([
'business:bookings:update',
diff --git a/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue b/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
index 602fa6b..d43d023 100644
--- a/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
@@ -21,6 +21,10 @@
<div class="item-title">浼氳鍐呭</div>
<div class="item-value">{{ form.content || "鏃�" }}</div>
</div>
+ <div class="item">
+ <div class="item-title">浼氳闇�姹�</div>
+ <div class="item-value">{{ form.remark || "鏃�" }}</div>
+ </div>
<div v-if="form.projectList && form.projectList.length" class="item">
<div class="">鏈嶅姟椤�</div>
<div class="item-value">
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index 0431450..70f7c03 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -53,8 +53,8 @@
<FileLink :links="form.fileList" linkName="fileFullUrl" />
</div>
</el-form-item>
- <el-form-item label="浼氳澶囨敞" prop="remark">
- <el-input type="textarea" v-model="form.remark" placeholder="璇疯緭鍏ヤ細璁娉�" v-trim />
+ <el-form-item label="浼氳闇�姹�" prop="remark">
+ <el-input type="textarea" v-model="form.remark" placeholder="璇疯緭鍏ヤ細璁渶姹�" v-trim />
</el-form-item>
<input type="file" @change="upFiles" ref="upFile" style="display: none;" />
</el-form>
diff --git a/h5/packagesMine/confirmAppointment/confirmAppointment.vue b/h5/packagesMine/confirmAppointment/confirmAppointment.vue
index 448fbe3..c19ed1a 100644
--- a/h5/packagesMine/confirmAppointment/confirmAppointment.vue
+++ b/h5/packagesMine/confirmAppointment/confirmAppointment.vue
@@ -97,7 +97,7 @@
</view>
<view class="confirm_b_item">
<view class="label">
- <text>澶囨敞</text>
+ <text>浼氳闇�姹�</text>
</view>
<view class="input">
<textarea
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 5646185..d516073 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -89,7 +89,7 @@
<view class="value">{{ item.bookingUser }}</view>
</view>
<view class="line">
- <view class="label">澶囨敞锛�</view>
+ <view class="label">浼氳闇�姹傦細</view>
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
diff --git a/h5/pages/staff/meetingManager.vue b/h5/pages/staff/meetingManager.vue
index 0c68958..9d6dfdd 100644
--- a/h5/pages/staff/meetingManager.vue
+++ b/h5/pages/staff/meetingManager.vue
@@ -70,7 +70,7 @@
<view class="value">{{ item.bookingUser }}</view>
</view>
<view class="line">
- <view class="label">澶囨敞锛�</view>
+ <view class="label">浼氳闇�姹傦細</view>
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
diff --git a/h5/pages/staff/meetingSubOrder.vue b/h5/pages/staff/meetingSubOrder.vue
index 25526ef..3237426 100644
--- a/h5/pages/staff/meetingSubOrder.vue
+++ b/h5/pages/staff/meetingSubOrder.vue
@@ -85,7 +85,7 @@
</view>
<view class="item">
<view class="name">
- <text>澶囨敞</text>
+ <text>浼氳闇�姹�</text>
</view>
<view class="line">
<u-textarea border="none" autoHeight v-model="param.remark" :maxlength="-1" placeholder="璇疯緭鍏�" placeholder-class="placeholder9"
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
index 5e97dc8..4ae6fe8 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -43,6 +43,7 @@
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="浼氳闇�姹�",index = 7,width = 10)
private String remark;
@ApiModelProperty(value = "浼氳涓婚")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index c1bcb97..0c23522 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -326,6 +326,9 @@
@ApiModelProperty(value = "閫氱煡鎻忚堪")
@TableField(exist = false)
private String info;
+ @ApiModelProperty(value = "褰撳墠鏄惁鍦ㄥ洯")
+ @TableField(exist = false)
+ private Integer retentionNum;
@ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
index c9c0ab1..2d067fc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -382,8 +382,7 @@
|| Objects.isNull(platformBooksApplyDTO.getDriverId())
|| StringUtils.isBlank(platformBooksApplyDTO.getDriverPhone())
|| StringUtils.isBlank(platformBooksApplyDTO.getDriverName())
- || StringUtils.isBlank(platformBooksApplyDTO.getTransportImg())
- ){
+ || StringUtils.isBlank(platformBooksApplyDTO.getTransportImg())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
//鏌ヨ杞﹁締鏄惁涓鸿嚜鏈夎溅
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index ba63d6f..f4b8bb7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1296,6 +1296,7 @@
queryWrapper.selectAll(Visits.class);
queryWrapper.select(" ( select count(distinct(v.CAR_NOS)) from visits v where v.PARENT_ID = t.ID and v.CAR_NOS is not null and v.CAR_NOS != '' and v.CAR_NOS != t.CAR_NOS ) as carNum ");
+ queryWrapper.select(" ( select count(distinct(v.id)) from retention v where v.member_id = t.member_id and v.type=1 )",Visits::getRetentionNum);
queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
--
Gitblit v1.9.3