diff --git a/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql b/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql index 3592e490..d03ab4c1 100644 --- a/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql +++ b/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql @@ -211,11 +211,12 @@ CREATE TABLE `efcode_cp_log` /*初始化数据*/ INSERT INTO `efcode_cp_setting` (`id`, `setting_name`, `setting_value`, `remark`, `create_by`, `create_dept`) VALUES ('CP_SETTING_SUBMIT_DEADLINE', '下阶段计划提交最晚时间', '26', '每月几号前需提交下阶段计划<=26号', '0', '0'), - ('CP_SETTING_AUTO_MATCH_START', '系统自动推荐匹配开始时间', '27', '系统自动推荐匹配的开始时间(号)=27号', '0', '0'), + ('CP_SETTING_AUTO_MATCH_START', '系统自动推荐匹配开始时间', '26', '系统自动推荐匹配的开始时间(号)=26号', '0', '0'), ('CP_SETTING_RESERVE_CANCEL_DURATION', '预约自动取消时长', '14', '发起预约后,如果多长时间没有处理,则自动取消,14天', '0', '0'), ('CP_SETTING_MANUAL_MATCH_DAYS', '手工匹配距计划开始天数', '3', '手工匹配距离计划开始的天数>=3天,同时,距离计划开始的第3天,系统自动去掉这些计划的预约,同时转化为任务', '0', '0'), - ('CP_MAX_UNION_UNIT', '单次联合单位最大数量', '3', '单次联合单位最大数量<=3个执法单位', '0', '0'), + ('CP_MAX_UNION_UNIT', '获取单次手动联合单位最大数量', '2', '获取单次手动联合单位最大数量<=2个执法单位', '0', '0'), + ('CP_MAX_AUTO_MATCH_UNION_UNIT', '获取单次系统联合单位最大数量', '3', '获取单次系统联合单位最大数量<=3个执法单位', '0', '0'), ('CP_MAX_INNER_UNIT_AC_PERSON_NUM', '单位内部单次计划最多参与人数', '3', '单位内部单次计划最多参与人数<=3人', '0', '0'), ('CP_SETTING_SYSTEM_MATCH_WEEKS', '系统匹配预约周数范围', '1', '系统匹配时向后查找的周数范围1周:可选1,2,3,4周', diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java index 6cf66419..afe8cbb6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java @@ -34,13 +34,13 @@ public class EnterpriseInformation extends BaseEntity { /** * 覆盖父类字段: 数据库中create_by存储的是人名字符串而非用户ID，跳过查询避免类型转换异常 */ - @TableField(value = "create_by", fill = FieldFill.INSERT) + @TableField(value = "create_by", select = false, fill = FieldFill.INSERT) private Long createBy; /** * 覆盖父类字段: 数据库中update_by存储的是人名字符串而非用户ID，跳过查询避免类型转换异常 */ - @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "update_by", select = false, fill = FieldFill.INSERT_UPDATE) private Long updateBy; /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java index 9c176fbd..b8a74a54 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java @@ -32,10 +32,15 @@ public interface IEfcodeCpSettingService { String SETTING_ID_MANUAL_MATCH_DAYS = "CP_SETTING_MANUAL_MATCH_DAYS"; /** - * 设置项主键：单次联合单位最大数量<=3 + * 设置项主键：获取单次手动联合单位最大数量<=3 */ String SETTING_ID_MAX_UNION_UNIT = "CP_MAX_UNION_UNIT"; + /** + * 设置项主键：获取单次系统联合单位最大数量<=3 + */ + String SETTING_ID_MAX_AUTO_MATCH_UNION_UNIT = "CP_MAX_AUTO_MATCH_UNION_UNIT"; + /** * 设置项主键：单位内部单次计划最多参与人数<=3 */ @@ -67,10 +72,15 @@ public interface IEfcodeCpSettingService { int DEFAULT_MANUAL_MATCH_DAYS = 3; /** - * 默认值：单次联合单位最大数量 + * 默认值：获取单次手动联合单位最大数量 */ int DEFAULT_MAX_UNION_UNIT = 3; + /** + * 默认值：获取单次系统联合单位最大数量 + */ + int DEFAULT_MAX_AUTO_MATCH_UNION_UNIT = 3; + /** * 默认值：单位内部单次计划最多参与人数 */ @@ -122,6 +132,13 @@ public interface IEfcodeCpSettingService { */ Integer getMaxUnionUnit(); + /** + * 获取单次系统联合单位最大数量 + * + * @return 数值，未配置或无法解析时返回默认值 {@link #DEFAULT_MAX_AUTO_MATCH_UNION_UNIT} + */ + Integer getMaxAutoMatchUnionUnit(); + /** * 获取单位内部单次计划最多参与人数 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java index 81efa1d7..581cbad0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java @@ -603,7 +603,7 @@ public class EfcodeCpPlanServiceImpl implements IEfcodeCpPlanService { } // 2. 获取最大联合单位数量 - int maxUnionUnit = cpSettingService.getMaxUnionUnit(); + int maxAutoMatchUnionUnit = cpSettingService.getMaxAutoMatchUnionUnit(); // 3. 查询待匹配的计划：plan_date > 当前时间 且 system_reserved=0, reserve_status=1, is_public=1, is_union=1 Date now = new Date(); @@ -667,7 +667,7 @@ public class EfcodeCpPlanServiceImpl implements IEfcodeCpPlanService { distinctUnitPlans.add(sp); } // 限制最大联合数量 - if (distinctUnitPlans.size() >= maxUnionUnit) { + if (distinctUnitPlans.size() >= maxAutoMatchUnionUnit) { break; } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java index b8d6d590..8a36750c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java @@ -69,13 +69,21 @@ public class EfcodeCpSettingServiceImpl implements IEfcodeCpSettingService { } /** - * 获取单次联合单位最大数量 + * 获取单次手动联合单位最大数量 */ @Override public Integer getMaxUnionUnit() { return getIntSetting(SETTING_ID_MAX_UNION_UNIT, DEFAULT_MAX_UNION_UNIT); } + /** + * 获取单次系统联合单位最大数量 + */ + @Override + public Integer getMaxAutoMatchUnionUnit() { + return getIntSetting(SETTING_ID_MAX_AUTO_MATCH_UNION_UNIT, DEFAULT_MAX_AUTO_MATCH_UNION_UNIT); + } + /** * 获取单位内部单次计划最多参与人数 */ 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 6ed532c9..fe577c5e 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 @@ -154,6 +154,8 @@ interface TestUser { const testUsers = ref([ { label: '超级管理员', tenantId: '000000', username: 'admin', password: 'szsf@zfjd' }, + { label: '深圳市司法局-刘倩琳', tenantId: '000000', username: 'liuqianlin', password: 'szsf@zfjd' }, + { label: '深圳市审计局-杜啟艺', tenantId: '000000', username: 'duqiyi', 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' }, diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/defaultAvatar.png b/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/defaultAvatar.png new file mode 100644 index 00000000..ceafb4fa Binary files /dev/null and b/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/defaultAvatar.png differ diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue index 9e8ec466..85202482 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue @@ -68,12 +68,13 @@ import { showToast } from 'vant'; const router = useRouter(); // ========== 用户信息 ========== -const defaultAvatar = 'https://img.yzcdn.cn/vant/cat.jpeg'; -const userInfo = ref({ - name: '司小华', - phone: '13800138000', +const defaultAvatar = new URL('@/assets/images/defaultAvatar.png', import.meta.url).href; +const commonStore = $globalStore.useCommon; +const userInfo = computed(() => ({ + name: commonStore.nickName || commonStore.userName || '未登录', + phone: commonStore.phonenumber || '', avatar: defaultAvatar, -}); +})); const onAvatarError = (e) => { e.target.src = defaultAvatar; @@ -215,6 +216,9 @@ const onMenuClick = (item) => { border: 3px solid rgba(255, 255, 255, 0.9); box-shadow: 0 4px 14px rgba(0, 0, 0, 0.12); background: #fff; + display: flex; + align-items: center; + justify-content: center; img { width: 100%; @@ -228,6 +232,7 @@ const onMenuClick = (item) => { font-weight: 700; color: #fff; letter-spacing: 2px; + text-align: center; text-shadow: 0 1px 3px rgba(0, 0, 0, 0.12); } @@ -235,6 +240,7 @@ const onMenuClick = (item) => { font-size: 13px; color: rgba(255, 255, 255, 0.9); letter-spacing: 1px; + text-align: center; } } diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue index 6618ccdb..746e25ae 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue @@ -202,6 +202,7 @@ const hasUserInfo = () => { }; onMounted(() => { + //debugger; console.log(useCommon.firstLoad); console.log(useCommon); isLoading.value = useCommon.firstLoad; @@ -437,7 +438,7 @@ onMounted(() => { padding: 0 !important; font-size: 14px; } - + .notice-text { font-size: 14px; color: #8c8c8c; 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 bb73501e..ab6c3e68 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 @@ -170,7 +170,7 @@ public class ResetUserPasswordTest { // 监督端的报表测试用户 userIds = Arrays.asList( // TODO: 在此填入需要重置的用户ID - 17608417340L, 17608417451L,17608417716L, 17608614169L,17608614499L + 17608417340L, 17608417451L,17608417716L, 17608614169L,17608614499L,7897L,17608634290L ); // 2. 根据ID列表查询系统用户