添加合同到账记录列表

hx-sale/src/main/java/com/fjhx/sale/controller/claim/ClaimContractController.java

@@ -1,13 +1,20 @@
 package com.fjhx.sale.controller.claim;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
-import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.sale.entity.claim.dto.ClaimContractDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
 import com.fjhx.sale.service.claim.ClaimContractService;
+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.Collections;
+import java.util.List;
 
 
 /**
@@ -15,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 到账认领-合同关联表 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @RestController
@@ -65,4 +72,13 @@ public class ClaimContractController {
         claimContractService.delete(dto.getId());
     }
 
+    /**
+     * 获取合同到账记录
+     */
+    @PostMapping("/getContractClaimRecord")
+    public List<ClaimContractVo> getContractClaimRecord(@RequestBody ClaimContractDto dto) {
+        Assert.notEmpty(dto.getContractId(), "合同id不能为空！");
+        return claimContractService.getListByContractIds(Collections.singletonList(dto.getContractId()));
+    }
+
 }

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

@@ -18,12 +18,17 @@ public class ClaimContractVo extends ClaimContract {
     /**
      * 认领人ID
      */
-    private  Long claimUserId;
+    private Long claimUserId;
 
     /**
      * 认领人名称
      */
-    private  String claimUserName;
+    private String claimUserName;
+
+    /**
+     * 流水币种
+     */
+    private String arwCurrency;
 
 
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/claim/ClaimContractMapper.java

@@ -1,8 +1,8 @@
 package com.fjhx.sale.mapper.claim;
 
-import com.fjhx.sale.entity.claim.po.ClaimContract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.po.ClaimContract;
 import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -25,12 +25,7 @@ public interface ClaimContractMapper extends BaseMapper<ClaimContract> {
      */
     Page<ClaimContractVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ClaimContract> wrapper);
 
-    /**
-     * 通过合同ID集合查询列表
-     * @param wrapper
-     * @return
-     */
-    List<ClaimContract> getListByContractIds(@Param("ew") IWrapper<ClaimContract> wrapper);
+    List<ClaimContractVo> getList(@Param("ew") IWrapper<ClaimContract> wrapper);
 
     /**
      * 根据合同号查询流水ID

hx-sale/src/main/java/com/fjhx/sale/service/claim/ClaimContractService.java

@@ -1,13 +1,11 @@
 package com.fjhx.sale.service.claim;
 
-import com.fjhx.sale.entity.claim.po.ClaimContract;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
-import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
 import com.fjhx.sale.entity.claim.dto.ClaimContractDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.apache.ibatis.annotations.Param;
+import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
+import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
+import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
 
@@ -49,10 +47,11 @@ public interface ClaimContractService extends BaseService<ClaimContract> {
 
     /**
      * 通过合同ID集合查询列表
+     *
      * @param contractIds
      * @return
      */
-    List<ClaimContract> getListByContractIds(List<Long> contractIds);
+    List<ClaimContractVo> getListByContractIds(List<Long> contractIds);
 
     /**
      * 根据合同号查询流水ID

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

@@ -1,16 +1,17 @@
 package com.fjhx.sale.service.claim.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.sale.entity.claim.dto.ClaimContractDto;
+import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
 import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
 import com.fjhx.sale.mapper.claim.ClaimContractMapper;
 import com.fjhx.sale.service.claim.ClaimContractService;
-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.claim.vo.ClaimContractVo;
-import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.sale.entity.claim.dto.ClaimContractDto;
-import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -20,7 +21,7 @@ import java.util.List;
  * 到账认领-合同关联表 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @Service
@@ -58,18 +59,22 @@ public class ClaimContractServiceImpl extends ServiceImpl<ClaimContractMapper, C
 
     /**
      * 通过合同ID集合查询列表
+     *
      * @param contractIds
      * @return
      */
     @Override
-    public List<ClaimContract> getListByContractIds(List<Long> contractIds) {
+    public List<ClaimContractVo> getListByContractIds(List<Long> contractIds) {
         IWrapper<ClaimContract> wrapper = getWrapper();
-        wrapper.in("t1.contract_id", contractIds);
-        return baseMapper.getListByContractIds(wrapper);
+        wrapper.in("cc.contract_id", contractIds);
+        List<ClaimContractVo> list = baseMapper.getList(wrapper);
+        UserUtil.assignmentNickName(list, ClaimContractVo::getCreateUser, ClaimContractVo::setClaimUserName);
+        return list;
     }
 
     /**
      * 根据合同号查询流水ID
+     *
      * @param code
      * @return
      */

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

@@ -15,11 +15,10 @@ import com.fjhx.common.service.currency.CurrencyRateService;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
-import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.sale.entity.claim.po.Claim;
 import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
 import com.fjhx.sale.entity.contract.bo.ContractCurrencyRate;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.statement.dto.ProfitSettlementDto;
@@ -29,9 +28,7 @@ import com.fjhx.sale.service.claim.ClaimService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.statement.SaleStatementService;
 import com.github.pagehelper.util.StringUtil;
-import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.system.utils.UserUtil;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -249,8 +246,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
         // 合同id
         List<Long> contractIdList = list.stream().map(ProfitSettlementVo::getContractId).collect(Collectors.toList());
         //通过合同ID查询到账认领合同的数据
-        List<ClaimContract> claimContractList = claimContractService.getListByContractIds(contractIdList);
-        Map<Long,List<ClaimContract>> claimContractMap = claimContractList.stream().collect(Collectors.groupingBy(ClaimContract::getContractId));
+        List<ClaimContractVo> claimContractList = claimContractService.getListByContractIds(contractIdList);
+        Map<Long, List<ClaimContract>> claimContractMap = claimContractList.stream().collect(Collectors.groupingBy(ClaimContract::getContractId));
 
         //通过合同ID查询到退税数据
         List<TaxRefundDetails> refundDetails = taxRefundDetailsService.getSumMoneyByContractIds(contractIdList);

hx-sale/src/main/resources/mapper/claim/ClaimContractMapper.xml

@@ -15,22 +15,35 @@
             ${ew.customSqlSegment}
     </select>
 
-    <select id="getListByContractIds" resultType="com.fjhx.sale.entity.claim.po.ClaimContract">
-        SELECT
-            t1.*,
-            t2.business_id
-        FROM
-            claim_contract t1
-        LEFT JOIN claim t2 ON t1.claim_id = t2.id
+    <select id="getList" resultType="com.fjhx.sale.entity.claim.vo.ClaimContractVo">
+        SELECT cc.id,
+               cc.claim_id,
+               cc.contract_id,
+               c.`code`       AS contract_code,
+               c.currency,
+               cc.money,
+               cc.contract_money,
+               cc.money_cny,
+               cc.data_type,
+               cc.rate,
+               cc.claim_type,
+               cc.create_user,
+               cc.create_time,
+               cc.update_user,
+               cc.update_time,
+               cc.create_user as claimUserId,
+               cl.business_id,
+               arw.currency   AS arwCurrency
+        FROM claim_contract cc
+                 JOIN claim cl ON cc.claim_id = cl.id
+                 JOIN bytesailing_account.account_running_water arw ON cl.business_id = arw.id
+                 JOIN contract c ON cc.contract_id = c.id
             ${ew.customSqlSegment}
     </select>
     <select id="getAccountWaterIdsByContractCode" resultType="java.lang.Long">
-        SELECT
-            business_id
-        FROM
-            claim_contract t1
-                LEFT JOIN claim t2 ON t1.claim_id = t2.id
-        WHERE
-            t1.contract_code LIKE concat('%',#{contractCode},'%')
+        SELECT business_id
+        FROM claim_contract t1
+                 LEFT JOIN claim t2 ON t1.claim_id = t2.id
+        WHERE t1.contract_code LIKE concat('%', #{contractCode}, '%')
     </select>
 </mapper>