|
|
@ -21,16 +21,20 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
|
import com.ruoyi.system.domain.SysPost;
|
|
|
|
import com.ruoyi.system.domain.SysPost;
|
|
|
|
import com.ruoyi.system.domain.SysUserPost;
|
|
|
|
import com.ruoyi.system.domain.SysUserPost;
|
|
|
|
import com.ruoyi.system.domain.SysUserRole;
|
|
|
|
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.check.TdCheckReport;
|
|
|
|
import com.ruoyi.system.domain.count.UserCountDTO;
|
|
|
|
import com.ruoyi.system.domain.count.UserCountDTO;
|
|
|
|
import com.ruoyi.system.domain.count.UserSmCountDTO;
|
|
|
|
import com.ruoyi.system.domain.count.UserSmCountDTO;
|
|
|
|
import com.ruoyi.system.service.*;
|
|
|
|
import com.ruoyi.system.service.*;
|
|
|
|
|
|
|
|
import com.ruoyi.system.service.apply.TdApplyInfoListService;
|
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import java.time.LocalDate;
|
|
|
|
import java.time.LocalDate;
|
|
|
|
import java.time.ZoneId;
|
|
|
|
import java.time.ZoneId;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.*;
|
|
|
@ -58,6 +62,9 @@ public class SysUsernumController extends BaseController {
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private SysUserPostService sysUserPostService;
|
|
|
|
private SysUserPostService sysUserPostService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private TdApplyInfoListService applyInfoListService;
|
|
|
|
|
|
|
|
|
|
|
|
@RequiresPermissions("system:usernum:view")
|
|
|
|
@RequiresPermissions("system:usernum:view")
|
|
|
|
@GetMapping()
|
|
|
|
@GetMapping()
|
|
|
|
public String user() {
|
|
|
|
public String user() {
|
|
|
@ -139,7 +146,7 @@ public class SysUsernumController extends BaseController {
|
|
|
|
@PostMapping("/countSm")
|
|
|
|
@PostMapping("/countSm")
|
|
|
|
@ResponseBody
|
|
|
|
@ResponseBody
|
|
|
|
public AjaxResult countSm() {
|
|
|
|
public AjaxResult countSm() {
|
|
|
|
UserSmCountDTO userSmCountDTO = userService.selectCountSmUser();
|
|
|
|
ApplySmCountDTO userSmCountDTO = applyInfoListService.selectCountSmApply();
|
|
|
|
List<Long> yAxisData = new ArrayList<>();
|
|
|
|
List<Long> yAxisData = new ArrayList<>();
|
|
|
|
smType.forEach(xAxis -> {
|
|
|
|
smType.forEach(xAxis -> {
|
|
|
|
AtomicReference<Long> yAxis = new AtomicReference<>(0L);
|
|
|
|
AtomicReference<Long> 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 = Date.from(LocalDate.parse(month.concat(StrPool.DASHED).concat("01")).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
|
|
|
|
Date minDayTime = ObtainLastSixMonthsUtil.getStartOfDay(date);
|
|
|
|
Date minDayTime = ObtainLastSixMonthsUtil.getStartOfDay(date);
|
|
|
|
AtomicReference<Long> yAxis = new AtomicReference<>(0L);
|
|
|
|
AtomicReference<Long> yAxis = new AtomicReference<>(0L);
|
|
|
|
Integer count = new LambdaQueryChainWrapper<>(userService.getBaseMapper())
|
|
|
|
Integer count = new LambdaQueryChainWrapper<>(applyInfoListService.getBaseMapper())
|
|
|
|
.ge(SysUser::getCreateTime, minDayTime)
|
|
|
|
.ge(TdApplyInfoList::getCreateTime, minDayTime)
|
|
|
|
.le(SysUser::getCreateTime, maxDayTime)
|
|
|
|
.le(TdApplyInfoList::getCreateTime, maxDayTime)
|
|
|
|
.eq(SysUser::getExamine,'2')
|
|
|
|
.eq(TdApplyInfoList::getApplyStatus,'0')
|
|
|
|
.eq(SysUser::getDelFlag,'0')
|
|
|
|
|
|
|
|
.count();
|
|
|
|
.count();
|
|
|
|
if(Objects.isNull(count)){
|
|
|
|
if(Objects.isNull(count)){
|
|
|
|
count = 0;
|
|
|
|
count = 0;
|
|
|
|