From 3a38c84a8d021600ad555ce8e2b0b03b69d274d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 三月 2025 10:10:08 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2 +-
admin/src/views/business/retentionCars.vue | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 13 +++++++------
admin/src/views/business/retention.vue | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 4 ++--
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 2 +-
admin/src/views/business/deviceEvent.vue | 6 ++----
admin/src/views/operation/danger/record.vue | 4 +++-
9 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 5564933..59aea23 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -80,7 +80,8 @@
<el-table-column prop="devName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="srcName" label="闂ㄧ鐐�" min-width="110px"></el-table-column>
<el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column label="鍑哄叆绫诲瀷" min-width="100px">
+ <el-table-column label="鍑哄叆绫诲瀷" min-width="100px">WMS浣滀笟宸插畬鎴�
+
<template slot-scope="{row}">
<span v-if="row.extEventInOut === 1">杩�</span>
<span v-if="row.extEventInOut != 1">鍑�</span>
@@ -93,9 +94,6 @@
</el-image>
</template>
</el-table-column>
-
-
-
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 40c7f04..0392b6a 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -72,7 +72,7 @@
<span>{{ row.deviceName || '-' }}</span>
</template>
</el-table-column>
- <el-table-column prop="eventDate" label="杩涘満鏃堕棿" min-width="140px"></el-table-column>
+ <el-table-column prop="eventDate" label="鏈�鍚庤繘鍦烘椂闂�" min-width="140px"></el-table-column>
<el-table-column label="浜鸿劯鐓х墖" min-width="100px">
<template slot-scope="{ row }">
<el-image v-if="row.faceImgFull != null" style="width: 80px; height: 80px" :src="row.faceImgFull"
diff --git a/admin/src/views/business/retentionCars.vue b/admin/src/views/business/retentionCars.vue
index 45320b1..815a2fa 100644
--- a/admin/src/views/business/retentionCars.vue
+++ b/admin/src/views/business/retentionCars.vue
@@ -51,7 +51,7 @@
</ul>
<el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="createDate" label="杩涘満鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="createDate" label="鏈�鍚庤繘鍦烘椂闂�" min-width="150px"></el-table-column>
<el-table-column prop="carNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
<el-table-column prop="companyName" label="缁勭粐" min-width="250px">
<template slot-scope="{ row }">
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index 84cce04..4c85924 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -68,7 +68,7 @@
<el-table-column prop="content" label="闂鎻忚堪" min-width="150px"></el-table-column>
<el-table-column prop="memberName" label="鎻愭姤浜�" min-width="80px"></el-table-column>
<el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
- <el-table-column prop="createDate" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="submitTime" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column label="澶勭悊缁撴灉" min-width="100px">
<template slot-scope="{row}">
<span class="status-blue" v-if="row.status === 0">寰呭鐞�</span>
@@ -76,7 +76,9 @@
<span class="status-red" v-if="row.status === 2">宸查��鍥�</span>
</template>
</el-table-column>
+<!--
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
+-->
<!-- <el-table-column label="鎿嶄綔" min-width="180" fixed="right"> -->
<el-table-column prop="dealTime" label="澶勭悊鏃堕棿" min-width="150px"></el-table-column>
<!--
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index ddf7501..e784118 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -1582,7 +1582,7 @@
.replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
.replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
.replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,""))
- .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"")));
+ .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�")));
smsEmailList.add(smsEmail);
}
}
@@ -1608,7 +1608,7 @@
.replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(systemUser.getRealname(),""))
.replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
.replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
- .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),""))
+ .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�"))
.replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
smsEmailList.add(smsEmail);
}
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
index c6b666b..6bec865 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
+++ b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -20,7 +20,7 @@
@GetMapping("/timer/empower/syncEmpowerResultData")
ApiResponse syncEmpowerResultData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃堕噸鏂颁笅鍙戝け璐ョ殑鎺堟潈鏁版嵁")
- @GetMapping("/timer/empower/syncEmpowerFailData")
+ @GetMapping("/timeempowerr//syncEmpowerFailData")
ApiResponse syncEmpowerFailData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺埛鏂颁汉鍛樿澶囨巿鏉�")
@GetMapping("/timer/empower/syncEmpowerData")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index e5303b1..af618a5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -476,8 +476,8 @@
.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
.or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
- .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), HiddenDanger::getCreateDate,pageWrap.getModel().getQueryStartTime())
- .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),HiddenDanger::getCreateDate,pageWrap.getModel().getQueryEndTime())
+ .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryEndTime())
.orderByDesc(Visits::getCreateDate)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index e26a7c9..921d94a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -606,7 +606,7 @@
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
List<Cars> carsList = carsMapper.selectList(new QueryWrapper<Cars>().lambda()
.eq(Cars::getMemberId,member.getId())
- .eq(Cars::getIsdeleted,Constants.ONE)
+ .eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getAuthStatus,Constants.ONE)//宸叉巿鏉冨寘鏈熺殑杞﹁締
);
if ((carsMapper!=null && carsList.size()>0)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index 8b212a9..b98167b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -185,22 +185,23 @@
if(finishAnswerDTO.getUseType().equals(Constants.ZERO)&&StringUtils.isNotBlank(finishAnswerDTO.getUserId())){
Member member = memberMapper.selectById(finishAnswerDTO.getUserId());
if(Objects.isNull(member)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍔冲姟浜哄憳");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌璁垮浜哄憳");
}
- if(!member.getType().equals(Constants.memberType.driver)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲姵鍔′汉鍛樼被鍨嬶紝绛旈澶辫触");
- }
+ /*if(!member.getType().equals(Constants.memberType.driver)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炶瀹汉鍛樼被鍨嬶紝绛旈澶辫触");
+ }*/
if(!member.getStatus().equals(Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璐﹀彿宸茬粡" + (member.getStatus().equals(Constants.ONE)?"绂佺敤":"鎷夐粦/鍒犻櫎") );
}
problemLog.setName(member.getName());
problemLog.setPhone(member.getPhone());
problemLog.setCompanyId(member.getCompanyId());
- Company company = companyMapper.selectById(member.getCompanyId());
+ problemLog.setCompanyName(member.getVisitCompanyName());
+ /* Company company = companyMapper.selectById(member.getCompanyId());
if(Objects.isNull(company)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍔冲姟浜哄憳鍏徃");
}
- problemLog.setCompanyName(company.getName());
+ problemLog.setCompanyName(company.getName());*/
}
this.problemLogMapper.insert(problemLog);
return problemLog.getId();
--
Gitblit v1.9.3