From ef369b3a2f4bec3435be8cae95252340294ee044 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 16:59:15 +0800
Subject: [PATCH] 最新版本
---
admin/src/components/system/user/OperaUserWindow.vue | 3 ++-
admin/src/views/business/visitorManagement.vue | 6 ++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 2 +-
admin/src/views/business/internalCompany.vue | 5 +++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 15 ++++++---------
admin/src/components/business/OperaCarUseBookWindow.vue | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 3 +++
7 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index b92af71..ba39fd1 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -43,8 +43,8 @@
</div>
<div class="item">
<div class="label">鐩殑鍦扮被鍒�</div>
- <div class="value status-green" v-if="model.type === 0">銆愬競鍐呯敤杞︺��</div>
- <spdivan class="value status-red" v-if="model.type === 1">銆愬競鍐呯敤杞︺��</spdivan>
+ <div class="value status-green" v-if="model.type == 0">銆愬競鍐呯敤杞︺��</div>
+ <div class="value status-red" v-if="model.type == 1">銆愬競澶栫敤杞︺��</div>
</div>
<div class="item">
<div class="label">鐩殑鍦�</div>
diff --git a/admin/src/components/system/user/OperaUserWindow.vue b/admin/src/components/system/user/OperaUserWindow.vue
index 35d784c..8fe9643 100644
--- a/admin/src/components/system/user/OperaUserWindow.vue
+++ b/admin/src/components/system/user/OperaUserWindow.vue
@@ -7,7 +7,7 @@
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鐢ㄦ埛鍚�" prop="username" required>
+ <el-form-item label="鐢ㄦ埛鍚�" prop="username" required v-if="form.id ==null">
<el-input v-model="form.username" placeholder="璇疯緭鍏ョ敤鎴峰悕" v-trim maxlength="50"/>
</el-form-item>
<el-form-item label="濮撳悕" prop="realname" required>
@@ -122,6 +122,7 @@
this.form.id = null
this.form.departmentId = null
this.form.positionIds = []
+ this.form.username=null
})
return
}
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 243356f..b797cdb 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -166,11 +166,12 @@
direction
})
.then(() => {
- if (direction === 'top') {
+ /* if (direction === 'top') {
menuPool.splice(menuIndex, 0, menuPool.splice(menuIndex - 1, 1)[0])
} else {
menuPool.splice(menuIndex, 0, menuPool.splice(menuIndex + 1, 1)[0])
- }
+ }*/
+ this.search()
})
.catch(e => {
this.$tip.apiFailed(e)
diff --git a/admin/src/views/business/visitorManagement.vue b/admin/src/views/business/visitorManagement.vue
index b143228..15a8e82 100644
--- a/admin/src/views/business/visitorManagement.vue
+++ b/admin/src/views/business/visitorManagement.vue
@@ -40,6 +40,12 @@
<span v-if="row.sex === 2">濂�</span>
</template>
</el-table-column>
+ <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="(row.status || 0) === 0" style="color: green">姝ｅ父</span>
+ <span v-else style="color: red">寮傚父</span>
+ </template>
+ </el-table-column>
<el-table-column label="璇佷欢绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.idcardType === 0">韬唤璇�</span>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 623a813..39f5e8b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -94,7 +94,7 @@
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
+ memberService.deleteByIdInBatch(idList,this.getLoginUser(token));
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 9b557ab..d90363d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -283,6 +283,9 @@
@ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
@TableField(exist = false)
private String roleName;
+ @ApiModelProperty(value = "鏈�鍚庢搷浣滃唴瀹�")
+ @TableField(exist = false)
+ private String optRemark;
@ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
@TableField(exist = false)
private Date trainStartTime;
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 c3ecdd0..57e507d 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
@@ -804,8 +804,8 @@
}
for (Integer id:ids) {
Member member = memberMapper.selectById(id);
- if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){
- member.setStatus(Constants.ZERO);//鎭㈠姝ｅ父鐘舵��
+ if(!Objects.isNull(member)&&member.getStatus()!=Constants.TWO){
+ member.setStatus(Constants.TWO);//鎭㈠姝ｅ父鐘舵��
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
@@ -815,7 +815,6 @@
member.setEditor(loginUserInfo.getId());
//鍒犻櫎鍛樺伐闂ㄧ鏉冮檺
cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper);
-
if(Constants.equalsInteger(type,Constants.ONE)){
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper,JSONObject.toJSONString(member));
}
@@ -936,7 +935,7 @@
userAction.setType(type.getKey());
userAction.setContent(content);
String info = type.getInfo();
- userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"绯荤粺").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate())));
+ userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"绯荤粺").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate()!=null?updateMember.getEditDate():new Date())));
userAction.setMemberId(updateMember.getId()+"");
userActionMapper.insert(userAction);
}
@@ -1160,7 +1159,6 @@
if(pageWrap.getModel().getType() != null){
if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
queryWrapper.select(" * , (select v.COMPANY_NAME from visits v where v.MEMBER_ID = member.id and v.STATUS = 2 order by v.CREATE_DATE desc limit 1 ) as companyName , " +
- " (select v.STARTTIME from visits v where v.MEMBER_ID = member.id and v.STATUS = 2 order by v.CREATE_DATE desc limit 1 ) as lastVisitDate , " +
" (select count(1) from visits v where v.MEMBER_ID = member.id and v.STATUS = 2 ) as visitTimes ");
}
}
@@ -1471,12 +1469,11 @@
public PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ int actiontype =Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ONE)?Constants.UserActionType.BLACKLIST.getKey():Constants.UserActionType.FREEZE.getKey();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,Member::getCompanyName)
- .select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 order by ua.CREATE_DATE desc limit 1) as optTime")
- .select(" (select s.REALNAME from user_action uac left join system_user s on uac.CREATOR = s.ID where uac.MEMBER_ID=t.id and uac.ISDELETED=0 order by uac.CREATE_DATE desc limit 1) as creatorName")
- .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE desc limit 1) as visitsLastDate")
+ .selectAs(Company::getCompanyNamePath,Member::getCompanyName)
+ .select(" (select ua.remark from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 and ua.type="+actiontype+" order by ua.CREATE_DATE desc limit 1) as optRemark")
.eq(Member::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCreaterId()),Member::getEditor,pageWrap.getModel().getCreaterId());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
--
Gitblit v1.9.3