From 54b7c20332af560785dc579aa666e59f25f519d4 Mon Sep 17 00:00:00 2001
From: tengxi <971623072@qq.com>
Date: Wed, 27 Sep 2023 10:22:37 +0800
Subject: [PATCH 1/2] 1
---
.../src/api/xxjj/enterprise/index.ts | 12 +-
.../enterprisebranching/EnterpriseModal.vue | 57 ++
.../enterprisebranching/enterprise.data.ts | 814 ++++++++++++++++++
.../views/xxjj/enterprisebranching/index.vue | 92 ++
4 files changed, 969 insertions(+), 6 deletions(-)
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
diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/enterprise/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/enterprise/index.ts
index f64805f..af8ddbe 100644
--- a/yudao-ui-admin-vben-master/src/api/xxjj/enterprise/index.ts
+++ b/yudao-ui-admin-vben-master/src/api/xxjj/enterprise/index.ts
@@ -2,30 +2,30 @@ import { defHttp } from '@/utils/http/axios'
// 查询企业信息列表
export function getEnterprisePage(params) {
- return defHttp.get({ url: '/xxjj/enterprise/page', params })
+ return defHttp.get({ url: '/system/enterprise/page', params })
}
// 查询企业信息详情
export function getEnterprise(id: number) {
- return defHttp.get({ url: '/xxjj/enterprise/get?id=' + id })
+ return defHttp.get({ url: '/system/enterprise/get?id=' + id })
}
// 新增企业信息
export function createEnterprise(data) {
- return defHttp.post({ url: '/xxjj/enterprise/create', data })
+ return defHttp.post({ url: '/system/enterprise/create', data })
}
// 修改企业信息
export function updateEnterprise(data) {
- return defHttp.put({ url: '/xxjj/enterprise/update', data })
+ return defHttp.put({ url: '/system/enterprise/update', data })
}
// 删除企业信息
export function deleteEnterprise(id: number) {
- return defHttp.delete({ url: '/xxjj/enterprise/delete?id=' + id })
+ return defHttp.delete({ url: '/system/enterprise/delete?id=' + id })
}
// 导出企业信息 Excel
export function exportEnterprise(params) {
- return defHttp.download({ url: '/xxjj/enterprise/export-excel', params }, '企业信息.xls')
+ return defHttp.download({ url: '/system/enterprise/export-excel', params }, '企业信息.xls')
}
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..6410a0f
--- /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..415cc7b
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+ {{ t('action.create') }}
+
+
+ {{ t('action.export') }}
+
+
+
+
+
+
+
+
+
+
+
+
From 984d9b94a55e4a7dd5115f2b206b699ae2ef1a29 Mon Sep 17 00:00:00 2001
From: tengxi <971623072@qq.com>
Date: Sat, 7 Oct 2023 11:25:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=B0=E5=AE=A2?=
=?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-ui-admin-vben-master/npm | 0
.../src/api/system/enterprise/index.ts | 6 +
.../src/views/xxjj/customer/customer.data.ts | 1023 +++++++++++++++--
.../enterprisebranching/enterprise.data.ts | 37 +
.../views/xxjj/enterprisebranching/index.vue | 32 +-
.../admin/customer/vo/CustomerBaseVO.java | 131 ++-
.../admin/customer/vo/CustomerExcelVO.java | 135 ++-
.../customer/vo/CustomerExportReqVO.java | 129 ++-
.../admin/customer/vo/CustomerPageReqVO.java | 129 ++-
.../dal/dataobject/customer/CustomerDO.java | 175 ++-
.../dal/mysql/customer/CustomerMapper.java | 88 +-
.../customer/CustomerServiceImplTest.java | 352 +++++-
12 files changed, 2034 insertions(+), 203 deletions(-)
create mode 100644 yudao-ui-admin-vben-master/npm
diff --git a/yudao-ui-admin-vben-master/npm b/yudao-ui-admin-vben-master/npm
new file mode 100644
index 0000000..e69de29
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
index af8ddbe..0e3ef42 100644
--- a/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
+++ b/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
@@ -20,6 +20,12 @@ export function updateEnterprise(data) {
return defHttp.put({ url: '/system/enterprise/update', data })
}
+// 修改企业状态
+export function updateEnterpriseStatus(data) {
+ return defHttp.put({ url: '/system/enterprise/updateStatus', data })
+}
+
+
// 删除企业信息
export function deleteEnterprise(id: number) {
return defHttp.delete({ url: '/system/enterprise/delete?id=' + id })
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/customer/customer.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/customer/customer.data.ts
index eba9953..1cae902 100644
--- a/yudao-ui-admin-vben-master/src/views/xxjj/customer/customer.data.ts
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/customer/customer.data.ts
@@ -62,11 +62,6 @@ export const columns: BasicColumn[] = [
dataIndex: 'belongingPeople',
width: 160
},
- {
- title: '所在城市',
- dataIndex: 'city',
- width: 160
- },
{
title: '国家',
dataIndex: 'country',
@@ -105,6 +100,24 @@ export const columns: BasicColumn[] = [
return useRender.renderDict(text, DICT_TYPE.CUSTOMER_STATUS1)
}
},
+ {
+ title: '创建时间',
+ dataIndex: 'createTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
+ dataIndex: 'industryClassify',
+ width: 160
+ },
+ {
+ title: '所在城市',
+ dataIndex: 'city',
+ width: 160
+ },
{
title: '社会信息代码证(营业执照)',
dataIndex: 'socialInformationCodeCertificate',
@@ -135,27 +148,221 @@ export const columns: BasicColumn[] = [
dataIndex: 'guarantorCertificate',
width: 160
},
+ {
+ title: '其他资质文件',
+ dataIndex: 'otherQualifications',
+ width: 160
+ },
{
title: '经营范围',
dataIndex: 'businessScope',
width: 160
},
{
- title: '创建时间',
- dataIndex: 'createTime',
+ title: '合作范围(关联业务线)',
+ dataIndex: 'collaborationScopeNum',
+ width: 160
+ },
+ {
+ title: '合作起始时间',
+ dataIndex: 'collaborationTime',
width: 180,
customRender: ({ text }) => {
return useRender.renderDate(text)
}
},
{
- title: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
- dataIndex: 'industryClassify',
+ title: '供货量(每月下限)',
+ dataIndex: 'supplyVolumeDown',
width: 160
},
{
- title: '其他资质文件',
- dataIndex: 'otherQualifications',
+ title: '供货量(每月下限)',
+ dataIndex: 'supplyVolumeUpper',
+ width: 160
+ },
+ {
+ title: '资金额度',
+ dataIndex: 'fundLimit',
+ width: 160
+ },
+ {
+ title: '营业时间',
+ dataIndex: 'businessHours',
+ width: 160
+ },
+ {
+ title: '允许卸货时间',
+ dataIndex: 'allowableUnloadingTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '卸货效率',
+ dataIndex: 'unloadingEfficiency',
+ width: 160
+ },
+ {
+ title: '允许装货时间',
+ dataIndex: 'allowableShipmentTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '装货效果',
+ dataIndex: 'shipmentEffciency',
+ width: 160
+ },
+ {
+ title: '付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)',
+ dataIndex: 'paymentMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.PAYMENT_METHOD)
+ }
+ },
+ {
+ title: '账户名称',
+ dataIndex: 'accountName',
+ width: 160
+ },
+ {
+ title: '银行账号',
+ dataIndex: 'bankAccount',
+ width: 160
+ },
+ {
+ title: '开户银行',
+ dataIndex: 'bankDeposit',
+ width: 160
+ },
+ {
+ title: '开户地区',
+ dataIndex: 'depositArea',
+ width: 160
+ },
+ {
+ title: '支行名称',
+ dataIndex: 'bankBranch',
+ width: 160
+ },
+ {
+ title: '公司税号',
+ dataIndex: 'companyTaxNumber',
+ width: 160
+ },
+ {
+ title: '企业名称',
+ dataIndex: 'enterpriseName',
+ width: 160
+ },
+ {
+ title: '单位地址',
+ dataIndex: 'workAddress',
+ width: 160
+ },
+ {
+ title: '合作方式(0:买断 1:联营)',
+ dataIndex: 'collaborationMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.COLLABORATION_METHOD)
+ }
+ },
+ {
+ title: '结算方式(0:先货后款 1:先款后货)',
+ dataIndex: 'settlementMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.SETTLEMENT_METHOD)
+ }
+ },
+ {
+ title: '账期',
+ dataIndex: 'accountPeriod',
+ width: 160
+ },
+ {
+ title: '压款方式(0:无 1:按金额 2:按比例)',
+ dataIndex: 'underpaymentMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.UNDERPAYMENT_METHOD)
+ }
+ },
+ {
+ title: '默认压款比例',
+ dataIndex: 'defaultUnderpaymentRatio',
+ width: 160
+ },
+ {
+ title: '申请压款比例',
+ dataIndex: 'applyForUnderpaymentRatio',
+ width: 160
+ },
+ {
+ title: '保证金方式(0:无 1:按金额 2:按比例)',
+ dataIndex: 'marginMethod',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.MARGIN_METHOD)
+ }
+ },
+ {
+ title: '默认保证金比例',
+ dataIndex: 'defaultMarginRatio',
+ width: 160
+ },
+ {
+ title: '申请保证金比例',
+ dataIndex: 'applyForMarginRatio',
+ width: 160
+ },
+ {
+ title: '逾期利率(0:按年化1:按月化)',
+ dataIndex: 'overdueInterestRate',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.OVERDUE_INTEREST_RATE)
+ }
+ },
+ {
+ title: '默认逾期利率',
+ dataIndex: 'defaultOverdueRatio',
+ width: 160
+ },
+ {
+ title: '申请逾期利率',
+ dataIndex: 'applyForOverdueRatio',
+ width: 160
+ },
+ {
+ title: '客户联系人id',
+ dataIndex: 'contactsId',
+ width: 160
+ },
+ {
+ title: '客户类型',
+ dataIndex: 'customerType',
+ width: 160
+ },
+ {
+ title: '账户类型',
+ dataIndex: 'accountType',
+ width: 160
+ },
+ {
+ title: '卸货时长',
+ dataIndex: 'unloading',
+ width: 160
+ },
+ {
+ title: '装货时长',
+ dataIndex: 'shipment',
width: 160
},
]
@@ -224,12 +431,6 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
colProps: { span: 8 }
},
- {
- label: '所在城市',
- field: 'city',
- component: 'Input',
- colProps: { span: 8 }
- },
{
label: '国家',
field: 'country',
@@ -274,128 +475,357 @@ export const searchFormSchema: FormSchema[] = [
},
colProps: { span: 8 }
},
+ {
+ label: '创建时间',
+ field: 'createTime',
+ component: 'RangePicker',
+ colProps: { span: 8 }
+ },
+ {
+ label: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
+ field: 'industryClassify',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
{
label: '社会信息代码证(营业执照)',
field: 'socialInformationCodeCertificate',
- component: 'RangePicker',
+ component: 'Input',
colProps: { span: 8 }
},
{
label: '法定代表人证件照',
field: 'legalRepresentativesPhoto',
+ component: 'Input',
colProps: { span: 8 }
},
{
label: '实缴资金证明',
field: 'proofPaidCapital',
+ component: 'Input',
colProps: { span: 8 }
},
{
label: '资产证明',
field: 'assetCertificate',
+ component: 'Input',
colProps: { span: 8 }
},
{
label: '资产抵押证明',
field: 'assetCertificateMortgage',
+ component: 'Input',
colProps: { span: 8 }
},
{
label: '担保人证明',
field: 'guarantorCertificate',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '其他资质文件',
+ field: 'otherQualifications',
+ component: 'Input',
colProps: { span: 8 }
},
{
label: '经营范围',
field: 'businessScope',
+ component: 'Input',
colProps: { span: 8 }
},
{
- label: '创建时间',
- field: 'createTime',
+ label: '合作范围(关联业务线)',
+ field: 'collaborationScopeNum',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '合作起始时间',
+ field: 'collaborationTime',
component: 'RangePicker',
colProps: { span: 8 }
},
{
- label: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
- field: 'industryClassify',
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeDown',
component: 'Input',
colProps: { span: 8 }
},
{
- label: '其他资质文件',
- field: 'otherQualifications',
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeUpper',
component: 'Input',
colProps: { span: 8 }
},
-]
-
-export const createFormSchema: FormSchema[] = [
{
- label: '编号',
- field: 'id',
- show: false,
- component: 'Input'
+ label: '资金额度',
+ field: 'fundLimit',
+ component: 'Input',
+ colProps: { span: 8 }
},
{
- label: '客户分类(0:一级客户 1:二级客户)',
- field: 'customerCalssify',
- required: true,
- component: 'Select',
- componentProps: {
- options: getDictOptions(DICT_TYPE.CUSTOMER_CALSSIFY, 'number')
- }
+ label: '营业时间',
+ field: 'businessHours',
+ component: 'Input',
+ colProps: { span: 8 }
},
{
- label: '客户名称',
- field: 'customerName',
- component: 'Input'
+ label: '允许卸货时间',
+ field: 'allowableUnloadingTime',
+ component: 'RangePicker',
+ colProps: { span: 8 }
},
{
- label: '公司logo',
- field: 'customerLogo',
- component: 'Input'
+ label: '卸货效率',
+ field: 'unloadingEfficiency',
+ component: 'Input',
+ colProps: { span: 8 }
},
{
- label: '企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)',
- field: 'enterpriseNature',
- component: 'Select',
- componentProps: {
- options: getDictOptions(DICT_TYPE.ENTERPRISE_NATURE, 'number')
- }
+ label: '允许装货时间',
+ field: 'allowableShipmentTime',
+ component: 'RangePicker',
+ colProps: { span: 8 }
},
{
- label: '客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)',
- field: 'customerSource',
- component: 'Select',
- componentProps: {
- options: getDictOptions(DICT_TYPE.PRODUCT_CLASS, 'number')
- }
+ label: '装货效果',
+ field: 'shipmentEffciency',
+ component: 'Input',
+ colProps: { span: 8 }
},
{
- label: '客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)',
- field: 'customerStarrating',
- component: 'Select',
- componentProps: {
- options: getDictOptions(DICT_TYPE.CUSTOMER_STARRATING, 'number')
- }
+ label: '付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)',
+ field: 'paymentMethod',
+ component: 'Input',
+ colProps: { span: 8 }
},
{
- label: '业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)',
- field: 'industrySchedule',
- component: 'Select',
- componentProps: {
- options: getDictOptions(DICT_TYPE.INDUSTRY_SCHEDULE, 'number')
+ label: '账户名称',
+ field: 'accountName',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '银行账号',
+ field: 'bankAccount',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '开户银行',
+ field: 'bankDeposit',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '开户地区',
+ field: 'depositArea',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '支行名称',
+ field: 'bankBranch',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '公司税号',
+ field: 'companyTaxNumber',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '企业名称',
+ field: 'enterpriseName',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '单位地址',
+ field: 'workAddress',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '合作方式(0:买断 1:联营)',
+ field: 'collaborationMethod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '结算方式(0:先货后款 1:先款后货)',
+ field: 'settlementMethod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '账期',
+ field: 'accountPeriod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '压款方式(0:无 1:按金额 2:按比例)',
+ field: 'underpaymentMethod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '默认压款比例',
+ field: 'defaultUnderpaymentRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '申请压款比例',
+ field: 'applyForUnderpaymentRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '保证金方式(0:无 1:按金额 2:按比例)',
+ field: 'marginMethod',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '默认保证金比例',
+ field: 'defaultMarginRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '申请保证金比例',
+ field: 'applyForMarginRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '逾期利率(0:按年化1:按月化)',
+ field: 'overdueInterestRate',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '默认逾期利率',
+ field: 'defaultOverdueRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '申请逾期利率',
+ field: 'applyForOverdueRatio',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '客户联系人id',
+ field: 'contactsId',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '客户类型',
+ field: 'customerType',
+ component: 'Select',
+ componentProps: {
+ options: []
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '账户类型',
+ field: 'accountType',
+ component: 'Select',
+ componentProps: {
+ options: []
+ },
+ colProps: { span: 8 }
+ },
+ {
+ label: '卸货时长',
+ field: 'unloading',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ {
+ label: '装货时长',
+ field: 'shipment',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+]
+
+export const createFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '客户分类(0:一级客户 1:二级客户)',
+ field: 'customerCalssify',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_CALSSIFY, 'number')
}
},
{
- label: '归属人员',
- field: 'belongingPeople',
+ label: '客户名称',
+ field: 'customerName',
component: 'Input'
},
{
- label: '所在城市',
- field: 'city',
+ label: '公司logo',
+ field: 'customerLogo',
+ component: 'Input'
+ },
+ {
+ label: '企业性质(0:国有企业 1:集体企业 2:私营企业 3:股份制企业 4:外资企业 5:合资企业)',
+ field: 'enterpriseNature',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.ENTERPRISE_NATURE, 'number')
+ }
+ },
+ {
+ label: '客户来源(0:电话营销 1:主动来电 2:客户介绍 3:朋友介绍 4:独立开发 5:网络搜索 6:广告杂志 7:展会促销 8:其他途径)',
+ field: 'customerSource',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.PRODUCT_CLASS, 'number')
+ }
+ },
+ {
+ label: '客户星级(0:一星 1:二星 2:三星 3:四星 4:五星)',
+ field: 'customerStarrating',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.CUSTOMER_STARRATING, 'number')
+ }
+ },
+ {
+ label: '业务进度(0:了解跟进 1:资料收集 2:客户评审 3:风控核准 4:合作洽谈 5:准备签约 6:已经签约 7:合作叫停 8:暂时搁置)',
+ field: 'industrySchedule',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.INDUSTRY_SCHEDULE, 'number')
+ }
+ },
+ {
+ label: '归属人员',
+ field: 'belongingPeople',
component: 'Input'
},
{
@@ -437,69 +867,240 @@ export const createFormSchema: FormSchema[] = [
options: getDictOptions(DICT_TYPE.CUSTOMER_STATUS1, 'number')
}
},
+ {
+ label: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
+ field: 'industryClassify',
+ component: 'Input'
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
{
label: '社会信息代码证(营业执照)',
field: 'socialInformationCodeCertificate',
- component: 'DatePicker'
+ component: 'Input'
},
{
label: '法定代表人证件照',
field: 'legalRepresentativesPhoto',
- component: 'FileUpload',
- componentProps: {
- fileType: 'file',
- maxCount: 1
- }
+ component: 'Input'
},
{
label: '实缴资金证明',
field: 'proofPaidCapital',
- component: 'FileUpload',
- componentProps: {
- fileType: 'file',
- maxCount: 1
- }
+ component: 'Input'
},
{
label: '资产证明',
field: 'assetCertificate',
- component: 'FileUpload',
- componentProps: {
- fileType: 'file',
- maxCount: 1
- }
+ component: 'Input'
},
{
label: '资产抵押证明',
field: 'assetCertificateMortgage',
- component: 'FileUpload',
- componentProps: {
- fileType: 'file',
- maxCount: 1
- }
+ component: 'Input'
},
{
label: '担保人证明',
field: 'guarantorCertificate',
- component: 'FileUpload',
- componentProps: {
- fileType: 'file',
- maxCount: 1
- }
+ component: 'Input'
+ },
+ {
+ label: '其他资质文件',
+ field: 'otherQualifications',
+ component: 'Input'
},
{
label: '经营范围',
field: 'businessScope',
- component: 'InputTextArea'
+ component: 'Input'
},
{
- label: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
- field: 'industryClassify',
+ label: '合作范围(关联业务线)',
+ field: 'collaborationScopeNum',
component: 'Input'
},
{
- label: '其他资质文件',
- field: 'otherQualifications',
+ label: '合作起始时间',
+ field: 'collaborationTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeDown',
+ component: 'Input'
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeUpper',
+ component: 'Input'
+ },
+ {
+ label: '资金额度',
+ field: 'fundLimit',
+ component: 'Input'
+ },
+ {
+ label: '营业时间',
+ field: 'businessHours',
+ component: 'Input'
+ },
+ {
+ label: '允许卸货时间',
+ field: 'allowableUnloadingTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '卸货效率',
+ field: 'unloadingEfficiency',
+ component: 'Input'
+ },
+ {
+ label: '允许装货时间',
+ field: 'allowableShipmentTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '装货效果',
+ field: 'shipmentEffciency',
+ component: 'Input'
+ },
+ {
+ label: '付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)',
+ field: 'paymentMethod',
+ component: 'Input'
+ },
+ {
+ label: '账户名称',
+ field: 'accountName',
+ component: 'Input'
+ },
+ {
+ label: '银行账号',
+ field: 'bankAccount',
+ component: 'Input'
+ },
+ {
+ label: '开户银行',
+ field: 'bankDeposit',
+ component: 'Input'
+ },
+ {
+ label: '开户地区',
+ field: 'depositArea',
+ component: 'Input'
+ },
+ {
+ label: '支行名称',
+ field: 'bankBranch',
+ component: 'Input'
+ },
+ {
+ label: '公司税号',
+ field: 'companyTaxNumber',
+ component: 'Input'
+ },
+ {
+ label: '企业名称',
+ field: 'enterpriseName',
+ component: 'Input'
+ },
+ {
+ label: '单位地址',
+ field: 'workAddress',
+ component: 'Input'
+ },
+ {
+ label: '合作方式(0:买断 1:联营)',
+ field: 'collaborationMethod',
+ component: 'Input'
+ },
+ {
+ label: '结算方式(0:先货后款 1:先款后货)',
+ field: 'settlementMethod',
+ component: 'Input'
+ },
+ {
+ label: '账期',
+ field: 'accountPeriod',
+ component: 'Input'
+ },
+ {
+ label: '压款方式(0:无 1:按金额 2:按比例)',
+ field: 'underpaymentMethod',
+ component: 'Input'
+ },
+ {
+ label: '默认压款比例',
+ field: 'defaultUnderpaymentRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请压款比例',
+ field: 'applyForUnderpaymentRatio',
+ component: 'Input'
+ },
+ {
+ label: '保证金方式(0:无 1:按金额 2:按比例)',
+ field: 'marginMethod',
+ component: 'Input'
+ },
+ {
+ label: '默认保证金比例',
+ field: 'defaultMarginRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请保证金比例',
+ field: 'applyForMarginRatio',
+ component: 'Input'
+ },
+ {
+ label: '逾期利率(0:按年化1:按月化)',
+ field: 'overdueInterestRate',
+ component: 'Input'
+ },
+ {
+ label: '默认逾期利率',
+ field: 'defaultOverdueRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请逾期利率',
+ field: 'applyForOverdueRatio',
+ component: 'Input'
+ },
+ {
+ label: '客户联系人id',
+ field: 'contactsId',
+ component: 'Input'
+ },
+ {
+ label: '客户类型',
+ field: 'customerType',
+ component: 'Select',
+ componentProps: {
+ options:[]
+ }
+ },
+ {
+ label: '账户类型',
+ field: 'accountType',
+ component: 'Select',
+ componentProps: {
+ options:[]
+ }
+ },
+ {
+ label: '卸货时长',
+ field: 'unloading',
+ component: 'Input'
+ },
+ {
+ label: '装货时长',
+ field: 'shipment',
component: 'Input'
},
]
@@ -567,11 +1168,6 @@ export const updateFormSchema: FormSchema[] = [
field: 'belongingPeople',
component: 'Input'
},
- {
- label: '所在城市',
- field: 'city',
- component: 'Input'
- },
{
label: '国家',
field: 'country',
@@ -611,49 +1207,240 @@ export const updateFormSchema: FormSchema[] = [
options: getDictOptions(DICT_TYPE.CUSTOMER_STATUS1, 'number')
}
},
+ {
+ label: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
+ field: 'industryClassify',
+ component: 'Input'
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
{
label: '社会信息代码证(营业执照)',
field: 'socialInformationCodeCertificate',
- component: 'DatePicker'
+ component: 'Input'
},
{
label: '法定代表人证件照',
field: 'legalRepresentativesPhoto',
- component: 'Upload'
+ component: 'Input'
},
{
label: '实缴资金证明',
field: 'proofPaidCapital',
- component: 'Upload'
+ component: 'Input'
},
{
label: '资产证明',
field: 'assetCertificate',
- component: 'Upload'
+ component: 'Input'
},
{
label: '资产抵押证明',
field: 'assetCertificateMortgage',
- component: 'Upload'
+ component: 'Input'
},
{
label: '担保人证明',
field: 'guarantorCertificate',
- component: 'Upload'
+ component: 'Input'
+ },
+ {
+ label: '其他资质文件',
+ field: 'otherQualifications',
+ component: 'Input'
},
{
label: '经营范围',
field: 'businessScope',
- component: 'InputTextArea'
+ component: 'Input'
},
{
- label: '行业分类(0:家用电器 1:交通运输 2:商务服务 3:家具用品 4:电工电气 5:通信产品 6:办公文教 7:运动休闲 8:传媒广电)',
- field: 'industryClassify',
+ label: '合作范围(关联业务线)',
+ field: 'collaborationScopeNum',
component: 'Input'
},
{
- label: '其他资质文件',
- field: 'otherQualifications',
+ label: '合作起始时间',
+ field: 'collaborationTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeDown',
+ component: 'Input'
+ },
+ {
+ label: '供货量(每月下限)',
+ field: 'supplyVolumeUpper',
+ component: 'Input'
+ },
+ {
+ label: '资金额度',
+ field: 'fundLimit',
+ component: 'Input'
+ },
+ {
+ label: '营业时间',
+ field: 'businessHours',
+ component: 'Input'
+ },
+ {
+ label: '允许卸货时间',
+ field: 'allowableUnloadingTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '卸货效率',
+ field: 'unloadingEfficiency',
+ component: 'Input'
+ },
+ {
+ label: '允许装货时间',
+ field: 'allowableShipmentTime',
+ component: 'DatePicker'
+ },
+ {
+ label: '装货效果',
+ field: 'shipmentEffciency',
+ component: 'Input'
+ },
+ {
+ label: '付款方式(0:无 1:现金 2:银行转账 3:承兑汇票 4:有赞代收 5:支付宝 6:微信 7:国家列表)',
+ field: 'paymentMethod',
+ component: 'Input'
+ },
+ {
+ label: '账户名称',
+ field: 'accountName',
+ component: 'Input'
+ },
+ {
+ label: '银行账号',
+ field: 'bankAccount',
+ component: 'Input'
+ },
+ {
+ label: '开户银行',
+ field: 'bankDeposit',
+ component: 'Input'
+ },
+ {
+ label: '开户地区',
+ field: 'depositArea',
+ component: 'Input'
+ },
+ {
+ label: '支行名称',
+ field: 'bankBranch',
+ component: 'Input'
+ },
+ {
+ label: '公司税号',
+ field: 'companyTaxNumber',
+ component: 'Input'
+ },
+ {
+ label: '企业名称',
+ field: 'enterpriseName',
+ component: 'Input'
+ },
+ {
+ label: '单位地址',
+ field: 'workAddress',
+ component: 'Input'
+ },
+ {
+ label: '合作方式(0:买断 1:联营)',
+ field: 'collaborationMethod',
+ component: 'Input'
+ },
+ {
+ label: '结算方式(0:先货后款 1:先款后货)',
+ field: 'settlementMethod',
+ component: 'Input'
+ },
+ {
+ label: '账期',
+ field: 'accountPeriod',
+ component: 'Input'
+ },
+ {
+ label: '压款方式(0:无 1:按金额 2:按比例)',
+ field: 'underpaymentMethod',
+ component: 'Input'
+ },
+ {
+ label: '默认压款比例',
+ field: 'defaultUnderpaymentRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请压款比例',
+ field: 'applyForUnderpaymentRatio',
+ component: 'Input'
+ },
+ {
+ label: '保证金方式(0:无 1:按金额 2:按比例)',
+ field: 'marginMethod',
+ component: 'Input'
+ },
+ {
+ label: '默认保证金比例',
+ field: 'defaultMarginRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请保证金比例',
+ field: 'applyForMarginRatio',
+ component: 'Input'
+ },
+ {
+ label: '逾期利率(0:按年化1:按月化)',
+ field: 'overdueInterestRate',
+ component: 'Input'
+ },
+ {
+ label: '默认逾期利率',
+ field: 'defaultOverdueRatio',
+ component: 'Input'
+ },
+ {
+ label: '申请逾期利率',
+ field: 'applyForOverdueRatio',
+ component: 'Input'
+ },
+ {
+ label: '客户联系人id',
+ field: 'contactsId',
+ component: 'Input'
+ },
+ {
+ label: '客户类型',
+ field: 'customerType',
+ component: 'Select',
+ componentProps: {
+ options:[]
+ }
+ },
+ {
+ label: '账户类型',
+ field: 'accountType',
+ component: 'Select',
+ componentProps: {
+ options:[]
+ }
+ },
+ {
+ label: '卸货时长',
+ field: 'unloading',
+ component: 'Input'
+ },
+ {
+ label: '装货时长',
+ field: 'shipment',
component: 'Input'
},
]
\ No newline at end of file
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
index bcbb697..7559da6 100644
--- 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
@@ -1,5 +1,9 @@
import { BasicColumn, FormSchema, useRender } from '@/components/Table'
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import {h} from "vue";
+import {Switch} from "ant-design-vue";
+import {useMessage} from "@/hooks/web/useMessage";
+import {updateEnterpriseStatus} from "@/api/system/enterprise";
export const columns: BasicColumn[] = [
// {
@@ -53,6 +57,39 @@ export const columns: BasicColumn[] = [
return useRender.renderDate(text)
}
},
+ {
+ title: '状态',
+ dataIndex: 'enterpriseStatus',
+ width: 180,
+ customRender: ({ record }) => {
+ if (!Reflect.has(record, 'pendingStatus'))
+ record.pendingStatus = false
+
+ return h(Switch, {
+ checked: record.status === 0,
+ checkedChildren: '已启用',
+ unCheckedChildren: '已禁用',
+ loading: record.pendingStatus,
+ onChange(checked: boolean) {
+ record.pendingStatus = true
+ const newStatus = checked ? 0 : 1
+ const { createMessage } = useMessage()
+ updateEnterpriseStatus(record.id, newStatus)
+ .then(() => {
+ record.status = newStatus
+ createMessage.success('已成功修改用户状态')
+ })
+ .catch(() => {
+ createMessage.error('修改用户状态失败')
+ })
+ .finally(() => {
+ record.pendingStatus = false
+ })
+ },
+ })
+ },
+ },
+
// {
// title: '企业简称',
// dataIndex: 'shortName',
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
index b4ad6ba..1f29989 100644
--- a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
@@ -3,7 +3,7 @@
- {{ t('action.create') }}
+ {{ '新增机构' }}
{{ t('action.export') }}
@@ -14,6 +14,19 @@
{
.eqIfPresent(CustomerDO::getCustomerStarrating, reqVO.getCustomerStarrating())
.eqIfPresent(CustomerDO::getIndustrySchedule, reqVO.getIndustrySchedule())
.eqIfPresent(CustomerDO::getBelongingPeople, reqVO.getBelongingPeople())
- .eqIfPresent(CustomerDO::getCity, reqVO.getCity())
.eqIfPresent(CustomerDO::getCountry, reqVO.getCountry())
.eqIfPresent(CustomerDO::getAddress, reqVO.getAddress())
.eqIfPresent(CustomerDO::getPhone, reqVO.getPhone())
@@ -35,16 +34,53 @@ public interface CustomerMapper extends BaseMapperX {
.eqIfPresent(CustomerDO::getCompanyHttp, reqVO.getCompanyHttp())
.eqIfPresent(CustomerDO::getCompanyProfile, reqVO.getCompanyProfile())
.eqIfPresent(CustomerDO::getCustomerStatus, reqVO.getCustomerStatus())
+ .betweenIfPresent(CustomerDO::getCreateTime, reqVO.getCreateTime())
+ .eqIfPresent(CustomerDO::getIndustryClassify, reqVO.getIndustryClassify())
+ .eqIfPresent(CustomerDO::getCity, reqVO.getCity())
.eqIfPresent(CustomerDO::getSocialInformationCodeCertificate, reqVO.getSocialInformationCodeCertificate())
.eqIfPresent(CustomerDO::getLegalRepresentativesPhoto, reqVO.getLegalRepresentativesPhoto())
.eqIfPresent(CustomerDO::getProofPaidCapital, reqVO.getProofPaidCapital())
.eqIfPresent(CustomerDO::getAssetCertificate, reqVO.getAssetCertificate())
.eqIfPresent(CustomerDO::getAssetCertificateMortgage, reqVO.getAssetCertificateMortgage())
.eqIfPresent(CustomerDO::getGuarantorCertificate, reqVO.getGuarantorCertificate())
- .eqIfPresent(CustomerDO::getBusinessScope, reqVO.getBusinessScope())
- .betweenIfPresent(CustomerDO::getCreateTime, reqVO.getCreateTime())
- .eqIfPresent(CustomerDO::getIndustryClassify, reqVO.getIndustryClassify())
.eqIfPresent(CustomerDO::getOtherQualifications, reqVO.getOtherQualifications())
+ .eqIfPresent(CustomerDO::getBusinessScope, reqVO.getBusinessScope())
+ .eqIfPresent(CustomerDO::getCollaborationScopeNum, reqVO.getCollaborationScopeNum())
+ .betweenIfPresent(CustomerDO::getCollaborationTime, reqVO.getCollaborationTime())
+ .eqIfPresent(CustomerDO::getSupplyVolumeDown, reqVO.getSupplyVolumeDown())
+ .eqIfPresent(CustomerDO::getSupplyVolumeUpper, reqVO.getSupplyVolumeUpper())
+ .eqIfPresent(CustomerDO::getFundLimit, reqVO.getFundLimit())
+ .eqIfPresent(CustomerDO::getBusinessHours, reqVO.getBusinessHours())
+ .betweenIfPresent(CustomerDO::getAllowableUnloadingTime, reqVO.getAllowableUnloadingTime())
+ .eqIfPresent(CustomerDO::getUnloadingEfficiency, reqVO.getUnloadingEfficiency())
+ .betweenIfPresent(CustomerDO::getAllowableShipmentTime, reqVO.getAllowableShipmentTime())
+ .eqIfPresent(CustomerDO::getShipmentEffciency, reqVO.getShipmentEffciency())
+ .eqIfPresent(CustomerDO::getPaymentMethod, reqVO.getPaymentMethod())
+ .likeIfPresent(CustomerDO::getAccountName, reqVO.getAccountName())
+ .eqIfPresent(CustomerDO::getBankAccount, reqVO.getBankAccount())
+ .eqIfPresent(CustomerDO::getBankDeposit, reqVO.getBankDeposit())
+ .eqIfPresent(CustomerDO::getDepositArea, reqVO.getDepositArea())
+ .eqIfPresent(CustomerDO::getBankBranch, reqVO.getBankBranch())
+ .eqIfPresent(CustomerDO::getCompanyTaxNumber, reqVO.getCompanyTaxNumber())
+ .likeIfPresent(CustomerDO::getEnterpriseName, reqVO.getEnterpriseName())
+ .eqIfPresent(CustomerDO::getWorkAddress, reqVO.getWorkAddress())
+ .eqIfPresent(CustomerDO::getCollaborationMethod, reqVO.getCollaborationMethod())
+ .eqIfPresent(CustomerDO::getSettlementMethod, reqVO.getSettlementMethod())
+ .eqIfPresent(CustomerDO::getAccountPeriod, reqVO.getAccountPeriod())
+ .eqIfPresent(CustomerDO::getUnderpaymentMethod, reqVO.getUnderpaymentMethod())
+ .eqIfPresent(CustomerDO::getDefaultUnderpaymentRatio, reqVO.getDefaultUnderpaymentRatio())
+ .eqIfPresent(CustomerDO::getApplyForUnderpaymentRatio, reqVO.getApplyForUnderpaymentRatio())
+ .eqIfPresent(CustomerDO::getMarginMethod, reqVO.getMarginMethod())
+ .eqIfPresent(CustomerDO::getDefaultMarginRatio, reqVO.getDefaultMarginRatio())
+ .eqIfPresent(CustomerDO::getApplyForMarginRatio, reqVO.getApplyForMarginRatio())
+ .eqIfPresent(CustomerDO::getOverdueInterestRate, reqVO.getOverdueInterestRate())
+ .eqIfPresent(CustomerDO::getDefaultOverdueRatio, reqVO.getDefaultOverdueRatio())
+ .eqIfPresent(CustomerDO::getApplyForOverdueRatio, reqVO.getApplyForOverdueRatio())
+ .eqIfPresent(CustomerDO::getContactsId, reqVO.getContactsId())
+ .eqIfPresent(CustomerDO::getCustomerType, reqVO.getCustomerType())
+ .eqIfPresent(CustomerDO::getAccountType, reqVO.getAccountType())
+ .eqIfPresent(CustomerDO::getUnloading, reqVO.getUnloading())
+ .eqIfPresent(CustomerDO::getShipment, reqVO.getShipment())
.orderByDesc(CustomerDO::getId));
}
@@ -58,7 +94,6 @@ public interface CustomerMapper extends BaseMapperX {
.eqIfPresent(CustomerDO::getCustomerStarrating, reqVO.getCustomerStarrating())
.eqIfPresent(CustomerDO::getIndustrySchedule, reqVO.getIndustrySchedule())
.eqIfPresent(CustomerDO::getBelongingPeople, reqVO.getBelongingPeople())
- .eqIfPresent(CustomerDO::getCity, reqVO.getCity())
.eqIfPresent(CustomerDO::getCountry, reqVO.getCountry())
.eqIfPresent(CustomerDO::getAddress, reqVO.getAddress())
.eqIfPresent(CustomerDO::getPhone, reqVO.getPhone())
@@ -66,16 +101,53 @@ public interface CustomerMapper extends BaseMapperX {
.eqIfPresent(CustomerDO::getCompanyHttp, reqVO.getCompanyHttp())
.eqIfPresent(CustomerDO::getCompanyProfile, reqVO.getCompanyProfile())
.eqIfPresent(CustomerDO::getCustomerStatus, reqVO.getCustomerStatus())
+ .betweenIfPresent(CustomerDO::getCreateTime, reqVO.getCreateTime())
+ .eqIfPresent(CustomerDO::getIndustryClassify, reqVO.getIndustryClassify())
+ .eqIfPresent(CustomerDO::getCity, reqVO.getCity())
.eqIfPresent(CustomerDO::getSocialInformationCodeCertificate, reqVO.getSocialInformationCodeCertificate())
.eqIfPresent(CustomerDO::getLegalRepresentativesPhoto, reqVO.getLegalRepresentativesPhoto())
.eqIfPresent(CustomerDO::getProofPaidCapital, reqVO.getProofPaidCapital())
.eqIfPresent(CustomerDO::getAssetCertificate, reqVO.getAssetCertificate())
.eqIfPresent(CustomerDO::getAssetCertificateMortgage, reqVO.getAssetCertificateMortgage())
.eqIfPresent(CustomerDO::getGuarantorCertificate, reqVO.getGuarantorCertificate())
- .eqIfPresent(CustomerDO::getBusinessScope, reqVO.getBusinessScope())
- .betweenIfPresent(CustomerDO::getCreateTime, reqVO.getCreateTime())
- .eqIfPresent(CustomerDO::getIndustryClassify, reqVO.getIndustryClassify())
.eqIfPresent(CustomerDO::getOtherQualifications, reqVO.getOtherQualifications())
+ .eqIfPresent(CustomerDO::getBusinessScope, reqVO.getBusinessScope())
+ .eqIfPresent(CustomerDO::getCollaborationScopeNum, reqVO.getCollaborationScopeNum())
+ .betweenIfPresent(CustomerDO::getCollaborationTime, reqVO.getCollaborationTime())
+ .eqIfPresent(CustomerDO::getSupplyVolumeDown, reqVO.getSupplyVolumeDown())
+ .eqIfPresent(CustomerDO::getSupplyVolumeUpper, reqVO.getSupplyVolumeUpper())
+ .eqIfPresent(CustomerDO::getFundLimit, reqVO.getFundLimit())
+ .eqIfPresent(CustomerDO::getBusinessHours, reqVO.getBusinessHours())
+ .betweenIfPresent(CustomerDO::getAllowableUnloadingTime, reqVO.getAllowableUnloadingTime())
+ .eqIfPresent(CustomerDO::getUnloadingEfficiency, reqVO.getUnloadingEfficiency())
+ .betweenIfPresent(CustomerDO::getAllowableShipmentTime, reqVO.getAllowableShipmentTime())
+ .eqIfPresent(CustomerDO::getShipmentEffciency, reqVO.getShipmentEffciency())
+ .eqIfPresent(CustomerDO::getPaymentMethod, reqVO.getPaymentMethod())
+ .likeIfPresent(CustomerDO::getAccountName, reqVO.getAccountName())
+ .eqIfPresent(CustomerDO::getBankAccount, reqVO.getBankAccount())
+ .eqIfPresent(CustomerDO::getBankDeposit, reqVO.getBankDeposit())
+ .eqIfPresent(CustomerDO::getDepositArea, reqVO.getDepositArea())
+ .eqIfPresent(CustomerDO::getBankBranch, reqVO.getBankBranch())
+ .eqIfPresent(CustomerDO::getCompanyTaxNumber, reqVO.getCompanyTaxNumber())
+ .likeIfPresent(CustomerDO::getEnterpriseName, reqVO.getEnterpriseName())
+ .eqIfPresent(CustomerDO::getWorkAddress, reqVO.getWorkAddress())
+ .eqIfPresent(CustomerDO::getCollaborationMethod, reqVO.getCollaborationMethod())
+ .eqIfPresent(CustomerDO::getSettlementMethod, reqVO.getSettlementMethod())
+ .eqIfPresent(CustomerDO::getAccountPeriod, reqVO.getAccountPeriod())
+ .eqIfPresent(CustomerDO::getUnderpaymentMethod, reqVO.getUnderpaymentMethod())
+ .eqIfPresent(CustomerDO::getDefaultUnderpaymentRatio, reqVO.getDefaultUnderpaymentRatio())
+ .eqIfPresent(CustomerDO::getApplyForUnderpaymentRatio, reqVO.getApplyForUnderpaymentRatio())
+ .eqIfPresent(CustomerDO::getMarginMethod, reqVO.getMarginMethod())
+ .eqIfPresent(CustomerDO::getDefaultMarginRatio, reqVO.getDefaultMarginRatio())
+ .eqIfPresent(CustomerDO::getApplyForMarginRatio, reqVO.getApplyForMarginRatio())
+ .eqIfPresent(CustomerDO::getOverdueInterestRate, reqVO.getOverdueInterestRate())
+ .eqIfPresent(CustomerDO::getDefaultOverdueRatio, reqVO.getDefaultOverdueRatio())
+ .eqIfPresent(CustomerDO::getApplyForOverdueRatio, reqVO.getApplyForOverdueRatio())
+ .eqIfPresent(CustomerDO::getContactsId, reqVO.getContactsId())
+ .eqIfPresent(CustomerDO::getCustomerType, reqVO.getCustomerType())
+ .eqIfPresent(CustomerDO::getAccountType, reqVO.getAccountType())
+ .eqIfPresent(CustomerDO::getUnloading, reqVO.getUnloading())
+ .eqIfPresent(CustomerDO::getShipment, reqVO.getShipment())
.orderByDesc(CustomerDO::getId));
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImplTest.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImplTest.java
index 094f1a6..a4b04af 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImplTest.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/customer/CustomerServiceImplTest.java
@@ -118,7 +118,6 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
o.setCustomerStarrating(null);
o.setIndustrySchedule(null);
o.setBelongingPeople(null);
- o.setCity(null);
o.setCountry(null);
o.setAddress(null);
o.setPhone(null);
@@ -126,16 +125,53 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
o.setCompanyHttp(null);
o.setCompanyProfile(null);
o.setCustomerStatus(null);
+ o.setCreateTime(null);
+ o.setIndustryClassify(null);
+ o.setCity(null);
o.setSocialInformationCodeCertificate(null);
o.setLegalRepresentativesPhoto(null);
o.setProofPaidCapital(null);
o.setAssetCertificate(null);
o.setAssetCertificateMortgage(null);
o.setGuarantorCertificate(null);
- o.setBusinessScope(null);
- o.setCreateTime(null);
- o.setIndustryClassify(null);
o.setOtherQualifications(null);
+ o.setBusinessScope(null);
+ o.setCollaborationScopeNum(null);
+ o.setCollaborationTime(null);
+ o.setSupplyVolumeDown(null);
+ o.setSupplyVolumeUpper(null);
+ o.setFundLimit(null);
+ o.setBusinessHours(null);
+ o.setAllowableUnloadingTime(null);
+ o.setUnloadingEfficiency(null);
+ o.setAllowableShipmentTime(null);
+ o.setShipmentEffciency(null);
+ o.setPaymentMethod(null);
+ o.setAccountName(null);
+ o.setBankAccount(null);
+ o.setBankDeposit(null);
+ o.setDepositArea(null);
+ o.setBankBranch(null);
+ o.setCompanyTaxNumber(null);
+ o.setEnterpriseName(null);
+ o.setWorkAddress(null);
+ o.setCollaborationMethod(null);
+ o.setSettlementMethod(null);
+ o.setAccountPeriod(null);
+ o.setUnderpaymentMethod(null);
+ o.setDefaultUnderpaymentRatio(null);
+ o.setApplyForUnderpaymentRatio(null);
+ o.setMarginMethod(null);
+ o.setDefaultMarginRatio(null);
+ o.setApplyForMarginRatio(null);
+ o.setOverdueInterestRate(null);
+ o.setDefaultOverdueRatio(null);
+ o.setApplyForOverdueRatio(null);
+ o.setContactsId(null);
+ o.setCustomerType(null);
+ o.setAccountType(null);
+ o.setUnloading(null);
+ o.setShipment(null);
});
customerMapper.insert(dbCustomer);
// 测试 customerCalssify 不匹配
@@ -154,8 +190,6 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustrySchedule(null)));
// 测试 belongingPeople 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBelongingPeople(null)));
- // 测试 city 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCity(null)));
// 测试 country 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCountry(null)));
// 测试 address 不匹配
@@ -170,6 +204,12 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyProfile(null)));
// 测试 customerStatus 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerStatus(null)));
+ // 测试 createTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCreateTime(null)));
+ // 测试 industryClassify 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustryClassify(null)));
+ // 测试 city 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCity(null)));
// 测试 socialInformationCodeCertificate 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSocialInformationCodeCertificate(null)));
// 测试 legalRepresentativesPhoto 不匹配
@@ -182,14 +222,82 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAssetCertificateMortgage(null)));
// 测试 guarantorCertificate 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setGuarantorCertificate(null)));
- // 测试 businessScope 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessScope(null)));
- // 测试 createTime 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCreateTime(null)));
- // 测试 industryClassify 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustryClassify(null)));
// 测试 otherQualifications 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setOtherQualifications(null)));
+ // 测试 businessScope 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessScope(null)));
+ // 测试 collaborationScopeNum 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationScopeNum(null)));
+ // 测试 collaborationTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationTime(null)));
+ // 测试 supplyVolumeDown 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSupplyVolumeDown(null)));
+ // 测试 supplyVolumeUpper 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSupplyVolumeUpper(null)));
+ // 测试 fundLimit 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setFundLimit(null)));
+ // 测试 businessHours 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessHours(null)));
+ // 测试 allowableUnloadingTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAllowableUnloadingTime(null)));
+ // 测试 unloadingEfficiency 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnloadingEfficiency(null)));
+ // 测试 allowableShipmentTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAllowableShipmentTime(null)));
+ // 测试 shipmentEffciency 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setShipmentEffciency(null)));
+ // 测试 paymentMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setPaymentMethod(null)));
+ // 测试 accountName 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountName(null)));
+ // 测试 bankAccount 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankAccount(null)));
+ // 测试 bankDeposit 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankDeposit(null)));
+ // 测试 depositArea 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDepositArea(null)));
+ // 测试 bankBranch 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankBranch(null)));
+ // 测试 companyTaxNumber 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyTaxNumber(null)));
+ // 测试 enterpriseName 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setEnterpriseName(null)));
+ // 测试 workAddress 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setWorkAddress(null)));
+ // 测试 collaborationMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationMethod(null)));
+ // 测试 settlementMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSettlementMethod(null)));
+ // 测试 accountPeriod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountPeriod(null)));
+ // 测试 underpaymentMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnderpaymentMethod(null)));
+ // 测试 defaultUnderpaymentRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultUnderpaymentRatio(null)));
+ // 测试 applyForUnderpaymentRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForUnderpaymentRatio(null)));
+ // 测试 marginMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setMarginMethod(null)));
+ // 测试 defaultMarginRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultMarginRatio(null)));
+ // 测试 applyForMarginRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForMarginRatio(null)));
+ // 测试 overdueInterestRate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setOverdueInterestRate(null)));
+ // 测试 defaultOverdueRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultOverdueRatio(null)));
+ // 测试 applyForOverdueRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForOverdueRatio(null)));
+ // 测试 contactsId 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setContactsId(null)));
+ // 测试 customerType 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerType(null)));
+ // 测试 accountType 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountType(null)));
+ // 测试 unloading 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnloading(null)));
+ // 测试 shipment 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setShipment(null)));
// 准备参数
CustomerPageReqVO reqVO = new CustomerPageReqVO();
reqVO.setCustomerCalssify(null);
@@ -200,7 +308,6 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
reqVO.setCustomerStarrating(null);
reqVO.setIndustrySchedule(null);
reqVO.setBelongingPeople(null);
- reqVO.setCity(null);
reqVO.setCountry(null);
reqVO.setAddress(null);
reqVO.setPhone(null);
@@ -208,16 +315,53 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
reqVO.setCompanyHttp(null);
reqVO.setCompanyProfile(null);
reqVO.setCustomerStatus(null);
+ reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setIndustryClassify(null);
+ reqVO.setCity(null);
reqVO.setSocialInformationCodeCertificate(null);
reqVO.setLegalRepresentativesPhoto(null);
reqVO.setProofPaidCapital(null);
reqVO.setAssetCertificate(null);
reqVO.setAssetCertificateMortgage(null);
reqVO.setGuarantorCertificate(null);
- reqVO.setBusinessScope(null);
- reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
- reqVO.setIndustryClassify(null);
reqVO.setOtherQualifications(null);
+ reqVO.setBusinessScope(null);
+ reqVO.setCollaborationScopeNum(null);
+ reqVO.setCollaborationTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setSupplyVolumeDown(null);
+ reqVO.setSupplyVolumeUpper(null);
+ reqVO.setFundLimit(null);
+ reqVO.setBusinessHours(null);
+ reqVO.setAllowableUnloadingTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setUnloadingEfficiency(null);
+ reqVO.setAllowableShipmentTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setShipmentEffciency(null);
+ reqVO.setPaymentMethod(null);
+ reqVO.setAccountName(null);
+ reqVO.setBankAccount(null);
+ reqVO.setBankDeposit(null);
+ reqVO.setDepositArea(null);
+ reqVO.setBankBranch(null);
+ reqVO.setCompanyTaxNumber(null);
+ reqVO.setEnterpriseName(null);
+ reqVO.setWorkAddress(null);
+ reqVO.setCollaborationMethod(null);
+ reqVO.setSettlementMethod(null);
+ reqVO.setAccountPeriod(null);
+ reqVO.setUnderpaymentMethod(null);
+ reqVO.setDefaultUnderpaymentRatio(null);
+ reqVO.setApplyForUnderpaymentRatio(null);
+ reqVO.setMarginMethod(null);
+ reqVO.setDefaultMarginRatio(null);
+ reqVO.setApplyForMarginRatio(null);
+ reqVO.setOverdueInterestRate(null);
+ reqVO.setDefaultOverdueRatio(null);
+ reqVO.setApplyForOverdueRatio(null);
+ reqVO.setContactsId(null);
+ reqVO.setCustomerType(null);
+ reqVO.setAccountType(null);
+ reqVO.setUnloading(null);
+ reqVO.setShipment(null);
// 调用
PageResult pageResult = customerService.getCustomerPage(reqVO);
@@ -240,7 +384,6 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
o.setCustomerStarrating(null);
o.setIndustrySchedule(null);
o.setBelongingPeople(null);
- o.setCity(null);
o.setCountry(null);
o.setAddress(null);
o.setPhone(null);
@@ -248,16 +391,53 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
o.setCompanyHttp(null);
o.setCompanyProfile(null);
o.setCustomerStatus(null);
+ o.setCreateTime(null);
+ o.setIndustryClassify(null);
+ o.setCity(null);
o.setSocialInformationCodeCertificate(null);
o.setLegalRepresentativesPhoto(null);
o.setProofPaidCapital(null);
o.setAssetCertificate(null);
o.setAssetCertificateMortgage(null);
o.setGuarantorCertificate(null);
- o.setBusinessScope(null);
- o.setCreateTime(null);
- o.setIndustryClassify(null);
o.setOtherQualifications(null);
+ o.setBusinessScope(null);
+ o.setCollaborationScopeNum(null);
+ o.setCollaborationTime(null);
+ o.setSupplyVolumeDown(null);
+ o.setSupplyVolumeUpper(null);
+ o.setFundLimit(null);
+ o.setBusinessHours(null);
+ o.setAllowableUnloadingTime(null);
+ o.setUnloadingEfficiency(null);
+ o.setAllowableShipmentTime(null);
+ o.setShipmentEffciency(null);
+ o.setPaymentMethod(null);
+ o.setAccountName(null);
+ o.setBankAccount(null);
+ o.setBankDeposit(null);
+ o.setDepositArea(null);
+ o.setBankBranch(null);
+ o.setCompanyTaxNumber(null);
+ o.setEnterpriseName(null);
+ o.setWorkAddress(null);
+ o.setCollaborationMethod(null);
+ o.setSettlementMethod(null);
+ o.setAccountPeriod(null);
+ o.setUnderpaymentMethod(null);
+ o.setDefaultUnderpaymentRatio(null);
+ o.setApplyForUnderpaymentRatio(null);
+ o.setMarginMethod(null);
+ o.setDefaultMarginRatio(null);
+ o.setApplyForMarginRatio(null);
+ o.setOverdueInterestRate(null);
+ o.setDefaultOverdueRatio(null);
+ o.setApplyForOverdueRatio(null);
+ o.setContactsId(null);
+ o.setCustomerType(null);
+ o.setAccountType(null);
+ o.setUnloading(null);
+ o.setShipment(null);
});
customerMapper.insert(dbCustomer);
// 测试 customerCalssify 不匹配
@@ -276,8 +456,6 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustrySchedule(null)));
// 测试 belongingPeople 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBelongingPeople(null)));
- // 测试 city 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCity(null)));
// 测试 country 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCountry(null)));
// 测试 address 不匹配
@@ -292,6 +470,12 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyProfile(null)));
// 测试 customerStatus 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerStatus(null)));
+ // 测试 createTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCreateTime(null)));
+ // 测试 industryClassify 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustryClassify(null)));
+ // 测试 city 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCity(null)));
// 测试 socialInformationCodeCertificate 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSocialInformationCodeCertificate(null)));
// 测试 legalRepresentativesPhoto 不匹配
@@ -304,14 +488,82 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAssetCertificateMortgage(null)));
// 测试 guarantorCertificate 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setGuarantorCertificate(null)));
- // 测试 businessScope 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessScope(null)));
- // 测试 createTime 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCreateTime(null)));
- // 测试 industryClassify 不匹配
- customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setIndustryClassify(null)));
// 测试 otherQualifications 不匹配
customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setOtherQualifications(null)));
+ // 测试 businessScope 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessScope(null)));
+ // 测试 collaborationScopeNum 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationScopeNum(null)));
+ // 测试 collaborationTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationTime(null)));
+ // 测试 supplyVolumeDown 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSupplyVolumeDown(null)));
+ // 测试 supplyVolumeUpper 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSupplyVolumeUpper(null)));
+ // 测试 fundLimit 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setFundLimit(null)));
+ // 测试 businessHours 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBusinessHours(null)));
+ // 测试 allowableUnloadingTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAllowableUnloadingTime(null)));
+ // 测试 unloadingEfficiency 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnloadingEfficiency(null)));
+ // 测试 allowableShipmentTime 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAllowableShipmentTime(null)));
+ // 测试 shipmentEffciency 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setShipmentEffciency(null)));
+ // 测试 paymentMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setPaymentMethod(null)));
+ // 测试 accountName 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountName(null)));
+ // 测试 bankAccount 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankAccount(null)));
+ // 测试 bankDeposit 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankDeposit(null)));
+ // 测试 depositArea 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDepositArea(null)));
+ // 测试 bankBranch 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setBankBranch(null)));
+ // 测试 companyTaxNumber 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCompanyTaxNumber(null)));
+ // 测试 enterpriseName 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setEnterpriseName(null)));
+ // 测试 workAddress 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setWorkAddress(null)));
+ // 测试 collaborationMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCollaborationMethod(null)));
+ // 测试 settlementMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setSettlementMethod(null)));
+ // 测试 accountPeriod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountPeriod(null)));
+ // 测试 underpaymentMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnderpaymentMethod(null)));
+ // 测试 defaultUnderpaymentRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultUnderpaymentRatio(null)));
+ // 测试 applyForUnderpaymentRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForUnderpaymentRatio(null)));
+ // 测试 marginMethod 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setMarginMethod(null)));
+ // 测试 defaultMarginRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultMarginRatio(null)));
+ // 测试 applyForMarginRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForMarginRatio(null)));
+ // 测试 overdueInterestRate 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setOverdueInterestRate(null)));
+ // 测试 defaultOverdueRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setDefaultOverdueRatio(null)));
+ // 测试 applyForOverdueRatio 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setApplyForOverdueRatio(null)));
+ // 测试 contactsId 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setContactsId(null)));
+ // 测试 customerType 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setCustomerType(null)));
+ // 测试 accountType 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setAccountType(null)));
+ // 测试 unloading 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setUnloading(null)));
+ // 测试 shipment 不匹配
+ customerMapper.insert(cloneIgnoreId(dbCustomer, o -> o.setShipment(null)));
// 准备参数
CustomerExportReqVO reqVO = new CustomerExportReqVO();
reqVO.setCustomerCalssify(null);
@@ -322,7 +574,6 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
reqVO.setCustomerStarrating(null);
reqVO.setIndustrySchedule(null);
reqVO.setBelongingPeople(null);
- reqVO.setCity(null);
reqVO.setCountry(null);
reqVO.setAddress(null);
reqVO.setPhone(null);
@@ -330,16 +581,53 @@ public class CustomerServiceImplTest extends BaseDbUnitTest {
reqVO.setCompanyHttp(null);
reqVO.setCompanyProfile(null);
reqVO.setCustomerStatus(null);
+ reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setIndustryClassify(null);
+ reqVO.setCity(null);
reqVO.setSocialInformationCodeCertificate(null);
reqVO.setLegalRepresentativesPhoto(null);
reqVO.setProofPaidCapital(null);
reqVO.setAssetCertificate(null);
reqVO.setAssetCertificateMortgage(null);
reqVO.setGuarantorCertificate(null);
- reqVO.setBusinessScope(null);
- reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
- reqVO.setIndustryClassify(null);
reqVO.setOtherQualifications(null);
+ reqVO.setBusinessScope(null);
+ reqVO.setCollaborationScopeNum(null);
+ reqVO.setCollaborationTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setSupplyVolumeDown(null);
+ reqVO.setSupplyVolumeUpper(null);
+ reqVO.setFundLimit(null);
+ reqVO.setBusinessHours(null);
+ reqVO.setAllowableUnloadingTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setUnloadingEfficiency(null);
+ reqVO.setAllowableShipmentTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+ reqVO.setShipmentEffciency(null);
+ reqVO.setPaymentMethod(null);
+ reqVO.setAccountName(null);
+ reqVO.setBankAccount(null);
+ reqVO.setBankDeposit(null);
+ reqVO.setDepositArea(null);
+ reqVO.setBankBranch(null);
+ reqVO.setCompanyTaxNumber(null);
+ reqVO.setEnterpriseName(null);
+ reqVO.setWorkAddress(null);
+ reqVO.setCollaborationMethod(null);
+ reqVO.setSettlementMethod(null);
+ reqVO.setAccountPeriod(null);
+ reqVO.setUnderpaymentMethod(null);
+ reqVO.setDefaultUnderpaymentRatio(null);
+ reqVO.setApplyForUnderpaymentRatio(null);
+ reqVO.setMarginMethod(null);
+ reqVO.setDefaultMarginRatio(null);
+ reqVO.setApplyForMarginRatio(null);
+ reqVO.setOverdueInterestRate(null);
+ reqVO.setDefaultOverdueRatio(null);
+ reqVO.setApplyForOverdueRatio(null);
+ reqVO.setContactsId(null);
+ reqVO.setCustomerType(null);
+ reqVO.setAccountType(null);
+ reqVO.setUnloading(null);
+ reqVO.setShipment(null);
// 调用
List list = customerService.getCustomerList(reqVO);