From 61c2c3482a7495805a4590fef8d2a1b1cd1127f8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 26 二月 2024 17:38:38 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 9 +++++++--
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java | 10 +++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java
index c52ad35..6ece8b1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java
+++ b/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;
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 b058b1d..5d16abd 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
@@ -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;
}
--
Gitblit v1.9.3