问题处理

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountRequestFundsVo.java

@@ -49,7 +49,7 @@ public class AccountRequestFundsVo extends AccountRequestFunds {
     private BigDecimal accountPaymentAmount;
 
     //请款详情表的信息
-    private List<AccountRequestFundsDetail> accountRequestFundsDetailList;
+    private List<AccountRequestFundsDetailVo> accountRequestFundsDetailList;
 
     /**
      * 附件信息

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

@@ -11,6 +11,7 @@ import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.po.AccountRequestFunds;
 import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
 import com.fjhx.account.mapper.account.AccountRequestFundsMapper;
 import com.fjhx.account.service.account.AccountRequestFundsDetailService;
@@ -70,6 +71,7 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), "arf.status", dto.getStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()), "ap.status", dto.getPaymentStatus());
         wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()), "arf.payment_remarks", dto.getKeyword());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getWriteOffStatus()), "arf.write_off_status", dto.getWriteOffStatus());
         wrapper.orderByDesc("ap.status", "arf.payment_time", "arf.create_time");
         Page<AccountRequestFundsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
@@ -120,10 +122,12 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         AccountRequestFundsVo accountRequestFundsVo = BeanUtil.toBean(accountRequestFunds, AccountRequestFundsVo.class);
 
         // 获取到请款明细信息
-        List<AccountRequestFundsDetail> accountRequestFundsDetailList = accountRequestFundsDetailService.list(q -> q
-                .eq(AccountRequestFundsDetail::getAccountRequestFundsId, accountRequestFunds.getId()));
+//        List<AccountRequestFundsDetail> accountRequestFundsDetailList = accountRequestFundsDetailService.list(q -> q
+//                .eq(AccountRequestFundsDetail::getAccountRequestFundsId, accountRequestFunds.getId()));
+        List<AccountRequestFundsDetailVo> accountRequestFundsDetailVos =
+                accountRequestFundsDetailService.listByAccountRequestFundsId(accountRequestFunds.getId());
 
-        accountRequestFundsVo.setAccountRequestFundsDetailList(accountRequestFundsDetailList);
+        accountRequestFundsVo.setAccountRequestFundsDetailList(accountRequestFundsDetailVos);
 
         // 查询归属公司的名称
         Corporation corporation = corporationService.getById(accountRequestFundsVo.getCorporationId());
@@ -141,11 +145,15 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         }
         accountRequestFundsVo.setDeptName(sysDept.getDeptName());
         DynamicDataSourceContextHolder.poll();
-        //赋值流程id
+
+        // 切换数据源
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+        // 赋值流程实例id
         FlowExample flowExample = flowExampleService.getOne(q -> q.eq(FlowExample::getBusinessId, accountRequestFunds.getId()));
         if (ObjectUtil.isNotEmpty(flowExample)) {
             accountRequestFundsVo.setFlowInfoId(flowExample.getId());
         }
+        DynamicDataSourceContextHolder.poll();
 
         return accountRequestFundsVo;
     }

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

@@ -37,5 +37,7 @@
                 LEFT JOIN bytesailing_sale.contract c ON arfd.contract_id
         WHERE
             arfd.account_request_funds_id = #{accountRequestFundsId}
+        GROUP BY
+            arfd.id
     </select>
 </mapper>