From ef2e97be5b5303ba62212cecbaa811796c38210d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 十月 2024 15:03:15 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java | 3 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 1 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 5 +++--
admin/src/views/business/relativeMember.vue | 3 ++-
admin/src/views/business/position.vue | 1 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 2 ++
6 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/position.vue b/admin/src/views/business/position.vue
index 36ce1dd..acf08e8 100644
--- a/admin/src/views/business/position.vue
+++ b/admin/src/views/business/position.vue
@@ -24,6 +24,7 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="宀椾綅" min-width="200px"></el-table-column>
+ <el-table-column prop="memberNum" label="鍛樺伐鏁�" min-width="200px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="200px"></el-table-column>
<el-table-column
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 366d9fb..881dc01 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -228,7 +228,7 @@
name: '',
status: '',
hkStatus: '',
- includeChild: false,
+ includeChild: true,
canVisit: '',
keyword: '',
type: 2,
@@ -244,6 +244,7 @@
working: false,
canvisiting: false,
companyTree: [],
+ positionList: [],
department: []
}
},
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 7f89081..39a3028 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
@@ -56,6 +56,8 @@
@ApiModelProperty(value = "娴峰悍鐘舵�� 0寰呬笅鍙� 1鎴愬姛2澶辫触")
private Integer hkStatus;
+ @ApiModelProperty(value = "鍦ㄨ亴鐘舵��")
+ private Integer workStatus;
@ApiModelProperty(value = "鎿嶄綔浜哄憳 ")
private Integer createrId;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java
index f10b48d..8bdf331 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java
@@ -79,6 +79,9 @@
@ApiModelProperty(value = "瀛愰泦鍒嗙被")
@TableField(exist = false)
private List<Position> childList;
+ @ApiModelProperty(value = "褰撳墠宀椾綅浜哄憳鏁伴噺")
+ @TableField(exist = false)
+ private Integer memberNum;
}
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 6a2eaf2..7316080 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
@@ -1387,6 +1387,7 @@
.eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getWorkStatus()),Member::getWorkStatus,pageWrap.getModel().getWorkStatus())
.eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
.eq(Objects.nonNull(pageWrap.getModel().getCompanyType()),Company::getType,pageWrap.getModel().getCompanyType())
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index db4a384..c735509 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -494,7 +494,7 @@
delRetentionLis.add(visits.getMemberId());
//濡傛灉鏄瀹㈤�氳
if(request.getData()!=null&&request.getData().getParamValues()!=null &&
- StringUtils.equals(request.getData().getParamValues().getInOrOut(),"1")){
+ StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
//濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
Retention r = getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType());
r.setCarNo(request.getData().getParamValues().getPlateNos());
@@ -505,7 +505,7 @@
inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
}
if(request.getData()!=null&&request.getData().getParamValues()!=null &&
- StringUtils.equals(request.getData().getParamValues().getInOrOut(),"2")){
+ !StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
}
}
@@ -571,6 +571,7 @@
event.setPhotoUrl(getHkImgUrl(detail.getFacePic()));
event.setPersonName(detail.getVisitorName());
event.setCarNo(detail.getPlateNo());
+ event.setRemark(JSONObject.toJSONString(request));
event.setInvoicesNo(request.getData().getVisitorInvoices().getInvoicesNo());//璁垮鍗曞彿
event.setIdType(detail.getCertType());
String idnum = detail.getCertNo();
--
Gitblit v1.9.3