后端未返回已到账金额字段

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

@@ -88,7 +88,6 @@ public class ContractVo extends Contract {
      */
     private BigDecimal sumClaimMoney;
 
-
     /**
      * 交接单附件信息
      */
@@ -113,5 +112,11 @@ public class ContractVo extends Contract {
      * 新到款状态
      */
     private String refundStatusNew;
+
+    private BigDecimal refundMoney;
+
+    public BigDecimal getRefundMoney() {
+        return sumClaimMoney;
+    }
 }
 

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

@@ -156,38 +156,42 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         }
         Page<ContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ContractVo> list = page.getRecords();
-        if(CollectionUtils.isNotEmpty(list)){
-            List<Long> customerIds = list.stream().map(Contract::getBuyCorporationId).collect(Collectors.toList());
-            List<Customer> customerList = customerService.list(Wrappers.<Customer>query().lambda().in(Customer::getId, customerIds));
-            Map<Long, List<Customer>> cusMap = customerList.stream().distinct().collect(Collectors.groupingBy(Customer::getId));
-
-            List<Long> ids = list.stream().map(ContractVo::getId).collect(Collectors.toList());
-            //获取交接单附件
-            Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(ids, 1);
-
-            //获取包装附件
-            Map<Long, List<FileInfoVo>> packageFileMap = ObsFileUtil.getFileMap(ids, 2);
-            for (ContractVo p : list) {
-                if (MapUtils.isNotEmpty(cusMap)) {//客户
-                    List<Customer> customers = cusMap.getOrDefault(p.getBuyCorporationId(), null);
-                    p.setBuyCorporationName(customers == null ? null : customers.get(0).getName());
-                    //赋值客户标签
-                    p.setTag(customers == null ? null : customers.get(0).getTag());
-                }
+        if (CollectionUtils.isEmpty(list)) {
+            return page;
+        }
 
-                //赋值交接单附件
-                if (MapUtils.isNotEmpty(fileMap)){
-                    List<FileInfoVo> fileInfoVos = fileMap.get(p.getId());
-                    p.setFileInfoVos(fileInfoVos);
-                }
+        List<Long> customerIds = list.stream().map(Contract::getBuyCorporationId).collect(Collectors.toList());
+        List<Customer> customerList = customerService.list(Wrappers.<Customer>query().lambda().in(Customer::getId, customerIds));
+        Map<Long, List<Customer>> cusMap = customerList.stream().distinct().collect(Collectors.groupingBy(Customer::getId));
 
-                //赋值包装附件信息
-                if (MapUtils.isNotEmpty(packageFileMap)){
-                    List<FileInfoVo>  packageFileInfoVOList= packageFileMap.get(p.getId());
-                    p.setPackageFileInfoVOList(packageFileInfoVOList);
-                }
+        List<Long> ids = list.stream().map(ContractVo::getId).collect(Collectors.toList());
+
+        // 获取交接单附件
+        Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(ids, 1);
 
+        // 获取包装附件
+        Map<Long, List<FileInfoVo>> packageFileMap = ObsFileUtil.getFileMap(ids, 2);
+
+        for (ContractVo p : list) {
+            if (MapUtils.isNotEmpty(cusMap)) {// 客户
+                List<Customer> customers = cusMap.getOrDefault(p.getBuyCorporationId(), null);
+                p.setBuyCorporationName(customers == null ? null : customers.get(0).getName());
+                // 赋值客户标签
+                p.setTag(customers == null ? null : customers.get(0).getTag());
+            }
+
+            // 赋值交接单附件
+            if (MapUtils.isNotEmpty(fileMap)) {
+                List<FileInfoVo> fileInfoVos = fileMap.get(p.getId());
+                p.setFileInfoVos(fileInfoVos);
             }
+
+            // 赋值包装附件信息
+            if (MapUtils.isNotEmpty(packageFileMap)) {
+                List<FileInfoVo> packageFileInfoVOList = packageFileMap.get(p.getId());
+                p.setPackageFileInfoVOList(packageFileInfoVOList);
+            }
+
         }
         return page;
     }

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

@@ -2,28 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.sale.mapper.contract.ContractMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
-        SELECT
-            *
-        FROM
-        (
-            SELECT
-                t1.*,
-                CASE
-                WHEN ( t1.amount - t1.sumClaimMoney ) &lt;= 0 THEN
-                20
-                WHEN t1.sumClaimMoney = 0 THEN
-                0 ELSE 10
-            END AS refundStatusNew
-        FROM
-        (
-            SELECT
-            t1.*,
-            ( SELECT IFNULL( SUM( money ), 0 ) FROM claim_contract WHERE contract_id = t1.id ) AS sumClaimMoney
-        FROM
-            contract t1
-            ) t1
-        ) t1
-        ${ew.customSqlSegment}
+        SELECT *
+        FROM (SELECT t1.*,
+                     CASE
+                         WHEN (t1.amount - t1.sumClaimMoney) &lt;= 0 THEN
+                             20
+                         WHEN t1.sumClaimMoney = 0 THEN
+                             0
+                         ELSE 10
+                         END AS refundStatusNew
+              FROM (SELECT t1.*,
+                           (SELECT IFNULL(SUM(money), 0) FROM claim_contract WHERE contract_id = t1.id) AS sumClaimMoney
+                    FROM contract t1) t1) t1
+            ${ew.customSqlSegment}
     </select>
 
     <select id="getProfitClearingPage" resultType="com.fjhx.sale.entity.contract.vo.ContractBudgetVo">