员工列表

liuleilei

2023-12-15 dcde17c2cc7b7438415f91bc2731f998eb0a36fc

员工列表

 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));
    }



}

 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){

 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;

}

 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;


}

 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);
    /**
     * 批量主键更新

 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);