Merge branch 'master' into test

# Conflicts:
#	hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

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

@@ -140,4 +140,9 @@ public class Commission extends BasePo {
      * 采购合同币种
      */
     private String purchaseCurrency;
+
+    /**
+     * 退税金额
+     */
+    private BigDecimal taxReturnAmount;
 }

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

@@ -24,4 +24,9 @@ public class IntermediateContractSelectDto extends BaseSelectDto {
      */
     private Long buyCorporationId;
 
+    /**
+     * 是否创建
+     */
+    private String isSet;
+
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractMapper.java

@@ -104,4 +104,6 @@ public interface ContractMapper extends BaseMapper<Contract> {
     void updateContract(Contract contract);
 
     List<ContractVo> getCustomerMoney(@Param("ew") IWrapper<Contract> wrapper);
+
+
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/intermediate/IntermediateContractMapper.java

@@ -30,4 +30,5 @@ public interface IntermediateContractMapper extends BaseMapper<IntermediateContr
      */
     List<IntermediateContractVo> contactList(@Param("ew") IWrapper<IntermediateContract> wrapper);
 
+    String getAllIds();
 }

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

@@ -44,6 +44,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         QueryWrapper<Object> query = Wrappers.query();
         query.eq(ObjectUtil.isNotEmpty(dto.getUserId()), "c.user_id", dto.getUserId());
         query.eq(ObjectUtil.isNotEmpty(dto.getTime()), "DATE_FORMAT(c.create_time,'%Y')", dto.getTime());
+        query.like(ObjectUtil.isNotEmpty(dto.getKeyword()),"c.contract_code",dto.getKeyword());
         query.orderByDesc("c.create_time");
         Page<CommissionVo> page = this.baseMapper.getPage(dto.getPage(), query);
         return page;
@@ -124,11 +125,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
 
         //计算净收入（总收入 - 总支出 - 售后 - 公共 - 总办）
         BigDecimal netIncome = commissionDto.getTotalIncome()
-                .subtract(commissionDto.getTotalExpenses()
-                        .subtract(commissionDto.getAfterSalesAmount())
-                        .subtract(commissionDto.getPublicAmount())
-                        .subtract(commissionDto.getHaveOverallAmount())
-                ) ;
+                .subtract(commissionDto.getTotalExpenses())
+                .subtract(commissionDto.getAfterSalesAmount())
+                .subtract(commissionDto.getPublicAmount())
+                .subtract(commissionDto.getHaveOverallAmount());
         //计算部门提成金额：（总收入 - 总支出 - 售后 - 公共 - 总办） * 部门占比
         commissionDto.setDepartmentalCommission(netIncome.
                 multiply(commissionRule.getDepartmentalRatio())

hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

@@ -195,7 +195,5 @@ public interface ContractService extends BaseService<Contract> {
      *
      * @return
      */
-    Map<String,Object> getHeadCustomerStatistics(ContractSelectDto dto);
-
-    void updateContract(Contract contract);
+    Map<String, Object> getHeadCustomerStatistics(ContractSelectDto dto);
 }

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

@@ -59,6 +59,7 @@ 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.contract.vo.*;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
 import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
 import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
 import com.fjhx.sale.entity.statement.dto.ProfitSettlementDto;
@@ -69,6 +70,7 @@ 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.purchase.EhsdPurchaseProductService;
+import com.fjhx.sale.service.purchase.EhsdPurchaseService;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
@@ -135,6 +137,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     private AccountManagementService accountManagementService;
 
     @Autowired
+    private EhsdPurchaseService ehsdPurchaseService;
+
+    @Autowired
     private EhsdPurchaseProductService ehsdPurchaseProductService;
 
     @Autowired

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

@@ -2,6 +2,7 @@ package com.fjhx.sale.service.intermediate.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.entity.corporation.po.Corporation;
@@ -18,7 +19,9 @@ import com.fjhx.sale.mapper.intermediate.IntermediateContractMapper;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.documents.DocumentsService;
 import com.fjhx.sale.service.intermediate.IntermediateContractService;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +29,7 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -52,11 +56,14 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
     public Page<IntermediateContractVo> getPage(IntermediateContractSelectDto dto) {
         IWrapper<IntermediateContract> wrapper = getWrapper();
         //买方公司过滤
-        wrapper.eq(IntermediateContract::getBuyCorporationId, dto.getBuyCorporationId());
+        wrapper.orderByDesc("d.create_time");
+        wrapper.eq(StringUtils.isNotEmpty(dto.getKeyword()),"c.code", dto.getKeyword());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getBuyCorporationId()),"c.buy_corporation_id", dto.getBuyCorporationId());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getSellCorporationId()),"c.sell_corporation_id", dto.getSellCorporationId());
+        List<IntermediateContract> intermediateContracts = this.list(Wrappers.<IntermediateContract>query().lambda().select(IntermediateContract::getDocumentsId));
+        List<Long> ids = intermediateContracts.stream().map(IntermediateContract::getDocumentsId).collect(Collectors.toList());
+        wrapper.notIn("d.id",ids);
         //卖方公司过滤
-        wrapper.eq(IntermediateContract::getSellCorporationId, dto.getSellCorporationId());
-
-        wrapper.orderByDesc("ic", IntermediateContract::getId);
         Page<IntermediateContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<IntermediateContractVo> records = page.getRecords();
         //赋值原买方公司名称 客户
@@ -67,16 +74,16 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
         corporationService.attributeAssign(records, IntermediateContractVo::getOldSellCorporationId, (item, corporation) -> {
             item.setOldSellCorporationName(corporation.getName());
         });
-        //赋值中间合同重新赋值过后的买方名称
-        corporationService.attributeAssign(records, IntermediateContractVo::getBuyCorporationId, (item, corporation) -> {
-            item.setBuyCorporationName(corporation.getName());
-        });
-        //赋值中间合同重新赋值过后的卖方名称
-        corporationService.attributeAssign(records, IntermediateContractVo::getSellCorporationId, (item, corporation) -> {
-            item.setSellCorporationName(corporation.getName());
-        });
+//        //赋值中间合同重新赋值过后的买方名称
+//        corporationService.attributeAssign(records, IntermediateContractVo::getBuyCorporationId, (item, corporation) -> {
+//            item.setBuyCorporationName(corporation.getName());
+//        });
+//        //赋值中间合同重新赋值过后的卖方名称
+//        corporationService.attributeAssign(records, IntermediateContractVo::getSellCorporationId, (item, corporation) -> {
+//            item.setSellCorporationName(corporation.getName());
+//        });
         //赋值最近操作用户
-        UserUtil.assignmentNickName(records, IntermediateContractVo::getUpdateUser, IntermediateContractVo::setOpUserName);
+//        UserUtil.assignmentNickName(records, IntermediateContractVo::getUpdateUser, IntermediateContractVo::setOpUserName);
         return page;
     }
 

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -298,4 +298,6 @@
         </set>
         where id = #{upId}
     </update>
+
+
 </mapper>

hx-sale/src/main/resources/mapper/intermediate/IntermediateContractMapper.xml

@@ -2,26 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.sale.mapper.intermediate.IntermediateContractMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.intermediate.vo.IntermediateContractVo">
-        SELECT c.CODE,
-               c.amount,
-               c.currency,
-               c.sell_corporation_id oldSellCorporationId,
-               c.buy_corporation_id  oldBuyCorporationId,
-               d.id                  documentsId,
-               ic.sell_corporation_id,
-               ic.sell_contact_name,
-               ic.sell_contact_number,
-               ic.buy_corporation_id,
-               ic.buy_contact_name,
-               ic.buy_contact_number,
-               ic.create_user,
-               ic.create_time,
-               ic.update_user,
-               ic.update_time
-        FROM documents d
-                 LEFT JOIN contract c ON d.contract_id = c.id
-                 LEFT JOIN documents_transport dp ON d.id = dp.documents_id
-                 LEFT JOIN intermediate_contract ic ON ic.documents_id = d.id
+        SELECT
+            c.CODE,
+            c.amount,
+            c.currency,
+            c.sell_corporation_id oldSellCorporationId,
+            c.buy_corporation_id oldBuyCorporationId
+        FROM
+            documents d
+        LEFT JOIN contract c ON d.contract_id = c.id
             ${ew.customSqlSegment}
     </select>
 
@@ -34,4 +23,7 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getAllIds" resultType="java.lang.String">
+        select GROUP_CONCAT(documents_id)AS ids FROM intermediate_contract
+    </select>
 </mapper>