diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java index 531b5279..1b056f28 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java @@ -21,16 +21,20 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole; +import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.ApplySmCountDTO; import com.ruoyi.system.domain.check.TdCheckReport; import com.ruoyi.system.domain.count.UserCountDTO; import com.ruoyi.system.domain.count.UserSmCountDTO; import com.ruoyi.system.service.*; +import com.ruoyi.system.service.apply.TdApplyInfoListService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.time.LocalDate; import java.time.ZoneId; import java.util.*; @@ -58,6 +62,9 @@ public class SysUsernumController extends BaseController { @Autowired private SysUserPostService sysUserPostService; + @Resource + private TdApplyInfoListService applyInfoListService; + @RequiresPermissions("system:usernum:view") @GetMapping() public String user() { @@ -139,7 +146,7 @@ public class SysUsernumController extends BaseController { @PostMapping("/countSm") @ResponseBody public AjaxResult countSm() { - UserSmCountDTO userSmCountDTO = userService.selectCountSmUser(); + ApplySmCountDTO userSmCountDTO = applyInfoListService.selectCountSmApply(); List yAxisData = new ArrayList<>(); smType.forEach(xAxis -> { AtomicReference yAxis = new AtomicReference<>(0L); @@ -211,11 +218,10 @@ public class SysUsernumController extends BaseController { date = Date.from(LocalDate.parse(month.concat(StrPool.DASHED).concat("01")).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant()); Date minDayTime = ObtainLastSixMonthsUtil.getStartOfDay(date); AtomicReference yAxis = new AtomicReference<>(0L); - Integer count = new LambdaQueryChainWrapper<>(userService.getBaseMapper()) - .ge(SysUser::getCreateTime, minDayTime) - .le(SysUser::getCreateTime, maxDayTime) - .eq(SysUser::getExamine,'2') - .eq(SysUser::getDelFlag,'0') + Integer count = new LambdaQueryChainWrapper<>(applyInfoListService.getBaseMapper()) + .ge(TdApplyInfoList::getCreateTime, minDayTime) + .le(TdApplyInfoList::getCreateTime, maxDayTime) + .eq(TdApplyInfoList::getApplyStatus,'0') .count(); if(Objects.isNull(count)){ count = 0; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/ApplySmCountDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/ApplySmCountDTO.java new file mode 100644 index 00000000..4def545f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/ApplySmCountDTO.java @@ -0,0 +1,32 @@ +package com.ruoyi.system.domain.apply.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * packageName com.ruoyi.system.domain.count + * + * @author wangxy + * @version JDK 8 + * @className UserSmCountDTO + * @date 2024/8/8 + * @description 涉密程度统计 + */ +@Data +@ApiModel(value="涉密程度统计", description="涉密程度统计") +public class ApplySmCountDTO implements Serializable { + + @ApiModelProperty(value = "一般") + private Integer yb; + + @ApiModelProperty(value = "重要") + private Integer zy; + + @ApiModelProperty(value = "核心") + private Integer hx; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java index 4e1db181..2e765d4a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper.apply; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.ApplySmCountDTO; import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO; import java.util.List; @@ -42,6 +43,11 @@ public interface TdApplyInfoListMapper extends BaseMapper { + public ApplySmCountDTO selectCountSmApply(); + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java index 1cf09ca1..2d285f9a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java @@ -2,7 +2,9 @@ package com.ruoyi.system.service.apply; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.ApplySmCountDTO; import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO; +import com.ruoyi.system.domain.count.UserSmCountDTO; import java.util.List; @@ -43,6 +45,11 @@ public interface TdApplyInfoListService extends IService { + public ApplySmCountDTO selectCountSmApply(); + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java index 3288f0fd..c7432f44 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.system.service.apply.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.ApplySmCountDTO; import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO; import com.ruoyi.system.mapper.apply.TdApplyInfoListMapper; import com.ruoyi.system.service.apply.TdApplyInfoListService; @@ -78,6 +79,11 @@ public class TdApplyInfoListServiceImpl extends ServiceImpl selectPersonLeaveAuditList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListMapper.selectPersonLeaveAuditList(applyInfoListDTO); } + + @Override + public ApplySmCountDTO selectCountSmApply() { + return applyInfoListMapper.selectCountSmApply(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml index fcf30ac4..8f12d0dc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml @@ -329,4 +329,13 @@ + + +