From 0411eeb918e0e09aa15cbefd0f9179932375757b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 13 五月 2024 17:18:57 +0800
Subject: [PATCH] 最新版本
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 58 ++
admin/src/api/business/member.js | 9
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 84 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 548 ++++++++++++++++++--------
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 20
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java | 3
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 43 -
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 37 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 31
/dev/null | 141 -------
admin/src/components/business/OperaMemberWindow.vue | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 13
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java | 13
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 4
admin/src/views/business/internalMember.vue | 142 +++++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java | 4
18 files changed, 686 insertions(+), 474 deletions(-)
diff --git a/admin/src/api/business/member.js b/admin/src/api/business/member.js
index d7bc671..0c358ae 100644
--- a/admin/src/api/business/member.js
+++ b/admin/src/api/business/member.js
@@ -36,6 +36,15 @@
export function updateById (data) {
return request.post('/visitsAdmin/cloudService/business/member/updateById', data)
}
+export function updateHead (data) {
+ return request.post('/visitsAdmin/cloudService/business/member/updateHead', data)
+}
+export function updateWorkStatus (data) {
+ return request.post('/visitsAdmin/cloudService/business/member/updateWorkStatus', data)
+}
+export function updateCanVisit (data) {
+ return request.post('/visitsAdmin/cloudService/business/member/updateCanVisitById', data)
+}
// 鎵归噺鎷夐粦
export function batchBlock (ids) {
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index 880fb75..19be014 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -22,20 +22,21 @@
</el-form-item>
<el-form-item label="鎵嬫満鍙�" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" v-trim/>
+ <div style="color: #F56C6C;font-size: 12px">锛堟敞锛氬憳宸ユ墜鏈哄彿灏嗕綔涓哄钩鍙扮櫥褰曡处鍙凤紝鍒濆瀵嗙爜涓虹郴缁熼粯璁ゅ瘑鐮侀厤缃」锛�</div>
</el-form-item>
<el-form-item label="韬唤璇佸彿" prop="idcardNo" v-if="form.id ==null">
<el-input v-model="form.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" v-trim/>
</el-form-item>
<el-form-item label="淇敼韬唤璇佸彿" prop="idcardNoNew" v-if="form.id !=null">
<el-input v-model="form.idcardNoNew" placeholder="鍙慨鏀硅韩浠借瘉鍙�" v-trim/>
- <div v-if="form.id !=null">
- 锛堟敞锛氬綋鍓嶈韩浠借瘉鍙蜂负<span style="color: red">銆恵{form.idcardDecode}}銆�</span>锛屽闇�淇敼锛岃鍦ㄨ緭鍏ユ爮濉啓鏂扮殑韬唤璇佸彿!锛�
+ <div style="font-size: 12px" v-if="form.id !=null">
+ 锛堟敞锛氬綋鍓嶈韩浠借瘉鍙蜂负<span style="color: #F56C6C">銆恵{form.idcardDecode}}銆�</span>锛屽闇�淇敼锛岃鍦ㄨ緭鍏ユ爮濉啓鏂扮殑韬唤璇佸彿!锛�
</div>
</el-form-item>
<el-form-item label="宸ュ彿" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏ュ憳宸ュ伐鍙�" v-trim/>
</el-form-item>
- <el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull">
+ <el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull" >
<UploadAvatarImage
:file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }"
:uploadData="uploadData"
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 19184f5..0777433 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -31,6 +31,9 @@
<el-option label="鍚屾澶辫触" value="2"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="" >
+ <el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1" >鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -76,7 +79,36 @@
<span v-if="row.status == 2" style="color: red">鎷夐粦/鍐荤粨</span>
</template>
</el-table-column>
- <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+ <el-table-column label="閮ㄩ棬绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
+ <span v-if="row.companyType == 1">鍐呴儴缁勭粐</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍦ㄨ亴鐘舵��">
+ <template slot-scope="{row}">
+ <el-switch
+ @change="changeWorkStatus($event, row)"
+ v-model="row.workStatus"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ :active-value="0"
+ :inactive-value="1">
+ </el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁鍙嫓璁�">
+ <template slot-scope="{row}">
+ <el-switch
+ @change="changeCanvisit($event, row)"
+ v-model="row.canVisit"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ :active-value="1"
+ :inactive-value="0">
+ </el-switch>
+ </template>
+ </el-table-column>
<el-table-column label="鍙嫓璁�" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.canVisit != 1">鍚�</span>
@@ -91,11 +123,25 @@
<span v-if="row.hkStatus == 3" style="color: red">涓嶇鍚堜笅鍙戞潯浠�</span>
</template>
</el-table-column>
+ <el-table-column label="鏄惁鎺堟潈" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.authStatus == 1" style="color: green">鏄�</span>
+ <span v-if="row.authStatus == 0" style="color: red">鍚�</span>
+ </template>
+ </el-table-column>
<el-table-column label="闂ㄧ瑙掕壊" min-width="100px">
<template slot-scope="{row}">
- <span>{{row.roleNames.join(',')}}</span>
+ <span>{{(row.roleNames && row.roleNames.length) ?row.roleNames.join(','): '-'}}</span>
</template>
</el-table-column>
+ <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+ <el-table-column label="鍗＄墖" min-width="80px">
+ <template slot-scope="{row}">
+ <el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{row.memberCardCount || '0'}}</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column fixed="right" label="浜鸿劯淇℃伅" min-width="100px">
<template slot-scope="{row}">
<el-image
@@ -106,21 +152,18 @@
</el-image>
</template>
</el-table-column>
- <el-table-column fixed="right" label="鍗＄墖淇℃伅" min-width="100px">
- <template slot-scope="{row}">
- <el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{row.memberCardCount || '0'}}</el-button>
- </template>
- </el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
label="鎿嶄綔"
- min-width="120"
+ min-width="280"
fixed="right"
>
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
- <el-button type="text" icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
+ <el-button type="text" :loading="heading" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
+ <el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row,1)" v-if="row.headStatus == 0" v-permissions="['business:member:head']">璁句负涓荤</el-button>
<el-button type="text" icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -145,11 +188,11 @@
import Tree from '@/components/common/Tree'
import OperaMemberWindow from '@/components/business/OperaMemberWindow'
import { fetchList } from '@/api/business/company'
-import { memberSync, roleAuth } from '@/api/business/member'
+import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
name: 'internalMember',
extends: BaseTable,
- components: { TableLayout1, Pagination, Tree, cardOpeningRecord,OperaMemberWindow },
+ components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow },
data () {
return {
TreeList: [],
@@ -158,6 +201,7 @@
name: '',
status: '',
hkStatus: '',
+ includeChild: false,
canVisit: '',
keyword: '',
type: 2,
@@ -165,9 +209,12 @@
companyId: '',
hasFace: ''
},
- loading:false,
+ loading: false,
+ heading: false,
+ working: false,
+ canvisiting: false,
companyTree: [],
- department:[]
+ department: []
}
},
created () {
@@ -181,7 +228,7 @@
this.getfindCompanyTreePage()
},
methods: {
- empower(id) {
+ empower (id) {
var that = this
this.$confirm('纭畾閲嶆柊鎺堟潈鍚�?', '鎻愮ず', {
confirmButtonText: '纭畾',
@@ -190,11 +237,12 @@
}).then(() => {
roleAuth(id)
.then(res => {
+ this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
that.search()
})
}).catch(() => {
-
- });
+ this.$tip.apiSuccess( '鎿嶄綔澶辫触')
+ })
},
// 鑾峰彇缁勭粐鏍�
getfindCompanyTreePage () {
@@ -209,22 +257,22 @@
}
})
},
- getDepartmentTree(tree) {
- if(tree ==null){
+ getDepartmentTree (tree) {
+ if (tree == null) {
return []
}
return tree.map(item => {
- let newItem = {...item}
- if(newItem){
- newItem.children=newItem.childList
+ const newItem = { ...item }
+ if (newItem) {
+ newItem.children = newItem.childList
}
if (item.children && item.children.length == 0) {
- this.$delete( newItem, 'children' )
+ this.$delete(newItem, 'children')
} else {
newItem.children = this.getDepartmentTree(newItem.children)
}
return newItem
- });
+ })
},
// 鍚屾淇℃伅
async synchronous () {
@@ -245,6 +293,54 @@
})
.catch(() => {})
},
+ async updateHead (row, type) {
+ this.$dialog.actionConfirm('鎮ㄧ‘璁よ繘琛屽綋鍓嶆搷浣滃悧锛�', '閮ㄩ棬涓荤璁剧疆鎿嶄綔鎻愮ず')
+ .then(() => {
+ this.heading = true
+ updateHead({ id: row.id, headStatus: type })
+ .then(res => {
+ this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.heading = false
+ })
+ .catch(() => {})
+ })
+ },
+ changeWorkStatus (e, row) {
+ this.working = true
+ updateWorkStatus({ id: row.id, workStatus: e })
+ .then(res => {
+ this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.working = false
+ })
+ .catch(() => {})
+ },
+ changeCanvisit (e, row) {
+ this.canvisiting = true
+ updateCanVisit({ id: row.id, canVisit: e })
+ .then(res => {
+ this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.canvisiting = false
+ })
+ .catch(() => {})
+ },
callback (row) {
this.searchForm.erpOrgId = row.erpId
this.searchForm.companyId = row.id
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 2bdbd58..ba0ee22 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -591,6 +591,64 @@
}
+ /**
+ * 鍛樺伐淇℃伅缁存姢鎿嶄綔鍘嗗彶绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊 11鎺堟潈闂ㄧ鏉冮檺 12绂昏亴 13鎭㈠鍦ㄨ亴
+ */
+ public enum UserActionType {
+ CANCEL_FREEZE(0, "瑙ｅ喕","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愯В鍐汇��" ),
+ FREEZE(1, "鍐荤粨","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬喕缁撱��" ),
+ BLACKLIST(2, "鎷夐粦","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愭媺榛戙��"),
+ CANCEL_BLACKLIST(3, "鎭㈠","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愮Щ鍑洪粦鍚嶅崟銆�" ),
+ CANVISIT(4, "璁句负鎷滆浜�","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愯涓烘嫓璁夸汉銆�" ),
+ CANCEL_VISIT(5, "鍙栨秷鎷滆浜�","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬彇娑堟嫓璁夸汉銆�" ),
+ //缁繚閫氱煡
+ HIGHCHECKOR(6, "璁句负楂樼骇瀹℃壒浜�","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愯涓洪珮绾у鎵逛汉銆�" ),
+ CANCEL_HIGHCHECKOR(7, "鍙栨秷楂樼骇瀹℃壒浜�","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬彇娑堥珮绾у鎵逛汉銆�" ),
+ LEVEL(8, "鎵嬪姩绂诲満","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愭墜鍔ㄧ鍦恒��" ),
+ DELETE(9, "鍒犻櫎","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬垹闄ゃ��" ),
+ EDIT(10, "鏇存柊","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愭洿鏂般��" ),
+ AUTH_ROLE(11, "鎺堟潈闂ㄧ鏉冮檺","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愭巿鏉冮棬绂佹潈闄愩��" ),
+ WORK_OFF(12, "绂昏亴","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愮鑱屻�戞搷浣�" ),
+ WORK_ON(13, "鍦ㄨ亴","鐢便��${param1}銆戜簬銆愭搷浣滄椂闂达細${param2}銆戯紝杩涜銆愬湪鑱屻�戞搷浣�" ),
+ ;
+
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+ private String info;
+
+ // 鏋勯�犳柟娉�
+ UserActionType(int key, String name,String info ) {
+ this.key = key;
+ this.info = info;
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
+
public enum NoticeObjectType {
MEETING_BOOK_SUCCESS(0, "浼氫笌棰勫畾鎴愬姛","浼氫笌棰勫畾鎴愬姛"),
MEETING_CACEL(1, "浼氳鍙栨秷","浼氳鍙栨秷"),
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 2ccb323..d68a093 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1876,11 +1876,10 @@
}
public static int compareDate(String format, String str1, Date date2) {
-
Date date1 = null;
try {
date1 = fromStringToDate(format, str1);
- } catch (ParseException e) {
+ } catch (Exception e) {
// TODO 鑷姩鐢熸垚 catch 鍧�
e.printStackTrace();
}
@@ -2785,7 +2784,7 @@
stringDate = getFomartDate(new Date(now), formate);
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
@@ -2800,8 +2799,7 @@
long now = date.getTime() + (long) Integer.parseInt(days) * DAY_IN_MILLISECOND;
date = new Date(now);
-
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
@@ -2818,10 +2816,16 @@
*
* 瀛楃涓插舰寮忚浆鍖栦负Date绫诲瀷 String绫诲瀷鎸夌収format鏍煎紡杞负Date绫诲瀷
**/
- public static Date fromStringToDate(String format, String dateTime) throws ParseException {
+ public static Date fromStringToDate(String format, String dateTime) {
Date date = null;
- SimpleDateFormat sdf = new SimpleDateFormat(format);
- date = sdf.parse(dateTime);
+ try {
+
+ SimpleDateFormat sdf = new SimpleDateFormat(format);
+ date = sdf.parse(dateTime);
+ }catch (Exception e){
+
+ }
+
return date;
}
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
index 2620950..ccf1673 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -122,7 +122,7 @@
@ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
@ExcelColumn(name="璐熻矗浜虹紪鐮�")
- private String headId;
+ private Integer headId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index a565622..7da2af5 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -9,7 +9,6 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.MemberService;
@@ -63,7 +62,7 @@
@GetMapping("/delete/{id}")
@RequiresPermissions("business:member:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
- memberService.deleteById(id);
+ memberService.deleteById(id,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -76,7 +75,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- memberService.deleteByIdInBatch(idList);
+ memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -123,28 +122,6 @@
return ApiResponse.success(null);
}
- @ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
- @PostMapping("/updateRemoveStatusById")
- @RequiresPermissions("business:member:update")
- public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
- if(list.size()>0){
- memberService.updateRemoveStatusById(list);
- return ApiResponse.success(null);
- }else{
- return ApiResponse.failed("鍙傛暟閿欒");
- }
-
- }
-
- @ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
- @PostMapping("/updateVisitsStatusById")
- @RequiresPermissions("business:member:update")
- public ApiResponse updateVisitsStatusById(@RequestBody Member member){
- memberService.updateVisitsStatusById(member);
- return ApiResponse.success(null);
- }
-
-
@ApiOperation("鎵归噺鎷夐粦")
@GetMapping("/batchBlock")
@RequiresPermissions("business:member:delete")
@@ -154,7 +131,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- memberService.batchBlock(idList,2);
+ memberService.batchBlock(idList,2,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -167,7 +144,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- memberService.batchBlock(idList,1);
+ memberService.batchBlock(idList,1,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -188,12 +165,6 @@
return ApiResponse.success(memberService.findPage(pageWrap));
}
- @ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
- @PostMapping("/findLaborMemberInfoPage")
- @RequiresPermissions("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
- return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
- }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@@ -221,7 +192,7 @@
@ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
@PostMapping("/findMemberInfoPage")
@RequiresPermissions("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+ public ApiResponse<PageData<Member>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
@@ -234,7 +205,7 @@
@ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
@PostMapping("/findVisitPage")
@RequiresPermissions("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ public ApiResponse<PageData<Member>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}
@@ -242,7 +213,7 @@
@ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
@PostMapping("/findUnusualPage")
@RequiresPermissions("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ public ApiResponse<PageData<Member>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
return ApiResponse.success(memberService.findUnusualPage(pageWrap));
}
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 7617064..6d923d2 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
@@ -11,7 +11,6 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
@@ -69,7 +68,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:member:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- memberService.deleteById(id);
+ memberService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -82,7 +81,7 @@
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- memberService.deleteByIdInBatch(idList);
+ memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -117,7 +116,16 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:member:update")
public ApiResponse updateById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
memberService.updateById(member);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("璁剧疆鎴栧彇娑堜富绠�")
+ @PostMapping("/updateHead")
+ @CloudRequiredPermission("business:member:head")
+ public ApiResponse updateHead(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
+ memberService.updateHead(member);
return ApiResponse.success(null);
}
@@ -125,56 +133,71 @@
@PostMapping("/updateStatusById")
@CloudRequiredPermission("business:member:update")
public ApiResponse updateStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
memberService.updateStatusById(member);
return ApiResponse.success(null);
}
- @ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
- @PostMapping("/updateRemoveStatusById")
+ @ApiOperation("鏍规嵁ID 璁剧疆鍦ㄨ亴銆佺鑱� ")
+ @PostMapping("/updateWorkStatus")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- if(list.size()>0){
- memberService.updateRemoveStatusById(list);
- return ApiResponse.success(null);
- }else{
- return ApiResponse.failed("鍙傛暟閿欒");
- }
-
- }
-
- @ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
- @PostMapping("/updateVisitsStatusById")
- @CloudRequiredPermission("business:member:update")
- public ApiResponse updateVisitsStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse updateWorkStatus(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
member.setLoginUserInfo(this.getLoginUser(token));
- memberService.updateVisitsStatusById(member);
+ memberService.updateWorkStatus(member);
return ApiResponse.success(null);
}
+
@ApiOperation("鎵归噺鎷夐粦")
@GetMapping("/batchBlock")
- @CloudRequiredPermission("business:member:delete")
+ @CloudRequiredPermission("business:member:update")
public ApiResponse batchBlock(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- memberService.batchBlock(idList,2);
+ memberService.batchBlock(idList,2,this.getLoginUser(token));
return ApiResponse.success(null);
}
@ApiOperation("鎵归噺鍐荤粨")
@GetMapping("/batchFreeze")
- @CloudRequiredPermission("business:member:delete")
+ @CloudRequiredPermission("business:member:update")
public ApiResponse batchFreeze(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- memberService.batchBlock(idList,1);
+ memberService.batchBlock(idList,1,this.getLoginUser(token));
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺绉诲嚭榛戝悕鍗�")
+ @GetMapping("/batchRemoveBlock")
+ @CloudRequiredPermission("business:member:update")
+ public ApiResponse batchCancelBlock(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray ){
+ idList.add(Integer.valueOf(id));
+ }
+ memberService.batchRemoveBlock(idList,2,this.getLoginUser(token));
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺瑙ｉ櫎鍐荤粨")
+ @GetMapping("/batchRemoveFreeze")
+ @CloudRequiredPermission("business:member:update")
+ public ApiResponse batchRemoveFreeze(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray ){
+ idList.add(Integer.valueOf(id));
+ }
+ memberService.batchRemoveBlock(idList,1,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -184,6 +207,7 @@
@PostMapping("/updateCanVisitById")
@CloudRequiredPermission("business:member:update")
public ApiResponse updateCanVisitById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
memberService.updateCanVisitById(member);
return ApiResponse.success(null);
}
@@ -201,12 +225,6 @@
return ApiResponse.success(memberService.findList(model));
}
- @ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
- @PostMapping("/findLaborMemberInfoPage")
- @CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
- }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@@ -234,7 +252,7 @@
@ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
@PostMapping("/findMemberInfoPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<PageData<Member>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
@@ -247,7 +265,7 @@
@ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
@PostMapping("/findVisitPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<PageData<Member>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}
@@ -255,7 +273,7 @@
@ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
@PostMapping("/findUnusualPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<PageData<Member>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findUnusualPage(pageWrap));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index d285e67..07a55a1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -65,6 +65,8 @@
@ApiModelProperty(value = "erp鏈烘瀯涓婚敭 ")
private String erpOrgId;
@ApiModelProperty(value = "鏈烘瀯涓婚敭 ")
- private String companyId;
+ private Integer companyId;
+ @ApiModelProperty(value = "鏄惁鍖呭惈涓嬬骇缁勭粐鐢ㄦ埛")
+ private Boolean includeChild;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
deleted file mode 100644
index a33943c..0000000
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.doumee.dao.admin.response;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author T14
- */
-@Data
-@ApiModel("鍔冲姟浜哄憳淇℃伅琛�")
-public class MemberInfoDTO implements Serializable {
-
- @ApiModelProperty(value = "涓婚敭")
- private Integer id;
-
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- private Integer creator;
-
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- private String creatorName;
-
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
-
- @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
- private Integer companyId;
-
- @ApiModelProperty(value = "鍏徃鍚嶇О")
- private String companyName;
-
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
- private Integer hkStatus;
-
- @ApiModelProperty(value = "鍏徃璐熻矗浜�")
- private String linkName;
-
- @ApiModelProperty(value = "鍏徃璐熻矗浜鸿仈绯荤數璇�")
- @ExcelColumn(name="鑱旂郴鐢佃瘽")
- private String linkPhone;
-
- @ApiModelProperty(value = "浜鸿劯鐓х墖")
- private String faceImg;
-
- @ApiModelProperty(value = "鍋ュ悍鐮�")
- private String imgurl;
- @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣")
- private String faceImgFull;
-
- @ApiModelProperty(value = "鍋ュ悍鐮佸畬鏁�")
- private String imgurlFull;
-
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
- private Integer type;
-
- @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳鍚嶇О")
- private String name;
-
- @ApiModelProperty(value = "鎬у埆")
- private Integer sex;
-
- @ApiModelProperty(value = "璁垮骞撮緞")
- private Date birthday;
-
- @ApiModelProperty(value = "鎵嬫満鍙�")
- private String phone;
-
- @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
- private String idcardNo;
-
- @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
- private String idcardDecode;
-
- @ApiModelProperty(value = "宸ュ彿")
- private String code;
-
- @ApiModelProperty(value = "鐝")
- private String classes;
-
- @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨")
- private Integer status;
-
- @ApiModelProperty(value = "娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級")
- private Integer parentId;
-
- @ApiModelProperty(value = "寰俊openid")
- private String openid;
-
- @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜")
- private String roleId;
-
- @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
- private String roleName;
-
- @ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�")
- private String canVisit;
-
- @ApiModelProperty(value = "鍗＄墖鏁�")
- private Integer memberCardCount;
-
- @ApiModelProperty(value = "鍩硅鏈夋晥鏈熺粨鏉熸椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date trainTimeEndTime;
-
- @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date empowerEndTime;
-
- @ApiModelProperty(value = "鎷滆娆℃暟")
- @TableField(exist = false)
- private Integer visitsCount;
-
- @ApiModelProperty(value = "鏈�鍚庤瀹㈡椂闂�")
- @TableField(exist = false)
- private Date visitsLastDate;
-
- @ApiModelProperty(value = "鏈�鍚庡喕缁�/鎷夐粦鏃堕棿")
- @TableField(exist = false)
- private Date optTime;
-
- @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
- private Integer idcardType;
-
- @ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
- private String visitCompanyName;
-
- @ApiModelProperty(value = "闂ㄧ缁勫悕绉�")
- private List<String> roleNames;
-
- @ApiModelProperty(value = "缁勭粐缂栫爜璺緞")
- private String companyPath;
- @ApiModelProperty(value = "缁勭粐璺緞")
- private String companyNamePath;
-}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
index 8ef6f07..58e60bb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
@@ -4,8 +4,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.doumee.dao.admin.response.MemberInfoDTO;
-import com.doumee.dao.business.model.CarEvent;
import com.doumee.dao.business.model.Member;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -17,17 +15,6 @@
* @date 2023/11/30 15:33
*/
public interface MemberMapper extends BaseMapper<Member> {
-
-
- @Select(" select m.* , c.name as companyName , " +
- " (select count(0) from member_card mc where mc.MEMBER_ID=m.id and mc.ISDELETED=0) as memberCardCount, " +
- " (select GROUP_CONCAT(dr.name) from member_role mr left join device_role dr on dr.id=mr.ROLE_ID " +
- " where mr.MEMBER_ID=m.id and mr.ISDELETED=0 GROUP BY mr.MEMBER_ID) as roleName "+
- " from member m " +
- " left join company c on m.COMPANY_ID=c.id "+
- " ${ew.customSqlSegment} ")
- IPage<MemberInfoDTO> getPage(IPage<MemberInfoDTO> page, @Param(Constants.WRAPPER) Wrapper wrapper);
-
void insertBatchSomeColumn(List<Member> list);
}
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 23c54e5..23ff05f 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
@@ -82,7 +82,6 @@
@ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
@ExcelColumn(name="璁垮鍚嶇О")
private String name;
-
@ApiModelProperty(value = "璁垮骞撮緞")
@ExcelColumn(name="璁垮骞撮緞")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -95,6 +94,9 @@
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
@ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
+ @ApiModelProperty(value = "淇敼鐨勮韩浠借瘉鍙� ")
+ @TableField(exist = false)
+ private String idcardNoNew;
@ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
@ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
@@ -146,12 +148,18 @@
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺")
private Integer hkStatus;
+ @ApiModelProperty(value = "娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ", example = "1")
+ @ExcelColumn(name="娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ")
+ private Integer authStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
+ @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
+ @ExcelColumn(name="鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴")
+ private Integer workStatus;
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
@ExcelColumn(name="ERP鏍囪瘑")
private String erpId;
@@ -210,9 +218,18 @@
@ApiModelProperty(value = "缁勭粐鍚嶇О")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
+ @TableField(exist = false)
+ private String editorName;
+ @ApiModelProperty(value = "缁勭粐绫诲瀷")
+ @TableField(exist = false)
+ private Integer companyType;
@ApiModelProperty(value = "缁勭粐缂栫爜璺緞")
@TableField(exist = false)
private String companyPath;
+ @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
+ @TableField(exist = false)
+ private Integer headId;
@ApiModelProperty(value = "缁勭粐璺緞")
@TableField(exist = false)
private String companyNamePath;
@@ -235,6 +252,8 @@
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
@TableField(exist = false)
private String keyword;
+
+
@ApiModelProperty(value = "鏄惁鏈変汉鑴革細0=鏃狅紱1=鏈夛紱")
@TableField(exist = false)
@@ -259,8 +278,22 @@
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
private Date endTime;
-
@ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
@TableField(exist = false)
private String faceImgFull;
+ @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
+ @TableField(exist = false)
+ private String imgurlFull;
+ @ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer headStatus;
+
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
+ @TableField(exist = false)
+ private String roleName;
+
+ @ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
+ @TableField(exist = false)
+ private List<String> roleNames;
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
index 62e3bf7..4de783f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
@@ -51,8 +51,8 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎", example = "1")
- @ExcelColumn(name="绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎")
+ @ApiModelProperty(value = "绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊", example = "1")
+ @ExcelColumn(name="绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊")
private Integer type;
@ApiModelProperty(value = "浜哄憳鎿嶄綔璁板綍鏃ュ織")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index d9cb5dd..a897572 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -1,11 +1,11 @@
package com.doumee.service.business;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
@@ -44,7 +44,7 @@
*
* @param id 涓婚敭
*/
- void deleteById(Integer id);
+ void deleteById(Integer id,LoginUserInfo user);
void roleAuthById(Integer id);
@@ -60,9 +60,10 @@
*
* @param ids 涓婚敭闆�
*/
- void deleteByIdInBatch(List<Integer> ids);
+ void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user);
- void batchBlock(List<Integer> ids,Integer type);
+ void batchBlock(List<Integer> ids, Integer type, LoginUserInfo loginUserInfo);
+ void batchRemoveBlock(List<Integer> ids, Integer type, LoginUserInfo loginUserInfo);
/**
* 涓婚敭鏇存柊
@@ -72,7 +73,6 @@
void updateById(Member member);
boolean updateFace(Member member);
-
/**
* 涓婚敭鏇存柊鍔冲姟浜哄憳鐘舵��
*
@@ -80,9 +80,6 @@
*/
void updateStatusById(Member member);
- void updateVisitsStatusById(Member member);
-
- void updateRemoveStatusById(List<Member> members);
void updateCanVisitById(Member member);
/**
@@ -127,14 +124,6 @@
/**
- * 鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ
- *
- * @param pageWrap 鍒嗛〉瀵硅薄
- * @return PageData<Member>
- */
- PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap);
-
- /**
* 鏉′欢缁熻
*
* @param member 瀹炰綋瀵硅薄
@@ -157,11 +146,11 @@
* @param pageWrap
* @return
*/
- PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
+ PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
- PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);
+ PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap);
- PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap);
+ PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap);
/**
* 瀹氭椂鍐荤粨鍐呴儴浜哄憳
@@ -207,4 +196,8 @@
void empowerByList(Member member);
void delHkForce(Member member);
+
+ void updateHead(Member member);
+
+ void updateWorkStatus(Member member);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 4a8efab..6ad0a41 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -10,7 +10,6 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.CarsQuery;
import com.doumee.dao.admin.response.CarsDTO;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.join.CarJoinMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
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 65ac052..cba4c22 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
@@ -1,10 +1,12 @@
package com.doumee.service.business.impl;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.Jwt.JwtPayLoad;
@@ -22,16 +24,12 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
-import com.doumee.core.utils.HttpsUtil;
-import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.*;
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
@@ -40,8 +38,6 @@
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemUserMapper;
-import com.doumee.dao.system.model.SystemDepartment;
-import com.doumee.dao.system.model.SystemDepartmentUser;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
@@ -50,10 +46,6 @@
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -67,6 +59,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;
@@ -189,10 +182,13 @@
insert.setCode(member.getCode());
insert.setType(Constants.TWO);
insert.setHkDate(new Date());
+ insert.setWorkStatus(Constants.ONE);//榛樿鍦ㄨ亴
+ insert.setCanVisit(Constants.ZERO);//榛樿涓嶅彲璁块棶
+ insert.setAuthStatus(Constants.ZERO);
insert.setName(member.getName());
insert.setHkStatus(Constants.ONE);
- insert.setSex(IdcardUtil.getGenderByIdCard(member.getIdcardNo()) ==1?Constants.TWO:Constants.ONE);//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
- insert.setBirthday( DateUtil.parse(IdcardUtil.getBirthByIdCard(member.getIdcardNo()), "yyyyMMdd"));
+ insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
+ insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
insert.setPhone(member.getPhone());
insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
@@ -246,22 +242,88 @@
}
return false;
}
+ private boolean dealHkUserForUpdateBiz(Member update ) {
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+
+ UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);
+
+ //澶勭悊鏂板鏁版嵁
+ BaseResponse<UserAddResponse> result = HKService.editUser(hkAddRequest);
+ if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
+ update.setHkStatus(Constants.ONE);//宸插悓姝�
+ update.setRemark("浜哄憳淇℃伅宸插悓姝ユ垚鍔�");
+ if(StringUtils.isNotBlank(update.getFaceImg()) && Constants.equalsInteger(update.getFaceStatus(),Constants.ZERO)){
+ //濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
+ String faceid = HkSyncOrgUserToHKServiceImpl.dealMemberFace(update,path);
+ if(StringUtils.isBlank(faceid)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍛樺伐浜鸿劯淇℃伅涓嶅悎鏍硷紝璇锋洿鎹汉鑴哥収鐗囬噸璇曪紒");
+ }else{
+ update.setFaceId(faceid);
+ update.setFaceStatus(Constants.ONE);
+ //濡傛灉浜鸿劯璺熶綘锛岄噸鏂颁笅鍙戞潈闄愭暟鎹�
+ update.setRemark("浜哄憳鍜屼汉鑴镐俊鎭悓姝ユ垚鍔�"+result.getMsg());
+ //閲嶆柊鎺堟潈璁惧鏉冮檺
+// HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,update,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
+ }
+ update.setHkDate(update.getEditDate());
+ return true;
+ }else if(result!=null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚屾瀹夐槻骞冲彴澶辫触銆�"+result.getMsg()+"銆戯紝璇疯仈绯荤鐞嗗憳锛�");
+ }
+ return false;
+ }
+
+ /**
+ * 娓呴櫎鍛樺伐鐨勮澶囨潈闄�
+ * @param member
+ */
+ private void cancelAllMemberEmpower(Member member) {
+ //鍒犻櫎鍏ㄩ儴鏉冮檺
+ memberRoleMapper.update(null,new UpdateWrapper<MemberRole>().lambda()
+ .eq(MemberRole::getMemberId,member.getId())
+ .set(MemberRole::getIsdeleted,Constants.ONE)
+ .set(MemberRole::getEdirot,member.getEditor())
+ .set(MemberRole::getEditDate,member.getEditDate()));
+ //鎶婃墍鏈夊緟涓嬪彂鐨勪换鍔℃敼鎴� 宸插彇娑�
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .eq(Empower::getSendStatus,Constants.EmpowerStatus.wait)
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .set(Empower::getSendStatus,Constants.EmpowerStatus.cancel));
+ //鎵�鏈変笅鍙戣繃鐨勪换鍔★紝鏀逛负寰呭垹闄ゆ潈闄�
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .notIn(Empower::getSendStatus,Constants.EmpowerStatus.fail)
+ .set(Empower::getRemark,"绛夊緟鍚屾鍒犻櫎瀹夐槻骞冲彴")
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .set(Empower::getSendStatus,Constants.ZERO));
+ }
private void isMemberParamValid(Member member) {
- if (!PhoneUtil.isPhone(member.getPhone())){
+ if (StringUtils.isBlank(member.getPhone())||!PhoneUtil.isPhone(member.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
}
- if (!IdcardUtil.isValidCard(member.getIdcardNo())){
+ if (StringUtils.isBlank(member.getIdcardNo())||!IdcardUtil.isValidCard(member.getIdcardNo())){
+ if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .ne(Member::getId,member.getId())) >0){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNo()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鏍煎紡鏈夎");
}
- SystemUser systemUser = new SystemUser();
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(member.getPhone());
queryUserDto.setDeleted(Boolean.FALSE);
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
if (user != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+systemUser.getUsername()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��"+queryUserDto.getUsername()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
}
// 楠岃瘉宸ュ彿
if (StringUtils.isNotBlank(member.getCode())) {
@@ -273,6 +335,86 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪");
}
}
+ }
+ private Member isMemberUpdateParamValid(Member member) {
+ Member model = memberMapper.selectById(member.getId());
+ if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ュ憳宸ヤ俊鎭笉瀛樺湪锛岃鍒锋柊椤甸潰閲嶈瘯锛�");
+ }
+ if (StringUtils.isNotBlank(member.getPhone()) && !PhoneUtil.isPhone(member.getPhone())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢佃瘽鍙风爜鏍煎紡鏈夎");
+ }
+ if (StringUtils.isNotBlank(member.getIdcardNoNew())){
+ String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNoNew()));//韬唤璇佸彿鍔犲瘑
+ if( !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
+ //濡傛灉鍙戠敓鏀瑰彉锛屽苟涓斾笉鍚堟硶锛屾彁绀哄紓甯�
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇敼鐨勬柊韬唤璇佸彿鏍煎紡鏈夎");
+ }
+ if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
+ if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .eq(Member::getIdcardNo,encrptNo)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .ne(Member::getId,member.getId())) >0){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "韬唤璇佸彿銆�"+member.getIdcardNoNew()+"銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
+
+ member.setSex(Constants.getSexByCardNo( member.getIdcardNoNew()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
+ member.setIdcardDecode( Constants.getTuominStr(member.getIdcardNoNew()));
+ member.setIdcardNo(encrptNo);
+ }
+ }
+ boolean isNeedUpdateUser = false;
+ if(StringUtils.isNotBlank(member.getPhone()) && StringUtils.equals(member.getPhone(),model.getPhone())){
+ // 濡傛灉鎵嬫満鍙峰彂鐢熶慨鏀癸紝鏍￠獙鍞竴鎬�
+ SystemUser queryUserDto = new SystemUser();
+ queryUserDto.setUsername(member.getPhone());
+ queryUserDto.setDeleted(Boolean.FALSE);
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
+ .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙枫��" + queryUserDto.getUsername() + "銆戝凡琚娇鐢紝涓嶈兘閲嶅");
+ }
+ isNeedUpdateUser = true;
+ }
+ if(StringUtils.isNotBlank(member.getCode()) && StringUtils.equals(member.getPhone(),model.getCode())){
+ // 楠岃瘉宸ュ彿
+ SystemUser queryUserDto = new SystemUser();
+ queryUserDto = new SystemUser();
+ queryUserDto.setDeleted(Boolean.FALSE);
+ queryUserDto.setEmpNo(member.getCode());
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
+ .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
+ if (user != null) {
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿銆�"+member.getCode()+"銆戝凡瀛樺湪");
+ }
+ isNeedUpdateUser = true;
+ }
+ if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
+ //濡傛灉缁勭粐鍙戠敓鍙樺寲
+ Company company = companyMapper.selectById(member.getCompanyId());
+ if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+ }
+ if(StringUtils.isBlank(company.getHkId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
+ }
+ member.setHkOrgId(company.getHkId());
+ isNeedUpdateUser = true;
+ }
+ if(isNeedUpdateUser){
+ //鏇存柊绯荤粺鐢ㄦ埛璐﹀彿淇℃伅
+ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+ .set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
+ .set(SystemUser::getUpdateTime,new Date())
+ .set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
+ .set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
+ .set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
+ .set(StringUtils.isNotBlank(model.getCode()),SystemUser::getEmpNo,member.getCode())
+ .eq(SystemUser::getMemberId,model.getId()));
+ }
+ member.setHkId(model.getHkId());
+ member.setFaceId(model.getFaceId());//浜鸿劯缂栫爜
+ return model;
}
@Transactional
@@ -293,8 +435,6 @@
//鑴辨晱鎿嶄綔
String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
//杞崲鏃ユ湡
- DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd");
-
Member insert = new Member();
insert.setCreator(loginUserInfo.getId());
insert.setCreateDate(new Date());
@@ -306,7 +446,7 @@
insert.setImgurl(member.getImgurl());
insert.setType(Constants.ZERO);
insert.setName(member.getName());
- insert.setBirthday(yyyyMMdd);
+ insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
insert.setPhone(member.getPhone());
insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
IdcardUtil.isValidCard(member.getIdcardNo());
@@ -331,7 +471,7 @@
}
@Override
- public void deleteById(Integer id) {
+ public void deleteById(Integer id,LoginUserInfo user) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Member member=new Member();
@@ -339,7 +479,10 @@
member.setIsdeleted(Constants.ZERO);
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
+ member.setHkStatus(Constants.ZERO);
+ member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
memberMapper.updateById(member);
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
}
@@ -374,81 +517,151 @@
}
@Override
- public void deleteByIdInBatch(List<Integer> ids) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo loginUserInfo) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Member member=new Member();
ids.stream().forEach(s ->{
member.setId(s);
member.setIsdeleted(Constants.ONE);
+ member.setHkStatus(Constants.ZERO);
+ member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
memberMapper.updateById(member);
-
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
- userAction.setType(9);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬垹闄ゃ��");
- userAction.setMemberId(s+"");
- userActionJoinMapper.insert(userAction);
-
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
});
-
-
-
-
- /* memberMapper.deleteBatchIds(ids);*/
}
+ /**
+ * 鎷夐粦鎴栬�呭喕缁撳憳宸ヤ俊鎭�
+ * @param ids
+ * @param type
+ * @param loginUserInfo
+ */
@Override
- public void batchBlock(List<Integer> ids,Integer type) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void batchBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Member member=new Member();
for (Integer id:ids) {
- member = memberMapper.selectById(id);
+ Member member = memberMapper.selectById(id);
if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
- UserAction userAction=new UserAction();
-// userAction.setBeforeStatus(member.getStatus());
member.setStatus(Constants.TWO);
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
+ member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
memberMapper.updateById(member);
+ Date date = new Date();
+ member.setEditDate(date);
+ member.setEditor(loginUserInfo.getId());
+ //鍒犻櫎鍛樺伐闂ㄧ鏉冮檺
+ cancelAllMemberEmpower(member);
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
if(Constants.equalsInteger(type,Constants.ONE)){
- userAction.setType(Constants.ONE);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper);
}
if(Constants.equalsInteger(type,Constants.TWO)){
- userAction.setType(Constants.TWO);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
-
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.BLACKLIST,userActionJoinMapper);
}
- userAction.setMemberId(id+"");
-
- userActionJoinMapper.insert(userAction);
}
}
- /* memberMapper.deleteBatchIds(ids);*/
+ }
+ /**
+ * 鎷夐粦鎴栬�呭喕缁撳憳宸ヤ俊鎭�
+ * @param ids
+ * @param type
+ * @param loginUserInfo
+ */
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void batchRemoveBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ for (Integer id:ids) {
+ Member member = memberMapper.selectById(id);
+ if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
+ member.setStatus(Constants.ONE);//鎭㈠姝ｅ父鐘舵��
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
+ memberMapper.updateById(member);
+ Date date = new Date();
+ member.setEditDate(date);
+ member.setEditor(loginUserInfo.getId());
+ if(Constants.equalsInteger(type,Constants.ONE)){
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_FREEZE,userActionJoinMapper);
+ }
+ if(Constants.equalsInteger(type,Constants.TWO)){
+ saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_BLACKLIST,userActionJoinMapper);
+ }
+ }
+ }
}
@Override
- public void updateById(Member member) {
- memberMapper.updateById(member);
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updateById(Member updateMember) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = updateMember.getLoginUserInfo();
+ }
+ //鏍￠獙鍙傛暟 骞朵笖鏇存柊systemuser 鎵嬫満鍙峰拰宸ュ彿淇℃伅锛堝鏋滈渶瑕佷慨鏀圭殑璇濓級
+ Member model = isMemberUpdateParamValid(updateMember);
+ updateMember.setEditor(loginUserInfo.getId());
+ updateMember.setEditDate(new Date());
+ //娴峰悍浜哄憳鏂板涓氬姟
+ if(dealHkUserForUpdateBiz(updateMember)){
+ updateMember.setHkId(null);
+ updateMember.setAuthStatus(Constants.ZERO);
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .set(Member::getStartTime,null)
+ .set(Member::getEndTime,null)
+ .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone())
+ .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
+ .set(Member::getEditDate,updateMember.getEditDate())
+ .set(Member::getEditor,updateMember.getEditor())
+ .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
+ .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
+ .set(updateMember.getAuthStatus()!=null,Member::getAuthStatus,updateMember.getAuthStatus())
+ .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
+ .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
+ .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
+ .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
+ .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
+ .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
+ .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
+ .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
+ .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
+ .eq(Member::getId,updateMember.getId()));
+ cancelAllMemberEmpower(updateMember);
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper);
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
}
+
+ private void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper) {
+ UserAction userAction=new UserAction();
+ userAction.setIsdeleted(Constants.ZERO);
+ userAction.setCreateDate(updateMember.getEditDate());
+ userAction.setCreator(updateMember.getEditor());
+ userAction.setType(type.getKey());
+ String info = type.getInfo();
+ userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate())));
+ userAction.setMemberId(updateMember.getId()+"");
+ userActionMapper.insert(userAction);
+ }
+
@Override
public boolean updateFace(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
@@ -489,95 +702,95 @@
}
HkSyncEmpowerServiceImpl.doHkDeleteUser(model.getId(),model.getHkId(),new Date(),memberMapper,memberCardMapper);
}
+ @Override
+ public void updateHead(Member member) {
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
+ if(model.getCompanyId()!=null) {
+ if(Constants.equalsObject(member.getHeadStatus(),Constants.ONE)){
+ //濡傛灉鏄彇娑堜富绠�
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .eq(Company::getId,model.getCompanyId())
+ .set(Company::getHeadId,member.getId()));
+ }else{
+ //濡傛灉鏄涓轰富绠�
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .eq(Company::getId,model.getCompanyId())
+ .set(Company::getHeadId,null)
+ );
+ }
+ }
+ }
@Override
public void updateStatusById(Member member) {
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
Member update = new Member();
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
update.setStatus(member.getStatus());
memberMapper.updateById(update);
}
-
-
@Override
- public void updateVisitsStatusById(Member member) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updateWorkStatus(Member member) {
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Member result=memberMapper.selectById(member.getId());
- Integer status=result.getStatus();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
Member update = new Member();
+ update.setId(member.getId());
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
- update.setStatus(Constants.Status.FREEZE.getValue());
- update.setId(member.getId());
+ update.setWorkStatus(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
+ if(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)){
+ //濡傛灉鏄鑱�
+ cancelAllMemberEmpower(update);
+ }
+ update.setAuthStatus(Constants.ZERO);
memberMapper.updateById(update);
-
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
- if(Constants.equalsInteger(result.getType(),Constants.TWO)){
- userAction.setType(Constants.ONE);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
- }
- if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
- userAction.setType(Constants.TWO);
- userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愭媺榛戙��");
-
- }
- userAction.setMemberId(result.getId()+"");
- userAction.setBeforeStatus(status);
- userActionJoinMapper.insert(userAction);
- }
-
-
- @Override
- public void updateRemoveStatusById(List<Member> members) {
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
- Date date=new Date();
- members.stream().forEach(s ->{
- Member result=memberMapper.selectById(s.getId());
- Integer status=result.getStatus();
- Member update = new Member();
- update.setEditDate(date);
- update.setEditor(loginUserInfo.getId());
- update.setStatus(Constants.Status.ENABLE.getValue());
- update.setId(s.getId());
- memberMapper.updateById(update);
-
- //瑙ｅ喕涓氬姟 澶勭悊鐢ㄦ埛鎺堟潈瀵煎叆璁板綍
- this.thawMember(result);
-
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setCreator(loginUserInfo.getId());
- if(Constants.equalsInteger(result.getType(),Constants.TWO)){
- userAction.setType(Constants.ZERO);
- userAction.setBeforeStatus(Constants.ONE);
- }
- if(Constants.equalsInteger(result.getType(),Constants.ONE)){
- userAction.setBeforeStatus(status);
- userAction.setType(Constants.TWO);
- }
- userAction.setMemberId(result.getId()+"");
- userActionJoinMapper.insert(userAction);
- });
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.UserActionType.WORK_OFF:Constants.UserActionType.WORK_ON,userActionJoinMapper);
}
-
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void updateCanVisitById(Member member) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = member.getLoginUserInfo();
+ }
+ Member model =memberMapper.selectById(member.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
+ }
+ if(Constants.equalsInteger(member.getCanVisit(),model.getCanVisit())){
+ //濡傛灉娌℃湁鍙戠敓鍙樺寲锛岀洿鎺ヨ繑鍥�
+ return;
+ }
Member update = new Member();
update.setEditDate(new Date());
+ update.setId(member.getId());
update.setEditor(loginUserInfo.getId());
update.setCanVisit(member.getCanVisit());
memberMapper.updateById(update);
+ //璁板綍鎿嶄綔鏃ュ織
+ saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper);
}
@Override
@@ -606,8 +819,7 @@
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
- .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName);
+ .selectAs(Company::getName,Member::getCompanyName) ;
if(null != member.getType()) {
queryWrapper.eq(Member::getType,member.getType());
@@ -785,36 +997,6 @@
}
@Override
- public PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap) {
- IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
- MemberInfoDTO model = pageWrap.getModel();
- Utils.MP.blankToNull(model);
- Date end =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
- queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
- /* .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
- .leftJoin(Empower.class,Empower::getMemberId,Member::getId);*/
-
- queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
- .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName)
- /*.select(" (select Max(tt.END_TIME) from train_time tt where tt.ISDELETED=0 and tt.MEMBER_ID=t.id) as trainTimeEndTime")*/
- .select(" (select Max(e.END_TIME) from empower e where e.ISDELETED=0 and e.MEMBER_ID=t.id) as empowerEndTime");
-
- queryWrapper.eq(Member::getType,Constants.ZERO);
- queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
- .like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
- .like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
- .like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
- .having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
- if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
- memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode()) ==1?Constants.TWO:Constants.ONE));
- }
- return PageData.from(memberIPage);
- }
-
- @Override
public long count(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<Member>(member);
wrapper.lambda().like(StringUtils.isNotBlank(member.getRoleIdParam()), Member::getRoleId, member.getRoleIdParam());
@@ -839,16 +1021,22 @@
}
@Override
- public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
+ public PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Member.class);
queryWrapper.selectAs(Company::getName,Member::getCompanyName);
+ queryWrapper.selectAs(SystemUser::getRealname,Member::getEditorName);
+ queryWrapper.selectAs(Company::getType,Member::getCompanyType);
+ queryWrapper.selectAs(Company::getHeadId,Member::getHeadId);
queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and mc.member_id = t.id ) as memberCardCount ");
+ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
+// queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
Member::getCompanyId,pageWrap.getModel().getCompanyIds())
.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()),ms->ms
@@ -864,16 +1052,26 @@
.eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
- .eq(Member::getType,Constants.memberType.internal)
+// .eq(Member::getType,Constants.memberType.internal)
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
.orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
.orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
- queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
+// queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
}
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ if(pageWrap.getModel().getCompanyId()!=null){
+ if(pageWrap.getModel().getIncludeChild()!=null &&pageWrap.getModel().getIncludeChild() ){
+ //濡傛灉鍖呭惈涓嬬骇缁勭粐
+ Company company = companyMapper.selectById(pageWrap.getModel().getCompanyId());//鏌ヨ缁勭粐淇℃伅
+ queryWrapper.likeRight(Company::getCompanyPath,company.getCompanyPath());
+ }else{
+ //涓嶅寘鍚笅绾х粍缁�
+ queryWrapper.eq(Company::getId,pageWrap.getModel().getCompanyId());
+ }
+ }
+ IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
//FTP鏂囦欢璁块棶鍓嶇紑
@@ -883,8 +1081,11 @@
List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
.select(DeviceRole::getId,DeviceRole::getName)
.eq(DeviceRole::getIsdeleted,Constants.ZERO));
- for (MemberInfoDTO memberInfoDTO:memberIPage.getRecords()) {
+ for (Member memberInfoDTO:memberIPage.getRecords()) {
//鑾峰緱闂ㄧ缁勫悕绉版暟缁�
+ memberInfoDTO.setCanVisit(Constants.formatIntegerNum(memberInfoDTO.getCanVisit()));
+ memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
+ memberInfoDTO.setHeadStatus(Constants.equalsInteger(memberInfoDTO.getHeadId(),memberInfoDTO.getId())?Constants.ONE:Constants.ZERO);
memberInfoDTO.setRoleNames(this.dealRoleDatas(memberInfoDTO.getRoleId(),deviceRoleList));
//鎷兼帴鍓嶇紑
if(StringUtils.isNotBlank(memberInfoDTO.getFaceImg())){
@@ -925,13 +1126,13 @@
}
@Override
- public PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap) {
+ public PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
- .selectAs(Member::getLastVisitDate,MemberInfoDTO::getVisitsLastDate)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
.select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status in (7,8) ) as visitsCount");
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
@@ -948,21 +1149,21 @@
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
- queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
+ queryWrapper.eq((pageWrap.getModel().getCompanyId())!=null,Member::getCompanyId,pageWrap.getModel().getCompanyId());
}
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
return PageData.from(memberIPage);
}
@Override
- public PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
+ public PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
- .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
+ .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")
@@ -977,12 +1178,12 @@
.or().like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName()))
.like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
.eq(Member::getStatus,Constants.Status.FREEZE.getValue())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId())
+ .eq((pageWrap.getModel().getCompanyId())!=null,Company::getId,pageWrap.getModel().getCompanyId())
.eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
.orderByDesc(Member::getCreateDate);
- IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
return PageData.from(memberIPage);
}
@@ -1073,15 +1274,12 @@
return;
}
List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());
-
+ Date date = new Date();
for (Integer id:memberIds) {
- UserAction userAction=new UserAction();
- userAction.setIsdeleted(Constants.ZERO);
- userAction.setCreateDate(new Date());
- userAction.setType(1);
- userAction.setRemark("鐢卞畾鏃朵换鍔′簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
- userAction.setMemberId(id+"");
- userActionJoinMapper.insert(userAction);
+ Member updateMember = new Member();
+ updateMember.setId(id);
+ updateMember.setEditDate(date);
+ saveUserActionBiz(updateMember,null,Constants.UserActionType.FREEZE,userActionJoinMapper);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
index 212b187..338441f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
@@ -3,11 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.Utils;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.ParksMapper;
import com.doumee.dao.business.join.ParksJoinMapper;
-import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Parks;
import com.doumee.service.business.ParksService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 708828c..32dfe09 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1,22 +1,16 @@
package com.doumee.service.business.impl;
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.erp.ErpConstants;
import com.doumee.core.erp.ErpTool;
-import com.doumee.core.erp.model.openapi.request.VisitListRequest;
import com.doumee.core.erp.model.openapi.request.erp.ApproveAddRequest;
import com.doumee.core.erp.model.openapi.request.erp.UserInfoRequest;
-import com.doumee.core.erp.model.openapi.response.VisitEventListResponse;
import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.HKTools;
import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
@@ -28,21 +22,17 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.DeviceJoinMapper;
-import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.AuditApproveDTO;
import com.doumee.dao.web.reqeust.ErpVisitDTO;
import com.doumee.dao.web.reqeust.ErpWithVisitDTO;
import com.doumee.dao.web.reqeust.VisitRecordDTO;
-import com.doumee.dao.web.response.InternalHomeVO;
import com.doumee.dao.web.response.VisitDetailVO;
import com.doumee.dao.web.response.VisitRecordVO;
-import com.doumee.service.business.ApproveService;
import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.VisitsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -51,16 +41,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
-import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
--
Gitblit v1.9.3