From 505afe30a8112f5322dbdcb712f24dad816200e9 Mon Sep 17 00:00:00 2001
From: tengxi <971623072@qq.com>
Date: Tue, 26 Sep 2023 17:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4=E4=BC=81?=
=?UTF-8?q?=E4=B8=9A=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/system/enterprise/index.ts | 31 +
yudao-ui-admin-vben-master/src/utils/dict.ts | 3 +
.../enterprisebranching/EnterpriseModal.vue | 57 ++
.../enterprisebranching/enterprise.data.ts | 814 ++++++++++++++++++
.../views/xxjj/enterprisebranching/index.vue | 92 ++
.../system/enums/ErrorCodeConstants.java | 2 +
.../enterprise/EnterpriseController.java | 26 +-
.../admin/enterprise/vo/EnterpriseBaseVO.java | 25 +-
.../enterprise/vo/EnterpriseCreateReqVO.java | 2 +-
.../enterprise/vo/EnterpriseExcelVO.java | 23 +-
.../enterprise/vo/EnterpriseExportReqVO.java | 20 +-
.../enterprise/vo/EnterprisePageReqVO.java | 20 +-
.../admin/enterprise/vo/EnterpriseRespVO.java | 2 +-
.../enterprise/vo/EnterpriseUpdateReqVO.java | 2 +-
.../convert/enterprise/EnterpriseConvert.java | 6 +-
.../dataobject/enterprise/EnterpriseDO.java | 14 +-
.../mysql/enterprise/EnterpriseMapper.java | 10 +-
.../service/enterprise/EnterpriseService.java | 6 +-
.../enterprise/EnterpriseServiceImpl.java | 12 +-
.../Mapper/enterprise/EnterpriseMapper.xml | 12 +
.../enterprise/EnterpriseServiceImplTest.java | 26 +-
21 files changed, 1136 insertions(+), 69 deletions(-)
create mode 100644 yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
create mode 100644 yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue
create mode 100644 yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts
create mode 100644 yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/EnterpriseController.java (81%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseBaseVO.java (73%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java (98%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseExcelVO.java (75%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseExportReqVO.java (76%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterprisePageReqVO.java (76%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseRespVO.java (88%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java (98%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/convert/enterprise/EnterpriseConvert.java (77%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/dal/dataobject/enterprise/EnterpriseDO.java (94%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/dal/mysql/enterprise/EnterpriseMapper.java (87%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/service/enterprise/EnterpriseService.java (87%)
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system}/service/enterprise/EnterpriseServiceImpl.java (83%)
create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml
rename {yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj => yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system}/service/enterprise/EnterpriseServiceImplTest.java (93%)
diff --git a/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts b/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
new file mode 100644
index 0000000..af8ddbe
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
@@ -0,0 +1,31 @@
+import { defHttp } from '@/utils/http/axios'
+
+// 查询企业信息列表
+export function getEnterprisePage(params) {
+ return defHttp.get({ url: '/system/enterprise/page', params })
+}
+
+// 查询企业信息详情
+export function getEnterprise(id: number) {
+ return defHttp.get({ url: '/system/enterprise/get?id=' + id })
+}
+
+// 新增企业信息
+export function createEnterprise(data) {
+ return defHttp.post({ url: '/system/enterprise/create', data })
+}
+
+// 修改企业信息
+export function updateEnterprise(data) {
+ return defHttp.put({ url: '/system/enterprise/update', data })
+}
+
+// 删除企业信息
+export function deleteEnterprise(id: number) {
+ return defHttp.delete({ url: '/system/enterprise/delete?id=' + id })
+}
+
+// 导出企业信息 Excel
+export function exportEnterprise(params) {
+ return defHttp.download({ url: '/system/enterprise/export-excel', params }, '企业信息.xls')
+}
diff --git a/yudao-ui-admin-vben-master/src/utils/dict.ts b/yudao-ui-admin-vben-master/src/utils/dict.ts
index 7ebce2f..29c44cd 100644
--- a/yudao-ui-admin-vben-master/src/utils/dict.ts
+++ b/yudao-ui-admin-vben-master/src/utils/dict.ts
@@ -156,4 +156,7 @@ export enum DICT_TYPE {
// ============= BUSINESSLINE 模块=================
BUSINESS_TYPE = 'business_type', //业务线类型
DIFF_FLAG = 'diff_flag',
+ // ============= ENTERPRISEBRANCHING 模块=================
+ ENTERPRISE_TYPE = 'enterprise_type', //业务线类型
+
}
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue
new file mode 100644
index 0000000..6d02582
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts
new file mode 100644
index 0000000..bcbb697
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts
@@ -0,0 +1,814 @@
+import { BasicColumn, FormSchema, useRender } from '@/components/Table'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+
+export const columns: BasicColumn[] = [
+ // {
+ // title: '编号',
+ // dataIndex: 'id',
+ // width: 160
+ // },
+ {
+ title: '企业名称',
+ dataIndex: 'name',
+ width: 160
+ },
+ {
+ title: '机构类型',
+ dataIndex: 'enterpriseType',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.ENTERPRISE_TYPE)
+ }
+ },
+ {
+ title: '关联子公司(没弄)',
+ dataIndex: '',
+ width: 160
+ },
+ {
+ title: '包含业务线(没弄)',
+ dataIndex: '',
+ width: 160
+ },
+ {
+ title: '关联员工(没弄)',
+ dataIndex: '',
+ width: 160
+ },
+ {
+ title: '首联系人',
+ dataIndex: 'firstConcat',
+ width: 160
+ },
+ {
+ title: '联系电话',
+ dataIndex: 'phone',
+ width: 160
+ },
+ {
+ title: '更新时间',
+ dataIndex: 'updateTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ // {
+ // title: '企业简称',
+ // dataIndex: 'shortName',
+ // width: 160
+ // },
+ // {
+ // title: '主体类型',
+ // dataIndex: 'mainType',
+ // width: 180,
+ // customRender: ({ text }) => {
+ // return useRender.renderDict(text, DICT_TYPE.MAIN_TYPE)
+ // }
+ // },
+ // {
+ // title: '企业代码',
+ // dataIndex: 'code',
+ // width: 160
+ // },
+ // {
+ // title: '社会统一信息代码',
+ // dataIndex: 'societyCode',
+ // width: 160
+ // },
+ // {
+ // title: '办理人(0:法人 1:代办人)',
+ // dataIndex: 'transactors',
+ // width: 160
+ // },
+ // {
+ // title: '实际操作人(0:法人 1:代办人)',
+ // dataIndex: 'operator',
+ // width: 160
+ // },
+ // {
+ // title: '法人证件有效期类型(0:长期 1:非长期)',
+ // dataIndex: 'legalOperator',
+ // width: 160
+ // },
+ // {
+ // title: '代办人证件类型(0:身份证 1:护照)',
+ // dataIndex: 'commissionCertificateType',
+ // width: 160
+ // },
+ // {
+ // title: '代办人证件有效期类型(0:长期 1:非长期)',
+ // dataIndex: 'commissionOperator',
+ // width: 160
+ // },
+ // {
+ // title: '创建时间',
+ // dataIndex: 'createTime',
+ // width: 180,
+ // customRender: ({ text }) => {
+ // return useRender.renderDate(text)
+ // }
+ // },
+ // {
+ // title: '企业id',
+ // dataIndex: 'parentId',
+ // width: 160
+ // },
+
+]
+
+export const searchFormSchema: FormSchema[] = [
+ {
+ label: '企业名称',
+ field: 'name',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ // {
+ // label: '主体类型',
+ // field: 'mainType',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.MAIN_TYPE)
+ // },
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '企业代码',
+ // field: 'code',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '社会统一信息代码',
+ // field: 'societyCode',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '办理人(0:法人 1:代办人)',
+ // field: 'transactors',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '实际操作人(0:法人 1:代办人)',
+ // field: 'operator',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '法人证件有效期类型(0:长期 1:非长期)',
+ // field: 'legalOperator',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '代办人证件类型(0:身份证 1:护照)',
+ // field: 'commissionCertificateType',
+ // component: 'Select',
+ // componentProps: {
+ // options: []
+ // },
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '代办人证件有效期类型(0:长期 1:非长期)',
+ // field: 'commissionOperator',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '创建时间',
+ // field: 'createTime',
+ // component: 'RangePicker',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '企业id',
+ // field: 'parentId',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '总公司,子公司机构类型',
+ // field: 'enterpriseType',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.ENTERPRISE_TYPE)
+ // },
+ // colProps: { span: 8 }
+ // },
+]
+
+export const createFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '企业名称',
+ field: 'name',
+ required: true,
+ component: 'Input'
+ },
+ // {
+ // label: '企业简称',
+ // field: 'shortName',
+ // component: 'Input'
+ // },
+ // {
+ // label: '主体类型',
+ // field: 'mainType',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.MAIN_TYPE, 'number')
+ // }
+ // },
+ // {
+ // label: '所在城市',
+ // field: 'city',
+ // component: 'Input'
+ // },
+ // {
+ // label: '行业类型',
+ // field: 'dutyType',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number')
+ // }
+ // },
+ {
+ label: '首联系人',
+ field: 'firstConcat',
+ component: 'Input'
+ },
+ // {
+ // label: '职位',
+ // field: 'position',
+ // component: 'Input'
+ // },
+ {
+ label: '手机号码',
+ field: 'phone',
+ component: 'Input'
+ },
+ // {
+ // label: 'logo图片',
+ // field: 'logo',
+ // component: 'FileUpload',
+ // componentProps: {
+ // fileType: 'file',
+ // maxCount: 1
+ // }
+ // },
+ // {
+ // label: '地址',
+ // field: 'address',
+ // component: 'Input'
+ // },
+ // {
+ // label: '企业电话',
+ // field: 'enterprisePhone',
+ // component: 'Input'
+ // },
+ // {
+ // label: '企业传真',
+ // field: 'enterpriseFax',
+ // component: 'Input'
+ // },
+ // {
+ // label: '企业网址',
+ // field: 'enterpriseWebsite',
+ // component: 'Input'
+ // },
+ // {
+ // label: '企业简介',
+ // field: 'enterpriseRemark',
+ // component: 'InputTextArea'
+ // },
+ // {
+ // label: '税号',
+ // field: 'dutyParagraph',
+ // component: 'Input'
+ // },
+ // {
+ // label: '发票抬头',
+ // field: 'invoiceHeader',
+ // component: 'Input'
+ // },
+ // {
+ // label: '开户银行',
+ // field: 'openBank',
+ // component: 'Input'
+ // },
+ // {
+ // label: '银行卡号',
+ // field: 'bankAccount',
+ // component: 'Input'
+ // },
+ // {
+ // label: '银行电话',
+ // field: 'bankPhone',
+ // component: 'Input'
+ // },
+ // {
+ // label: '注册地址',
+ // field: 'registerAddress',
+ // component: 'Input'
+ // },
+ // {
+ // label: '经营开始时间',
+ // field: 'startDate',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '经营结束时间',
+ // field: 'endDate',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '证件照',
+ // field: 'photo',
+ // component: 'FileUpload',
+ // componentProps: {
+ // fileType: 'file',
+ // maxCount: 1
+ // }
+ // },
+ // {
+ // label: '经营范围',
+ // field: 'businessScope',
+ // component: 'InputTextArea'
+ // },
+ // {
+ // label: '邮箱',
+ // field: 'email',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人证件照1',
+ // field: 'legalPersonPhoto1',
+ // component: 'FileUpload',
+ // componentProps: {
+ // fileType: 'file',
+ // maxCount: 1
+ // }
+ // },
+ // {
+ // label: '法人证件照2',
+ // field: 'legalPersonPhoto2',
+ // component: 'FileUpload',
+ // componentProps: {
+ // fileType: 'file',
+ // maxCount: 1
+ // }
+ // },
+ // {
+ // label: '法人证件照3',
+ // field: 'legalPersonPhoto3',
+ // component: 'FileUpload',
+ // componentProps: {
+ // fileType: 'file',
+ // maxCount: 1
+ // }
+ // },
+ // {
+ // label: '法人证件类型(0:身份证 1:护照)',
+ // field: 'legalCertificateType',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.CERTIFICATE_TYPE, 'number')
+ // }
+ // },
+ // {
+ // label: '法人姓名',
+ // field: 'legalPersonName',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人证件号',
+ // field: 'legalCardNo',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人生日',
+ // field: 'legalBirthday',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人证件有效开始时间',
+ // field: 'legalCardStart',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '法人证件有效结束时间',
+ // field: 'legalCardEnd',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '代办人证件照1',
+ // field: 'commissionPersonPhoto1',
+ // component: 'FileUpload',
+ // componentProps: {
+ // fileType: 'file',
+ // maxCount: 1
+ // }
+ // },
+ // {
+ // label: '代办人证件照2',
+ // field: 'commissionPersonPhoto2',
+ // component: 'FileUpload',
+ // componentProps: {
+ // fileType: 'file',
+ // maxCount: 1
+ // }
+ // },
+ // {
+ // label: '代办人证件照3',
+ // field: 'commissionPersonPhoto3',
+ // component: 'FileUpload',
+ // componentProps: {
+ // fileType: 'file',
+ // maxCount: 1
+ // }
+ // },
+ // {
+ // label: '代办人证件照4',
+ // field: 'commissionPersonPhoto4',
+ // component: 'FileUpload',
+ // componentProps: {
+ // fileType: 'file',
+ // maxCount: 1
+ // }
+ // },
+ // {
+ // label: '代办人姓名',
+ // field: 'commissionPersonName',
+ // component: 'Input'
+ // },
+ // {
+ // label: '代办人证件号',
+ // field: 'commissionCardNo',
+ // component: 'Input'
+ // },
+ // {
+ // label: '代办人生日',
+ // field: 'commissionBirthday',
+ // component: 'Input'
+ // },
+ // {
+ // label: '代办人证件有效开始时间',
+ // field: 'commissionCardStart',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '代办人证件有效结束时间',
+ // field: 'commissionCardEnd',
+ // component: 'DatePicker'
+ // },
+ {
+ label: '描述',
+ field: 'description',
+ component: 'InputTextArea'
+ },
+ // {
+ // label: '企业代码',
+ // field: 'code',
+ // component: 'Input'
+ // },
+ // {
+ // label: '社会统一信息代码',
+ // field: 'societyCode',
+ // component: 'Input'
+ // },
+ // {
+ // label: '办理人(0:法人 1:代办人)',
+ // field: 'transactors',
+ // component: 'Input'
+ // },
+ // {
+ // label: '实际操作人(0:法人 1:代办人)',
+ // field: 'operator',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人证件有效期类型(0:长期 1:非长期)',
+ // field: 'legalOperator',
+ // component: 'Input'
+ // },
+ // {
+ // label: '代办人证件类型(0:身份证 1:护照)',
+ // field: 'commissionCertificateType',
+ // component: 'Select',
+ // componentProps: {
+ // options:[]
+ // }
+ // },
+ // {
+ // label: '代办人证件有效期类型(0:长期 1:非长期)',
+ // field: 'commissionOperator',
+ // component: 'Input'
+ // },
+ {
+ label: '企业id',
+ field: 'parentId',
+ component: 'Input'
+ },
+ {
+ label: '上级机构',
+ field: 'enterpriseType',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.ENTERPRISE_TYPE, 'number')
+ }
+ },
+]
+
+export const updateFormSchema: FormSchema[] = [
+ // {
+ // label: '编号',
+ // field: 'id',
+ // show: false,
+ // component: 'Input'
+ // },
+ {
+ label: '企业名称',
+ field: 'name',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '企业id',
+ field: 'parentId',
+ component: 'Input'
+ },
+ {
+ label: '首联系人',
+ field: 'firstConcat',
+ component: 'Input'
+ },
+ {
+ label: '手机号码',
+ field: 'phone',
+ component: 'Input'
+ },
+ {
+ label: '机构描述',
+ field: 'description',
+ component: 'InputTextArea'
+ },
+ // {
+ // label: '企业简称',
+ // field: 'shortName',
+ // component: 'Input'
+ // },
+ // {
+ // label: '主体类型',
+ // field: 'mainType',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.MAIN_TYPE, 'number')
+ // }
+ // },
+ // {
+ // label: '所在城市',
+ // field: 'city',
+ // component: 'Input'
+ // },
+ // {
+ // label: '行业类型',
+ // field: 'dutyType',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number')
+ // }
+ // },
+
+ // {
+ // label: 'logo图片',
+ // field: 'logo',
+ // component: 'Upload'
+ // },
+ // {
+ // label: '地址',
+ // field: 'address',
+ // component: 'Input'
+ // },
+ // {
+ // label: '企业电话',
+ // field: 'enterprisePhone',
+ // component: 'Input'
+ // },
+ // {
+ // label: '企业传真',
+ // field: 'enterpriseFax',
+ // component: 'Input'
+ // },
+ // {
+ // label: '企业网址',
+ // field: 'enterpriseWebsite',
+ // component: 'Input'
+ // },
+ // {
+ // label: '企业简介',
+ // field: 'enterpriseRemark',
+ // component: 'InputTextArea'
+ // },
+ // {
+ // label: '税号',
+ // field: 'dutyParagraph',
+ // component: 'Input'
+ // },
+ // {
+ // label: '发票抬头',
+ // field: 'invoiceHeader',
+ // component: 'Input'
+ // },
+ // {
+ // label: '开户银行',
+ // field: 'openBank',
+ // component: 'Input'
+ // },
+ // {
+ // label: '银行卡号',
+ // field: 'bankAccount',
+ // component: 'Input'
+ // },
+ // {
+ // label: '银行电话',
+ // field: 'bankPhone',
+ // component: 'Input'
+ // },
+ // {
+ // label: '注册地址',
+ // field: 'registerAddress',
+ // component: 'Input'
+ // },
+ // {
+ // label: '经营开始时间',
+ // field: 'startDate',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '经营结束时间',
+ // field: 'endDate',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '证件照',
+ // field: 'photo',
+ // component: 'Upload'
+ // },
+ // {
+ // label: '经营范围',
+ // field: 'businessScope',
+ // component: 'InputTextArea'
+ // },
+ // {
+ // label: '邮箱',
+ // field: 'email',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人证件照1',
+ // field: 'legalPersonPhoto1',
+ // component: 'Upload'
+ // },
+ // {
+ // label: '法人证件照2',
+ // field: 'legalPersonPhoto2',
+ // component: 'Upload'
+ // },
+ // {
+ // label: '法人证件照3',
+ // field: 'legalPersonPhoto3',
+ // component: 'Upload'
+ // },
+ // {
+ // label: '法人证件类型(0:身份证 1:护照)',
+ // field: 'legalCertificateType',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.CERTIFICATE_TYPE, 'number')
+ // }
+ // },
+ // {
+ // label: '法人姓名',
+ // field: 'legalPersonName',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人证件号',
+ // field: 'legalCardNo',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人生日',
+ // field: 'legalBirthday',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人证件有效开始时间',
+ // field: 'legalCardStart',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '法人证件有效结束时间',
+ // field: 'legalCardEnd',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '代办人证件照1',
+ // field: 'commissionPersonPhoto1',
+ // component: 'Upload'
+ // },
+ // {
+ // label: '代办人证件照2',
+ // field: 'commissionPersonPhoto2',
+ // component: 'Upload'
+ // },
+ // {
+ // label: '代办人证件照3',
+ // field: 'commissionPersonPhoto3',
+ // component: 'Upload'
+ // },
+ // {
+ // label: '代办人证件照4',
+ // field: 'commissionPersonPhoto4',
+ // component: 'Upload'
+ // },
+ // {
+ // label: '代办人姓名',
+ // field: 'commissionPersonName',
+ // component: 'Input'
+ // },
+ // {
+ // label: '代办人证件号',
+ // field: 'commissionCardNo',
+ // component: 'Input'
+ // },
+ // {
+ // label: '代办人生日',
+ // field: 'commissionBirthday',
+ // component: 'Input'
+ // },
+ // {
+ // label: '代办人证件有效开始时间',
+ // field: 'commissionCardStart',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '代办人证件有效结束时间',
+ // field: 'commissionCardEnd',
+ // component: 'DatePicker'
+ // },
+ // {
+ // label: '企业代码',
+ // field: 'code',
+ // component: 'Input'
+ // },
+ // {
+ // label: '社会统一信息代码',
+ // field: 'societyCode',
+ // component: 'Input'
+ // },
+ // {
+ // label: '办理人(0:法人 1:代办人)',
+ // field: 'transactors',
+ // component: 'Input'
+ // },
+ // {
+ // label: '实际操作人(0:法人 1:代办人)',
+ // field: 'operator',
+ // component: 'Input'
+ // },
+ // {
+ // label: '法人证件有效期类型(0:长期 1:非长期)',
+ // field: 'legalOperator',
+ // component: 'Input'
+ // },
+ // {
+ // label: '代办人证件类型(0:身份证 1:护照)',
+ // field: 'commissionCertificateType',
+ // component: 'Select',
+ // componentProps: {
+ // options:[]
+ // }
+ // },
+ // {
+ // label: '代办人证件有效期类型(0:长期 1:非长期)',
+ // field: 'commissionOperator',
+ // component: 'Input'
+ // },
+ // {
+ // label: '总公司,子公司机构类型',
+ // field: 'enterpriseType',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.ENTERPRISE_TYPE, 'number')
+ // }
+ // },
+]
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
new file mode 100644
index 0000000..b4ad6ba
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+ {{ t('action.create') }}
+
+
+ {{ t('action.export') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java
index 7af04b7..77b849f 100644
--- a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java
+++ b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java
@@ -163,4 +163,6 @@ public interface ErrorCodeConstants {
// ========== 站内信发送 1002028000 ==========
ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002028000, "模板参数({})缺失");
+ // ========== 企业信息 TODO 补充编号 ==========
+ ErrorCode ENTERPRISE_NOT_EXISTS = new ErrorCode(1002004015, "企业信息不存在");
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
similarity index 81%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
index 2cee7bf..cc1b3a9 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise;
+package com.yunxi.scm.module.system.controller.admin.enterprise;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -23,14 +23,14 @@ import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
-import com.yunxi.scm.module.xxjj.convert.enterprise.EnterpriseConvert;
-import com.yunxi.scm.module.xxjj.service.enterprise.EnterpriseService;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.convert.enterprise.EnterpriseConvert;
+import com.yunxi.scm.module.system.service.enterprise.EnterpriseService;
@Tag(name = "管理后台 - 企业信息")
@RestController
-@RequestMapping("/xxjj/enterprise")
+@RequestMapping("/system/enterprise")
@Validated
public class EnterpriseController {
@@ -39,14 +39,14 @@ public class EnterpriseController {
@PostMapping("/create")
@Operation(summary = "创建企业信息")
- @PreAuthorize("@ss.hasPermission('xxjj:enterprise:create')")
+ @PreAuthorize("@ss.hasPermission('system:enterprise:create')")
public CommonResult createEnterprise(@Valid @RequestBody EnterpriseCreateReqVO createReqVO) {
return success(enterpriseService.createEnterprise(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新企业信息")
- @PreAuthorize("@ss.hasPermission('xxjj:enterprise:update')")
+ @PreAuthorize("@ss.hasPermission('system:enterprise:update')")
public CommonResult updateEnterprise(@Valid @RequestBody EnterpriseUpdateReqVO updateReqVO) {
enterpriseService.updateEnterprise(updateReqVO);
return success(true);
@@ -55,7 +55,7 @@ public class EnterpriseController {
@DeleteMapping("/delete")
@Operation(summary = "删除企业信息")
@Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('xxjj:enterprise:delete')")
+ @PreAuthorize("@ss.hasPermission('system:enterprise:delete')")
public CommonResult deleteEnterprise(@RequestParam("id") Long id) {
enterpriseService.deleteEnterprise(id);
return success(true);
@@ -64,7 +64,7 @@ public class EnterpriseController {
@GetMapping("/get")
@Operation(summary = "获得企业信息")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('xxjj:enterprise:query')")
+ @PreAuthorize("@ss.hasPermission('system:enterprise:query')")
public CommonResult getEnterprise(@RequestParam("id") Long id) {
EnterpriseDO enterprise = enterpriseService.getEnterprise(id);
return success(EnterpriseConvert.INSTANCE.convert(enterprise));
@@ -73,7 +73,7 @@ public class EnterpriseController {
@GetMapping("/list")
@Operation(summary = "获得企业信息列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
- @PreAuthorize("@ss.hasPermission('xxjj:enterprise:query')")
+ @PreAuthorize("@ss.hasPermission('system:enterprise:query')")
public CommonResult> getEnterpriseList(@RequestParam("ids") Collection ids) {
List list = enterpriseService.getEnterpriseList(ids);
return success(EnterpriseConvert.INSTANCE.convertList(list));
@@ -81,7 +81,7 @@ public class EnterpriseController {
@GetMapping("/page")
@Operation(summary = "获得企业信息分页")
- @PreAuthorize("@ss.hasPermission('xxjj:enterprise:query')")
+ @PreAuthorize("@ss.hasPermission('system:enterprise:query')")
public CommonResult> getEnterprisePage(@Valid EnterprisePageReqVO pageVO) {
PageResult pageResult = enterpriseService.getEnterprisePage(pageVO);
return success(EnterpriseConvert.INSTANCE.convertPage(pageResult));
@@ -89,7 +89,7 @@ public class EnterpriseController {
@GetMapping("/export-excel")
@Operation(summary = "导出企业信息 Excel")
- @PreAuthorize("@ss.hasPermission('xxjj:enterprise:export')")
+ @PreAuthorize("@ss.hasPermission('system:enterprise:export')")
@OperateLog(type = EXPORT)
public void exportEnterpriseExcel(@Valid EnterpriseExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
similarity index 73%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
index b4df461..e814adb 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
@@ -1,7 +1,9 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
@@ -15,6 +17,8 @@ import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
+import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
/**
* 企业信息 Base VO,提供给添加、修改、详细的子 VO 使用
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
@@ -53,10 +57,23 @@ public class EnterpriseBaseVO {
@Schema(description = "代办人证件有效期类型(0:长期 1:非长期)")
private String commissionOperator;
- @Schema(description = "企业id", example = "9306")
- private Long enterpriseId;
-
@Schema(description = "总公司,子公司机构类型", example = "1")
private String enterpriseType;
+ @Schema(description = "企业父id", example = "26924")
+ private Long parentId;
+
+ @Schema(description = "更新时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime updateTime;
+
+ @Schema(description = "首联系人")
+ private String firstConcat;
+
+ @Schema(description = "联系电话")
+ private String phone;
+
+ @Schema(description = "描述")
+ private String description;
+
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
similarity index 98%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
index 5fa1861..0c0bbd9 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
import lombok.*;
import java.util.*;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java
similarity index 75%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java
index dfd1e98..e86fc37 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -17,6 +17,9 @@ import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yunxi.scm.framework.excel.core.annotations.DictFormat;
import com.yunxi.scm.framework.excel.core.convert.DictConvert;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
@@ -64,11 +67,23 @@ public class EnterpriseExcelVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
- @ExcelProperty("企业id")
- private Long enterpriseId;
-
@ExcelProperty(value = "总公司,子公司机构类型", converter = DictConvert.class)
@DictFormat("enterprise_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String enterpriseType;
+ @ExcelProperty("企业父id")
+ private Long parentId;
+
+ @Schema(description = "更新时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime updateTime;
+
+ @Schema(description = "首联系人")
+ private String firstConcat;
+
+ @Schema(description = "联系电话")
+ private String phone;
+
+ @Schema(description = "描述")
+ private String description;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
similarity index 76%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
index 4a86650..9938961 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
import lombok.*;
import java.util.*;
@@ -44,10 +44,22 @@ public class EnterpriseExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
- @Schema(description = "企业id", example = "9306")
- private Long enterpriseId;
-
@Schema(description = "总公司,子公司机构类型", example = "1")
private String enterpriseType;
+ @Schema(description = "企业父id", example = "26924")
+ private Long parentId;
+
+ @Schema(description = "更新时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime updateTime;
+
+ @Schema(description = "首联系人")
+ private String firstConcat;
+
+ @Schema(description = "联系电话")
+ private String phone;
+
+ @Schema(description = "描述")
+ private String description;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
similarity index 76%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
index 4b35989..bf19109 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
import lombok.*;
import java.util.*;
@@ -46,10 +46,22 @@ public class EnterprisePageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
- @Schema(description = "企业id", example = "9306")
- private Long enterpriseId;
-
@Schema(description = "总公司,子公司机构类型", example = "1")
private String enterpriseType;
+ @Schema(description = "企业父id", example = "26924")
+ private Long parentId;
+
+ @Schema(description = "更新时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime updateTime;
+
+ @Schema(description = "首联系人")
+ private String firstConcat;
+
+ @Schema(description = "联系电话")
+ private String phone;
+
+ @Schema(description = "描述")
+ private String description;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java
similarity index 88%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java
index bd6f589..5dcd1d6 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
similarity index 98%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
index 97e1a99..32ac970 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java
similarity index 77%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java
index 9e7d469..73fa3a8 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.convert.enterprise;
+package com.yunxi.scm.module.system.convert.enterprise;
import java.util.*;
@@ -6,8 +6,8 @@ import com.yunxi.scm.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
/**
* 企业信息 Convert
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
similarity index 94%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
index 7758ebe..f58a1fb 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.dal.dataobject.enterprise;
+package com.yunxi.scm.module.system.dal.dataobject.enterprise;
import lombok.*;
import java.util.*;
@@ -20,8 +20,8 @@ import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
*
* @author 长江云息
*/
-@TableName("xxjj_enterprise")
-@KeySequence("xxjj_enterprise_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@TableName("system_enterprise")
+@KeySequence("system_enterprise_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@@ -245,15 +245,15 @@ public class EnterpriseDO extends BaseDO {
* 代办人证件有效期类型(0:长期 1:非长期)
*/
private String commissionOperator;
- /**
- * 企业id
- */
- private Long enterpriseId;
/**
* 总公司,子公司机构类型
*
* 枚举 {@link TODO enterprise_type 对应的类}
*/
private String enterpriseType;
+ /**
+ * 企业父id
+ */
+ private Long parentId;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java
similarity index 87%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java
index d80106d..4778927 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java
@@ -1,13 +1,13 @@
-package com.yunxi.scm.module.xxjj.dal.mysql.enterprise;
+package com.yunxi.scm.module.system.dal.mysql.enterprise;
import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
import org.apache.ibatis.annotations.Mapper;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
/**
* 企业信息 Mapper
@@ -29,8 +29,8 @@ public interface EnterpriseMapper extends BaseMapperX {
.eqIfPresent(EnterpriseDO::getCommissionCertificateType, reqVO.getCommissionCertificateType())
.eqIfPresent(EnterpriseDO::getCommissionOperator, reqVO.getCommissionOperator())
.betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime())
- .eqIfPresent(EnterpriseDO::getEnterpriseId, reqVO.getEnterpriseId())
.eqIfPresent(EnterpriseDO::getEnterpriseType, reqVO.getEnterpriseType())
+ .eqIfPresent(EnterpriseDO::getParentId, reqVO.getParentId())
.orderByDesc(EnterpriseDO::getId));
}
@@ -46,8 +46,8 @@ public interface EnterpriseMapper extends BaseMapperX {
.eqIfPresent(EnterpriseDO::getCommissionCertificateType, reqVO.getCommissionCertificateType())
.eqIfPresent(EnterpriseDO::getCommissionOperator, reqVO.getCommissionOperator())
.betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime())
- .eqIfPresent(EnterpriseDO::getEnterpriseId, reqVO.getEnterpriseId())
.eqIfPresent(EnterpriseDO::getEnterpriseType, reqVO.getEnterpriseType())
+ .eqIfPresent(EnterpriseDO::getParentId, reqVO.getParentId())
.orderByDesc(EnterpriseDO::getId));
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java
similarity index 87%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java
index 131a98c..300512f 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java
@@ -1,9 +1,9 @@
-package com.yunxi.scm.module.xxjj.service.enterprise;
+package com.yunxi.scm.module.system.service.enterprise;
import java.util.*;
import javax.validation.*;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
/**
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java
similarity index 83%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java
index 2883b2a..65b5b31 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java
@@ -1,19 +1,19 @@
-package com.yunxi.scm.module.xxjj.service.enterprise;
+package com.yunxi.scm.module.system.service.enterprise;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
-import com.yunxi.scm.module.xxjj.convert.enterprise.EnterpriseConvert;
-import com.yunxi.scm.module.xxjj.dal.mysql.enterprise.EnterpriseMapper;
+import com.yunxi.scm.module.system.convert.enterprise.EnterpriseConvert;
+import com.yunxi.scm.module.system.dal.mysql.enterprise.EnterpriseMapper;
import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
+import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*;
/**
* 企业信息 Service 实现类
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml
new file mode 100644
index 0000000..e170329
--- /dev/null
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java b/yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java
similarity index 93%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java
rename to yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java
index 7305bfc..3f40fc8 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.service.enterprise;
+package com.yunxi.scm.module.system.service.enterprise;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -8,9 +8,9 @@ import javax.annotation.Resource;
import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
-import com.yunxi.scm.module.xxjj.dal.mysql.enterprise.EnterpriseMapper;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.dal.mysql.enterprise.EnterpriseMapper;
import com.yunxi.scm.framework.common.pojo.PageResult;
import javax.annotation.Resource;
@@ -19,7 +19,7 @@ import java.util.*;
import java.time.LocalDateTime;
import static cn.hutool.core.util.RandomUtil.*;
-import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
+import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*;
import static com.yunxi.scm.framework.test.core.util.AssertUtils.*;
import static com.yunxi.scm.framework.test.core.util.RandomUtils.*;
import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*;
@@ -120,8 +120,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
o.setCommissionCertificateType(null);
o.setCommissionOperator(null);
o.setCreateTime(null);
- o.setEnterpriseId(null);
o.setEnterpriseType(null);
+ o.setParentId(null);
});
enterpriseMapper.insert(dbEnterprise);
// 测试 name 不匹配
@@ -144,10 +144,10 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCommissionOperator(null)));
// 测试 createTime 不匹配
enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCreateTime(null)));
- // 测试 enterpriseId 不匹配
- enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseId(null)));
// 测试 enterpriseType 不匹配
enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseType(null)));
+ // 测试 parentId 不匹配
+ enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setParentId(null)));
// 准备参数
EnterprisePageReqVO reqVO = new EnterprisePageReqVO();
reqVO.setName(null);
@@ -160,8 +160,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
reqVO.setCommissionCertificateType(null);
reqVO.setCommissionOperator(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
- reqVO.setEnterpriseId(null);
reqVO.setEnterpriseType(null);
+ reqVO.setParentId(null);
// 调用
PageResult pageResult = enterpriseService.getEnterprisePage(reqVO);
@@ -186,8 +186,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
o.setCommissionCertificateType(null);
o.setCommissionOperator(null);
o.setCreateTime(null);
- o.setEnterpriseId(null);
o.setEnterpriseType(null);
+ o.setParentId(null);
});
enterpriseMapper.insert(dbEnterprise);
// 测试 name 不匹配
@@ -210,10 +210,10 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCommissionOperator(null)));
// 测试 createTime 不匹配
enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCreateTime(null)));
- // 测试 enterpriseId 不匹配
- enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseId(null)));
// 测试 enterpriseType 不匹配
enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseType(null)));
+ // 测试 parentId 不匹配
+ enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setParentId(null)));
// 准备参数
EnterpriseExportReqVO reqVO = new EnterpriseExportReqVO();
reqVO.setName(null);
@@ -226,8 +226,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
reqVO.setCommissionCertificateType(null);
reqVO.setCommissionOperator(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
- reqVO.setEnterpriseId(null);
reqVO.setEnterpriseType(null);
+ reqVO.setParentId(null);
// 调用
List list = enterpriseService.getEnterpriseList(reqVO);