From 80e8fce03fb67ddc17923ca122be33335432b48a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 27 三月 2025 16:46:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/operaVisitsWindow.vue | 29 +++++--
h5/pages/guidemap/guidemap.vue | 3
h5/pages/staffLogin/login.vue | 3
h5/utils/config.js | 4
admin/src/views/business/reportRecord.vue | 1
h5/pages/driver/reservedGuide.vue | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 9 ++
h5/pages/driver/reserved.vue | 19 ++++
h5/pages/visitorApplication/visitorApplication.vue | 54 +++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 60 ++++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java | 1
h5/pages/staff/signin.vue | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 14 +--
admin/src/views/platform/platformGroup.vue | 2
h5/manifest.json | 2
h5/pages/visitorSubGuide/index.vue | 3
admin/src/views/meeting/components/OperaBookingsWindow.vue | 2
18 files changed, 172 insertions(+), 42 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/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index 9a6fb47..1925e01 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -178,7 +178,6 @@
this.getList()
})
}).catch(() => {
-
})
},
exportExcel () {
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/admin/src/views/platform/platformGroup.vue b/admin/src/views/platform/platformGroup.vue
index 1538aa5..4af7ef3 100644
--- a/admin/src/views/platform/platformGroup.vue
+++ b/admin/src/views/platform/platformGroup.vue
@@ -28,6 +28,8 @@
</template>
</el-table-column>
<el-table-column prop="waitCallTime" label="鍙彿绛夊緟鏃堕棿锛堝垎閽燂級" min-width="140px" align="center"></el-table-column>
+ <el-table-column prop="signInNoticeUserNames" label="绛惧埌閫氱煡浜哄憳" min-width="" align="center"></el-table-column>
+ <el-table-column prop="unFinishNoticeUserNames" label="鏈畬鎴愪綔涓氶�氱煡浜哄憳" min-width=" " align="center"></el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞洿鏂版椂闂�" min-width="150px" align="center"></el-table-column>
<el-table-column
v-if="containPermissions(['business:platformgroup:update', 'business:platformgroup:delete'])"
diff --git a/h5/manifest.json b/h5/manifest.json
index 1367de7..98170d5 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "laborVisitors",
- "appid" : "__UNI__BCCF400",
+ "appid" : "__UNI__91B8BB7",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/h5/pages/driver/reserved.vue b/h5/pages/driver/reserved.vue
index 3571990..b5ff413 100644
--- a/h5/pages/driver/reserved.vue
+++ b/h5/pages/driver/reserved.vue
@@ -113,6 +113,7 @@
closeOnClickOverlay
:minDate="new Date().getTime()"
mode="datetime"
+ :formatter="formatter"
@close="showDatetime = false"
@cancel="showDatetime = false"
@confirm="setinDate"
@@ -151,6 +152,24 @@
this.initData()
},
methods: {
+ formatter(type, value) {
+ if (type === 'year') {
+ return `${value}骞碻
+ }
+ if (type === 'month') {
+ return `${value}鏈坄
+ }
+ if (type === 'day') {
+ return `${value}鏃
+ }
+ if (type === 'hour') {
+ return `${value}鏃禶
+ }
+ if (type === 'minute') {
+ return `${value}鍒哷
+ }
+ return value
+ },
checkSurplus() {
const { arriveDate, reasonId, totalNum } = this.param
if(!arriveDate || !reasonId || !totalNum) return
diff --git a/h5/pages/driver/reservedGuide.vue b/h5/pages/driver/reservedGuide.vue
index 2841be5..aca4af5 100644
--- a/h5/pages/driver/reservedGuide.vue
+++ b/h5/pages/driver/reservedGuide.vue
@@ -1,6 +1,7 @@
<template>
<view class="box">
- <mp-html :content="content" />
+ <!-- <mp-html :content="content" /> -->
+ <u-parse :content="content"></u-parse>
</view>
</template>
diff --git a/h5/pages/guidemap/guidemap.vue b/h5/pages/guidemap/guidemap.vue
index b2914b9..8da0c72 100644
--- a/h5/pages/guidemap/guidemap.vue
+++ b/h5/pages/guidemap/guidemap.vue
@@ -1,7 +1,8 @@
<template>
<view class="box">
<!-- <view v-html="info"></view> -->
- <mp-html :content="info" />
+ <!-- <mp-html :content="info" /> -->
+ <u-parse :content="info"></u-parse>
</view>
</template>
<script>
diff --git a/h5/pages/staff/signin.vue b/h5/pages/staff/signin.vue
index d1d44ee..a748d77 100644
--- a/h5/pages/staff/signin.vue
+++ b/h5/pages/staff/signin.vue
@@ -1,7 +1,8 @@
<template>
<view class="box">
<!-- <view v-html="info"></view> -->
- <mp-html :content="info" />
+ <!-- <mp-html :content="info" /> -->
+ <u-parse :content="info"></u-parse>
</view>
</template>
<script>
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index 6b8785f..28a2a8e 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -68,7 +68,8 @@
<view class="modal">
<!-- <view v-html="htmlText"></view> -->
<view class="content">
- <mp-html :content="htmlText" />
+ <!-- <mp-html :content="htmlText" /> -->
+ <u-parse :content="htmlText"></u-parse>
</view>
</view>
</u-popup>
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 0fd3b21..20b6bd2 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -82,7 +82,7 @@
</view>
</view>
</view> -->
- <view v-if="form1.type == '1'" class="list_item">
+ <view v-if="form1.type == 1" class="list_item">
<view class="list_item_label">
<text></text>
<text>鏂藉伐鍐呭</text>
@@ -106,13 +106,13 @@
</view>
</view>
</view>
- <view class="footer">
- <view class="footer_btn" @click="onSubmit">鎻愪氦</view>
+ <view class="footer-box">
+ <view class="submit-button" @click="onSubmit">鎻愪氦</view>
</view>
<!-- 鍏ュ洯鏃堕棿 -->
- <u-datetime-picker :show="show4" :minDate="new Date().getTime()" mode="datetime" :formatter="formatter"
+ <u-datetime-picker :show="show4" :minDate="new Date().getTime()" :formatter="formatter" mode="datetime"
@cancel="show4 = false" @confirm="setstarttime"></u-datetime-picker>
- <!-- 绂诲洯鏃堕棿 -->
+ <!-- 绂诲洯鏃堕棿 -->
<u-datetime-picker v-if="form1.starttime" :show="show5" :formatter="formatter"
:minDate="formatTimeStamp(form1.starttime)" :maxDate="formatTimeStamp(form1.starttime.slice(0,10) + ' 23:59')"
mode="datetime" @cancel="show5 = false" @confirm="setendtime"></u-datetime-picker>
@@ -416,6 +416,15 @@
},
methods: {
formatter(type, value) {
+ // if (type === 'year') {
+ // return `${value}骞碻
+ // }
+ // if (type === 'month') {
+ // return `${value}鏈坄
+ // }
+ // if (type === 'day') {
+ // return `${value}鏃
+ // }
if (type === 'year') {
return `${value}骞碻
}
@@ -425,9 +434,15 @@
if (type === 'day') {
return `${value}鏃
}
-// <<<<<<< HEAD
- this.$forceUpdate()
- this.closeInput()
+ if (type === 'hour') {
+ return `${value}鏃禶
+ }
+ if (type === 'minute') {
+ return `${value}鍒哷
+ }
+ // this.$forceUpdate()
+ // this.closeInput()
+ return value
},
closeInput() {
this.$refs.keyboard.close()
@@ -1361,6 +1376,29 @@
}
}
}
+
+ .footer-box {
+ width: 100%;
+ position: fixed;
+ bottom: 30rpx;
+ height: 80rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .submit-button {
+ width: calc(100% - 60rpx);
+ height: 88rpx;
+ line-height: 88rpx;
+ background: #4d99a8;
+ border-radius: 4rpx;
+ color: #fff;
+ border-radius: 44rpx;
+ font-size: 32rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
.head {
width: 100%;
diff --git a/h5/pages/visitorSubGuide/index.vue b/h5/pages/visitorSubGuide/index.vue
index 3f50a81..23b337c 100644
--- a/h5/pages/visitorSubGuide/index.vue
+++ b/h5/pages/visitorSubGuide/index.vue
@@ -1,7 +1,8 @@
<template>
<view class="box">
<!-- <view v-html="info"></view> -->
- <mp-html :content="info" />
+ <!-- <mp-html :content="info" /> -->
+ <u-parse :content="info"></u-parse>
</view>
</template>
<script>
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 08884a3..05ff784 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-export const baseUrl = 'zhyq_interface/'
+// export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java
index bb3223f..f197b53 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java
@@ -27,6 +27,7 @@
}
public static void main(String[] args) throws ParseException {
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 777de62..0675a65 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -571,7 +571,7 @@
String[] customBroadcast= new String[]{"/api/ibas/v1/customBroadcast","鐢ㄤ簬璁剧疆骞挎挱鐨勮嚜瀹氭挱鏀惧拰鍋滄"};//鐢ㄤ簬璁剧疆骞挎挱鐨勮嚜瀹氭挱鏀惧拰鍋滄
String[] iccmAppointment= new String[]{"/api/iccm/v2/appointment/","iccm璁垮鐧昏娣诲姞"};//iccm璁垮鐧昏娣诲姞
String[] iccmUpdateAppointment= new String[]{"/api/iccm/v2/appointment/update","iccm璁垮鐧昏淇敼"};//iccm璁垮鐧昏淇敼
- String[] iccmCancelAppointment= new String[]{"/api/iccm/v1/appointment/cancel","iccm璁垮鐧昏淇敼"};//iccm璁垮鐧昏淇敼
+ String[] iccmCancelAppointment= new String[]{"/api/iccm/v1/appointment/cancel","iccm璁垮鐧昏鍙栨秷"};//iccm璁垮鐧昏鍙栨秷
String[] iccmAppointmentMDJ= new String[]{"/api/iccm/v1/appointment/free/registration","iccm璁垮棰勭害鍏嶇櫥璁�"};//iccm璁垮棰勭害鍏嶇櫥璁�
String[] privilegIccmeGroup= new String[]{"/api/iccm/v1/privilege/groups","鏌ヨ璁垮鏉冮檺缁�"};//鏌ヨ璁垮鏉冮檺缁�
String[] iccmAppointmentRecords= new String[]{"/api/iccm/v2/appointment/records","iccm鏌ヨ宸查绾︾櫥璁�"};//iccm鏌ヨ宸查绾︾櫥璁�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index ab3c0f5..8f3c266 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -5,6 +5,7 @@
import com.doumee.core.haikang.model.param.request.CarPictureRequest;
import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
+import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
@@ -39,16 +40,9 @@
ArtemisConfig.appSecret = "88wFsg3xfn7o8QMsWEO2";
HKConstants.https = "https://";
- ParkReservationAddRequest request = new ParkReservationAddRequest();
- request.setPlateNo("鐨朅90LL0");
- request.setParkSyscode("1c4cdb8b66ed4c23bacb385c3fb6c46b");
- request.setPhoneNo("15345690849");
- request.setOwner("鏂芥棴杈�");
- request.setAllowTimes(Constants.ONE+"");
- request.setIsCharge(Constants.ONE+"");
- request.setStartTime( DateUtil.getISO8601Timestamp2(new Date()) );
- request.setEndTime( "2025-03-27T00:00:00+08:00" );
- String response = parkAddition(JSONObject.toJSONString(request));
+ VisitAppointmentCancelRequest request = new VisitAppointmentCancelRequest();
+ request.setAppointRecordIds(new String[]{"鐨朅90LL0"});
+ String response = iccmCancelAppointment(JSONObject.toJSONString(request));
System.out.println(response);
/* CarPictureRequest param = new CarPictureRequest();
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