From 092a458a32d81bdbdc2dbea05826317c74874faf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 六月 2024 11:44:40 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 2 +-
admin/src/views/task/index.vue | 18 ++++++++++--------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2 +-
admin/src/components/business/OperaHiddenDangerWindow.vue | 3 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 2 +-
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index 8281999..d2895a6 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -407,6 +407,7 @@
this.$tip.apiSuccess('澶勭悊鎴愬姛')
this.getDetail()
this.getLogList()
+ this.$emit('success')
this.isShowProblem = false
})
.catch(e => {
@@ -436,6 +437,7 @@
this.$tip.apiSuccess('閫�鍥炴垚鍔�')
this.getDetail()
this.getLogList()
+ this.$emit('success')
this.isBackProblem = false
})
.catch(e => {
@@ -488,6 +490,7 @@
this.$tip.apiSuccess('杞氦鎴愬姛')
this.getDetail()
this.getLogList()
+ this.$emit('success')
this.isShowTransfer = false
})
.catch(e => {
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index cd6a515..ca44648 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -85,7 +85,7 @@
row-key="id"
default-expand-all
>
- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100">
+<!-- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100">
<template v-slot="scope">
<span
v-if="
@@ -95,12 +95,12 @@
>{{ cateList[scope.row.objType].name }}</span
>
</template>
- </el-table-column>
- <el-table-column label="鎻愪氦浜�" min-width="80">
- <template v-slot="scope">
- <span v-if="scope.row.title">{{
- scope.row.title.split(" - ")[1]
- }}</span>
+ </el-table-column>-->
+ <el-table-column label="澶勭悊浜嬮」" min-width="200">
+ <template slot-scope="{ row }"> {{ row.title}}
+<!-- <span v-if="row.title">{{
+ row.title.split("-")[1]
+ }}</span>-->
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100">
@@ -215,8 +215,9 @@
}
},
created () {
- this.getHeadData()
+ // this.getHeadData()
this.changeRadio('0')
+ this.getList()
},
methods: {
changeRadio (day) {
@@ -261,6 +262,7 @@
}
},
getList (page) {
+ this.getHeadData()
console.log(this.filters)
const { filters, pagination } = this
if (filters.selTime && filters.selTime.length > 0) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index ece9591..25eeca6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -182,7 +182,7 @@
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
- model.getType().equals(Constants.ZERO)?3:4,
+ Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
memberId);
List<Approve> approveList = approveDataVO.getApproveList();
if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
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 c263aac..10ea27c 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
@@ -443,7 +443,7 @@
isTrue = true;
}
}
- if(isTrue){
+ if(!isTrue){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓澶勭悊鏁版嵁");
}
}
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 82ee127..a4a88cb 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
@@ -596,7 +596,7 @@
//濡傛灉鍛樺伐淇℃伅涓嶅悎娉曠洿鎺ヨ烦杩�
continue;
}
- if(StringUtils.isNotBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
+ if(StringUtils.isBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+member.getName()+"銆戠殑浜鸿劯淇℃伅涓嶆弧瓒虫巿鏉冩潯浠讹紝璇疯繑鍥炲畬鍠勫悗鍐嶈繘琛岃鎿嶄綔锛�");
}
member.setStartTime(memberRole.getStartTime());
--
Gitblit v1.9.3