DeXun/fad-l3
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: drop klp_pocketfactory/cgldb/double_rack and related code

Browse Source 
- Remove klp-pocket module entirely (acid/galvanize1/common)
- Remove klp-da OEE files (depended on pocket)
- Remove klp-wms Dr* files (double-rack)
- Strip double-rack code from WmsCoilPendingActionServiceImpl
- Remove acid/galvanize1/double-rack datasources from prod/dev yml
- Remove sql-server-api, da.oee, oee.acid config
This commit is contained in:
wangyu
2026-06-08 15:42:29 +08:00
parent 5cd31efef1
commit e793b19c41
2532 changed files with 13606 additions and 25940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
klp-crm/src/main/java/com/klp/crm/controller/CrmContractController.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.controller;
package com.fad.crm.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.crm.domain.vo.CrmContractVo;
import com.klp.crm.domain.bo.CrmContractBo;
import com.klp.crm.service.ICrmContractService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.crm.domain.vo.CrmContractVo;
import com.fad.crm.domain.bo.CrmContractBo;
import com.fad.crm.service.ICrmContractService;
import com.fad.common.core.page.TableDataInfo;
/**
* 合同信息

28
klp-crm/src/main/java/com/klp/crm/controller/CrmContractProductController.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.controller;
package com.fad.crm.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.crm.domain.vo.CrmContractProductVo;
import com.klp.crm.domain.bo.CrmContractProductBo;
import com.klp.crm.service.ICrmContractProductService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.crm.domain.vo.CrmContractProductVo;
import com.fad.crm.domain.bo.CrmContractProductBo;
import com.fad.crm.service.ICrmContractProductService;
import com.fad.common.core.page.TableDataInfo;
/**
* 合同产品明细

28
klp-crm/src/main/java/com/klp/crm/controller/CrmCustomerController.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.controller;
package com.fad.crm.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.crm.domain.vo.CrmCustomerVo;
import com.klp.crm.domain.bo.CrmCustomerBo;
import com.klp.crm.service.ICrmCustomerService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.crm.domain.vo.CrmCustomerVo;
import com.fad.crm.domain.bo.CrmCustomerBo;
import com.fad.crm.service.ICrmCustomerService;
import com.fad.common.core.page.TableDataInfo;
/**
* 客户信息

40
klp-crm/src/main/java/com/klp/crm/controller/CrmOrderController.java
View File

@@ -1,35 +1,35 @@
package com.klp.crm.controller;
package com.fad.crm.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
import java.util.Date;
import com.klp.aps.domain.bo.ApsPlanDetailBo;
import com.klp.aps.domain.bo.ApsPlanSheetBo;
import com.fad.aps.domain.bo.ApsPlanDetailBo;
import com.fad.aps.domain.bo.ApsPlanSheetBo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.crm.domain.vo.CrmOrderVo;
import com.klp.crm.domain.bo.CrmOrderBo;
import com.klp.crm.service.ICrmOrderService;
import com.klp.common.core.page.TableDataInfo;
import com.klp.aps.domain.vo.ApsPlanSheetVo;
import com.klp.aps.domain.vo.ApsPlanDetailVo;
import com.klp.aps.service.IApsPlanSheetService;
import com.klp.aps.service.IApsPlanDetailService;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.crm.domain.vo.CrmOrderVo;
import com.fad.crm.domain.bo.CrmOrderBo;
import com.fad.crm.service.ICrmOrderService;
import com.fad.common.core.page.TableDataInfo;
import com.fad.aps.domain.vo.ApsPlanSheetVo;
import com.fad.aps.domain.vo.ApsPlanDetailVo;
import com.fad.aps.service.IApsPlanSheetService;
import com.fad.aps.service.IApsPlanDetailService;
/**
* 正式订单主

32
klp-crm/src/main/java/com/klp/crm/controller/CrmOrderItemController.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.controller;
package com.fad.crm.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,21 +8,21 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.crm.domain.vo.CrmOrderItemVo;
import com.klp.crm.domain.vo.CrmContractOrderFinanceVo;
import com.klp.crm.domain.bo.CrmOrderItemBo;
import com.klp.crm.service.ICrmOrderItemService;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.crm.domain.vo.CrmOrderItemVo;
import com.fad.crm.domain.vo.CrmContractOrderFinanceVo;
import com.fad.crm.domain.bo.CrmOrderItemBo;
import com.fad.crm.service.ICrmOrderItemService;
import com.fad.domain.vo.WmsMaterialCoilVo;
import com.fad.common.core.page.TableDataInfo;
/**
* 正式订单明细

28
klp-crm/src/main/java/com/klp/crm/controller/CrmOrderOperationTraceController.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.controller;
package com.fad.crm.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.crm.domain.vo.CrmOrderOperationTraceVo;
import com.klp.crm.domain.bo.CrmOrderOperationTraceBo;
import com.klp.crm.service.ICrmOrderOperationTraceService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.crm.domain.vo.CrmOrderOperationTraceVo;
import com.fad.crm.domain.bo.CrmOrderOperationTraceBo;
import com.fad.crm.service.ICrmOrderOperationTraceService;
import com.fad.common.core.page.TableDataInfo;
/**
* 订单操作追溯

28
klp-crm/src/main/java/com/klp/crm/controller/CrmSalesContractController.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.controller;
package com.fad.crm.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.crm.domain.vo.CrmSalesContractVo;
import com.klp.crm.domain.bo.CrmSalesContractBo;
import com.klp.crm.service.ICrmSalesContractService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.crm.domain.vo.CrmSalesContractVo;
import com.fad.crm.domain.bo.CrmSalesContractBo;
import com.fad.crm.service.ICrmSalesContractService;
import com.fad.common.core.page.TableDataInfo;
/**
* 销售合同

28
klp-crm/src/main/java/com/klp/crm/controller/CrmSalesObjectionController.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.controller;
package com.fad.crm.controller;
import java.util.List;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.crm.domain.vo.CrmSalesObjectionVo;
import com.klp.crm.domain.bo.CrmSalesObjectionBo;
import com.klp.crm.service.ICrmSalesObjectionService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.crm.domain.vo.CrmSalesObjectionVo;
import com.fad.crm.domain.bo.CrmSalesObjectionBo;
import com.fad.crm.service.ICrmSalesObjectionService;
import com.fad.common.core.page.TableDataInfo;
/**
* 销售异议管理

24
klp-crm/src/main/java/com/klp/crm/controller/CrmSalesReportController.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.controller;
package com.fad.crm.controller;
import java.util.List;
@@ -7,16 +7,16 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.crm.domain.vo.CrmSalesReportVo;
import com.klp.crm.domain.bo.CrmSalesReportBo;
import com.klp.crm.service.ICrmSalesReportService;
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.crm.domain.vo.CrmSalesReportVo;
import com.fad.crm.domain.bo.CrmSalesReportBo;
import com.fad.crm.service.ICrmSalesReportService;
import com.fad.common.core.page.TableDataInfo;
/**
* 销售报表
@@ -133,4 +133,4 @@ public class CrmSalesReportController extends BaseController {
List<CrmSalesReportVo.IndustryStat> list = iCrmSalesReportService.queryIndustryStats(bo);
ExcelUtil.exportExcel(list, "行业统计", CrmSalesReportVo.IndustryStat.class, response);
}
}
}

4
klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain;
package com.fad.crm.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-crm/src/main/java/com/klp/crm/domain/CrmContractProduct.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain;
package com.fad.crm.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-crm/src/main/java/com/klp/crm/domain/CrmCustomer.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain;
package com.fad.crm.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain;
package com.fad.crm.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain;
package com.fad.crm.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-crm/src/main/java/com/klp/crm/domain/CrmOrderOperationTrace.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain;
package com.fad.crm.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-crm/src/main/java/com/klp/crm/domain/CrmSalesContract.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain;
package com.fad.crm.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-crm/src/main/java/com/klp/crm/domain/CrmSalesObjection.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain;
package com.fad.crm.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractBo.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain.bo;
package com.fad.crm.domain.bo;
import org.springframework.format.annotation.DateTimeFormat;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractProductBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.crm.domain.bo;
package com.fad.crm.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmCustomerBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.crm.domain.bo;
package com.fad.crm.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.crm.domain.bo;
package com.fad.crm.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.crm.domain.bo;
package com.fad.crm.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderOperationTraceBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.crm.domain.bo;
package com.fad.crm.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmSalesContractBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.crm.domain.bo;
package com.fad.crm.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

4
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmSalesObjectionBo.java
View File

@@ -1,6 +1,6 @@
package com.klp.crm.domain.bo;
package com.fad.crm.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

6
klp-crm/src/main/java/com/klp/crm/domain/bo/CrmSalesReportBo.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.domain.bo;
package com.fad.crm.domain.bo;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;

6
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractOrderFinanceVo.java
View File

@@ -1,7 +1,7 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import com.klp.domain.vo.WmsDeliveryWaybillVo;
import com.klp.domain.vo.WmsReceivableVo;
import com.fad.domain.vo.WmsDeliveryWaybillVo;
import com.fad.domain.vo.WmsReceivableVo;
import lombok.Data;
import java.util.List;

6
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractProductVo.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

6
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractVo.java
View File

@@ -1,11 +1,11 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

6
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmCustomerVo.java
View File

@@ -1,9 +1,9 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

6
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
View File

@@ -1,12 +1,12 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

8
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderOperationTraceVo.java
View File

@@ -1,12 +1,12 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;

10
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
@@ -7,10 +7,10 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.klp.common.core.domain.BaseEntity;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import com.fad.common.core.domain.BaseEntity;
import com.fad.domain.vo.WmsMaterialCoilVo;
import lombok.Data;

6
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmSalesContractVo.java
View File

@@ -1,12 +1,12 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;

8
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmSalesObjectionVo.java
View File

@@ -1,12 +1,12 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;
@@ -131,6 +131,6 @@ public class CrmSalesObjectionVo {
/**
* 钢卷信息列表
*/
private List<com.klp.domain.vo.WmsMaterialCoilVo> coilList;
private List<com.fad.domain.vo.WmsMaterialCoilVo> coilList;
}

4
klp-crm/src/main/java/com/klp/crm/domain/vo/CrmSalesReportVo.java
View File

@@ -1,4 +1,4 @@
package com.klp.crm.domain.vo;
package com.fad.crm.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
@@ -6,7 +6,7 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.crm.domain.CrmOrderItem;
import com.fad.crm.domain.CrmOrderItem;
import lombok.Data;
/**

8
klp-crm/src/main/java/com/klp/crm/mapper/CrmContractMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.crm.mapper;
package com.fad.crm.mapper;
import com.klp.crm.domain.CrmContract;
import com.klp.crm.domain.vo.CrmContractVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.crm.domain.CrmContract;
import com.fad.crm.domain.vo.CrmContractVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 合同信息Mapper接口

8
klp-crm/src/main/java/com/klp/crm/mapper/CrmContractProductMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.crm.mapper;
package com.fad.crm.mapper;
import com.klp.crm.domain.CrmContractProduct;
import com.klp.crm.domain.vo.CrmContractProductVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.crm.domain.CrmContractProduct;
import com.fad.crm.domain.vo.CrmContractProductVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 合同产品明细Mapper接口

8
klp-crm/src/main/java/com/klp/crm/mapper/CrmCustomerMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.crm.mapper;
package com.fad.crm.mapper;
import com.klp.crm.domain.CrmCustomer;
import com.klp.crm.domain.vo.CrmCustomerVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.crm.domain.CrmCustomer;
import com.fad.crm.domain.vo.CrmCustomerVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 客户信息Mapper接口

10
klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderItemMapper.java
View File

@@ -1,9 +1,9 @@
package com.klp.crm.mapper;
package com.fad.crm.mapper;
import com.klp.crm.domain.CrmOrderItem;
import com.klp.crm.domain.bo.CrmOrderItemBo;
import com.klp.crm.domain.vo.CrmOrderItemVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.crm.domain.CrmOrderItem;
import com.fad.crm.domain.bo.CrmOrderItemBo;
import com.fad.crm.domain.vo.CrmOrderItemVo;
import com.fad.common.core.mapper.BaseMapperPlus;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;

8
klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderMapper.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.mapper;
package com.fad.crm.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.crm.domain.CrmOrder;
import com.klp.crm.domain.vo.CrmOrderVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.crm.domain.CrmOrder;
import com.fad.crm.domain.vo.CrmOrderVo;
import com.fad.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;

8
klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderOperationTraceMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.crm.mapper;
package com.fad.crm.mapper;
import com.klp.crm.domain.CrmOrderOperationTrace;
import com.klp.crm.domain.vo.CrmOrderOperationTraceVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.crm.domain.CrmOrderOperationTrace;
import com.fad.crm.domain.vo.CrmOrderOperationTraceVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 订单操作追溯Mapper接口

8
klp-crm/src/main/java/com/klp/crm/mapper/CrmSalesContractMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.crm.mapper;
package com.fad.crm.mapper;
import com.klp.crm.domain.CrmSalesContract;
import com.klp.crm.domain.vo.CrmSalesContractVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.crm.domain.CrmSalesContract;
import com.fad.crm.domain.vo.CrmSalesContractVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 销售合同Mapper接口

8
klp-crm/src/main/java/com/klp/crm/mapper/CrmSalesObjectionMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.crm.mapper;
package com.fad.crm.mapper;
import com.klp.crm.domain.CrmSalesObjection;
import com.klp.crm.domain.vo.CrmSalesObjectionVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.crm.domain.CrmSalesObjection;
import com.fad.crm.domain.vo.CrmSalesObjectionVo;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* 销售异议管理Mapper接口

10
klp-crm/src/main/java/com/klp/crm/mapper/CrmSalesReportMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.crm.mapper;
package com.fad.crm.mapper;
import com.klp.crm.domain.vo.CrmSalesReportVo;
import com.klp.crm.domain.bo.CrmSalesReportBo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.crm.domain.vo.CrmSalesReportVo;
import com.fad.crm.domain.bo.CrmSalesReportBo;
import com.fad.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -62,4 +62,4 @@ public interface CrmSalesReportMapper {
* @return 省份统计列表
*/
List<CrmSalesReportVo.ProvinceStat> selectProvinceStats(@Param("bo") CrmSalesReportBo bo);
}
}

12
klp-crm/src/main/java/com/klp/crm/service/ICrmContractProductService.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.service;
package com.fad.crm.service;
import com.klp.crm.domain.CrmContractProduct;
import com.klp.crm.domain.vo.CrmContractProductVo;
import com.klp.crm.domain.bo.CrmContractProductBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.crm.domain.CrmContractProduct;
import com.fad.crm.domain.vo.CrmContractProductVo;
import com.fad.crm.domain.bo.CrmContractProductBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-crm/src/main/java/com/klp/crm/service/ICrmContractService.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.service;
package com.fad.crm.service;
import com.klp.crm.domain.CrmContract;
import com.klp.crm.domain.vo.CrmContractVo;
import com.klp.crm.domain.bo.CrmContractBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.crm.domain.CrmContract;
import com.fad.crm.domain.vo.CrmContractVo;
import com.fad.crm.domain.bo.CrmContractBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-crm/src/main/java/com/klp/crm/service/ICrmCustomerService.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.service;
package com.fad.crm.service;
import com.klp.crm.domain.CrmCustomer;
import com.klp.crm.domain.vo.CrmCustomerVo;
import com.klp.crm.domain.bo.CrmCustomerBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.crm.domain.CrmCustomer;
import com.fad.crm.domain.vo.CrmCustomerVo;
import com.fad.crm.domain.bo.CrmCustomerBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

17
klp-crm/src/main/java/com/klp/crm/service/ICrmOrderItemService.java
View File

@@ -1,16 +1,15 @@
package com.klp.crm.service;
package com.fad.crm.service;
import com.klp.crm.domain.CrmOrderItem;
import com.klp.crm.domain.vo.CrmOrderItemVo;
import com.klp.crm.domain.bo.CrmOrderItemBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.crm.domain.CrmOrderItem;
import com.fad.crm.domain.vo.CrmOrderItemVo;
import com.fad.crm.domain.bo.CrmOrderItemBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
import com.klp.crm.domain.vo.CrmContractOrderFinanceVo;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.fad.crm.domain.vo.CrmContractOrderFinanceVo;
import com.fad.domain.vo.WmsMaterialCoilVo;
import java.util.List;
/**

12
klp-crm/src/main/java/com/klp/crm/service/ICrmOrderOperationTraceService.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.service;
package com.fad.crm.service;
import com.klp.crm.domain.CrmOrderOperationTrace;
import com.klp.crm.domain.vo.CrmOrderOperationTraceVo;
import com.klp.crm.domain.bo.CrmOrderOperationTraceBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.crm.domain.CrmOrderOperationTrace;
import com.fad.crm.domain.vo.CrmOrderOperationTraceVo;
import com.fad.crm.domain.bo.CrmOrderOperationTraceBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-crm/src/main/java/com/klp/crm/service/ICrmOrderService.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.service;
package com.fad.crm.service;
import com.klp.crm.domain.CrmOrder;
import com.klp.crm.domain.vo.CrmOrderVo;
import com.klp.crm.domain.bo.CrmOrderBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.crm.domain.CrmOrder;
import com.fad.crm.domain.vo.CrmOrderVo;
import com.fad.crm.domain.bo.CrmOrderBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-crm/src/main/java/com/klp/crm/service/ICrmSalesContractService.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.service;
package com.fad.crm.service;
import com.klp.crm.domain.CrmSalesContract;
import com.klp.crm.domain.vo.CrmSalesContractVo;
import com.klp.crm.domain.bo.CrmSalesContractBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.crm.domain.CrmSalesContract;
import com.fad.crm.domain.vo.CrmSalesContractVo;
import com.fad.crm.domain.bo.CrmSalesContractBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-crm/src/main/java/com/klp/crm/service/ICrmSalesObjectionService.java
View File

@@ -1,10 +1,10 @@
package com.klp.crm.service;
package com.fad.crm.service;
import com.klp.crm.domain.CrmSalesObjection;
import com.klp.crm.domain.vo.CrmSalesObjectionVo;
import com.klp.crm.domain.bo.CrmSalesObjectionBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.crm.domain.CrmSalesObjection;
import com.fad.crm.domain.vo.CrmSalesObjectionVo;
import com.fad.crm.domain.bo.CrmSalesObjectionBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;

12
klp-crm/src/main/java/com/klp/crm/service/ICrmSalesReportService.java
View File

@@ -1,9 +1,9 @@
package com.klp.crm.service;
package com.fad.crm.service;
import com.klp.crm.domain.vo.CrmSalesReportVo;
import com.klp.crm.domain.bo.CrmSalesReportBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.crm.domain.vo.CrmSalesReportVo;
import com.fad.crm.domain.bo.CrmSalesReportBo;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import java.util.List;
@@ -80,4 +80,4 @@ public interface ICrmSalesReportService {
* @return 省份统计列表
*/
List<CrmSalesReportVo.ProvinceStat> queryProvinceStats(CrmSalesReportBo bo);
}
}

18
klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractProductServiceImpl.java
View File

@@ -1,19 +1,19 @@
package com.klp.crm.service.impl;
package com.fad.crm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.fad.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.crm.domain.bo.CrmContractProductBo;
import com.klp.crm.domain.vo.CrmContractProductVo;
import com.klp.crm.domain.CrmContractProduct;
import com.klp.crm.mapper.CrmContractProductMapper;
import com.klp.crm.service.ICrmContractProductService;
import com.fad.crm.domain.bo.CrmContractProductBo;
import com.fad.crm.domain.vo.CrmContractProductVo;
import com.fad.crm.domain.CrmContractProduct;
import com.fad.crm.mapper.CrmContractProductMapper;
import com.fad.crm.service.ICrmContractProductService;
import java.util.List;
import java.util.Map;

18
klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractServiceImpl.java
View File

@@ -1,19 +1,19 @@
package com.klp.crm.service.impl;
package com.fad.crm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.fad.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.crm.domain.bo.CrmContractBo;
import com.klp.crm.domain.vo.CrmContractVo;
import com.klp.crm.domain.CrmContract;
import com.klp.crm.mapper.CrmContractMapper;
import com.klp.crm.service.ICrmContractService;
import com.fad.crm.domain.bo.CrmContractBo;
import com.fad.crm.domain.vo.CrmContractVo;
import com.fad.crm.domain.CrmContract;
import com.fad.crm.mapper.CrmContractMapper;
import com.fad.crm.service.ICrmContractService;
import java.util.List;
import java.util.Map;

18
klp-crm/src/main/java/com/klp/crm/service/impl/CrmCustomerServiceImpl.java
View File

@@ -1,19 +1,19 @@
package com.klp.crm.service.impl;
package com.fad.crm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.fad.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.crm.domain.bo.CrmCustomerBo;
import com.klp.crm.domain.vo.CrmCustomerVo;
import com.klp.crm.domain.CrmCustomer;
import com.klp.crm.mapper.CrmCustomerMapper;
import com.klp.crm.service.ICrmCustomerService;
import com.fad.crm.domain.bo.CrmCustomerBo;
import com.fad.crm.domain.vo.CrmCustomerVo;
import com.fad.crm.domain.CrmCustomer;
import com.fad.crm.mapper.CrmCustomerMapper;
import com.fad.crm.service.ICrmCustomerService;
import java.util.List;
import java.util.Map;

66
klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
View File

@@ -1,41 +1,41 @@
package com.klp.crm.service.impl;
package com.fad.crm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.klp.crm.domain.CrmSalesObjection;
import com.klp.crm.domain.bo.CrmOrderBo;
import com.klp.crm.domain.vo.CrmOrderVo;
import com.klp.crm.service.ICrmOrderService;
import com.klp.domain.WmsMaterialCoil;
import com.klp.domain.WmsReceivable;
import com.klp.domain.vo.WmsDeliveryWaybillVo;
import com.fad.common.utils.StringUtils;
import com.fad.crm.domain.CrmSalesObjection;
import com.fad.crm.domain.bo.CrmOrderBo;
import com.fad.crm.domain.vo.CrmOrderVo;
import com.fad.crm.service.ICrmOrderService;
import com.fad.domain.WmsMaterialCoil;
import com.fad.domain.WmsReceivable;
import com.fad.domain.vo.WmsDeliveryWaybillVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.crm.domain.bo.CrmOrderItemBo;
import com.klp.crm.domain.vo.CrmOrderItemVo;
import com.klp.crm.domain.vo.CrmContractOrderFinanceVo;
import com.klp.crm.domain.vo.CrmSalesObjectionVo;
import com.klp.domain.vo.WmsReceivableVo;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.crm.domain.CrmOrderItem;
import com.klp.crm.domain.CrmOrder;
import com.klp.domain.WmsDeliveryWaybill;
import com.klp.domain.WmsDeliveryWaybillDetail;
import com.klp.crm.mapper.CrmOrderItemMapper;
import com.klp.crm.mapper.CrmOrderMapper;
import com.klp.crm.mapper.CrmSalesObjectionMapper;
import com.klp.crm.service.ICrmOrderItemService;
import com.klp.mapper.WmsReceivableMapper;
import com.klp.mapper.WmsDeliveryWaybillMapper;
import com.klp.mapper.WmsDeliveryWaybillDetailMapper;
import com.klp.service.IWmsMaterialCoilService;
import com.fad.crm.domain.bo.CrmOrderItemBo;
import com.fad.crm.domain.vo.CrmOrderItemVo;
import com.fad.crm.domain.vo.CrmContractOrderFinanceVo;
import com.fad.crm.domain.vo.CrmSalesObjectionVo;
import com.fad.domain.vo.WmsReceivableVo;
import com.fad.domain.vo.WmsMaterialCoilVo;
import com.fad.domain.bo.WmsMaterialCoilBo;
import com.fad.crm.domain.CrmOrderItem;
import com.fad.crm.domain.CrmOrder;
import com.fad.domain.WmsDeliveryWaybill;
import com.fad.domain.WmsDeliveryWaybillDetail;
import com.fad.crm.mapper.CrmOrderItemMapper;
import com.fad.crm.mapper.CrmOrderMapper;
import com.fad.crm.mapper.CrmSalesObjectionMapper;
import com.fad.crm.service.ICrmOrderItemService;
import com.fad.mapper.WmsReceivableMapper;
import com.fad.mapper.WmsDeliveryWaybillMapper;
import com.fad.mapper.WmsDeliveryWaybillDetailMapper;
import com.fad.service.IWmsMaterialCoilService;
import java.util.*;
import java.util.stream.Collectors;
@@ -123,7 +123,7 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
boolean hasCustomerFilter = StringUtils.isNotBlank(bo.getCustomer());
boolean hasSignDateFilter = bo.getSignDateStart() != null || bo.getSignDateEnd() != null;
boolean hasDeliveryDateFilter = bo.getDeliveryDateStart() != null || bo.getDeliveryDateEnd() != null;
if (!hasContractFilter && !hasCustomerFilter && !hasSignDateFilter && !hasDeliveryDateFilter) {
return null;
}
@@ -273,7 +273,7 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
List<CrmSalesObjectionVo> objectionList = crmSalesObjectionMapper.selectVoList(objectionWrapper);
result.setObjectionList(objectionList);
LambdaQueryWrapper<com.klp.domain.WmsReceivable> receivableWrapper = new LambdaQueryWrapper<>();
LambdaQueryWrapper<com.fad.domain.WmsReceivable> receivableWrapper = new LambdaQueryWrapper<>();
receivableWrapper.in(WmsReceivable::getOrderId, orderIds);
List<WmsReceivableVo> receivableList = wmsReceivableMapper.selectVoList(receivableWrapper);
result.setReceivableList(receivableList);
@@ -384,7 +384,7 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
List<CrmSalesObjectionVo> objectionList = crmSalesObjectionMapper.selectVoList(objectionWrapper);
result.setObjectionList(objectionList);
LambdaQueryWrapper<com.klp.domain.WmsReceivable> receivableWrapper = new LambdaQueryWrapper<>();
LambdaQueryWrapper<com.fad.domain.WmsReceivable> receivableWrapper = new LambdaQueryWrapper<>();
receivableWrapper.in(WmsReceivable::getOrderId, orderIds);
List<WmsReceivableVo> receivableList = wmsReceivableMapper.selectVoList(receivableWrapper);
result.setReceivableList(receivableList);

22
klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderOperationTraceServiceImpl.java
View File

@@ -1,21 +1,21 @@
package com.klp.crm.service.impl;
package com.fad.crm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.system.service.ISysUserService;
import com.fad.common.utils.StringUtils;
import com.fad.domain.vo.WmsMaterialCoilVo;
import com.fad.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.crm.domain.bo.CrmOrderOperationTraceBo;
import com.klp.crm.domain.vo.CrmOrderOperationTraceVo;
import com.klp.crm.domain.CrmOrderOperationTrace;
import com.klp.crm.mapper.CrmOrderOperationTraceMapper;
import com.klp.crm.service.ICrmOrderOperationTraceService;
import com.fad.crm.domain.bo.CrmOrderOperationTraceBo;
import com.fad.crm.domain.vo.CrmOrderOperationTraceVo;
import com.fad.crm.domain.CrmOrderOperationTrace;
import com.fad.crm.mapper.CrmOrderOperationTraceMapper;
import com.fad.crm.service.ICrmOrderOperationTraceService;
import java.util.*;
import java.util.stream.Collectors;

42
klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java
View File

@@ -1,32 +1,32 @@
package com.klp.crm.service.impl;
package com.fad.crm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.klp.crm.domain.vo.CrmOrderOperationTraceVo;
import com.klp.mapper.WmsCoilContractRelMapper;
import com.klp.system.service.ISysUserService;
import com.fad.common.utils.StringUtils;
import com.fad.crm.domain.vo.CrmOrderOperationTraceVo;
import com.fad.mapper.WmsCoilContractRelMapper;
import com.fad.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.crm.domain.bo.CrmOrderBo;
import com.klp.crm.domain.vo.CrmOrderVo;
import com.klp.crm.domain.CrmOrder;
import com.klp.crm.mapper.CrmOrderMapper;
import com.klp.crm.service.ICrmOrderService;
import com.klp.domain.WmsCoilContractRel;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.service.IWmsCoilContractRelService;
import com.klp.service.IWmsMaterialCoilService;
import com.klp.domain.WmsDeliveryWaybill;
import com.klp.domain.WmsDeliveryWaybillDetail;
import com.klp.mapper.WmsDeliveryWaybillDetailMapper;
import com.klp.mapper.WmsDeliveryWaybillMapper;
import com.fad.crm.domain.bo.CrmOrderBo;
import com.fad.crm.domain.vo.CrmOrderVo;
import com.fad.crm.domain.CrmOrder;
import com.fad.crm.mapper.CrmOrderMapper;
import com.fad.crm.service.ICrmOrderService;
import com.fad.domain.WmsCoilContractRel;
import com.fad.domain.bo.WmsMaterialCoilBo;
import com.fad.domain.vo.WmsMaterialCoilVo;
import com.fad.service.IWmsCoilContractRelService;
import com.fad.service.IWmsMaterialCoilService;
import com.fad.domain.WmsDeliveryWaybill;
import com.fad.domain.WmsDeliveryWaybillDetail;
import com.fad.mapper.WmsDeliveryWaybillDetailMapper;
import com.fad.mapper.WmsDeliveryWaybillMapper;
import java.util.*;
import java.util.stream.Collectors;

18
klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesContractServiceImpl.java
View File

@@ -1,19 +1,19 @@
package com.klp.crm.service.impl;
package com.fad.crm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.fad.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.crm.domain.bo.CrmSalesContractBo;
import com.klp.crm.domain.vo.CrmSalesContractVo;
import com.klp.crm.domain.CrmSalesContract;
import com.klp.crm.mapper.CrmSalesContractMapper;
import com.klp.crm.service.ICrmSalesContractService;
import com.fad.crm.domain.bo.CrmSalesContractBo;
import com.fad.crm.domain.vo.CrmSalesContractVo;
import com.fad.crm.domain.CrmSalesContract;
import com.fad.crm.mapper.CrmSalesContractMapper;
import com.fad.crm.service.ICrmSalesContractService;
import java.util.List;
import java.util.Map;

32
klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesObjectionServiceImpl.java
View File

@@ -1,22 +1,22 @@
package com.klp.crm.service.impl;
package com.fad.crm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.fad.common.utils.StringUtils;
import com.fad.domain.bo.WmsMaterialCoilBo;
import com.fad.domain.vo.WmsMaterialCoilVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.crm.domain.bo.CrmSalesObjectionBo;
import com.klp.crm.domain.vo.CrmSalesObjectionVo;
import com.klp.crm.domain.CrmSalesObjection;
import com.klp.crm.mapper.CrmSalesObjectionMapper;
import com.klp.crm.service.ICrmSalesObjectionService;
import com.klp.service.IWmsMaterialCoilService;
import com.fad.crm.domain.bo.CrmSalesObjectionBo;
import com.fad.crm.domain.vo.CrmSalesObjectionVo;
import com.fad.crm.domain.CrmSalesObjection;
import com.fad.crm.mapper.CrmSalesObjectionMapper;
import com.fad.crm.service.ICrmSalesObjectionService;
import com.fad.service.IWmsMaterialCoilService;
import java.util.List;
import java.util.Map;
@@ -43,9 +43,9 @@ public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
public CrmSalesObjectionVo queryById(String objectionId){
CrmSalesObjectionVo vo = baseMapper.selectVoById(objectionId);
if (vo != null && StringUtils.isNotBlank(vo.getCoilIds())) {
com.klp.domain.bo.WmsMaterialCoilBo coilBo = new com.klp.domain.bo.WmsMaterialCoilBo();
com.fad.domain.bo.WmsMaterialCoilBo coilBo = new com.fad.domain.bo.WmsMaterialCoilBo();
coilBo.setCoilIds(vo.getCoilIds());
List<com.klp.domain.vo.WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
List<com.fad.domain.vo.WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
vo.setCoilList(coilList);
}
return vo;
@@ -83,9 +83,9 @@ public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
// 查询钢卷信息并填充到VO中
for (CrmSalesObjectionVo vo : resultList) {
if (StringUtils.isNotBlank(vo.getCoilIds())) {
com.klp.domain.bo.WmsMaterialCoilBo coilBo = new com.klp.domain.bo.WmsMaterialCoilBo();
com.fad.domain.bo.WmsMaterialCoilBo coilBo = new com.fad.domain.bo.WmsMaterialCoilBo();
coilBo.setCoilIds(vo.getCoilIds());
List<com.klp.domain.vo.WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
List<com.fad.domain.vo.WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
vo.setCoilList(coilList);
}
}

20
klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesReportServiceImpl.java
View File

@@ -1,16 +1,16 @@
package com.klp.crm.service.impl;
package com.fad.crm.service.impl;
import com.klp.crm.domain.CrmOrderItem;
import com.klp.crm.mapper.CrmOrderItemMapper;
import com.fad.crm.domain.CrmOrderItem;
import com.fad.crm.mapper.CrmOrderItemMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.utils.StringUtils;
import com.klp.crm.domain.vo.CrmSalesReportVo;
import com.klp.crm.domain.bo.CrmSalesReportBo;
import com.klp.crm.mapper.CrmSalesReportMapper;
import com.klp.crm.service.ICrmSalesReportService;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.utils.StringUtils;
import com.fad.crm.domain.vo.CrmSalesReportVo;
import com.fad.crm.domain.bo.CrmSalesReportBo;
import com.fad.crm.mapper.CrmSalesReportMapper;
import com.fad.crm.service.ICrmSalesReportService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;

4
klp-crm/src/main/resources/mapper/CrmContractMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.crm.mapper.CrmContractMapper">
<mapper namespace="com.fad.crm.mapper.CrmContractMapper">
<resultMap type="com.klp.crm.domain.CrmContract" id="CrmContractResult">
<resultMap type="com.fad.crm.domain.CrmContract" id="CrmContractResult">
<result property="contractId" column="contract_id"/>
<result property="contractName" column="contract_name"/>
<result property="contractNo" column="contract_no"/>

4
klp-crm/src/main/resources/mapper/CrmContractProductMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.crm.mapper.CrmContractProductMapper">
<mapper namespace="com.fad.crm.mapper.CrmContractProductMapper">
<resultMap type="com.klp.crm.domain.CrmContractProduct" id="CrmContractProductResult">
<resultMap type="com.fad.crm.domain.CrmContractProduct" id="CrmContractProductResult">
<result property="contractProductId" column="contract_product_id"/>
<result property="contractId" column="contract_id"/>
<result property="productName" column="product_name"/>

4
klp-crm/src/main/resources/mapper/CrmCustomerMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.crm.mapper.CrmCustomerMapper">
<mapper namespace="com.fad.crm.mapper.CrmCustomerMapper">
<resultMap type="com.klp.crm.domain.CrmCustomer" id="CrmCustomerResult">
<resultMap type="com.fad.crm.domain.CrmCustomer" id="CrmCustomerResult">
<result property="customerId" column="customer_id"/>
<result property="customerCode" column="customer_code"/>
<result property="companyName" column="company_name"/>

6
klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.crm.mapper.CrmOrderItemMapper">
<mapper namespace="com.fad.crm.mapper.CrmOrderItemMapper">
<resultMap type="com.klp.crm.domain.CrmOrderItem" id="CrmOrderItemResult">
<resultMap type="com.fad.crm.domain.CrmOrderItem" id="CrmOrderItemResult">
<result property="itemId" column="item_id"/>
<result property="orderId" column="order_id"/>
<result property="productType" column="product_type"/>
@@ -37,7 +37,7 @@
<result property="delFlag" column="del_flag"/>
</resultMap>
<!-- 联表查询结果映射 -->
<resultMap type="com.klp.crm.domain.vo.CrmOrderItemVo" id="CrmOrderItemVoResult">
<resultMap type="com.fad.crm.domain.vo.CrmOrderItemVo" id="CrmOrderItemVoResult">
<result property="itemId" column="item_id"/>
<result property="orderId" column="order_id"/>
<result property="productType" column="product_type"/>

8
klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.crm.mapper.CrmOrderMapper">
<mapper namespace="com.fad.crm.mapper.CrmOrderMapper">
<resultMap type="com.klp.crm.domain.CrmOrder" id="CrmOrderResult">
<resultMap type="com.fad.crm.domain.CrmOrder" id="CrmOrderResult">
<result property="orderId" column="order_id"/>
<result property="orderCode" column="order_code"/>
<result property="orderType" column="order_type"/>
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag"/>
<result property="isTop" column="is_top"/>
</resultMap>
<select id="selectVoPagePlus" resultType="com.klp.crm.domain.vo.CrmOrderVo">
<select id="selectVoPagePlus" resultType="com.fad.crm.domain.vo.CrmOrderVo">
SELECT
co.order_id AS orderId,
co.order_code AS orderCode,
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectVoById" resultType="com.klp.crm.domain.vo.CrmOrderVo">
<select id="selectVoById" resultType="com.fad.crm.domain.vo.CrmOrderVo">
SELECT
co.order_id AS orderId,
co.order_code AS orderCode,

4
klp-crm/src/main/resources/mapper/CrmOrderOperationTraceMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.crm.mapper.CrmOrderOperationTraceMapper">
<mapper namespace="com.fad.crm.mapper.CrmOrderOperationTraceMapper">
<resultMap type="com.klp.crm.domain.CrmOrderOperationTrace" id="CrmOrderOperationTraceResult">
<resultMap type="com.fad.crm.domain.CrmOrderOperationTrace" id="CrmOrderOperationTraceResult">
<result property="traceId" column="trace_id"/>
<result property="orderId" column="order_id"/>
<result property="operationType" column="operation_type"/>

4
klp-crm/src/main/resources/mapper/CrmSalesContractMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.crm.mapper.CrmSalesContractMapper">
<mapper namespace="com.fad.crm.mapper.CrmSalesContractMapper">
<resultMap type="com.klp.crm.domain.CrmSalesContract" id="CrmSalesContractResult">
<resultMap type="com.fad.crm.domain.CrmSalesContract" id="CrmSalesContractResult">
<result property="contractId" column="contract_id"/>
<result property="contractCode" column="contract_code"/>
<result property="contractType" column="contract_type"/>

4
klp-crm/src/main/resources/mapper/CrmSalesObjectionMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.crm.mapper.CrmSalesObjectionMapper">
<mapper namespace="com.fad.crm.mapper.CrmSalesObjectionMapper">
<resultMap type="com.klp.crm.domain.CrmSalesObjection" id="CrmSalesObjectionResult">
<resultMap type="com.fad.crm.domain.CrmSalesObjection" id="CrmSalesObjectionResult">
<result property="objectionId" column="objection_id"/>
<result property="objectionCode" column="objection_code"/>
<result property="orderId" column="order_id"/>

14
klp-crm/src/main/resources/mapper/CrmSalesReportMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.crm.mapper.CrmSalesReportMapper">
<mapper namespace="com.fad.crm.mapper.CrmSalesReportMapper">
<!-- 通用查询条件 -->
<sql id="selectCondition">
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<!-- 查询销售汇总统计数据 -->
<select id="selectSalesSummary" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$SalesSummary">
<select id="selectSalesSummary" resultType="com.fad.crm.domain.vo.CrmSalesReportVo$SalesSummary">
SELECT
COUNT(o.order_id) as totalOrderCount,
COALESCE(SUM(o.order_amount), 0) as totalSalesAmount,
@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!-- 查询订单明细列表 -->
<select id="selectOrderDetailList" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$OrderDetail">
<select id="selectOrderDetailList" resultType="com.fad.crm.domain.vo.CrmSalesReportVo$OrderDetail">
SELECT
o.order_id,
o.order_code,
@@ -146,7 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!-- 查询销售员统计数据 -->
<select id="selectSalesmanStats" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$SalesmanStat">
<select id="selectSalesmanStats" resultType="com.fad.crm.domain.vo.CrmSalesReportVo$SalesmanStat">
SELECT
o.salesman,
COUNT(o.order_id) as orderCount,
@@ -241,7 +241,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!-- 查询客户等级统计数据 -->
<select id="selectCustomerLevelStats" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$CustomerLevelStat">
<select id="selectCustomerLevelStats" resultType="com.fad.crm.domain.vo.CrmSalesReportVo$CustomerLevelStat">
SELECT
c.customer_level,
COUNT(DISTINCT c.customer_id) as customerCount,
@@ -255,7 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!-- 查询行业统计数据 -->
<select id="selectIndustryStats" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$IndustryStat">
<select id="selectIndustryStats" resultType="com.fad.crm.domain.vo.CrmSalesReportVo$IndustryStat">
SELECT
COALESCE(c.industry, '未分类') as industry,
COUNT(DISTINCT c.customer_id) as customerCount,
@@ -269,7 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!-- 查询省份统计数据 -->
<select id="selectProvinceStats" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$ProvinceStat">
<select id="selectProvinceStats" resultType="com.fad.crm.domain.vo.CrmSalesReportVo$ProvinceStat">
SELECT
COALESCE(c.province, '其他') as province,
COUNT(DISTINCT c.customer_id) as customerCount,