From c63e34ef49767a645b60787eeadd9fe58d2a6b64 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Thu, 28 Aug 2025 16:49:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=95=B0=E7=BB=9F=E8=AE=A1=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E7=9A=84;=E5=AF=BC=E5=85=A5=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/license/service/customer/CustomerServiceImpl.java | 5 +++--
 .../module/license/service/license/LicenseServiceImpl.java   | 4 +++-
 .../src/main/resources/mapper/customer/CustomerMapper.xml    | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

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.<CustomerDO>lambdaQuery().ne(CustomerDO::getName, "AGT"));
+        CustomerDO customerDO = customerMapper.selectOne(Wrappers.<CustomerDO>lambdaQuery().eq(CustomerDO::getName, "AGT"), false);
+        Long projectCount = projectMapper.selectCount(Wrappers.<ProjectDO>lambdaQuery().ne(customerDO != null, ProjectDO::getCustomerId, customerDO.getId()));
         Long contractCount = projectMapper.selectCount(Wrappers.<ProjectDO>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 @@
     </select>
 
     <select id="selectUserCount" resultType="Long">
-        select count(*) from system_users WHERE deleted = 0;
+        select count(*) from system_users WHERE deleted = 0 and username != 'agtuser';
     </select>
 
     <select id="getUserByName" resultType="Long">