添加报价单的数据

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountRunningWaterVo.java

@@ -30,7 +30,7 @@ public class AccountRunningWaterVo extends AccountRunningWater {
     /**
      * 部门ID
      */
-    private String deptId;
+    private Long deptId;
 
     /**
      * 部门名称

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountDeptRunningWaterDetailServiceImpl.java

@@ -57,20 +57,22 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
         //查询资金流水信息
         AccountRunningWater accountRunningWater = accountRunningWaterService.getById(id);
         AccountRunningWaterVo accountRunningWaterVo = BeanUtil.toBean(accountRunningWater, AccountRunningWaterVo.class);
-
+            //判断是否有添加部门-资金流水表的信息
         if (ObjectUtil.isNotEmpty(accountRunningWaterVo)){
             //查询资金流水-部门关联表的信息(一个流水对应一个部门)
             AccountDeptRunningWater accountDeptRunningWater = accountDeptRunningWaterService.getOne(Wrappers.<AccountDeptRunningWater>lambdaQuery()
                     .eq(AccountDeptRunningWater::getRunningWaterId, accountRunningWater.getId()));
+            if(ObjectUtil.isNotEmpty(accountDeptRunningWater)){
+                //查询资金流水分拆部门表明细
+                List<AccountDeptRunningWaterDetail> accountDeptRunningWaterDetailList = this.list(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
+                        .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId, accountDeptRunningWater.getId()));
 
-            //查询资金流水分拆部门表明细
-            List<AccountDeptRunningWaterDetail> accountDeptRunningWaterDetailList = this.list(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
-                    .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId, accountDeptRunningWater.getId()));
+                //插入资金流水分拆部门表明细信息
+                accountRunningWaterVo.setAccountDeptRunningWaterDetailList(accountDeptRunningWaterDetailList);
+                //插入资金流水-部门关联表ID
+                accountRunningWaterVo.setAccountDeptRunningWaterId(accountDeptRunningWater.getId());
+            }
 
-            //插入资金流水分拆部门表明细信息
-            accountRunningWaterVo.setAccountDeptRunningWaterDetailList(accountDeptRunningWaterDetailList);
-            //插入资金流水-部门关联表ID
-            accountRunningWaterVo.setAccountDeptRunningWaterId(accountDeptRunningWater.getId());
         }
 
         return accountRunningWaterVo;
@@ -81,15 +83,24 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
      */
     @Override
     public void add(AccountRunningWaterVo accountRunningWaterVo) {
+
         //修改资金流水-账户表的的分拆类型为已分拆
         AccountDeptRunningWater accountDeptRunningWater = new AccountDeptRunningWater();
-        accountDeptRunningWater.setId(accountRunningWaterVo.getAccountDeptRunningWaterId());
-        accountDeptRunningWater.setType("20");
-        accountDeptRunningWaterService.updateById(accountDeptRunningWater);
-
-        //删除资金流水分拆部门表数据
-        this.remove(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
-                .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId,accountRunningWaterVo.getAccountDeptRunningWaterId()));
+        if (ObjectUtil.isNotEmpty(accountRunningWaterVo.getAccountDeptRunningWaterId())){
+            accountDeptRunningWater.setId(accountRunningWaterVo.getAccountDeptRunningWaterId());
+            accountDeptRunningWater.setType(accountRunningWaterVo.getType());
+            accountDeptRunningWater.setDeptId(accountRunningWaterVo.getDeptId());
+            accountDeptRunningWaterService.updateById(accountDeptRunningWater);
+
+            //删除资金流水分拆部门表数据
+            this.remove(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
+                    .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId,accountRunningWaterVo.getAccountDeptRunningWaterId()));
+        }else {
+            accountDeptRunningWater.setId(accountRunningWaterVo.getAccountDeptRunningWaterId());
+            accountDeptRunningWater.setType(accountRunningWaterVo.getType());
+            accountDeptRunningWater.setDeptId(accountRunningWaterVo.getDeptId());
+            accountDeptRunningWaterService.save(accountDeptRunningWater);
+        }
 
         //添加资金流水分拆部门表数据
         List<AccountDeptRunningWaterDetail> deptRunningWaterDetailList = accountRunningWaterVo.getAccountDeptRunningWaterDetailList();

hx-account/src/main/resources/mapper/account/AccountPaymentMapper.xml

@@ -26,7 +26,7 @@
             ap.name,
             ap.business_management_id,
             ap.opening_bank,
-            ap.bussines_currency,
+            ap.business_currency,
             ap.account_opening,
             ap.interbank_number
         from account_payment ap
@@ -58,7 +58,7 @@
             ap.name,
             ap.business_management_id,
             ap.opening_bank,
-            ap.bussines_currency,
+            ap.business_currency,
             ap.account_opening,
             ap.interbank_number
         from account_payment ap

hx-sale/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.fjhx</groupId>
+        <artifactId>bytesailing</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>hx-sale</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-base</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-common</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,68 @@
+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.dto.QuotationPayDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.quotation.QuotationPayService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 报价 -收费项目表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@RestController
+@RequestMapping("/quotationPay")
+public class QuotationPayController {
+
+    @Autowired
+    private QuotationPayService quotationPayService;
+
+    /**
+     * 报价 -收费项目表分页
+     */
+    @PostMapping("/page")
+    public Page<QuotationPayVo> page(@RequestBody QuotationPaySelectDto dto) {
+        return quotationPayService.getPage(dto);
+    }
+
+    /**
+     * 报价 -收费项目表明细
+     */
+    @PostMapping("/detail")
+    public QuotationPayVo detail(@RequestBody BaseSelectDto dto) {
+        return quotationPayService.detail(dto.getId());
+    }
+
+    /**
+     * 报价 -收费项目表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody QuotationPayDto quotationPayDto) {
+        quotationPayService.add(quotationPayDto);
+    }
+
+    /**
+     * 报价 -收费项目表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody QuotationPayDto quotationPayDto) {
+        quotationPayService.edit(quotationPayDto);
+    }
+
+    /**
+     * 报价 -收费项目表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        quotationPayService.delete(dto.getId());
+    }
+
+}

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

@@ -0,0 +1,68 @@
+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.QuotationProductVo;
+import com.fjhx.sale.entity.quotation.dto.QuotationProductSelectDto;
+import com.fjhx.sale.entity.quotation.dto.QuotationProductDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.quotation.QuotationProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 商品-报价单关联表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@RestController
+@RequestMapping("/quotationProduct")
+public class QuotationProductController {
+
+    @Autowired
+    private QuotationProductService quotationProductService;
+
+    /**
+     * 商品-报价单关联表分页
+     */
+    @PostMapping("/page")
+    public Page<QuotationProductVo> page(@RequestBody QuotationProductSelectDto dto) {
+        return quotationProductService.getPage(dto);
+    }
+
+    /**
+     * 商品-报价单关联表明细
+     */
+    @PostMapping("/detail")
+    public QuotationProductVo detail(@RequestBody BaseSelectDto dto) {
+        return quotationProductService.detail(dto.getId());
+    }
+
+    /**
+     * 商品-报价单关联表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody QuotationProductDto quotationProductDto) {
+        quotationProductService.add(quotationProductDto);
+    }
+
+    /**
+     * 商品-报价单关联表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody QuotationProductDto quotationProductDto) {
+        quotationProductService.edit(quotationProductDto);
+    }
+
+    /**
+     * 商品-报价单关联表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        quotationProductService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/sale/SaleQuotationController.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.controller.sale;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
+import com.fjhx.sale.entity.sale.dto.SaleQuotationSelectDto;
+import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.service.sale.SaleQuotationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 报价表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@RestController
+@RequestMapping("/saleQuotation")
+public class SaleQuotationController {
+
+    @Autowired
+    private SaleQuotationService saleQuotationService;
+
+    /**
+     * 报价表分页
+     */
+    @PostMapping("/page")
+    public Page<SaleQuotationVo> page(@RequestBody SaleQuotationSelectDto dto) {
+        return saleQuotationService.getPage(dto);
+    }
+
+    /**
+     * 报价表明细
+     */
+    @PostMapping("/detail")
+    public SaleQuotationVo detail(@RequestBody BaseSelectDto dto) {
+        return saleQuotationService.detail(dto.getId());
+    }
+
+    /**
+     * 报价表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody SaleQuotationDto saleQuotationDto) {
+        saleQuotationService.add(saleQuotationDto);
+    }
+
+    /**
+     * 报价表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody SaleQuotationDto saleQuotationDto) {
+        saleQuotationService.edit(saleQuotationDto);
+    }
+
+    /**
+     * 报价表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        saleQuotationService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/dto/QuotationPayDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.quotation.dto;
+
+import com.fjhx.sale.entity.quotation.po.QuotationPay;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 报价 -收费项目表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class QuotationPayDto extends QuotationPay {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/dto/QuotationPaySelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.quotation.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 报价 -收费项目表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class QuotationPaySelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/dto/QuotationProductDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.quotation.dto;
+
+import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 商品-报价单关联表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class QuotationProductDto extends QuotationProduct {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/dto/QuotationProductSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.quotation.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 商品-报价单关联表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class QuotationProductSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/po/QuotationPay.java

@@ -0,0 +1,39 @@
+package com.fjhx.sale.entity.quotation.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 报价 -收费项目表
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+@TableName("quotation_pay")
+public class QuotationPay extends BasePo {
+
+    /**
+     * 收费项目
+
+     */
+    private String payName;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 付款条件
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/po/QuotationProduct.java

@@ -0,0 +1,58 @@
+package com.fjhx.sale.entity.quotation.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 商品-报价单关联表
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+@TableName("quotation_product")
+public class QuotationProduct extends BasePo {
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 商品名称
+     */
+    private String productName;
+
+    /**
+     * 商品型号
+     */
+    private String productModel;
+
+    /**
+     * 商品数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 商品单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 商品金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 付款条件
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/vo/QuotationPayVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.quotation.vo;
+
+import com.fjhx.sale.entity.quotation.po.QuotationPay;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 报价 -收费项目表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class QuotationPayVo extends QuotationPay {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/vo/QuotationProductVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.quotation.vo;
+
+import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 商品-报价单关联表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class QuotationProductVo extends QuotationProduct {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/sale/dto/SaleQuotationDto.java

@@ -0,0 +1,33 @@
+package com.fjhx.sale.entity.sale.dto;
+
+import com.fjhx.sale.entity.quotation.po.QuotationPay;
+import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import com.fjhx.sale.entity.sale.po.SaleQuotation;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 报价表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class SaleQuotationDto extends SaleQuotation {
+
+    /**
+     * 商品-报价单关联表信息
+     */
+    private List<QuotationProduct> quotationProductList;
+
+    /**
+     *报价 -收费项目表
+     */
+    private List<QuotationPay> quotationPayList;
+
+
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/sale/dto/SaleQuotationSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.sale.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 报价表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class SaleQuotationSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/sale/po/SaleQuotation.java

@@ -0,0 +1,150 @@
+package com.fjhx.sale.entity.sale.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 报价表
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+@TableName("sale_quotation")
+public class SaleQuotation extends BasePo {
+
+    /**
+     * 合同模版ID
+     */
+    private Long contractTemplateId;
+
+    /**
+     * 卖方公司ID
+     */
+    private Long sellCorporationId;
+
+    /**
+     * 卖方联系人名称
+     */
+    private String sellContactName;
+
+    /**
+     * 卖方联系人电话
+     */
+    private String sellContactNumber;
+
+    /**
+     * 卖方国家表id
+     */
+    private String sellCountryId;
+
+    /**
+     * 卖方省份id
+     */
+    private String sellProvinceId;
+
+    /**
+     * 卖方城市id
+     */
+    private String sellCityId;
+
+    /**
+     * 卖方详细地址
+     */
+    private String sellAddress;
+
+    /**
+     * 买方公司ID
+     */
+    private Long buyCorporationId;
+
+    /**
+     * 买方联系人名称
+     */
+    private String buyContactName;
+
+    /**
+     * 买方联系人电话
+     */
+    private String buyContactNumber;
+
+    /**
+     * 买方国家表id
+     */
+    private String buyCountryId;
+
+    /**
+     * 买方省份id
+     */
+    private String buyProvinceId;
+
+    /**
+     * 买方城市id
+     */
+    private String buyCityId;
+
+    /**
+     * 买方详细地址
+     */
+    private String buyAddress;
+
+    /**
+     * 买方邮编
+     */
+    private String buyPostalCode;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 付款金额（打款中的实际打款金额）
+     */
+    private BigDecimal amount;
+
+    /**
+     * 付款方式（字典funds_payment_method（多余的业务字段）
+     */
+    private String paymentMethod;
+
+    /**
+     * 贸易方式（字典trade_methods）
+     */
+    private String tradeMethods;
+
+    /**
+     * 预付比例
+     */
+    private String advanceRatio;
+
+    /**
+     * 运输方式（字典  shipping_method）
+     */
+    private String transportMethod;
+
+    /**
+     * 运输备注
+     */
+    private String transportRemark;
+
+    /**
+     * 有效期
+     */
+    private Integer effective;
+
+    private Integer warranty;
+
+    /**
+     * 付款条件
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/sale/vo/SaleQuotationVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.sale.vo;
+
+import com.fjhx.sale.entity.sale.po.SaleQuotation;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 报价表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Getter
+@Setter
+public class SaleQuotationVo extends SaleQuotation {
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/quotation/QuotationPayMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.quotation;
+
+import com.fjhx.sale.entity.quotation.po.QuotationPay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.quotation.vo.QuotationPayVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 报价 -收费项目表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+public interface QuotationPayMapper extends BaseMapper<QuotationPay> {
+
+    /**
+     * 报价 -收费项目表分页
+     */
+    Page<QuotationPayVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<QuotationPay> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/quotation/QuotationProductMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.quotation;
+
+import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.quotation.vo.QuotationProductVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 商品-报价单关联表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+public interface QuotationProductMapper extends BaseMapper<QuotationProduct> {
+
+    /**
+     * 商品-报价单关联表分页
+     */
+    Page<QuotationProductVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<QuotationProduct> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/sale/SaleQuotationMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.sale;
+
+import com.fjhx.sale.entity.sale.po.SaleQuotation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 报价表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+public interface SaleQuotationMapper extends BaseMapper<SaleQuotation> {
+
+    /**
+     * 报价表分页
+     */
+    Page<SaleQuotationVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<SaleQuotation> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/quotation/QuotationPayService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.quotation;
+
+import com.fjhx.sale.entity.quotation.po.QuotationPay;
+import com.ruoyi.common.core.service.BaseService;
+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.dto.QuotationPayDto;
+
+
+/**
+ * <p>
+ * 报价 -收费项目表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+public interface QuotationPayService extends BaseService<QuotationPay> {
+
+    /**
+     * 报价 -收费项目表分页
+     */
+    Page<QuotationPayVo> getPage(QuotationPaySelectDto dto);
+
+    /**
+     * 报价 -收费项目表明细
+     */
+    QuotationPayVo detail(Long id);
+
+    /**
+     * 报价 -收费项目表新增
+     */
+    void add(QuotationPayDto quotationPayDto);
+
+    /**
+     * 报价 -收费项目表编辑
+     */
+    void edit(QuotationPayDto quotationPayDto);
+
+    /**
+     * 报价 -收费项目表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/quotation/QuotationProductService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.quotation;
+
+import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.quotation.vo.QuotationProductVo;
+import com.fjhx.sale.entity.quotation.dto.QuotationProductSelectDto;
+import com.fjhx.sale.entity.quotation.dto.QuotationProductDto;
+
+
+/**
+ * <p>
+ * 商品-报价单关联表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+public interface QuotationProductService extends BaseService<QuotationProduct> {
+
+    /**
+     * 商品-报价单关联表分页
+     */
+    Page<QuotationProductVo> getPage(QuotationProductSelectDto dto);
+
+    /**
+     * 商品-报价单关联表明细
+     */
+    QuotationProductVo detail(Long id);
+
+    /**
+     * 商品-报价单关联表新增
+     */
+    void add(QuotationProductDto quotationProductDto);
+
+    /**
+     * 商品-报价单关联表编辑
+     */
+    void edit(QuotationProductDto quotationProductDto);
+
+    /**
+     * 商品-报价单关联表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/quotation/impl/QuotationPayServiceImpl.java

@@ -0,0 +1,60 @@
+package com.fjhx.sale.service.quotation.impl;
+
+import com.fjhx.sale.entity.quotation.po.QuotationPay;
+import com.fjhx.sale.mapper.quotation.QuotationPayMapper;
+import com.fjhx.sale.service.quotation.QuotationPayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+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.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.quotation.dto.QuotationPayDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 报价 -收费项目表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Service
+public class QuotationPayServiceImpl extends ServiceImpl<QuotationPayMapper, QuotationPay> implements QuotationPayService {
+
+    @Override
+    public Page<QuotationPayVo> getPage(QuotationPaySelectDto dto) {
+        IWrapper<QuotationPay> wrapper = getWrapper();
+        wrapper.orderByDesc("qp", QuotationPay::getId);
+        Page<QuotationPayVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public QuotationPayVo detail(Long id) {
+        QuotationPay QuotationPay = this.getById(id);
+        QuotationPayVo result = BeanUtil.toBean(QuotationPay, QuotationPayVo.class);
+        return result;
+    }
+
+    /**
+     * 报价表新增
+     */
+    @Override
+    public void add(QuotationPayDto quotationPayDto) {
+        this.save(quotationPayDto);
+    }
+
+    @Override
+    public void edit(QuotationPayDto quotationPayDto) {
+        this.updateById(quotationPayDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/quotation/impl/QuotationProductServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.quotation.impl;
+
+import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import com.fjhx.sale.mapper.quotation.QuotationProductMapper;
+import com.fjhx.sale.service.quotation.QuotationProductService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.quotation.vo.QuotationProductVo;
+import com.fjhx.sale.entity.quotation.dto.QuotationProductSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.quotation.dto.QuotationProductDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 商品-报价单关联表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Service
+public class QuotationProductServiceImpl extends ServiceImpl<QuotationProductMapper, QuotationProduct> implements QuotationProductService {
+
+    @Override
+    public Page<QuotationProductVo> getPage(QuotationProductSelectDto dto) {
+        IWrapper<QuotationProduct> wrapper = getWrapper();
+        wrapper.orderByDesc("qp", QuotationProduct::getId);
+        Page<QuotationProductVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public QuotationProductVo detail(Long id) {
+        QuotationProduct QuotationProduct = this.getById(id);
+        QuotationProductVo result = BeanUtil.toBean(QuotationProduct, QuotationProductVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(QuotationProductDto quotationProductDto) {
+        this.save(quotationProductDto);
+    }
+
+    @Override
+    public void edit(QuotationProductDto quotationProductDto) {
+        this.updateById(quotationProductDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/sale/SaleQuotationService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.sale;
+
+import com.fjhx.sale.entity.sale.po.SaleQuotation;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
+import com.fjhx.sale.entity.sale.dto.SaleQuotationSelectDto;
+import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
+
+
+/**
+ * <p>
+ * 报价表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+public interface SaleQuotationService extends BaseService<SaleQuotation> {
+
+    /**
+     * 报价表分页
+     */
+    Page<SaleQuotationVo> getPage(SaleQuotationSelectDto dto);
+
+    /**
+     * 报价表明细
+     */
+    SaleQuotationVo detail(Long id);
+
+    /**
+     * 报价表新增
+     */
+    void add(SaleQuotationDto saleQuotationDto);
+
+    /**
+     * 报价表编辑
+     */
+    void edit(SaleQuotationDto saleQuotationDto);
+
+    /**
+     * 报价表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.sale.impl;
+
+import com.fjhx.sale.entity.sale.po.SaleQuotation;
+import com.fjhx.sale.mapper.sale.SaleQuotationMapper;
+import com.fjhx.sale.service.sale.SaleQuotationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
+import com.fjhx.sale.entity.sale.dto.SaleQuotationSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 报价表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-14
+ */
+@Service
+public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, SaleQuotation> implements SaleQuotationService {
+
+    @Override
+    public Page<SaleQuotationVo> getPage(SaleQuotationSelectDto dto) {
+        IWrapper<SaleQuotation> wrapper = getWrapper();
+        wrapper.orderByDesc("sq", SaleQuotation::getId);
+        Page<SaleQuotationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public SaleQuotationVo detail(Long id) {
+        SaleQuotation SaleQuotation = this.getById(id);
+        SaleQuotationVo result = BeanUtil.toBean(SaleQuotation, SaleQuotationVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(SaleQuotationDto saleQuotationDto) {
+        this.save(saleQuotationDto);
+    }
+
+    @Override
+    public void edit(SaleQuotationDto saleQuotationDto) {
+        this.updateById(saleQuotationDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/resources/mapper/quotation/QuotationPayMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.sale.mapper.quotation.QuotationPayMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.quotation.vo.QuotationPayVo">
+        select
+            qp.id,
+            qp.pay_name,
+            qp.amount,
+            qp.remark,
+            qp.create_user,
+            qp.create_time,
+            qp.update_user,
+            qp.update_time
+        from quotation_pay qp
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/mapper/quotation/QuotationProductMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.sale.mapper.quotation.QuotationProductMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.quotation.vo.QuotationProductVo">
+        select
+            qp.id,
+            qp.product_id,
+            qp.product_name,
+            qp.product_model,
+            qp.quantity,
+            qp.price,
+            qp.amount,
+            qp.remark,
+            qp.create_user,
+            qp.create_time,
+            qp.update_user,
+            qp.update_time
+        from quotation_product qp
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/mapper/sale/SaleQuotationMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.sale.mapper.sale.SaleQuotationMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.sale.vo.SaleQuotationVo">
+        select
+            sq.id,
+            sq.contract_template_id,
+            sq.sell_corporation_id,
+            sq.sell_contact_name,
+            sq.sell_contact_number,
+            sq.sell_country_id,
+            sq.sell_province_id,
+            sq.sell_city_id,
+            sq.sell_address,
+            sq.buy_corporation_id,
+            sq.buy_contact_name,
+            sq.buy_contact_number,
+            sq.buy_country_id,
+            sq.buy_province_id,
+            sq.buy_city_id,
+            sq.buy_address,
+            sq.buy_postal_code,
+            sq.currency,
+            sq.amount,
+            sq.payment_method,
+            sq.trade_methods,
+            sq.advance_ratio,
+            sq.transport_method,
+            sq.transport_remark,
+            sq.effective,
+            sq.warranty,
+            sq.remark,
+            sq.create_user,
+            sq.create_time,
+            sq.update_user,
+            sq.update_time
+        from sale_quotation sq
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>