k94314517
2024-02-26 61c2c3482a7495805a4590fef8d2a1b1cd1127f8
ERP接口
已修改2个文件
19 ■■■■■ 文件已修改
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java
@@ -27,13 +27,13 @@
    private Long lwCount;
    @ApiModelProperty(value = "在场车辆")
    private Long presenceCarCount;
    private Integer presenceCarCount;
    @ApiModelProperty(value = "访客车辆")
    private Long visitorCarCount;
    @ApiModelProperty(value = "预约车辆")
    private Integer visitorCarCount;
    @ApiModelProperty(value = "劳务车辆")
    private Long lwCarCount;
    @ApiModelProperty(value = "长期车辆")
    private Integer longCarCount;
    @ApiModelProperty(value = "供应商数量")
    private Integer supplierCount;
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -997,8 +997,13 @@
            stagingHeadVO.setLwCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.lw_visitor)).count());
            stagingHeadVO.setVisitorCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.visitor)).count());
        }
        //TODO
        //在场车辆
        stagingHeadVO.setPresenceCarCount(retentionJoinMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,3)));
        //长期车辆
        stagingHeadVO.setLongCarCount(retentionJoinMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,3)
                .exists(" select 1 from park_book p where p.origin = 0 and p.car_code = retention.car_no and p.ISDELETED = 0  ")
        ));
        stagingHeadVO.setVisitorCarCount(stagingHeadVO.getPresenceCarCount() - stagingHeadVO.getLongCarCount());
        stagingHeadVO.setSupplierCount(companyMapper.selectCount(new QueryWrapper<Company>().lambda().eq(Company::getIsdeleted,Constants.ZERO)));
        return stagingHeadVO;
    }