diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/customer/CustomerServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/customer/CustomerServiceImpl.java index 004a7c9..7474ff5 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/customer/CustomerServiceImpl.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/customer/CustomerServiceImpl.java @@ -26,8 +26,10 @@ import org.springframework.validation.annotation.Validated; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; +import java.util.stream.Collectors; import static org.agt.framework.common.exception.util.ServiceExceptionUtil.exception; import static org.agt.module.license.enums.ErrorCodeConstants.CUSTOMER_CODE_DUPLICATE; @@ -56,9 +58,10 @@ public class CustomerServiceImpl implements CustomerService { @Override public DashboardRespVO dashboard() { - Long customerCount = customerMapper.selectCount(Wrappers.lambdaQuery().ne(CustomerDO::getName, "AGT")); - CustomerDO customerDO = customerMapper.selectOne(Wrappers.lambdaQuery().eq(CustomerDO::getName, "AGT"), false); - Long projectCount = projectMapper.selectCount(Wrappers.lambdaQuery().ne(customerDO != null, ProjectDO::getCustomerId, customerDO.getId())); + Long customerCount = customerMapper.selectCount(Wrappers.lambdaQuery().notIn(CustomerDO::getName, Arrays.asList("AGT", "BA", "Blue Arcus"))); + List customerDOS = customerMapper.selectList(Wrappers.lambdaQuery().in(CustomerDO::getName, Arrays.asList("AGT", "BA", "Blue Arcus"))); + List customerIds = customerDOS.stream().map(CustomerDO::getId).collect(Collectors.toList()); + Long projectCount = projectMapper.selectCount(Wrappers.lambdaQuery().notIn(CollUtil.isNotEmpty(customerIds), ProjectDO::getCustomerId, customerIds)); Long contractCount = projectMapper.selectCount(Wrappers.lambdaQuery().ne(ProjectDO::getContractCode, "0")); Long licenseCount = licenseMapper.selectCount(); DashboardRespVO dashboardRespVO = new DashboardRespVO(); diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml index 06e14eb..2d33fce 100644 --- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml +++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml @@ -65,9 +65,9 @@ LEFT JOIN system_users u3 ON p.technical_owner_a = u3.id AND u3.deleted = 0 where p.deleted = 0 + and c.update_time >= DATE_SUB(CURDATE(), INTERVAL 1 WEEK) ORDER BY c.update_time DESC - LIMIT 10 \ No newline at end of file