应收账单查询科目信息

mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java

@@ -3,6 +3,7 @@ package com.linke.finance.application.server.reconciliation;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.dingtalkworkflow_1_0.models.StartProcessInstanceResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.linke.finance.domain.businessDocument.entity.BusinessDocument;
@@ -15,6 +16,7 @@ import com.linke.finance.domain.reconciliation.repository.po.ReconciliationPO;
 import com.linke.finance.domain.reconciliation.repository.todo.ReconciliationDO;
 import com.linke.finance.domain.reconciliation.service.ReconciliationDomainService;
 import com.linke.finance.domain.reconciliationAccount.entity.ReconciliationAccount;
+import com.linke.finance.domain.reconciliationAccount.repository.mapper.ReconciliationAccountMapper;
 import com.linke.finance.domain.reconciliationAccount.repository.todo.ReconciliationAccountDO;
 import com.linke.finance.domain.reconciliationAccount.service.ReconciliationAccountDomainService;
 import com.linke.finance.domain.revenueExpensesRecord.entity.RevenueExpensesRecord;
@@ -87,6 +89,10 @@ public class ReconciliationApplicationService {
     @Resource
     private ReconciliationAccountAssembler reconciliationAccountAssembler;
 
+    @Autowired
+    private ReconciliationAccountMapper reconciliationAccountMapper;
+
+
     /**
      * 分页查询对账单列表
      */
@@ -186,6 +192,11 @@ public class ReconciliationApplicationService {
                     }
                 }
             }
+            List<ReconciliationAccount> reconciliationAccountList=reconciliationAccountMapper.selectList(new QueryWrapper<ReconciliationAccount>()
+                    .lambda().eq(ReconciliationAccount::getReconciliationId,reconciliationPO.getReconciliationId()).eq(ReconciliationAccount::getDelFlag,1));
+            if(ObjectUtil.isNotNull(reconciliationAccountList)&&reconciliationAccountList.size()>0){
+                reconciliationPO.setReconciliationAccountDTOList(reconciliationAccountList);
+            }
         }
 
         return reconciliationPOS;
@@ -248,6 +259,11 @@ public class ReconciliationApplicationService {
     public ReconciliationPO getInfo(Long reconciliationId) {
         ReconciliationPO info = reconciliationDomainService.getInfo(reconciliationId);
         List<BusinessDocument> list = reconciliationDomainService.selectBusinessByReconciliationId(reconciliationId);
+        List<ReconciliationAccount> reconciliationAccountList=reconciliationAccountMapper.selectList(new QueryWrapper<ReconciliationAccount>()
+                .lambda().eq(ReconciliationAccount::getReconciliationId,reconciliationId).eq(ReconciliationAccount::getDelFlag,1));
+        if(ObjectUtil.isNotNull(reconciliationAccountList)&&reconciliationAccountList.size()>0){
+            info.setReconciliationAccountDTOList(reconciliationAccountList);
+        }
         info.setBusinessDocumentList(list);
         return info;
     }

mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java

@@ -1,7 +1,9 @@
 package com.linke.finance.domain.reconciliation.repository.po;
 
 import com.linke.finance.domain.businessDocument.entity.BusinessDocument;
+import com.linke.finance.domain.reconciliationAccount.entity.ReconciliationAccount;
 import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.domain.dto.ReconciliationAccountDTO;
 import lombok.Data;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -242,4 +244,6 @@ public class ReconciliationPO extends BaseVOEntity{
     @ApiModelProperty("结算币种")
     private String settlementCurrency;
 
+    @ApiModelProperty(value = "账单科目明细")
+    public List<ReconciliationAccount> reconciliationAccountDTOList;
 }