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 90f0a16..004a7c9 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 @@ -56,8 +56,9 @@ public class CustomerServiceImpl implements CustomerService { @Override public DashboardRespVO dashboard() { - Long customerCount = customerMapper.selectCount(); - Long projectCount = projectMapper.selectCount(); + 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 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/java/org/agt/module/license/service/license/LicenseServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java index 838931b..d6c1da5 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java @@ -730,6 +730,7 @@ public class LicenseServiceImpl implements LicenseService { projectDO.setTechnicalOwnerB(customerMapper.getUserByName(importVO.getTechnicalOwnerBName())); projectDO.setDataType(1); projectDO.setCreateTime(createTime); + projectDO.setStartTime(createTime); projectMapper.insert(projectDO); projectId = projectDO.getId(); } else if (updateSupport) { @@ -741,6 +742,7 @@ public class LicenseServiceImpl implements LicenseService { projectDO.setTechnicalOwnerA(customerMapper.getUserByName(importVO.getTechnicalOwnerAName())); projectDO.setTechnicalOwnerB(customerMapper.getUserByName(importVO.getTechnicalOwnerBName())); projectDO.setCreateTime(createTime); + projectDO.setStartTime(createTime); projectMapper.updateById(projectDO); } else { projectId = projectDO.getId(); @@ -750,7 +752,7 @@ public class LicenseServiceImpl implements LicenseService { licenseDO.setProjectId(projectId); licenseDO.setSerialNo(serialNo); licenseDO.setStatus(LicenseStatusEnum.COMPLETED.getCode()); - licenseDO.setApplicant(WebFrameworkUtils.getLoginUserId()); +// licenseDO.setApplicant(WebFrameworkUtils.getLoginUserId()); String expiryDateExt = importVO.getExpiryDateExt(); LocalDateTime expiryDate; if ("永久".equals(expiryDateExt)) { diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/customer/CustomerMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/customer/CustomerMapper.xml index 83b9559..42c93e5 100644 --- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/customer/CustomerMapper.xml +++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/customer/CustomerMapper.xml @@ -7,7 +7,7 @@