From dcde17c2cc7b7438415f91bc2731f998eb0a36fc Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期五, 15 十二月 2023 15:03:58 +0800
Subject: [PATCH] 员工列表
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 47 ++++++++++++++++++++++-
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 4 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 2 +
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 4 +
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 3 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 14 ++++++-
6 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 69790af..043b24e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -86,7 +86,15 @@
return ApiResponse.success(null);
}
- @ApiOperation("浜哄憳鎷夐粦")
+ @ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
+ @PostMapping("/updateRemoveStatusById")
+ @RequiresPermissions("business:member:update")
+ public ApiResponse updateRemoveStatusById(@RequestParam List<Member> list){
+ memberService.updateRemoveStatusById(list);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
@PostMapping("/updateVisitsStatusById")
@RequiresPermissions("business:member:update")
public ApiResponse updateVisitsStatusById(@RequestBody Member member){
@@ -152,11 +160,13 @@
}
- @ApiOperation("寮傚父浜哄憳")
+ @ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
@PostMapping("/findUnusualPage")
@RequiresPermissions("business:member:query")
public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
return ApiResponse.success(memberService.findUnusualPage(pageWrap));
}
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 69242b4..fb80c8a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -23,6 +23,7 @@
public static final int ZERO = 0 ;
public static final int ONE = 1 ;
public static final int TWO = 2 ;
+ public static final int THREE = 2 ;
public static final String HK_PARAM ="HK_PARAM" ;
public static final String HK_HOST ="HK_HOST" ;
public static final String HK_APPKEY ="HK_APPKEY" ;
@@ -70,8 +71,7 @@
// ERP ACCESS_SECRET
public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET";
- // FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
- public static final String FTP_RESOURCE_PATH = "FTP_RESOURCE_PATH";
+
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
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 e35b43f..5bd15cc 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
@@ -46,4 +46,7 @@
private Integer type;
+ @ApiModelProperty(value = " 宸ュ彿鍛�")
+ private Integer code;
+
}
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 7a66b78..524bd4d 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
@@ -113,7 +113,9 @@
@TableField(exist = false)
private Date visitsLastDate;
-
+ @ApiModelProperty(value = "鏈�鍚庡喕缁撴椂闂�")
+ @TableField(exist = false)
+ private Date userActionType1;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 77b11b7..8a08150 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -76,6 +76,8 @@
void updateVisitsStatusById(Member member);
+ void updateRemoveStatusById(List<Member> members);
+
void updateCanVisitById(Member member);
/**
* 鎵归噺涓婚敭鏇存柊
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 dae492d..9677c71 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
@@ -42,11 +42,14 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -204,11 +207,49 @@
userAction.setIsdeleted(Constants.ZERO);
userAction.setCreateDate(new Date());
userAction.setCreator(loginUserInfo.getId());
- userAction.setType(Constants.TWO);
+ if(Constants.equalsInteger(result.getType(),Constants.TWO)){
+ userAction.setType(Constants.ONE);
+ }
+ if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
+ userAction.setType(Constants.TWO);
+ }
userAction.setMemberId(result.getId()+"");
userAction.setBeforeStatus(status);
userActionJoinMapper.insert(userAction);
}
+
+
+ @Override
+ public void updateRemoveStatusById(List<Member> members) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ Date date=new Date();
+ members.stream().forEach(s ->{
+ Member result=memberMapper.selectById(s.getId());
+ Integer status=result.getStatus();
+ Member update = new Member();
+ update.setEditDate(date);
+ update.setEditor(loginUserInfo.getId());
+ update.setStatus(s.getStatus());
+ update.setId(s.getId());
+ memberMapper.updateById(update);
+
+ UserAction userAction=new UserAction();
+ userAction.setIsdeleted(Constants.ZERO);
+ userAction.setCreateDate(new Date());
+ userAction.setCreator(loginUserInfo.getId());
+ if(Constants.equalsInteger(result.getType(),Constants.TWO)){
+ userAction.setType(Constants.ZERO);
+ }
+ if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
+ userAction.setType(Constants.THREE);
+ }
+ userAction.setMemberId(result.getId()+"");
+ userAction.setBeforeStatus(status);
+ userActionJoinMapper.insert(userAction);
+ });
+ }
+
@@ -535,7 +576,8 @@
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 ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 and ua.type=1 order by ua.CREATE_DATE limit 1) as userActionType1")
+ /* .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.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
@@ -544,6 +586,7 @@
.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)
+ .eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
.orderByDesc(Member::getCreateDate);
--
Gitblit v1.9.3