利润结算表添加请款支出

hx-account/src/main/java/com/fjhx/account/controller/account/AccountRequestFundsDetailController.java

@@ -9,6 +9,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.account.service.account.AccountRequestFundsDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -65,4 +67,12 @@ public class AccountRequestFundsDetailController {
         accountRequestFundsDetailService.delete(dto.getId());
     }
 
+    /**
+     * 分页
+     */
+    @PostMapping("/list")
+    public List<AccountRequestFundsDetailVo> list(@RequestBody AccountRequestFundsDetailSelectDto dto) {
+        return accountRequestFundsDetailService.getList(dto);
+    }
+
 }

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountRequestFundsDetailSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class AccountRequestFundsDetailSelectDto extends BaseSelectDto {
 
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
 }

hx-account/src/main/java/com/fjhx/account/mapper/account/AccountRequestFundsDetailMapper.java

@@ -1,6 +1,7 @@
 package com.fjhx.account.mapper.account;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
@@ -53,6 +54,6 @@ public interface AccountRequestFundsDetailMapper extends BaseMapper<AccountReque
      * @param eq
      * @return
      */
-    List<AccountRequestFundsDetail> getList(@Param("ew") LambdaQueryWrapper<AccountRequestFundsDetail> eq);
+    List<AccountRequestFundsDetailVo> getList(@Param("ew") IWrapper<AccountRequestFundsDetail> eq);
 
 }

hx-account/src/main/java/com/fjhx/account/service/account/AccountRequestFundsDetailService.java

@@ -1,12 +1,14 @@
 package com.fjhx.account.service.account;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailSelectDto;
 import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
 import com.ruoyi.common.core.service.BaseService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 
 import java.util.List;
 
@@ -69,10 +71,7 @@ public interface AccountRequestFundsDetailService extends BaseService<AccountReq
 
     /**
      * 获取到请款明细信息
-     *
-     * @param eq
-     * @return
      */
-    List<AccountRequestFundsDetail> getList(LambdaQueryWrapper<AccountRequestFundsDetail> eq);
+    List<AccountRequestFundsDetailVo> getList(AccountRequestFundsDetailSelectDto dto);
 
 }

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

@@ -2,6 +2,7 @@ package com.fjhx.account.service.account.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailDto;
@@ -81,13 +82,12 @@ public class AccountRequestFundsDetailServiceImpl extends ServiceImpl<AccountReq
 
     /**
      * 获取到请款明细信息
-     *
-     * @param eq
-     * @return
      */
     @Override
-    public List<AccountRequestFundsDetail> getList(LambdaQueryWrapper<AccountRequestFundsDetail> eq) {
-        return baseMapper.getList(eq);
+    public List<AccountRequestFundsDetailVo> getList(AccountRequestFundsDetailSelectDto dto) {
+        return baseMapper.getList(IWrapper.<AccountRequestFundsDetail>getWrapper()
+                .eq(AccountRequestFundsDetail::getContractId,dto.getContractId())
+        );
     }
 
     @Override

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

@@ -56,11 +56,12 @@
         WHERE arfd.account_request_funds_id = #{accountRequestFundsId}
     </select>
 
-    <select id="getList" resultType="com.fjhx.account.entity.account.po.AccountRequestFundsDetail">
+    <select id="getList" resultType="com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo">
         SELECT fd.*,
                sc.code contractCode
         FROM account_request_funds_detail fd
-                 LEFT JOIN bytesailing_sale.contract sc ON fd.contract_id = sc.id
+                 LEFT JOIN bytesailing_jxst.sales_contract sc ON fd.contract_id = sc.id
+        ${ew.customSqlSegment}
     </select>
 
 </mapper>

hx-jxst/src/main/java/com/fjhx/jxst/entity/statement/bo/SettlementBo.java

@@ -76,6 +76,11 @@ public class SettlementBo {
     private BigDecimal otherFee;
 
     /**
+     * 请款金额
+     */
+    private BigDecimal requestFundsAmount;
+
+    /**
      * 合同是否结清
      */
     private Integer isSettled;

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -240,6 +240,7 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
         totalExpenditure = totalExpenditure.add(record.getInspectionRedPackFee());//验货红包
         totalExpenditure = totalExpenditure.add(record.getCommissionFee());//佣金
         totalExpenditure = totalExpenditure.add(record.getOtherFee());//其他费用
+        totalExpenditure = totalExpenditure.add(record.getRequestFundsAmount());//请款支出
         record.setTotalExpenditure(totalExpenditure.setScale(4, RoundingMode.HALF_UP));
 
         //毛利(总收入-总支出)

hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml

@@ -33,7 +33,8 @@
             IFNULL( sum( inspectionRedPackFee ), 0 ) AS inspectionRedPackFee,
             IFNULL( sum( commissionFee ), 0 ) AS commissionFee,
             IFNULL( sum( otherFee ), 0 ) AS otherFee,
-            IFNULL( sum( contractAmount ), 0 ) AS contractAmount
+            IFNULL( sum( contractAmount ), 0 ) AS contractAmount,
+            IFNULL( sum( requestFundsAmount ), 0 ) AS requestFundsAmount
         FROM
             (
                 <include refid="getProfitClearing"/>
@@ -46,7 +47,7 @@
             sc.`code` AS salesContractCode,
             sc.customer_id,
             cu.`name` AS customerName,
-            ( SELECT IFNULL( sum( cc.contract_money ), 0 ) FROM bytesailing_sale.claim_contract cc WHERE cc.contract_id = sc.id ) AS contractClaimAmount,
+            ( SELECT IFNULL( sum( cc.contract_money ), 0 ) FROM bytesailing_sale.claim_contract cc WHERE cc.del_flag=0 and cc.contract_id = sc.id ) AS contractClaimAmount,
             sc.contract_amount AS contractAmount,
             (
                 SELECT
@@ -57,7 +58,8 @@
                         JOIN bytesailing_mes.work_order wo ON sj.work_order_id = wo.id
                         JOIN sales_contract_details scd ON wo.contract_details_id = scd.id
                 WHERE
-                    scd.sales_contract_id = sc.id
+                    sjd.del_flag=0
+                    and scd.sales_contract_id = sc.id
             ) AS materialFee,
             (
                 SELECT
@@ -76,7 +78,8 @@
             sc.inspection_red_pack_fee AS inspectionRedPackFee,
             sc.commission_fee AS commissionFee,
             sc.other_fee AS otherFee,
-            sc.is_settled
+            sc.is_settled,
+            (SELECT IFNULL( sum( arfd.amount ), 0 ) FROM bytesailing_account.account_request_funds_detail arfd WHERE arfd.contract_id = sc.id) as requestFundsAmount
         FROM
             sales_contract sc
             LEFT JOIN bytesailing_customer.customer cu ON sc.customer_id = cu.id