WFC/agt-cloud
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 客户项目员工数统计去掉内部的;导入项目开始时间补充

Browse Source
This commit is contained in:
caiyuchao
2025-08-28 16:49:57 +08:00
parent 2495dad119
commit c63e34ef49
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/customer/CustomerServiceImpl.java
View File

@@ -56,8 +56,9 @@ public class CustomerServiceImpl implements CustomerService {
@Override @Override
public DashboardRespVO dashboard() { public DashboardRespVO dashboard() {
Long customerCount = customerMapper.selectCount(); Long customerCount = customerMapper.selectCount(Wrappers.<CustomerDO>lambdaQuery().ne(CustomerDO::getName, "AGT"));
Long projectCount = projectMapper.selectCount(); 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 contractCount = projectMapper.selectCount(Wrappers.<ProjectDO>lambdaQuery().ne(ProjectDO::getContractCode, "0"));
Long licenseCount = licenseMapper.selectCount(); Long licenseCount = licenseMapper.selectCount();
DashboardRespVO dashboardRespVO = new DashboardRespVO(); DashboardRespVO dashboardRespVO = new DashboardRespVO();

4
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java
View File

@@ -730,6 +730,7 @@ public class LicenseServiceImpl implements LicenseService {
projectDO.setTechnicalOwnerB(customerMapper.getUserByName(importVO.getTechnicalOwnerBName())); projectDO.setTechnicalOwnerB(customerMapper.getUserByName(importVO.getTechnicalOwnerBName()));
projectDO.setDataType(1); projectDO.setDataType(1);
projectDO.setCreateTime(createTime); projectDO.setCreateTime(createTime);
projectDO.setStartTime(createTime);
projectMapper.insert(projectDO); projectMapper.insert(projectDO);
projectId = projectDO.getId(); projectId = projectDO.getId();
} else if (updateSupport) { } else if (updateSupport) {
@@ -741,6 +742,7 @@ public class LicenseServiceImpl implements LicenseService {
projectDO.setTechnicalOwnerA(customerMapper.getUserByName(importVO.getTechnicalOwnerAName())); projectDO.setTechnicalOwnerA(customerMapper.getUserByName(importVO.getTechnicalOwnerAName()));
projectDO.setTechnicalOwnerB(customerMapper.getUserByName(importVO.getTechnicalOwnerBName())); projectDO.setTechnicalOwnerB(customerMapper.getUserByName(importVO.getTechnicalOwnerBName()));
projectDO.setCreateTime(createTime); projectDO.setCreateTime(createTime);
projectDO.setStartTime(createTime);
projectMapper.updateById(projectDO); projectMapper.updateById(projectDO);
} else { } else {
projectId = projectDO.getId(); projectId = projectDO.getId();
@@ -750,7 +752,7 @@ public class LicenseServiceImpl implements LicenseService {
licenseDO.setProjectId(projectId); licenseDO.setProjectId(projectId);
licenseDO.setSerialNo(serialNo); licenseDO.setSerialNo(serialNo);
licenseDO.setStatus(LicenseStatusEnum.COMPLETED.getCode()); licenseDO.setStatus(LicenseStatusEnum.COMPLETED.getCode());
licenseDO.setApplicant(WebFrameworkUtils.getLoginUserId()); // licenseDO.setApplicant(WebFrameworkUtils.getLoginUserId());
String expiryDateExt = importVO.getExpiryDateExt(); String expiryDateExt = importVO.getExpiryDateExt();
LocalDateTime expiryDate; LocalDateTime expiryDate;
if ("永久".equals(expiryDateExt)) { if ("永久".equals(expiryDateExt)) {

2
agt-module-license/agt-module-license-server/src/main/resources/mapper/customer/CustomerMapper.xml
View File

@@ -7,7 +7,7 @@
</select> </select>
<select id="selectUserCount" resultType="Long"> <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>
<select id="getUserByName" resultType="Long"> <select id="getUserByName" resultType="Long">