linkage
/
YX-SCM
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重新提交企业中心

Browse Source
qhw-dev-0927
tengxi 1 year ago
parent 8655c2ed97
commit 505afe30a8
21 changed files with 1136 additions and 69 deletions
Show Stats Download Patch File Download Diff File

31
yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
Unescape View File

@ -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')
}

3
yudao-ui-admin-vben-master/src/utils/dict.ts
Unescape View File

@ -156,4 +156,7 @@ export enum DICT_TYPE {
// ============= BUSINESSLINE 模块=================
BUSINESS_TYPE = 'business_type', //业务线类型
DIFF_FLAG = 'diff_flag',
// ============= ENTERPRISEBRANCHING 模块=================
ENTERPRISE_TYPE = 'enterprise_type', //业务线类型
}

57
yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue
Unescape View File

@ -0,0 +1,57 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? t('action.edit') : t('action.create')" @ok="handleSubmit">
<BasicForm @register="registerForm" />
</BasicModal>
</template>
<script lang="ts" setup>
import { ref, unref } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { useMessage } from '@/hooks/web/useMessage'
import { BasicForm, useForm } from '@/components/Form'
import { BasicModal, useModalInner } from '@/components/Modal'
import { createFormSchema, updateFormSchema } from './enterprise.data'
import { createEnterprise, getEnterprise, updateEnterprise } from '@/api/system/enterprise'
defineOptions({ name: 'EnterpriseModal' })
const { t } = useI18n()
const { createMessage } = useMessage()
const emit = defineEmits(['success', 'register'])
const isUpdate = ref(true)
const [registerForm, { setFieldsValue, resetFields, resetSchema, validate }] = useForm({
labelWidth: 120,
baseColProps: { span: 24 },
schemas: createFormSchema,
showActionButtonGroup: false,
actionColOptions: { span: 23 }
})
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
resetFields()
setModalProps({ confirmLoading: false })
isUpdate.value = !!data?.isUpdate
if (unref(isUpdate)) {
resetSchema(updateFormSchema)
const res = await getEnterprise(data.record.id)
setFieldsValue({ ...res })
}
})
async function handleSubmit() {
try {
const values = await validate()
setModalProps({ confirmLoading: true })
if (unref(isUpdate)) {
await updateEnterprise(values)
} else {
await createEnterprise(values)
}
closeModal()
emit('success')
createMessage.success(t('common.saveSuccessText'))
} finally {
setModalProps({ confirmLoading: false })
}
}
</script>

814
yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts
Unescape View File

@ -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')
// }
// },
]

92
yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
Unescape View File

@ -0,0 +1,92 @@
<template>
<div>
<BasicTable @register="registerTable">
<template #toolbar>
<a-button type="primary" v-auth="['system:enterprise:create']" :preIcon="IconEnum.ADD" @click="handleCreate">
{{ t('action.create') }}
</a-button>
<a-button type="warning" v-auth="['system:enterprise:export']" :preIcon="IconEnum.EXPORT" @click="handleExport">
{{ t('action.export') }}
</a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{ icon: IconEnum.EDIT, label: t('action.edit'), auth: 'system:enterprise:update', onClick: handleEdit.bind(null, record) },
{
icon: IconEnum.DELETE,
color: 'error',
label: t('action.delete'),
auth: 'system:enterprise:delete',
popConfirm: {
title: t('common.delMessage'),
placement: 'left',
confirm: handleDelete.bind(null, record)
}
}
]"
/>
</template>
</template>
</BasicTable>
<EnterpriseModal @register="registerModal" @success="reload()" />
</div>
</template>
<script lang="ts" setup>
import { useI18n } from '@/hooks/web/useI18n'
import { useMessage } from '@/hooks/web/useMessage'
import { useModal } from '@/components/Modal'
import EnterpriseModal from './EnterpriseModal.vue'
import { IconEnum } from '@/enums/appEnum'
import { BasicTable, useTable, TableAction } from '@/components/Table'
import { deleteEnterprise, exportEnterprise, getEnterprisePage } from '@/api/system/enterprise'
import { columns, searchFormSchema } from './enterprise.data'
defineOptions({ name: 'Enterprise' })
const { t } = useI18n()
const { createConfirm, createMessage } = useMessage()
const [registerModal, { openModal }] = useModal()
const [registerTable, { getForm, reload }] = useTable({
title: '分支机构',
api: getEnterprisePage,
columns,
formConfig: { labelWidth: 120, schemas: searchFormSchema },
useSearchForm: true,
showTableSetting: true,
actionColumn: {
width: 140,
title: t('common.action'),
dataIndex: 'action',
fixed: 'right'
}
})
function handleCreate() {
openModal(true, { isUpdate: false })
}
function handleEdit(record: Recordable) {
openModal(true, { record, isUpdate: true })
}
async function handleExport() {
createConfirm({
title: t('common.exportTitle'),
iconType: 'warning',
content: t('common.exportMessage'),
async onOk() {
await exportEnterprise(getForm().getFieldsValue())
createMessage.success(t('common.exportSuccessText'))
}
})
}
async function handleDelete(record: Recordable) {
await deleteEnterprise(record.id)
createMessage.success(t('common.delSuccessText'))
reload()
}
</script>

2
yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java
Unescape View File

@ -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, "企业信息不存在");
}

26
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
Unescape View File

@ -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<Long> 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<Boolean> 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<Boolean> 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<EnterpriseRespVO> 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<List<EnterpriseRespVO>> getEnterpriseList(@RequestParam("ids") Collection<Long> ids) {
List<EnterpriseDO> 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<PageResult<EnterpriseRespVO>> getEnterprisePage(@Valid EnterprisePageReqVO pageVO) {
PageResult<EnterpriseDO> 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 {

25
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
Unescape View File

@ -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;
}

2
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
Unescape View File

@ -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.*;

23
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java
Unescape View File

@ -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;
}

20
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
Unescape View File

@ -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;
}

20
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
Unescape View File

@ -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;
}

2
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java
Unescape View File

@ -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.*;

2
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
Unescape View File

@ -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.*;

6
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java
Unescape View File

@ -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

14
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
Unescape View File

@ -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;
}

10
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java
Unescape View File

@ -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<EnterpriseDO> {
.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<EnterpriseDO> {
.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));
}

6
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java
Unescape View File

@ -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;
/**

12
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java
Unescape View File

@ -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 实现类

12
yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml
Unescape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yunxi.scm.module.system.dal.mysql.enterprise.EnterpriseMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

26
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java → yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java
Unescape View File

@ -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<EnterpriseDO> 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<EnterpriseDO> list = enterpriseService.getEnterpriseList(reqVO);
Write Preview
Loading…
Cancel
Save