From e0edecb48cbf4853937976242f041b74203b8e50 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期日, 17 三月 2024 21:18:38 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 18 ++++++++++++++----
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 4 +++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 2 +-
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 3 +--
5 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 478d293..30104fd 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -131,9 +131,8 @@
* 瀹氭椂鍚屾鍐呴儴浜哄憳鎺堟潈鍒版捣搴风郴缁�
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedDelay= 10*1000)
public void syncEmpowerData() {
-
hkSyncEmpowerService.syncEmpowerData();
}
/**
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
index 646d48d..783d6a4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -146,7 +146,7 @@
queryWrapper.ge(Empower::getSendDate,cal.getTime());
}
}
- queryWrapper.orderByDesc(Empower::getCreateDate);
+ queryWrapper.orderByDesc(Empower::getId);
IPage<Empower> result = empowerJoinMapper.selectJoinPage(page, Empower.class,queryWrapper);
return PageData.from(result);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 8bac41e..af7d7cd 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -70,7 +70,7 @@
|| StringUtils.isBlank(memberCard.getCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(memberCard.getCode().length()<=8){
+ if(memberCard.getCode().length()<8){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍗″彿闇�瑕佸ぇ浜�8浣�");
}
memberCard.setCreator(userInfo.getId());
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 cc32054..4ac301f 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
@@ -393,12 +393,22 @@
@Override
public List<Member> findList(Member member) {
- QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
+
+ 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);
+
if(null != member.getType()) {
- wrapper.lambda().eq(Member::getType,member.getType());
+ queryWrapper.eq(Member::getType,member.getType());
}
- wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO);
- return memberMapper.selectList(wrapper);
+ if(null != member.getCompanyId()) {
+ queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
+ }
+ queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
+
+ return memberJoinMapper.selectJoinList(Member.class,queryWrapper);
}
@Override
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index a5c0441..5f9f5f4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -520,7 +520,9 @@
queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.wait);
queryWrapper.eq( Empower::getIsdeleted,del);
-// queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
+ queryWrapper.orderByAsc(Empower::getId );
+ queryWrapper.orderByAsc(Empower::getCreateDate );
+ queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
}
--
Gitblit v1.9.3