提交

hx-purchase/src/main/java/com/fjhx/purchase/service/refund/RefundDetailService.java

@@ -1,11 +1,11 @@
 package com.fjhx.purchase.service.refund;
 
-import com.fjhx.purchase.entity.refund.po.RefundDetail;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.refund.vo.RefundDetailVo;
-import com.fjhx.purchase.entity.refund.dto.RefundDetailSelectDto;
 import com.fjhx.purchase.entity.refund.dto.RefundDetailDto;
+import com.fjhx.purchase.entity.refund.dto.RefundDetailSelectDto;
+import com.fjhx.purchase.entity.refund.po.RefundDetail;
+import com.fjhx.purchase.entity.refund.vo.RefundDetailVo;
+import com.ruoyi.common.core.service.BaseService;
 
 
 /**

hx-purchase/src/main/java/com/fjhx/purchase/service/refund/RefundService.java

@@ -1,14 +1,11 @@
 package com.fjhx.purchase.service.refund;
 
-import com.fjhx.purchase.entity.refund.po.Refund;
-import com.fjhx.purchase.entity.sales.po.SalesReturn;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.refund.vo.RefundVo;
-import com.fjhx.purchase.entity.refund.dto.RefundSelectDto;
 import com.fjhx.purchase.entity.refund.dto.RefundDto;
-
-import java.util.List;
+import com.fjhx.purchase.entity.refund.dto.RefundSelectDto;
+import com.fjhx.purchase.entity.refund.po.Refund;
+import com.fjhx.purchase.entity.refund.vo.RefundVo;
+import com.ruoyi.common.core.service.BaseService;
 
 
 /**

hx-purchase/src/main/java/com/fjhx/purchase/service/refund/impl/RefundDetailServiceImpl.java

@@ -1,16 +1,16 @@
 package com.fjhx.purchase.service.refund.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.purchase.entity.refund.dto.RefundDetailDto;
+import com.fjhx.purchase.entity.refund.dto.RefundDetailSelectDto;
 import com.fjhx.purchase.entity.refund.po.RefundDetail;
+import com.fjhx.purchase.entity.refund.vo.RefundDetailVo;
 import com.fjhx.purchase.mapper.refund.RefundDetailMapper;
 import com.fjhx.purchase.service.refund.RefundDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.refund.vo.RefundDetailVo;
-import com.fjhx.purchase.entity.refund.dto.RefundDetailSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.purchase.entity.refund.dto.RefundDetailDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.stereotype.Service;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/commission/CommissionController.java

@@ -1,13 +1,14 @@
 package com.fjhx.sale.controller.commission;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.commission.vo.CommissionVo;
 import com.fjhx.sale.entity.commission.dto.CommissionSelectDto;
-import com.fjhx.sale.entity.commission.dto.CommissionDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.commission.vo.CommissionVo;
 import com.fjhx.sale.service.commission.CommissionService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/commission/CommissionRuleController.java

@@ -1,11 +1,13 @@
 package com.fjhx.sale.controller.commission;
 
 import com.fjhx.sale.entity.commission.po.CommissionRule;
-import com.fjhx.sale.entity.commission.vo.CommissionVo;
 import com.fjhx.sale.service.commission.CommissionRuleService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractBudgetController.java

@@ -1,13 +1,16 @@
 package com.fjhx.sale.controller.contract;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
-import com.fjhx.sale.entity.contract.dto.ContractBudgetSelectDto;
 import com.fjhx.sale.entity.contract.dto.ContractBudgetDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.contract.dto.ContractBudgetSelectDto;
+import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
 import com.fjhx.sale.service.contract.ContractBudgetService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractProductController.java

@@ -1,13 +1,18 @@
 package com.fjhx.sale.controller.contract;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.contract.vo.ContractProductVo;
-import com.fjhx.sale.entity.contract.dto.ContractProductSelectDto;
 import com.fjhx.sale.entity.contract.dto.ContractProductDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.contract.dto.ContractProductSelectDto;
+import com.fjhx.sale.entity.contract.vo.ContractProductVo;
 import com.fjhx.sale.service.contract.ContractProductService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractProjectController.java

@@ -1,13 +1,16 @@
 package com.fjhx.sale.controller.contract;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.contract.vo.ContractProjectVo;
-import com.fjhx.sale.entity.contract.dto.ContractProjectSelectDto;
 import com.fjhx.sale.entity.contract.dto.ContractProjectDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.contract.dto.ContractProjectSelectDto;
+import com.fjhx.sale.entity.contract.vo.ContractProjectVo;
 import com.fjhx.sale.service.contract.ContractProjectService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractShipmentController.java

@@ -1,13 +1,16 @@
 package com.fjhx.sale.controller.contract;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.contract.vo.ContractShipmentVo;
-import com.fjhx.sale.entity.contract.dto.ContractShipmentSelectDto;
 import com.fjhx.sale.entity.contract.dto.ContractShipmentDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.contract.dto.ContractShipmentSelectDto;
+import com.fjhx.sale.entity.contract.vo.ContractShipmentVo;
 import com.fjhx.sale.service.contract.ContractShipmentService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/documents/DocumentsController.java

@@ -1,14 +1,19 @@
 package com.fjhx.sale.controller.documents;
 
-import com.fjhx.sale.entity.documents.po.DocumentsPdf;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.documents.vo.DocumentsVo;
-import com.fjhx.sale.entity.documents.dto.DocumentsSelectDto;
 import com.fjhx.sale.entity.documents.dto.DocumentsDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.documents.dto.DocumentsSelectDto;
+import com.fjhx.sale.entity.documents.po.DocumentsPdf;
+import com.fjhx.sale.entity.documents.vo.DocumentsVo;
 import com.fjhx.sale.service.documents.DocumentsService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 

hx-sale/src/main/java/com/fjhx/sale/controller/documents/DocumentsPdfController.java

@@ -1,11 +1,14 @@
 package com.fjhx.sale.controller.documents;
 
-import org.springframework.web.bind.annotation.*;
-import com.fjhx.sale.entity.documents.vo.DocumentsPdfVo;
 import com.fjhx.sale.entity.documents.dto.DocumentsPdfDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.documents.vo.DocumentsPdfVo;
 import com.fjhx.sale.service.documents.DocumentsPdfService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/documents/DocumentsProductController.java

@@ -1,11 +1,14 @@
 package com.fjhx.sale.controller.documents;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.documents.vo.DocumentsProductVo;
 import com.fjhx.sale.entity.documents.dto.DocumentsProductSelectDto;
+import com.fjhx.sale.entity.documents.vo.DocumentsProductVo;
 import com.fjhx.sale.service.documents.DocumentsProductService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/documents/DocumentsTransportController.java

@@ -1,13 +1,16 @@
 package com.fjhx.sale.controller.documents;
 
-import com.fjhx.sale.entity.documents.dto.DocumentsTransportDto;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.documents.vo.DocumentsTransportVo;
+import com.fjhx.sale.entity.documents.dto.DocumentsTransportDto;
 import com.fjhx.sale.entity.documents.dto.DocumentsTransportSelectDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.documents.vo.DocumentsTransportVo;
 import com.fjhx.sale.service.documents.DocumentsTransportService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/quotation/QuotationPayController.java

@@ -1,11 +1,14 @@
 package com.fjhx.sale.controller.quotation;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.quotation.vo.QuotationPayVo;
 import com.fjhx.sale.entity.quotation.dto.QuotationPaySelectDto;
+import com.fjhx.sale.entity.quotation.vo.QuotationPayVo;
 import com.fjhx.sale.service.quotation.QuotationPayService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/quotation/QuotationProductController.java

@@ -1,8 +1,9 @@
 package com.fjhx.sale.controller.quotation;
 
-import org.springframework.web.bind.annotation.*;
 import com.fjhx.sale.service.quotation.QuotationProductService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/serviceContract/ServiceContractController.java

@@ -1,14 +1,17 @@
 package com.fjhx.sale.controller.serviceContract;
 
-import com.fjhx.sale.enums.ServiceContractEnum;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.serviceContract.vo.ServiceContractVo;
-import com.fjhx.sale.entity.serviceContract.dto.ServiceContractSelectDto;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.serviceContract.dto.ServiceContractSelectDto;
+import com.fjhx.sale.entity.serviceContract.vo.ServiceContractVo;
+import com.fjhx.sale.enums.ServiceContractEnum;
 import com.fjhx.sale.service.serviceContract.ServiceContractService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 

hx-sale/src/main/java/com/fjhx/sale/controller/serviceContract/ServiceContractPayController.java

@@ -1,11 +1,14 @@
 package com.fjhx.sale.controller.serviceContract;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.serviceContract.vo.ServiceContractPayVo;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractPaySelectDto;
+import com.fjhx.sale.entity.serviceContract.vo.ServiceContractPayVo;
 import com.fjhx.sale.service.serviceContract.ServiceContractPayService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/serviceContract/ServiceContractProductController.java

@@ -1,11 +1,14 @@
 package com.fjhx.sale.controller.serviceContract;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.serviceContract.vo.ServiceContractProductVo;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractProductSelectDto;
+import com.fjhx.sale.entity.serviceContract.vo.ServiceContractProductVo;
 import com.fjhx.sale.service.serviceContract.ServiceContractProductService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

hx-sale/src/main/java/com/fjhx/sale/controller/serviceContract/ServiceContractRecordController.java

@@ -1,13 +1,16 @@
 package com.fjhx.sale.controller.serviceContract;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.serviceContract.vo.ServiceContractRecordVo;
-import com.fjhx.sale.entity.serviceContract.dto.ServiceContractRecordSelectDto;
 import com.fjhx.sale.entity.serviceContract.dto.ServiceContractRecordDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.serviceContract.dto.ServiceContractRecordSelectDto;
+import com.fjhx.sale.entity.serviceContract.vo.ServiceContractRecordVo;
 import com.fjhx.sale.service.serviceContract.ServiceContractRecordService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**