添加了报价单的数据

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

@@ -26,6 +26,7 @@ import cn.hutool.core.bean.BeanUtil;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -102,17 +103,20 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public void edit(AccountManagementDto accountManagementDto) {
+        this.updateById(accountManagementDto);
         //判断账户的别名是否已存在
         List<AccountManagement> accountManagements = this.list(Wrappers.<AccountManagement>lambdaQuery()
                 .eq(AccountManagement::getAlias, accountManagementDto.getAlias()));
-        if (accountManagements.size()>0){
+        if (accountManagements.size()>1){
             throw new ServiceException("数据错误：账户别名已存在请重新创建");
         }
-
-        this.updateById(accountManagementDto);
         //删除账户-余额表的信息
+        List<AccountRemainder> accountRemainderList = accountManagementDto.getAccountRemainderList();
+        List<Long> ids = accountRemainderList.stream().map(accountRemainder -> accountRemainder.getId()).collect(Collectors.toList());
         accountRemainderService.remove(Wrappers.<AccountRemainder>lambdaQuery()
-                .eq(AccountRemainder::getAccountManagementId,accountManagementDto.getId()));
+                .eq(AccountRemainder::getAccountManagementId,accountManagementDto.getId())
+                .notIn(AccountRemainder::getId,ids)
+        );
         //添加账户余额表的信息
         saveAccountRemainder(accountManagementDto);
     }

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

@@ -25,44 +25,4 @@ 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

@@ -25,44 +25,5 @@ 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

@@ -42,27 +42,11 @@ public class SaleQuotationController {
     }
 
     /**
-     * 报价表新增
+     * 报价单的复制功能
      */
-    @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());
+    @PostMapping("/copy")
+    public void copy(SaleQuotationDto saleQuotationDto){
+        saleQuotationService.copy(saleQuotationDto);
     }
 
 }

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

@@ -36,4 +36,9 @@ public class QuotationPay extends BasePo {
      */
     private String remark;
 
+    /**
+     * 报价表ID
+     */
+    private Long saleQuotationId;
+
 }

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

@@ -21,6 +21,11 @@ import lombok.Setter;
 public class QuotationProduct extends BasePo {
 
     /**
+     * 报价表ID
+     */
+    private Long saleQuotationId;
+
+    /**
      * 商品ID
      */
     private Long productId;

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

@@ -13,5 +13,14 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SaleQuotationSelectDto extends BaseSelectDto {
+    /**
+     * 审批状态。10:发起。20 驳回。30通过
+     */
+    private String status;
 
+
+    /**
+     * 卖方公司ID
+     */
+    private Long sellCorporationId;
 }

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

@@ -33,6 +33,16 @@ public class SaleQuotation extends BasePo {
     /**
      * 卖方联系人名称
      */
+    private String code;
+
+    /**
+     * 审批状态。10:发起。20 驳回。30通过
+     */
+    private String status;
+
+    /**
+     * 卖方联系人名称
+     */
     private String sellContactName;
 
     /**
@@ -140,6 +150,9 @@ public class SaleQuotation extends BasePo {
      */
     private Integer effective;
 
+    /**
+     * 质保期
+     */
     private Integer warranty;
 
     /**

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

@@ -1,9 +1,13 @@
 package com.fjhx.sale.entity.sale.vo;
 
+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;
+
 /**
  * 报价表列表查询返回值实体
  *
@@ -14,4 +18,18 @@ import lombok.Setter;
 @Setter
 public class SaleQuotationVo extends SaleQuotation {
 
+    /**
+     *  业务员名称
+     */
+    private  String userName;
+
+    /**
+     * 商品-报价单关联表信息
+     */
+    private List<QuotationProduct> quotationProductList;
+
+    /**
+     *报价 -收费项目表
+     */
+    private List<QuotationPay> quotationPayList;
 }

hx-sale/src/main/java/com/fjhx/sale/enums/SaleQuotationEnum.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.enums;
+
+import org.apache.commons.collections4.MapUtils;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public enum SaleQuotationEnum {
+    UNDER_REVIEW("10", "审批中"),
+    REJECT("20", "驳回"),
+    PASS("30","通过"),
+    ;
+    private String key;
+
+    private String value;
+
+    private static Map<String, String> map = new LinkedHashMap<>();
+
+    SaleQuotationEnum(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    /**
+     * 获取枚举map
+     *
+     * @return
+     */
+    public static Map<String, String> getMap() {
+        if (MapUtils.isNotEmpty(map)) {
+            return map;
+        }
+        for (SaleQuotationEnum ms : values()) {
+            map.put(ms.key, ms.value);
+        }
+        return map;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

hx-sale/src/main/java/com/fjhx/sale/flow/ContractFlow.java

@@ -38,6 +38,8 @@ public class ContractFlow extends FlowDelegate {
         return "contract_flow";
     }
 
+
+
     /**
      * 发起流程
      * @param flowId 流程ID

hx-sale/src/main/java/com/fjhx/sale/flow/SaleQuotationFlow.java

@@ -0,0 +1,95 @@
+package com.fjhx.sale.flow;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.sale.entity.contract.po.Contract;
+import com.fjhx.sale.entity.contract.po.ContractProduct;
+import com.fjhx.sale.entity.contract.po.ContractProject;
+import com.fjhx.sale.entity.contract.po.ContractShipment;
+import com.fjhx.sale.entity.quotation.po.QuotationPay;
+import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
+import com.fjhx.sale.entity.sale.po.SaleQuotation;
+import com.fjhx.sale.enums.FlowStatusEnum;
+import com.fjhx.sale.enums.SaleQuotationEnum;
+import com.fjhx.sale.service.contract.ContractProductService;
+import com.fjhx.sale.service.contract.ContractProjectService;
+import com.fjhx.sale.service.contract.ContractService;
+import com.fjhx.sale.service.contract.ContractShipmentService;
+import com.fjhx.sale.service.quotation.QuotationPayService;
+import com.fjhx.sale.service.quotation.QuotationProductService;
+import com.fjhx.sale.service.sale.SaleQuotationService;
+import com.fjhx.sale.util.code.CodeEnum;
+import com.obs.services.internal.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 报价单流程
+ */
+@DS(SourceConstant.SALE)
+@Component
+public class SaleQuotationFlow extends FlowDelegate {
+    @Override
+    public String getFlowKey() {
+        return "sale_quotation_flow";
+    }
+
+    /**
+     * 发起流程
+     * @param flowId 流程ID
+     * @param submitData 采购付款数据
+     * @return
+     */
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+        SaleQuotationService saleQuotationService = SpringUtil.getBean(SaleQuotationService.class);
+        QuotationPayService quotationPayService = SpringUtil.getBean(QuotationPayService.class);
+        QuotationProductService quotationProductService = SpringUtil.getBean(QuotationProductService.class);
+        SaleQuotationDto saleQuotation = submitData.toJavaObject(SaleQuotationDto.class);
+        //添加报价编码
+        saleQuotation.setCode(CodeEnum.SALE_QUOTATION.getCode());
+        //添加报价状态
+        saleQuotation.setStatus(SaleQuotationEnum.UNDER_REVIEW.getKey());
+        //添加报价单信息
+        saleQuotationService.save(saleQuotation);
+        List<QuotationProduct> quotationProductList = saleQuotation.getQuotationProductList();
+        if(CollectionUtils.isNotEmpty(quotationProductList)){//保存报价产品信息
+            quotationProductList.forEach(quotationProduct -> quotationProduct.setSaleQuotationId(saleQuotation.getId()));
+            quotationProductService.saveBatch(quotationProductList);
+        }
+        List<QuotationPay> quotationPayList = saleQuotation.getQuotationPayList();
+        if(CollectionUtils.isNotEmpty(quotationPayList)){//保存报价项目信息
+           quotationPayList.forEach(quotationPay -> quotationPay.setSaleQuotationId(saleQuotation.getId()));
+            quotationPayService.saveBatch(quotationPayList);
+        }
+
+        return saleQuotation.getId();
+    }
+
+    /**
+     * 结束流程
+     * @param flowId 流程ID
+     * @param businessId 业务ID
+     * @param submitData 数据
+     */
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        SaleQuotationService saleQuotationService = SpringUtil.getBean(SaleQuotationService.class);
+        //通过业务ID查询合同数据
+        SaleQuotation contract = saleQuotationService.getById(businessId);
+        if(ObjectUtils.isEmpty(contract)){
+            throw new ServiceException("报价单不存在");
+        }
+        //修改采购状态为审批通过
+        contract.setStatus(SaleQuotationEnum.PASS.getKey());
+        saleQuotationService.updateById(contract);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.fjhx.sale.mapper.sale;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,6 +22,6 @@ public interface SaleQuotationMapper extends BaseMapper<SaleQuotation> {
     /**
      * 报价表分页
      */
-    Page<SaleQuotationVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<SaleQuotation> wrapper);
+    Page<SaleQuotationVo> getPage(@Param("page") Page<Object> page, @Param("ew") LambdaQueryWrapper<SaleQuotation> wrapper);
 
 }

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

@@ -43,4 +43,8 @@ public interface SaleQuotationService extends BaseService<SaleQuotation> {
      */
     void delete(Long id);
 
+    /**
+     * 报价单的复制功能
+     */
+    void copy(SaleQuotationDto saleQuotationDto);
 }

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

@@ -1,9 +1,21 @@
 package com.fjhx.sale.service.sale.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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 com.fjhx.sale.mapper.sale.SaleQuotationMapper;
+import com.fjhx.sale.service.quotation.QuotationPayService;
+import com.fjhx.sale.service.quotation.QuotationProductService;
 import com.fjhx.sale.service.sale.SaleQuotationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.util.code.CodeEnum;
+import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
@@ -12,6 +24,8 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -23,19 +37,50 @@ import cn.hutool.core.bean.BeanUtil;
  */
 @Service
 public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, SaleQuotation> implements SaleQuotationService {
+    @Autowired
+    private QuotationProductService quotationProductService;
+
+    @Autowired
+    private QuotationPayService quotationPayService;
 
+    /**
+     * 报价表分页
+     */
     @Override
     public Page<SaleQuotationVo> getPage(SaleQuotationSelectDto dto) {
-        IWrapper<SaleQuotation> wrapper = getWrapper();
-        wrapper.orderByDesc("sq", SaleQuotation::getId);
+        LambdaQueryWrapper<SaleQuotation> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getSellCorporationId()),
+                SaleQuotation::getSellCorporationId, dto.getSellCorporationId());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), SaleQuotation::getStatus, dto.getStatus());
+        wrapper.orderByDesc(SaleQuotation::getCreateTime);
         Page<SaleQuotationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<SaleQuotationVo> saleQuotationVoList = page.getRecords();
+
+        //赋值用户名称
+        UserUtil.assignmentNickName(saleQuotationVoList, BasePo::getCreateUser, SaleQuotationVo::setUserName);
         return page;
     }
 
+    /**
+     * 报价表明细
+     */
     @Override
     public SaleQuotationVo detail(Long id) {
+        //查询报价表详情
         SaleQuotation SaleQuotation = this.getById(id);
         SaleQuotationVo result = BeanUtil.toBean(SaleQuotation, SaleQuotationVo.class);
+        if (ObjectUtil.isNotEmpty(result)) {
+            //查询报价-商品表的详情
+            List<QuotationProduct> quotationProductList = quotationProductService.list(Wrappers.<QuotationProduct>lambdaQuery()
+                    .eq(QuotationProduct::getSaleQuotationId, result.getId()));
+            result.setQuotationProductList(quotationProductList);
+
+            //查询报价-收费项目表的详情
+            List<QuotationPay> quotationPayList = quotationPayService.list(Wrappers.<QuotationPay>lambdaQuery()
+                    .eq(QuotationPay::getSaleQuotationId, result.getId()));
+            result.setQuotationPayList(quotationPayList);
+        }
+
         return result;
     }
 
@@ -54,4 +99,42 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         this.removeById(id);
     }
 
+    /**
+     * 报价单的复制功能（报价单，报价-商品表的 ，报价-收费项目表，根据报价表的ID相关数据复制一份）
+     */
+    @Override
+    public void copy(SaleQuotationDto saleQuotationDto) {
+        if (ObjectUtil.isEmpty(saleQuotationDto.getId())) {
+            throw new ServiceException("参数缺失：报价单ID不能为null");
+        }
+        //查询商品-报价表的数据
+        SaleQuotation saleQuotation = this.getById(saleQuotationDto.getId());
+        if (ObjectUtil.isNotEmpty(saleQuotation)){
+            throw new ServiceException("报价表的数据不存在");
+        }
+
+        //查询报价-商品表的数据
+        List<QuotationProduct> quotationProductList = quotationProductService.list(Wrappers.<QuotationProduct>lambdaQuery()
+                .eq(QuotationProduct::getSaleQuotationId, saleQuotationDto.getId()));
+
+        //查询报价-收费项目表
+        List<QuotationPay> quotationPays = quotationPayService.list(Wrappers.<QuotationPay>lambdaQuery()
+                .eq(QuotationPay::getSaleQuotationId, saleQuotationDto.getId()));
+
+        //添加商品-报价表
+        quotationProductList.forEach(quotationProduct -> quotationProduct.setId(null));
+        quotationProductService.saveBatch(quotationProductList);
+
+        //添加报价-收费项目表
+        quotationPays.forEach(quotationPay -> quotationPay.setId(null));
+        quotationPayService.saveBatch(quotationPays);
+
+
+        //添加报价表的信息
+        saleQuotation.setId(null);
+        saleQuotation.setCode(CodeEnum.SALE_QUOTATION.getCode());
+        baseMapper.insert(saleQuotation);
+
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/util/code/CodeEnum.java

@@ -18,6 +18,7 @@ public enum CodeEnum {
 
     //外销合同
     CONTRACT("SC-", "yyMM-", "code", 3, ContractService.class),
+    SALE_QUOTATION("GSQT-", "yyMM-", "code", 3, ContractService.class),
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {

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

@@ -4,6 +4,7 @@
     <select id="getPage" resultType="com.fjhx.sale.entity.quotation.vo.QuotationPayVo">
         select
             qp.id,
+            qp.sale_quotation_id,
             qp.pay_name,
             qp.amount,
             qp.remark,

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

@@ -4,6 +4,7 @@
     <select id="getPage" resultType="com.fjhx.sale.entity.quotation.vo.QuotationProductVo">
         select
             qp.id,
+            qp.sale_quotation_id,
             qp.product_id,
             qp.product_name,
             qp.product_model,

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

@@ -5,6 +5,8 @@
         select
             sq.id,
             sq.contract_template_id,
+            sq.code,
+            sq.status,
             sq.sell_corporation_id,
             sq.sell_contact_name,
             sq.sell_contact_number,