From 44861bb66c75164548a470128c5307016a4527e1 Mon Sep 17 00:00:00 2001 From: luozhun <2025254074@qq.com> Date: Mon, 11 Nov 2024 14:41:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor(unitManage):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8D=95=E4=BD=8D=E9=BB=98=E8=AE=A4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=85=9A=E6=94=BF=E6=9C=BA=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -将 EnterprisesUnitType 枚举中的 party_government 类型名称从 "党政机关 " 修改为 "党政机关" - 在评估标准和单位管理页面中,将创建单位的默认类型从 'school' 修改为 'party_government' --- .../java/com/changhu/common/db/enums/EnterprisesUnitType.java | 2 +- .../src/views/unitManage/police/assessmentCriteria/index.ts | 2 +- .../src/views/unitManage/police/unitManage/index.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EnterprisesUnitType.java b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EnterprisesUnitType.java index a53a410..3e03b53 100644 --- a/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EnterprisesUnitType.java +++ b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EnterprisesUnitType.java @@ -17,7 +17,7 @@ import java.util.stream.Collectors; @AllArgsConstructor public enum EnterprisesUnitType implements BaseEnum, IEnum { - party_government("party_government", "党政机关 "), + party_government("party_government", "党政机关"), medical("medical", "医疗机构"), residential("residential", "小区"), higher_learning("higher_learning", "高等院校"), diff --git a/superManagement/src/views/unitManage/police/assessmentCriteria/index.ts b/superManagement/src/views/unitManage/police/assessmentCriteria/index.ts index beb5e85..b3137ff 100644 --- a/superManagement/src/views/unitManage/police/assessmentCriteria/index.ts +++ b/superManagement/src/views/unitManage/police/assessmentCriteria/index.ts @@ -12,7 +12,7 @@ export const saveOrUpdateCkProject = (params: SaveOrUpdateCkProjectParams = { name: '', totalScore: 100, remark: '', - type: 'school' + type: 'party_government' }, callback: Function) => { submitSimpleFormModal({ title: params.snowFlakeId ? `编辑【${params.name}】` : '添加考核项目', diff --git a/superManagement/src/views/unitManage/police/unitManage/index.tsx b/superManagement/src/views/unitManage/police/unitManage/index.tsx index 2490f56..fe88327 100644 --- a/superManagement/src/views/unitManage/police/unitManage/index.tsx +++ b/superManagement/src/views/unitManage/police/unitManage/index.tsx @@ -220,7 +220,7 @@ export const showEnterprisesUnit = (policeUnitPagerVo: PoliceUnitPagerVo) => { class="btn-success" onClick={() => saveOrUpdateEnterprisesUnit({ name: undefined, - type: 'school', + type: 'party_government', policeUnitId: policeUnitPagerVo.snowFlakeId, administrativeDivisionCodes: [policeUnitPagerVo.province, policeUnitPagerVo.city, policeUnitPagerVo.districts, policeUnitPagerVo.street].filter(Boolean) }, _tableRef.value?.requestGetTableData)}