From 1b1d1b997efbbe791b67d27a61a4c4cf00a46b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?=
<10549902+zhuangruibo@user.noreply.gitee.com>
Date: Mon, 8 Jun 2026 16:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../EnforcementRegistrationReportMapper.xml | 17 ++++++++++++++++-
.../report/registration_statistics/index.vue | 15 +++++++++++++--
.../zdxt-admin-plus-ui/src/views/login.vue | 11 ++++++++---
.../service/test/ResetUserPasswordTest.java | 10 +++++++++-
4 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml
index dbb563b8..3caf676e 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml
@@ -468,7 +468,22 @@
AND t.num >= #{bo.num}
- ORDER BY IFNULL(area.dict_sort, 9999), IFNULL(str.dict_sort, 9999), t.enforcement_time ASC
+ ORDER BY
+ CASE
+ WHEN t.district IS NULL OR t.district = '' THEN 2
+ WHEN area.dict_sort IS NULL THEN 1
+ ELSE 0
+ END,
+ area.dict_sort,
+ t.district,
+ CASE
+ WHEN t.street IS NULL OR t.street = '' THEN 2
+ WHEN str.dict_sort IS NULL THEN 1
+ ELSE 0
+ END,
+ str.dict_sort,
+ t.street,
+ t.enforcement_time ASC
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration_statistics/index.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration_statistics/index.vue
index 19dea773..8b183838 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration_statistics/index.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration_statistics/index.vue
@@ -286,6 +286,17 @@ const getLevelCellStyle = (level: string) => {
+
+
+
+
+
+
+
+
+
+
+
@@ -361,10 +372,10 @@ const getLevelCellStyle = (level: string) => {
-
+
-
+
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue
index 0155e720..6ed532c9 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue
@@ -78,9 +78,9 @@
-
+
-
+
@@ -153,7 +153,12 @@ interface TestUser {
}
const testUsers = ref([
- { label: '超级管理员', tenantId: '000000', username: 'admin', password: 'szsf@zfjd' }
+ { label: '超级管理员', tenantId: '000000', username: 'admin', password: 'szsf@zfjd' },
+ { label: '深圳市龙岗区司法局-黄占海', tenantId: '000000', username: 'huangzhanhai', password: 'szsf@zfjd' },
+ { label: '深圳市南山区司法局-梁有志', tenantId: '000000', username: 'liangyouzhi', password: 'szsf@zfjd' },
+ { label: '深圳市坪山区司法局-李旺', tenantId: '000000', username: 'liwang4', password: 'szsf@zfjd' },
+ { label: '深圳市光明区司法局-李振禧', tenantId: '000000', username: 'lizhenxi', password: 'szsf@zfjd' },
+ { label: '深圳市光明区司法局-王亚伟', tenantId: '000000', username: 'wangyawei3', password: 'szsf@zfjd' }
]);
const selectTestUser = (user: TestUser) => {
diff --git a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java
index 1768bbeb..bb73501e 100644
--- a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java
+++ b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java
@@ -26,6 +26,7 @@ import org.dromara.common.satoken.utils.LoginHelper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.context.ActiveProfiles;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -37,6 +38,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
*/
@SpringBootTest(classes = ZdxtAdminApplication.class)
@AutoConfigureMockMvc
+@ActiveProfiles({"dev", "dev-cust-zrb"})
@DisplayName("批量重置企业用户密码")
public class ResetUserPasswordTest {
@@ -159,12 +161,18 @@ public class ResetUserPasswordTest {
@DisplayName("批量重置 sys_user 指定用户密码为 szsf@zfjd")
@Test
public void resetSysUserPassword() {
- // 1. 指定需要重置密码的用户ID列表
+ // 1. 执法端的测试用户
List userIds = Arrays.asList(
// TODO: 在此填入需要重置的用户ID
7897L, 17608416858L,17608416876L, 17608416904L,17608416912L, 17608416926L,17608416927L, 17608416945L
);
+ // 监督端的报表测试用户
+ userIds = Arrays.asList(
+ // TODO: 在此填入需要重置的用户ID
+ 17608417340L, 17608417451L,17608417716L, 17608614169L,17608614499L
+ );
+
// 2. 根据ID列表查询系统用户
List userList = sysUserMapper.selectList(
new LambdaQueryWrapper()