Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1685修复

Browse Source
This commit is contained in:
gaoqr
2026-06-16 11:57:21 +08:00
parent 111b7bee0e
commit af3aa8eed4
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java
+12 -12
View File
@@ -80,19 +80,19 @@ public interface OrganMapper extends BaseMapperX<OrganizationDO> {
.eq(OrganizationDO::getDeleted, OrderDeletedEnum.NOT_DELETED.getStatus())));
}
default Integer selectOrgCountAdd() {
return Math.toIntExact(selectCount(new LambdaQueryWrapperX<OrganizationDO>()
.eq(OrganizationDO::getDeleted, OrderDeletedEnum.NOT_DELETED.getStatus())
.between(OrganizationDO::getCreateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIDNIGHT),
LocalDateTime.of(LocalDate.now(), LocalTime.of(23, 59, 59)))));
}
/**
* 查询今天创建的组织
*
* @return
*/
Integer selectOrgCountAdd(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
default Integer selectOrgCountDel() {
return Math.toIntExact(selectCount(new LambdaQueryWrapperX<OrganizationDO>()
.eq(OrganizationDO::getDeleted, OrderDeletedEnum.DELETED.getStatus())
.between(OrganizationDO::getUpdateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIDNIGHT),
LocalDateTime.of(LocalDate.now(), LocalTime.of(23, 59, 59)))));
}
/**
* 查询今天被删除的组织
*
* @return
*/
Integer selectOrgCountDel(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
Integer selectOrgSilentCount(@Param("dateTime")LocalDateTime dateTime);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
+7 -2
View File
@@ -83,7 +83,9 @@ import org.springframework.validation.annotation.Validated;
import jakarta.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -587,12 +589,15 @@ public class OrganServiceImpl implements OrganService {
public ManageOrgTotalStatisticRespVO getOrgTotal() {
ManageOrgTotalStatisticRespVO respVO = new ManageOrgTotalStatisticRespVO();
LocalDate now = LocalDate.now();
LocalDateTime todayStart = LocalDateTime.of(now, LocalTime.MIDNIGHT);
LocalDateTime todayEnd = LocalDateTime.of(now, LocalTime.of(23, 59, 59));
// 组织总数
respVO.setOrgTotal(organMapper.selectOrgCount());
// 当日新增数
respVO.setOrgAdd(organMapper.selectOrgCountAdd());
respVO.setOrgAdd(organMapper.selectOrgCountAdd(todayStart, todayEnd));
// 当日状态-删除
respVO.setOrgDel(organMapper.selectOrgCountDel());
respVO.setOrgDel(organMapper.selectOrgCountDel(todayStart, todayEnd));
// 当日沉寂数 (组织中所有用户30天未登录)
// 获得30天前的时间，赋值时间为0：00：00
Date date = DateUtil.offsetDay(new Date(), -30);
cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml
+9
View File
@@ -13,7 +13,16 @@
AND ul.id IS NULL;
</select>
<select id="selectOrgCountAdd">
select count(*) from system_organization
WHERE create_time BETWEEN #{startTime} AND #{endTime}
</select>
<select id="selectOrgCountDel">
select count(*) from system_organization
WHERE deleted = true
AND update_time BETWEEN #{startTime} AND #{endTime}
</select>
<select id="selectOrganDataSource" resultType="java.util.Map">