From e4a06e0730dc0aa6ced97cbb3362d6b8ef473d39 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 15:56:34 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/components/business/operaVisitsWindow.vue | 29 ++++++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 60 ++++++++++++++++++++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 9 ++++
admin/src/views/meeting/components/OperaBookingsWindow.vue | 2
4 files changed, 86 insertions(+), 14 deletions(-)
diff --git a/admin/src/components/business/operaVisitsWindow.vue b/admin/src/components/business/operaVisitsWindow.vue
index b5bdf07..f87cfbb 100644
--- a/admin/src/components/business/operaVisitsWindow.vue
+++ b/admin/src/components/business/operaVisitsWindow.vue
@@ -92,7 +92,7 @@
/>
</el-form-item>
<el-form-item label="鏉ヨ浜嬬敱" prop="reason">
- <el-select v-model="param.reason" placeholder="璇烽�夋嫨">
+ <el-select v-model="param.reason" placeholder="璇烽�夋嫨" @change="changeReason" value-key="id">
<el-option
v-for="item in VisitReason"
:key="item.id"
@@ -101,7 +101,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鏂藉伐浣滀笟">
+<!-- <el-form-item label="鏄惁鏂藉伐浣滀笟">
<el-switch
style="width: 200px"
v-model="param.type"
@@ -109,8 +109,8 @@
:inactive-value="0"
>
</el-switch>
- </el-form-item>
- <el-form-item v-if="param.type == 1" label="鏂藉伐鍐呭">
+ </el-form-item>-->
+ <el-form-item v-if="param.type == 2" label="鏂藉伐鍐呭">
<el-input
v-model="param.constructionReason"
placeholder="璇疯緭鍏ユ柦宸ュ唴瀹�"
@@ -135,7 +135,7 @@
GlobalWindow,
UploadFaceImg
},
-
+
data () {
return {
isShowModal: false,
@@ -169,7 +169,7 @@
starttime: [{ required: true, message: '璇烽�夋嫨鏃ユ湡', trigger: 'change' }],
endtime: [{ required: true, message: '璇烽�夋嫨鏃ユ湡', trigger: 'change' }],
reason: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
- type: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
+ // type: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
receptMemberId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
idcardType: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
faceImgUrl: [{ required: true, message: '璇蜂笂浼�', trigger: 'change' }],
@@ -232,6 +232,17 @@
}
},
methods: {
+ changeReason (val) {
+ console.log(val)
+ var obj = this.VisitReason.find(function (i) {
+ return i.title === val
+ })
+ // 鍦╟hange涓幏鍙栧埌鏁存潯瀵硅薄鏁版嵁
+ if(obj){
+ this.param.type = obj.constructionType
+ }
+ console.log(obj)
+ },
close () {
this.isShowModal = false
this.$emit('close')
@@ -259,9 +270,9 @@
return
}
const { param } = this
- if(param.carNos){
- param.carNos = param.carNos.replace(/\s*/g,"")
- param.carNos = param.carNos.replace(/[\r\n]/g, "")
+ if (param.carNos) {
+ param.carNos = param.carNos.replace(/\s*/g, '')
+ param.carNos = param.carNos.replace(/[\r\n]/g, '')
}
if (param.starttime.slice(0, 10) !== param.endtime.slice(0, 10)) return this.$tip.error('鍏ュ洯鏃堕棿鍜岀鍥椂闂翠笉鍙法澶�')
// 璋冪敤鏂板缓鎺ュ彛
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index 71b905e..a6ceb54 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -4,7 +4,7 @@
<el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�">
<el-form-item label="鍏宠仈浼氳瀹�" prop="roomId">
<el-select v-model="form.roomId" filterable clearable :disabled="isEdit" placeholder="璇烽�夋嫨鍏宠仈浼氳瀹�"
- @change="selectRoom">
+ > @change="selectRoom"
<el-option v-for="item in rooms()" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index 400dc1d..d186c96 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -102,4 +102,13 @@
@ApiModelProperty(value = "璁″垝鏀惰揣鏁伴噺(闈瀢ms)", example = "1")
@TableField(exist = false)
private BigDecimal ortherTotalNum;
+
+
+ @ApiModelProperty(value = "杞﹁締绛惧埌寰俊閫氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊")
+ @TableField(exist = false)
+ private String signInNoticeUserNames;
+
+ @ApiModelProperty(value = "浣滀笟鏈畬鎴愬井淇￠�氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊")
+ @TableField(exist = false)
+ private String unFinishNoticeUserNames;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index 4b2ede0..f959ee4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -2,6 +2,10 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -21,13 +25,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -40,6 +43,8 @@
@Autowired
private PlatformGroupMapper platformGroupMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Autowired
private PlatformJoinMapper platformJoinMapper;
@@ -188,7 +193,54 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(platformGroupMapper.selectPage(page, queryWrapper));
+ PageData<PlatformGroup> result =PageData.from(platformGroupMapper.selectPage(page, queryWrapper));
+ if(result !=null && result.getRecords()!=null){
+ List<String > ids0 = new ArrayList<>();
+ List<SystemUser> systemUserList ;
+ for(PlatformGroup platformGroup : result.getRecords()){
+ if( StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers()) || StringUtils.isNotBlank(platformGroup.getUnFinishNoticeUsers())) {
+ if( StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers()) ){
+ ids0.addAll(Arrays.asList(platformGroup.getSignInNoticeUsers().split(",")));
+ }
+ if( StringUtils.isNotBlank(platformGroup.getUnFinishNoticeUsers()) ){
+ ids0.addAll(Arrays.asList(platformGroup.getUnFinishNoticeUsers().split(",")));
+ }
+ }
+ }
+ systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO).eq(SystemUser::getStatus, Constants.ZERO).isNotNull(SystemUser::getOpenid)
+ .in(SystemUser::getId,ids0) );
+ if (systemUserList!=null) {
+ for(PlatformGroup platformGroup : result.getRecords()){
+ platformGroup.setSignInNoticeUserNames(getUserNameFromList(0,platformGroup,systemUserList));
+ platformGroup.setUnFinishNoticeUserNames(getUserNameFromList(1,platformGroup,systemUserList));
+ }
+ }
+ }
+
+ return result;
+ }
+
+ private String getUserNameFromList(int i, PlatformGroup platformGroup, List<SystemUser> systemUserList) {
+ String ids = i ==0?platformGroup.getSignInNoticeUsers():platformGroup.getSignInNoticeUsers();
+ String name = "";
+ if( StringUtils.isNotBlank(ids)) {
+ List<String > ids0 = Arrays.asList(ids.split(","));
+
+ if (systemUserList!=null) {
+ for(SystemUser user :systemUserList){
+ for(String s : ids0){
+ if(StringUtils.isNotBlank(name)){
+ name += ",";
+ }
+ if(StringUtils.equals(user.getId().toString(),s)){
+ name += StringUtils.defaultString(user.getRealname(),user.getUsername());
+ }
+ }
+ }
+ }
+ }
+ return name;
}
@Override
--
Gitblit v1.9.3