Merge branch 'master' of http://222.71.165.188:3000/linkage/YX-SCM

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

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

yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue

@@ -12,6 +12,7 @@ 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()

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',

yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue

@@ -2,8 +2,11 @@
   <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="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') }}
@@ -13,7 +16,24 @@
         <template v-if="column.key === 'action'">
           <TableAction
              :actions="[
+
+               { icon: IconEnum.EDIT, label: '设置状态', auth: 'system:enterprise:update', onClick: handleEdit.bind(null, record) },
+
+               { icon: IconEnum.EDIT, label: t('action.edit'), auth: 'system:enterprise:update', onClick: handleEdit1.bind(null, record) },
+
                { icon: IconEnum.EDIT, label: t('action.edit'), auth: 'system:enterprise:update', onClick: handleEdit.bind(null, record) },
+
+               {
+                  icon: IconEnum.DELETE,
+                  color: 'warrning',
+                  label: '状态',
+                  auth: 'system:enterprise:delete',
+                  popConfirm: {
+                    title: t('common.delMessage'),
+                    placement: 'left',
+                    confirm: handleDelete1.bind(null, record)
+                  }
+              },
                {
                   icon: IconEnum.DELETE,
                   color: 'error',
@@ -40,7 +60,12 @@ 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 {
+  deleteEnterprise,
+  exportEnterprise,
+  getEnterprisePage,
+  updateEnterpriseStatus
+} from '@/api/system/enterprise'
 import { columns, searchFormSchema } from './enterprise.data'
 
 defineOptions({ name: 'Enterprise' })
@@ -57,7 +82,7 @@ const [registerTable, { getForm, reload }] = useTable({
   useSearchForm: true,
   showTableSetting: true,
   actionColumn: {
-    width: 140,
+
     title: t('common.action'),
     dataIndex: 'action',
     fixed: 'right'
@@ -72,6 +97,12 @@ function handleEdit(record: Recordable) {
   openModal(true, { record, isUpdate: true })
 }
 
+
+function handleEdit1(record: Recordable) {
+  openModal(true, { record, isUpdate: true })
+}
+
+
 async function handleExport() {
   createConfirm({
     title: t('common.exportTitle'),
@@ -89,4 +120,10 @@ async function handleDelete(record: Recordable) {
   createMessage.success(t('common.delSuccessText'))
   reload()
 }
+
+async function handleDelete1(record: Recordable) {
+  await updateEnterpriseStatus(record.id)
+  createMessage.success(t('common.delSuccessText'))
+  reload()
+}
 </script>

yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerBaseVO.java

@@ -5,7 +5,13 @@ import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
 import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
  * 客户信息 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -39,9 +45,6 @@ public class CustomerBaseVO {
     @Schema(description = "归属人员")
     private String belongingPeople;
 
-    @Schema(description = "所在城市")
-    private Long city;
-
     @Schema(description = "国家")
     private String country;
 
@@ -64,6 +67,12 @@ public class CustomerBaseVO {
     @NotNull(message = "客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)不能为空")
     private String customerStatus;
 
+    @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)")
+    private String industryClassify;
+
+    @Schema(description = "所在城市")
+    private String city;
+
     @Schema(description = "社会信息代码证（营业执照）")
     private String socialInformationCodeCertificate;
 
@@ -82,13 +91,121 @@ public class CustomerBaseVO {
     @Schema(description = "担保人证明")
     private String guarantorCertificate;
 
+    @Schema(description = "其他资质文件")
+    private String otherQualifications;
+
     @Schema(description = "经营范围")
     private String businessScope;
 
-    @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)")
-    private String industryClassify;
+    @Schema(description = "合作范围(关联业务线)")
+    private Integer collaborationScopeNum;
 
-    @Schema(description = "其他资质文件")
-    private String otherQualifications;
+    @Schema(description = "合作起始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime collaborationTime;
+
+    @Schema(description = "供货量（每月下限）")
+    private Long supplyVolumeDown;
+
+    @Schema(description = "供货量（每月下限）")
+    private Long supplyVolumeUpper;
+
+    @Schema(description = "资金额度")
+    private Long fundLimit;
+
+    @Schema(description = "营业时间")
+    private String businessHours;
+
+    @Schema(description = "允许卸货时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime allowableUnloadingTime;
+
+    @Schema(description = "卸货效率")
+    private String unloadingEfficiency;
+
+    @Schema(description = "允许装货时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime allowableShipmentTime;
+
+    @Schema(description = "装货效果")
+    private String shipmentEffciency;
+
+    @Schema(description = "付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)")
+    private String paymentMethod;
+
+    @Schema(description = "账户名称", example = "王五")
+    private String accountName;
+
+    @Schema(description = "银行账号", example = "18155")
+    private String bankAccount;
+
+    @Schema(description = "开户银行")
+    private String bankDeposit;
+
+    @Schema(description = "开户地区")
+    private String depositArea;
+
+    @Schema(description = "支行名称")
+    private String bankBranch;
+
+    @Schema(description = "公司税号")
+    private String companyTaxNumber;
+
+    @Schema(description = "企业名称", example = "芋艿")
+    private String enterpriseName;
+
+    @Schema(description = "单位地址")
+    private String workAddress;
+
+    @Schema(description = "合作方式(0：买断 1：联营)")
+    private String collaborationMethod;
+
+    @Schema(description = "结算方式(0:先货后款 1：先款后货)")
+    private String settlementMethod;
+
+    @Schema(description = "账期")
+    private String accountPeriod;
+
+    @Schema(description = "压款方式(0：无 1：按金额 2：按比例)")
+    private String underpaymentMethod;
+
+    @Schema(description = "默认压款比例")
+    private String defaultUnderpaymentRatio;
+
+    @Schema(description = "申请压款比例")
+    private String applyForUnderpaymentRatio;
+
+    @Schema(description = "保证金方式(0：无 1：按金额 2：按比例)")
+    private String marginMethod;
+
+    @Schema(description = "默认保证金比例")
+    private String defaultMarginRatio;
+
+    @Schema(description = "申请保证金比例")
+    private String applyForMarginRatio;
+
+    @Schema(description = "逾期利率(0：按年化1：按月化)")
+    private String overdueInterestRate;
+
+    @Schema(description = "默认逾期利率")
+    private String defaultOverdueRatio;
+
+    @Schema(description = "申请逾期利率")
+    private String applyForOverdueRatio;
+
+    @Schema(description = "客户联系人id", example = "6351")
+    private Long contactsId;
+
+    @Schema(description = "客户类型", example = "1")
+    private String customerType;
+
+    @Schema(description = "账户类型", example = "2")
+    private String accountType;
+
+    @Schema(description = "卸货时长")
+    private String unloading;
+
+    @Schema(description = "装货时长")
+    private String shipment;
 
 }

yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExcelVO.java

@@ -5,6 +5,9 @@ import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yunxi.scm.framework.excel.core.annotations.DictFormat;
@@ -51,9 +54,6 @@ public class CustomerExcelVO {
     @ExcelProperty("归属人员")
     private String belongingPeople;
 
-    @ExcelProperty("所在城市")
-    private Long city;
-
     @ExcelProperty("国家")
     private String country;
 
@@ -76,6 +76,15 @@ public class CustomerExcelVO {
     @DictFormat("customer_status1") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String customerStatus;
 
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)")
+    private String industryClassify;
+
+    @ExcelProperty("所在城市")
+    private String city;
+
     @ExcelProperty("社会信息代码证（营业执照）")
     private String socialInformationCodeCertificate;
 
@@ -94,16 +103,124 @@ public class CustomerExcelVO {
     @ExcelProperty("担保人证明")
     private String guarantorCertificate;
 
+    @ExcelProperty("其他资质文件")
+    private String otherQualifications;
+
     @ExcelProperty("经营范围")
     private String businessScope;
 
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
+    @ExcelProperty("合作范围(关联业务线)")
+    private Integer collaborationScopeNum;
 
-    @ExcelProperty("行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)")
-    private String industryClassify;
+    @ExcelProperty("合作起始时间")
+    private LocalDateTime collaborationTime;
 
-    @ExcelProperty("其他资质文件")
-    private String otherQualifications;
+    @ExcelProperty("供货量（每月下限）")
+    private Long supplyVolumeDown;
+
+    @ExcelProperty("供货量（每月下限）")
+    private Long supplyVolumeUpper;
+
+    @ExcelProperty("资金额度")
+    private Long fundLimit;
+
+    @ExcelProperty("营业时间")
+    private String businessHours;
+
+    @ExcelProperty("允许卸货时间")
+    private LocalDateTime allowableUnloadingTime;
+
+    @ExcelProperty("卸货效率")
+    private String unloadingEfficiency;
+
+    @ExcelProperty("允许装货时间")
+    private LocalDateTime allowableShipmentTime;
+
+    @ExcelProperty("装货效果")
+    private String shipmentEffciency;
+
+    @ExcelProperty(value = "付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)", converter = DictConvert.class)
+    @DictFormat("payment_method") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String paymentMethod;
+
+    @ExcelProperty("账户名称")
+    private String accountName;
+
+    @ExcelProperty("银行账号")
+    private String bankAccount;
+
+    @ExcelProperty("开户银行")
+    private String bankDeposit;
+
+    @ExcelProperty("开户地区")
+    private String depositArea;
+
+    @ExcelProperty("支行名称")
+    private String bankBranch;
+
+    @ExcelProperty("公司税号")
+    private String companyTaxNumber;
+
+    @ExcelProperty("企业名称")
+    private String enterpriseName;
+
+    @ExcelProperty("单位地址")
+    private String workAddress;
+
+    @ExcelProperty(value = "合作方式(0：买断 1：联营)", converter = DictConvert.class)
+    @DictFormat("collaboration_method") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String collaborationMethod;
+
+    @ExcelProperty(value = "结算方式(0:先货后款 1：先款后货)", converter = DictConvert.class)
+    @DictFormat("settlement_method") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String settlementMethod;
+
+    @ExcelProperty("账期")
+    private String accountPeriod;
+
+    @ExcelProperty(value = "压款方式(0：无 1：按金额 2：按比例)", converter = DictConvert.class)
+    @DictFormat("underpayment_method") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String underpaymentMethod;
+
+    @ExcelProperty("默认压款比例")
+    private String defaultUnderpaymentRatio;
+
+    @ExcelProperty("申请压款比例")
+    private String applyForUnderpaymentRatio;
+
+    @ExcelProperty(value = "保证金方式(0：无 1：按金额 2：按比例)", converter = DictConvert.class)
+    @DictFormat("margin_method") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String marginMethod;
+
+    @ExcelProperty("默认保证金比例")
+    private String defaultMarginRatio;
+
+    @ExcelProperty("申请保证金比例")
+    private String applyForMarginRatio;
+
+    @ExcelProperty(value = "逾期利率(0：按年化1：按月化)", converter = DictConvert.class)
+    @DictFormat("overdue_interest_rate") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String overdueInterestRate;
+
+    @ExcelProperty("默认逾期利率")
+    private String defaultOverdueRatio;
+
+    @ExcelProperty("申请逾期利率")
+    private String applyForOverdueRatio;
+
+    @ExcelProperty("客户联系人id")
+    private Long contactsId;
+
+    @ExcelProperty("客户类型")
+    private String customerType;
+
+    @ExcelProperty("账户类型")
+    private String accountType;
+
+    @ExcelProperty("卸货时长")
+    private String unloading;
+
+    @ExcelProperty("装货时长")
+    private String shipment;
 
 }

yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerExportReqVO.java

@@ -37,9 +37,6 @@ public class CustomerExportReqVO {
     @Schema(description = "归属人员")
     private String belongingPeople;
 
-    @Schema(description = "所在城市")
-    private Long city;
-
     @Schema(description = "国家")
     private String country;
 
@@ -61,6 +58,16 @@ public class CustomerExportReqVO {
     @Schema(description = "客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)", example = "1")
     private String customerStatus;
 
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)")
+    private String industryClassify;
+
+    @Schema(description = "所在城市")
+    private String city;
+
     @Schema(description = "社会信息代码证（营业执照）")
     private String socialInformationCodeCertificate;
 
@@ -79,17 +86,121 @@ public class CustomerExportReqVO {
     @Schema(description = "担保人证明")
     private String guarantorCertificate;
 
+    @Schema(description = "其他资质文件")
+    private String otherQualifications;
+
     @Schema(description = "经营范围")
     private String businessScope;
 
-    @Schema(description = "创建时间")
+    @Schema(description = "合作范围(关联业务线)")
+    private Integer collaborationScopeNum;
+
+    @Schema(description = "合作起始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    private LocalDateTime[] collaborationTime;
 
-    @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)")
-    private String industryClassify;
+    @Schema(description = "供货量（每月下限）")
+    private Long supplyVolumeDown;
 
-    @Schema(description = "其他资质文件")
-    private String otherQualifications;
+    @Schema(description = "供货量（每月下限）")
+    private Long supplyVolumeUpper;
+
+    @Schema(description = "资金额度")
+    private Long fundLimit;
+
+    @Schema(description = "营业时间")
+    private String businessHours;
+
+    @Schema(description = "允许卸货时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] allowableUnloadingTime;
+
+    @Schema(description = "卸货效率")
+    private String unloadingEfficiency;
+
+    @Schema(description = "允许装货时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] allowableShipmentTime;
+
+    @Schema(description = "装货效果")
+    private String shipmentEffciency;
+
+    @Schema(description = "付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)")
+    private String paymentMethod;
+
+    @Schema(description = "账户名称", example = "王五")
+    private String accountName;
+
+    @Schema(description = "银行账号", example = "18155")
+    private String bankAccount;
+
+    @Schema(description = "开户银行")
+    private String bankDeposit;
+
+    @Schema(description = "开户地区")
+    private String depositArea;
+
+    @Schema(description = "支行名称")
+    private String bankBranch;
+
+    @Schema(description = "公司税号")
+    private String companyTaxNumber;
+
+    @Schema(description = "企业名称", example = "芋艿")
+    private String enterpriseName;
+
+    @Schema(description = "单位地址")
+    private String workAddress;
+
+    @Schema(description = "合作方式(0：买断 1：联营)")
+    private String collaborationMethod;
+
+    @Schema(description = "结算方式(0:先货后款 1：先款后货)")
+    private String settlementMethod;
+
+    @Schema(description = "账期")
+    private String accountPeriod;
+
+    @Schema(description = "压款方式(0：无 1：按金额 2：按比例)")
+    private String underpaymentMethod;
+
+    @Schema(description = "默认压款比例")
+    private String defaultUnderpaymentRatio;
+
+    @Schema(description = "申请压款比例")
+    private String applyForUnderpaymentRatio;
+
+    @Schema(description = "保证金方式(0：无 1：按金额 2：按比例)")
+    private String marginMethod;
+
+    @Schema(description = "默认保证金比例")
+    private String defaultMarginRatio;
+
+    @Schema(description = "申请保证金比例")
+    private String applyForMarginRatio;
+
+    @Schema(description = "逾期利率(0：按年化1：按月化)")
+    private String overdueInterestRate;
+
+    @Schema(description = "默认逾期利率")
+    private String defaultOverdueRatio;
+
+    @Schema(description = "申请逾期利率")
+    private String applyForOverdueRatio;
+
+    @Schema(description = "客户联系人id", example = "6351")
+    private Long contactsId;
+
+    @Schema(description = "客户类型", example = "1")
+    private String customerType;
+
+    @Schema(description = "账户类型", example = "2")
+    private String accountType;
+
+    @Schema(description = "卸货时长")
+    private String unloading;
+
+    @Schema(description = "装货时长")
+    private String shipment;
 
 }

yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/customer/vo/CustomerPageReqVO.java

@@ -39,9 +39,6 @@ public class CustomerPageReqVO extends PageParam {
     @Schema(description = "归属人员")
     private String belongingPeople;
 
-    @Schema(description = "所在城市")
-    private Long city;
-
     @Schema(description = "国家")
     private String country;
 
@@ -63,6 +60,16 @@ public class CustomerPageReqVO extends PageParam {
     @Schema(description = "客户状态(0：待提交 1：待审核 2：待核准 3：带启用 4：已启用 5：已禁用 6：已关闭)", example = "1")
     private String customerStatus;
 
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)")
+    private String industryClassify;
+
+    @Schema(description = "所在城市")
+    private String city;
+
     @Schema(description = "社会信息代码证（营业执照）")
     private String socialInformationCodeCertificate;
 
@@ -81,17 +88,121 @@ public class CustomerPageReqVO extends PageParam {
     @Schema(description = "担保人证明")
     private String guarantorCertificate;
 
+    @Schema(description = "其他资质文件")
+    private String otherQualifications;
+
     @Schema(description = "经营范围")
     private String businessScope;
 
-    @Schema(description = "创建时间")
+    @Schema(description = "合作范围(关联业务线)")
+    private Integer collaborationScopeNum;
+
+    @Schema(description = "合作起始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    private LocalDateTime[] collaborationTime;
 
-    @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)")
-    private String industryClassify;
+    @Schema(description = "供货量（每月下限）")
+    private Long supplyVolumeDown;
 
-    @Schema(description = "其他资质文件")
-    private String otherQualifications;
+    @Schema(description = "供货量（每月下限）")
+    private Long supplyVolumeUpper;
+
+    @Schema(description = "资金额度")
+    private Long fundLimit;
+
+    @Schema(description = "营业时间")
+    private String businessHours;
+
+    @Schema(description = "允许卸货时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] allowableUnloadingTime;
+
+    @Schema(description = "卸货效率")
+    private String unloadingEfficiency;
+
+    @Schema(description = "允许装货时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] allowableShipmentTime;
+
+    @Schema(description = "装货效果")
+    private String shipmentEffciency;
+
+    @Schema(description = "付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)")
+    private String paymentMethod;
+
+    @Schema(description = "账户名称", example = "王五")
+    private String accountName;
+
+    @Schema(description = "银行账号", example = "18155")
+    private String bankAccount;
+
+    @Schema(description = "开户银行")
+    private String bankDeposit;
+
+    @Schema(description = "开户地区")
+    private String depositArea;
+
+    @Schema(description = "支行名称")
+    private String bankBranch;
+
+    @Schema(description = "公司税号")
+    private String companyTaxNumber;
+
+    @Schema(description = "企业名称", example = "芋艿")
+    private String enterpriseName;
+
+    @Schema(description = "单位地址")
+    private String workAddress;
+
+    @Schema(description = "合作方式(0：买断 1：联营)")
+    private String collaborationMethod;
+
+    @Schema(description = "结算方式(0:先货后款 1：先款后货)")
+    private String settlementMethod;
+
+    @Schema(description = "账期")
+    private String accountPeriod;
+
+    @Schema(description = "压款方式(0：无 1：按金额 2：按比例)")
+    private String underpaymentMethod;
+
+    @Schema(description = "默认压款比例")
+    private String defaultUnderpaymentRatio;
+
+    @Schema(description = "申请压款比例")
+    private String applyForUnderpaymentRatio;
+
+    @Schema(description = "保证金方式(0：无 1：按金额 2：按比例)")
+    private String marginMethod;
+
+    @Schema(description = "默认保证金比例")
+    private String defaultMarginRatio;
+
+    @Schema(description = "申请保证金比例")
+    private String applyForMarginRatio;
+
+    @Schema(description = "逾期利率(0：按年化1：按月化)")
+    private String overdueInterestRate;
+
+    @Schema(description = "默认逾期利率")
+    private String defaultOverdueRatio;
+
+    @Schema(description = "申请逾期利率")
+    private String applyForOverdueRatio;
+
+    @Schema(description = "客户联系人id", example = "6351")
+    private Long contactsId;
+
+    @Schema(description = "客户类型", example = "1")
+    private String customerType;
+
+    @Schema(description = "账户类型", example = "2")
+    private String accountType;
+
+    @Schema(description = "卸货时长")
+    private String unloading;
+
+    @Schema(description = "装货时长")
+    private String shipment;
 
 }

yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/customer/CustomerDO.java

@@ -4,6 +4,9 @@ import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
 
@@ -69,10 +72,6 @@ public class CustomerDO extends BaseDO {
      * 归属人员
      */
     private String belongingPeople;
-    /**
-     * 所在城市
-     */
-    private Long city;
     /**
      * 国家
      */
@@ -103,6 +102,14 @@ public class CustomerDO extends BaseDO {
      * 枚举 {@link TODO customer_status1 对应的类}
      */
     private String customerStatus;
+    /**
+     * 行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)
+     */
+    private String industryClassify;
+    /**
+     * 所在城市
+     */
+    private String city;
     /**
      * 社会信息代码证（营业执照）
      */
@@ -127,17 +134,169 @@ public class CustomerDO extends BaseDO {
      * 担保人证明
      */
     private String guarantorCertificate;
+    /**
+     * 其他资质文件
+     */
+    private String otherQualifications;
     /**
      * 经营范围
      */
     private String businessScope;
     /**
-     * 行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)
+     * 合作范围(关联业务线)
      */
-    private String industryClassify;
+    private Integer collaborationScopeNum;
     /**
-     * 其他资质文件
+     * 合作起始时间
      */
-    private String otherQualifications;
+    private LocalDateTime collaborationTime;
+    /**
+     * 供货量（每月下限）
+     */
+    private Long supplyVolumeDown;
+    /**
+     * 供货量（每月下限）
+     */
+    private Long supplyVolumeUpper;
+    /**
+     * 资金额度
+     */
+    private Long fundLimit;
+    /**
+     * 营业时间
+     */
+    private String businessHours;
+    /**
+     * 允许卸货时间
+     */
+    private LocalDateTime allowableUnloadingTime;
+    /**
+     * 卸货效率
+     */
+    private String unloadingEfficiency;
+    /**
+     * 允许装货时间
+     */
+    private LocalDateTime allowableShipmentTime;
+    /**
+     * 装货效果
+     */
+    private String shipmentEffciency;
+    /**
+     * 付款方式(0：无 1：现金 2：银行转账 3：承兑汇票 4：有赞代收 5：支付宝 6：微信 7：国家列表)
+     *
+     * 枚举 {@link TODO payment_method 对应的类}
+     */
+    private String paymentMethod;
+    /**
+     * 账户名称
+     */
+    private String accountName;
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+    /**
+     * 开户银行
+     */
+    private String bankDeposit;
+    /**
+     * 开户地区
+     */
+    private String depositArea;
+    /**
+     * 支行名称
+     */
+    private String bankBranch;
+    /**
+     * 公司税号
+     */
+    private String companyTaxNumber;
+    /**
+     * 企业名称
+     */
+    private String enterpriseName;
+    /**
+     * 单位地址
+     */
+    private String workAddress;
+    /**
+     * 合作方式(0：买断 1：联营)
+     *
+     * 枚举 {@link TODO collaboration_method 对应的类}
+     */
+    private String collaborationMethod;
+    /**
+     * 结算方式(0:先货后款 1：先款后货)
+     *
+     * 枚举 {@link TODO settlement_method 对应的类}
+     */
+    private String settlementMethod;
+    /**
+     * 账期
+     */
+    private String accountPeriod;
+    /**
+     * 压款方式(0：无 1：按金额 2：按比例)
+     *
+     * 枚举 {@link TODO underpayment_method 对应的类}
+     */
+    private String underpaymentMethod;
+    /**
+     * 默认压款比例
+     */
+    private String defaultUnderpaymentRatio;
+    /**
+     * 申请压款比例
+     */
+    private String applyForUnderpaymentRatio;
+    /**
+     * 保证金方式(0：无 1：按金额 2：按比例)
+     *
+     * 枚举 {@link TODO margin_method 对应的类}
+     */
+    private String marginMethod;
+    /**
+     * 默认保证金比例
+     */
+    private String defaultMarginRatio;
+    /**
+     * 申请保证金比例
+     */
+    private String applyForMarginRatio;
+    /**
+     * 逾期利率(0：按年化1：按月化)
+     *
+     * 枚举 {@link TODO overdue_interest_rate 对应的类}
+     */
+    private String overdueInterestRate;
+    /**
+     * 默认逾期利率
+     */
+    private String defaultOverdueRatio;
+    /**
+     * 申请逾期利率
+     */
+    private String applyForOverdueRatio;
+    /**
+     * 客户联系人id
+     */
+    private Long contactsId;
+    /**
+     * 客户类型
+     */
+    private String customerType;
+    /**
+     * 账户类型
+     */
+    private String accountType;
+    /**
+     * 卸货时长
+     */
+    private String unloading;
+    /**
+     * 装货时长
+     */
+    private String shipment;
 
 }

yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/customer/CustomerMapper.java

@@ -27,7 +27,6 @@ public interface CustomerMapper extends BaseMapperX<CustomerDO> {
                 .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<CustomerDO> {
                 .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<CustomerDO> {
                 .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<CustomerDO> {
                 .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));
     }
 

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<CustomerDO> 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<CustomerDO> list = customerService.getCustomerList(reqVO);