diff --git a/src/main/java/com/biutag/supervision/controller/StatisticsController.java b/src/main/java/com/biutag/supervision/controller/StatisticsController.java index 6a52ef4..ea7509f 100644 --- a/src/main/java/com/biutag/supervision/controller/StatisticsController.java +++ b/src/main/java/com/biutag/supervision/controller/StatisticsController.java @@ -34,7 +34,7 @@ public class StatisticsController { boolean authEmpty = (user.getAuthSources().isEmpty() || user.getAuthDepartIds().isEmpty()) && !AppConstants.USER_TYPE_SUPER.equals(user.getUserType()); if (authEmpty) { Map data = new HashMap<>(); - data.put("flowNumber", List.of(new FlowNumber("问题待签收", "sign", 0L), + data.put("flowNumber", List.of(new FlowNumber("问题签收中", "sign", 0L), new FlowNumber("核查办理", "verify", 0L), new FlowNumber("申请延期", "delay", 0L), new FlowNumber("办结审批", "completedApprove", 0L)) @@ -116,7 +116,7 @@ public class StatisticsController { ); Map data = new HashMap<>(); - data.put("flowNumber", List.of(new FlowNumber("问题待签收", "sign", signCount), + data.put("flowNumber", List.of(new FlowNumber("问题签收中", "sign", signCount), new FlowNumber("核查办理", "verify", verifyCount), new FlowNumber("申请延期", "delay", delayCount), new FlowNumber("办结审批", "completedApprove", completedApproveCount)) diff --git a/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java b/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java index 5d73a97..3febe0d 100644 --- a/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java +++ b/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java @@ -44,4 +44,6 @@ public class ModelClueModel { private String data; + private String negativeId; + } diff --git a/src/main/java/com/biutag/supervision/pojo/model/PoliceModel.java b/src/main/java/com/biutag/supervision/pojo/model/PoliceModel.java index 26f13f8..793a6dc 100644 --- a/src/main/java/com/biutag/supervision/pojo/model/PoliceModel.java +++ b/src/main/java/com/biutag/supervision/pojo/model/PoliceModel.java @@ -104,6 +104,9 @@ public class PoliceModel { // 警员角色 private String policeRole; - private String level; + private Integer level; + + private String role; + } diff --git a/src/main/java/com/biutag/supervision/pojo/param/PoliceQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/PoliceQueryParam.java index 8cb1809..f2126ae 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/PoliceQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/PoliceQueryParam.java @@ -14,4 +14,5 @@ public class PoliceQueryParam extends BasePage { private String departId; // 当前单位及其所有子单位 private Boolean departBranch; + private String roleId; } diff --git a/src/main/java/com/biutag/supervision/service/SupPoliceService.java b/src/main/java/com/biutag/supervision/service/SupPoliceService.java index be946a3..7c7d7e7 100644 --- a/src/main/java/com/biutag/supervision/service/SupPoliceService.java +++ b/src/main/java/com/biutag/supervision/service/SupPoliceService.java @@ -49,6 +49,7 @@ public class SupPoliceService extends ServiceImpl { queryWrapper.eq("p.org_id", param.getDepartId()); } } + queryWrapper.apply(StrUtil.isNotBlank(param.getRoleId()), String.format("find_in_set( '%s', u.role_id) > 0", param.getRoleId())); queryWrapper.orderByAsc("d.level").orderByDesc("p.position").orderByAsc("p.person_status"); return baseMapper.queryPage(Page.of(param.getCurrent(), param.getSize()), queryWrapper); } diff --git a/src/main/resources/mapper/SupPoliceMapper.xml b/src/main/resources/mapper/SupPoliceMapper.xml index 5ed31c5..c2f3e43 100644 --- a/src/main/resources/mapper/SupPoliceMapper.xml +++ b/src/main/resources/mapper/SupPoliceMapper.xml @@ -5,12 +5,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"