From 896cb061fbef0e4805bd1e40dc63cd0239070431 Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期四, 14 十二月 2023 16:40:01 +0800
Subject: [PATCH] 员工列表
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 88 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 79 insertions(+), 9 deletions(-)
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 983da41..8bdd4a9 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
@@ -28,6 +28,7 @@
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
+import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
@@ -70,6 +71,8 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private UserActionJoinMapper userActionJoinMapper;
@Override
public Integer create(Member member) {
@@ -119,7 +122,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());
@@ -130,13 +133,20 @@
trainTime.setEndTime(Utils.Date.getDayEnd(member.getEndTime()));
// trainTime.setImportStatus();
// trainTime.setImportInfo();
- trainTimeMapper.insert(trainTime);
+ trainTimeMapper.insert(trainTime);*/
return insert.getId();
}
@Override
public void deleteById(Integer id) {
- memberMapper.deleteById(id);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ Member member=new Member();
+ member.setId(id);
+ member.setIsdeleted(Constants.ZERO);
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ memberMapper.updateById(member);
}
@Override
@@ -150,7 +160,16 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- memberMapper.deleteBatchIds(ids);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member member=new Member();
+ ids.stream().forEach(s ->{
+ member.setId(s);
+ member.setIsdeleted(Constants.ZERO);
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ memberMapper.updateById(member);
+ });
+ /* memberMapper.deleteBatchIds(ids);*/
}
@Override
@@ -167,6 +186,30 @@
update.setStatus(member.getStatus());
memberMapper.updateById(update);
}
+
+
+ @Override
+ public void updateVisitsStatusById(Member member) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member result=memberMapper.selectById(member.getId());
+ Integer status=result.getStatus();
+ Member update = new Member();
+ update.setEditDate(new Date());
+ update.setEditor(loginUserInfo.getId());
+ update.setStatus(member.getStatus());
+ update.setId(member.getId());
+ memberMapper.updateById(update);
+
+ UserAction userAction=new UserAction();
+ userAction.setIsdeleted(Constants.ZERO);
+ userAction.setCreateDate(new Date());
+ userAction.setCreator(loginUserInfo.getId());
+ userAction.setType(Constants.TWO);
+ userAction.setMemberId(result.getId()+"");
+ userAction.setBeforeStatus(status);
+ userActionJoinMapper.insert(userAction);
+ }
+
@Override
@@ -354,16 +397,17 @@
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.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("Max(t1.endTime)","trainTimeEndTime")
- .select("Max(t2.endTime)","empowerEndTime");
+ /*.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())
@@ -455,6 +499,32 @@
return PageData.from(memberIPage);
}
+
+ @Override
+ public PageData<MemberInfoDTO> 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)
+ .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0) as visitsCount")
+ .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE limit 1) as visitsLastDate");
+
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
+ .eq(Member::getStatus,Constants.Status.ENABLE)
+ .orderByDesc(Member::getCreateDate);
+
+
+ IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ return PageData.from(memberIPage);
+
+ }
+
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
--
Gitblit v1.9.3