From ad6dfb8323ab40ca8fe4fed94722c755d89c3203 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 15:14:47 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 5 +++--
server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 7 ++++---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 3 +++
server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java | 11 ++++++-----
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 3 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 8 ++++----
6 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index 488965e..94d7245 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -171,10 +171,11 @@
@RequiresPermissions("business:company:sync")
public ApiResponse sync(){
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
- erpSyncService.syncCompany(null);
+ return ApiResponse.success( erpSyncService.syncCompany(null));
}else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
- hkSyncOrgUserFHKService.syncOrgData();
+ hkSyncOrgUserFHKService.syncOrgData();
+ return ApiResponse.success("鍚屾鎴愬姛");
}
- return ApiResponse.success("鍚屾鎴愬姛");
+ return ApiResponse.failed("鏃犳晥鎿嶄綔");
}
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index 8d94c37..ab4e651 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -49,6 +49,9 @@
@ApiModelProperty(value = " 宸ュ彿鍛�")
private Integer code;
+ @ApiModelProperty(value = "娴峰悍鐘舵�� 0寰呬笅鍙� 1鎴愬姛2澶辫触")
+ private Integer hkStatus;
+
@ApiModelProperty(value = "鎿嶄綔浜哄憳 ")
private Integer createrId;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
index 1f168ae..284d522 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
@@ -36,6 +36,9 @@
@ApiModelProperty(value = "鍏徃鍚嶇О")
private String companyName;
+ @ApiModelProperty(value = "娴峰悍鐘舵�� 0寰呬笅鍙� 1鎴愬姛2澶辫触")
+ private Integer hkStatus;
+
@ApiModelProperty(value = "鍏徃璐熻矗浜�")
private String linkName;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 562b1e1..7f39337 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -598,6 +598,7 @@
.isNotNull(!Objects.isNull(pageWrap.getModel().getHasFace())&&Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId)
.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(Member::getIsdeleted,Constants.ZERO)
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
.eq(Member::getType,Constants.memberType.internal)
@@ -672,8 +673,8 @@
.and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ms->ms.like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName())
.or().like(Company::getName,pageWrap.getModel().getCompanyName()))
.like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
- .eq(Objects.isNull(pageWrap.getModel().getStatus()),Member::getStatus,Constants.Status.ENABLE.getValue())
- .eq(!Objects.isNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Member::getType,Constants.memberType.visitor)
.eq(Member::getIsdeleted,Constants.ZERO)
.orderByDesc(Member::getCreateDate);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index ea6a205..089b691 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -401,8 +401,8 @@
member.setRoleIds(param.getRoleIds());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
- member.setStartTime(request.getStartTime());
- member.setEndTime(request.getEndTime());
+// member.setStartTime(request.getStartTime());
+// member.setEndTime(request.getEndTime());
return member;
}
@@ -418,8 +418,8 @@
member.setHkStatus(Constants.ZERO);
member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
member.setRoleIds(param.getRoleIds());
- member.setStartTime(request.getStartTime());
- member.setEndTime(request.getEndTime());
+// member.setStartTime(request.getStartTime());
+// member.setEndTime(request.getEndTime());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
return member;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
index d59fd00..da0131d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
@@ -37,10 +37,11 @@
@Override
public void deleteById(Integer id) {
- SystemRolePermission systemRolePermission = new SystemRolePermission();
- systemRolePermission.setId(id);
- systemRolePermission.setDeleted(Boolean.TRUE);
- this.updateById(systemRolePermission);
+// SystemRolePermission systemRolePermission = new SystemRolePermission();
+// systemRolePermission.setId(id);
+// systemRolePermission.setDeleted(Boolean.TRUE);
+// this.updateById(systemRolePermission);
+ systemRolePermissionMapper.deleteById(id);
}
@Override
@@ -48,7 +49,7 @@
SystemRolePermission newPermission = new SystemRolePermission();
newPermission.setDeleted(Boolean.TRUE);
UpdateWrapper<SystemRolePermission> updateWrapper = new UpdateWrapper<>(systemRolePermission);
- systemRolePermissionMapper.update(newPermission, updateWrapper);
+ systemRolePermissionMapper.delete(new UpdateWrapper<SystemRolePermission>().lambda().eq(SystemRolePermission::getRoleId,systemRolePermission.getRoleId() ));
}
@Override
--
Gitblit v1.9.3