员工列表

liuleilei

2023-12-15 31933f572488dbf7af07067a97ea18a66ec13a8c

员工列表

 server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java

@@ -69,7 +69,7 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
   // @RequiresPermissions("business:cars:query")
    @RequiresPermissions("business:cars:query")
    public ApiResponse<PageData<Cars>> findPage (@RequestBody PageWrap<Cars> pageWrap) {
        return ApiResponse.success(carsService.findPage(pageWrap));
    }

 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java

@@ -151,4 +151,12 @@
        return ApiResponse.success(memberService.findVisitPage(pageWrap));
    }


    @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

@@ -249,7 +249,8 @@

        /** ç”¨æˆ·å¯ç”¨ç¦ç”¨æžšä¸¾å€¼*/
        ENABLE(0,"正常"),
        DISABLE(1,"禁用");
        DISABLE(1,"禁用"),
        FREEZE(2,"拉黑/冻结");

        private  Integer value;
        private  String des;

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java

@@ -42,5 +42,8 @@
    @ApiModelProperty(value = "身份证号")
    private String idcardNo;

    @ApiModelProperty(value = " 0劳务访客 1普通访客  2内部人员")
    private Integer type;


}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarJoinMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.doumee.dao.business.join;

import com.doumee.dao.business.model.Cars;
import com.github.yulichang.base.mapper.MPJJoinMapper;

public interface CarJoinMapper extends MPJJoinMapper<Cars> {
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java

@@ -153,6 +153,8 @@

    PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);

    PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap);


    /********************************************公众号接口***********************************************************************/


 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java

@@ -99,11 +99,6 @@
    @Override
    public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {

        MPJLambdaWrapper<Cars> visRecord = new MPJLambdaWrapper<>();
        visRecord.selectAll(Cars.class);
        visRecord.eq(Cars::getIsdeleted, Constants.ZERO);
        visRecord.eq(Cars::getId, Constants.ZERO);
        Cars result = carJoinMapper.selectJoinOne(Cars.class,visRecord);

        IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Cars> queryWrapper = new QueryWrapper<>();

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -516,6 +516,33 @@
                .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.FREEZE)
                .orderByDesc(Member::getCreateDate);


        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        return PageData.from(memberIPage);

    }


    @Override
    public PageData<MemberInfoDTO> findUnusualPage(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.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
        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);