From 931e45f5f78494c7af4cab75053da49b57f22fbe Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 14:31:43 +0800
Subject: [PATCH] 定时自动叫号 与 WMS获取车辆是否在园接口开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
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 2cd7077..830c4fe 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
@@ -111,6 +111,8 @@
private MemberCardMapper memberCardMapper;
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private PositionMapper positionMapper;
@Autowired
private RedisTemplate<String, Object> redisTemplate;
@@ -565,7 +567,7 @@
insert.setParentId(member.getParentId());
memberMapper.insert(insert);
- /* TrainTime trainTime = new TrainTime();
+ /* TrainTime trainTime = new TrainTime();
trainTime.setCreator(loginUserInfo.getId().toString());
trainTime.setCreateDate(new Date());
trainTime.setEdirot(loginUserInfo.getId().toString());
@@ -602,6 +604,7 @@
.set(SystemUser::getUpdateUser,member.getEditor())
.set(SystemUser::getUpdateTime,member.getEditDate())
);
+// cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper);
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
List<Cars> carsList = carsMapper.selectList(new QueryWrapper<Cars>().lambda()
.eq(Cars::getMemberId,member.getId())
@@ -1509,8 +1512,11 @@
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
// .eq(Member::getType,Constants.memberType.internal)
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
- .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
- .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
+
+ .orderByAsc(Company::getSortnum)
+ .orderByAsc(Position::getSortnum);
+// .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
+// .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{
@@ -1615,7 +1621,10 @@
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Member::getType,Constants.memberType.visitor)
.eq(Member::getIsdeleted,Constants.ZERO)
- .orderByAsc(Member::getPinyin);
+ .orderByAsc(Company::getSortnum)
+ .orderByAsc(Position::getSortnum);
+
+
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
@@ -2090,6 +2099,8 @@
);
List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
.eq(Company::getIsdeleted,Constants.ZERO));
+ List<Position> positionList = positionMapper.selectList(new QueryWrapper<Position>().lambda()
+ .eq(Position::getIsdeleted,Constants.ZERO));
List<Member> newList = new ArrayList<>();
for(int i=0;i<dataList.size();i++){
MemberImport model = dataList.get(i);
@@ -2101,7 +2112,7 @@
&&StringUtils.isBlank(model.getCompanyName())){
continue;
}
- Member member = checkModelParam(model,newList,i,loginUserInfo,list,companyList,companyType);
+ Member member = checkModelParam(model,newList,i,loginUserInfo,list,companyList,companyType,positionList);
newList.add(member);
}
if(newList == null || newList.size() ==0){
@@ -2155,7 +2166,8 @@
,LoginUserInfo loginUserInfo
,List<Member> memberList
,List<Company> companyList
- ,Integer companyType) {
+ ,Integer companyType
+ ,List<Position> positionList) {
if(StringUtils.isBlank(model.getName())
// ||StringUtils.isBlank(model.getIdcardNo())
||StringUtils.isBlank(model.getPhone())
@@ -2176,6 +2188,7 @@
}
}
+
for(Member member: newList){
if(StringUtils.isNotBlank(model.getIdcardNo())&&StringUtils.isNotBlank(member.getIdcardNo())) {
if (StringUtils.equals(model.getIdcardNo(), member.getIdcardNo())) {
@@ -2192,6 +2205,10 @@
}
if(companyType != null && !Constants.equalsInteger(companyType,company.getType())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戠被鍨嬩笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ Position position = findPositionFromList(model.getPositionName(),positionList);
+ if(Objects.isNull(position)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屽矖浣嶅悕绉般��"+model.getPositionName()+"銆戜笉瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
if(StringUtils.isNotBlank(model.getIdcardNo())){
@@ -2224,6 +2241,18 @@
}
return null;
}
+
+ private Position findPositionFromList(String positionName, List<Position> positionList) {
+ if(positionList !=null){
+ for(Position position : positionList){
+ if(StringUtils.equals(positionName,position.getName())){
+ return position;
+ }
+ }
+ }
+ return null;
+ }
+
public static Member findMemberFromListByIdcard(String param, List<Member> list) {
if(list !=null){
for(Member member : list){
--
Gitblit v1.9.3