楚江erp：台账明细-手续完善状态逻辑处理

@@ -28,7 +28,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
 @Service
 public class FundOrderingUnitDetailServiceImpl extends BaseMpServiceImpl<FundOrderingUnitDetailMapper, FundOrderingUnitDetail> implements FundOrderingUnitDetailService {
 public class FundOrderingUnitDetailServiceImpl extends BaseMpServiceImpl<FundOrderingUnitDetailMapper, FundOrderingUnitDetail> implements FundOrderingUnitDetailService {
@@ -157,6 +159,15 @@ public class FundOrderingUnitDetailServiceImpl extends BaseMpServiceImpl<FundOrd
     }
     }
 
 
     @Override
     @Override
+    public List<Map<String, Object>> listByLedgerIds(List<String> ledgerIds) {
+        if (CollectionUtils.isEmpty(ledgerIds)) {
+            return Collections.emptyList();
+        }
+
+        return getBaseMapper().queryFundsCoordinateStatus(ledgerIds);
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {
 
 
     }
     }

@@ -28,6 +28,7 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
+import com.lframework.xingyun.sc.service.ledger.FundOrderingUnitDetailService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
@@ -84,6 +85,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     private ContractDistributorStandardService contractDistributorStandardService;
     private ContractDistributorStandardService contractDistributorStandardService;
     @Resource
     @Resource
     private DraftRequestCarTicketService draftRequestCarTicketService;
     private DraftRequestCarTicketService draftRequestCarTicketService;
+    @Resource
+    private FundOrderingUnitDetailService fundOrderingUnitDetailService;
 
 
 
 
     // 定义状态优先级顺序（从高到低）
     // 定义状态优先级顺序（从高到低）
@@ -121,11 +124,34 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         List<SysDataDicItem> debtStatusList = sysDataDicItemService.findByDicCode("DEBT_STATUS");
         List<SysDataDicItem> debtStatusList = sysDataDicItemService.findByDicCode("DEBT_STATUS");
         Map<String, String> debtStatusMap = debtStatusList.stream()
         Map<String, String> debtStatusMap = debtStatusList.stream()
                 .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName, (v1, v2) -> v1));
                 .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName, (v1, v2) -> v1));
+        // 获取资金协调状态
+        Map<String, String> fundCoordinateStatusMap = new HashMap<>();
+        List<String> ledgerIds = infoList.stream().map(ReceiptLedgerInfo::getId).collect(Collectors.toList());
+        List<Map<String, Object>> fundCoordinateStatusList = fundOrderingUnitDetailService.listByLedgerIds(ledgerIds);
+        if (CollectionUtils.isNotEmpty(fundCoordinateStatusList)) {
+            for (Map<String, Object> map : fundCoordinateStatusList) {
+                String ledgerId = (String) map.get("ledger_id");
+                String debtStatus = (String) map.get("debt_status");
+                String status = (String) map.get("status");
+
+                fundCoordinateStatusMap.put(ledgerId + "_" + debtStatus, status);
+            }
+        }
         for (ReceiptLedgerInfo info : infoList) {
         for (ReceiptLedgerInfo info : infoList) {
             String customerType = info.getCustomerType();
             String customerType = info.getCustomerType();
             String enterpriseType = enterpriseTypeMap.get(customerType);
             String enterpriseType = enterpriseTypeMap.get(customerType);
             String debtStatus = info.getDebtStatus();
             String debtStatus = info.getDebtStatus();
             String debtStatusName = debtStatusMap.get(debtStatus);
             String debtStatusName = debtStatusMap.get(debtStatus);
+            String applyStatus = fundCoordinateStatusMap.get(info.getId() + "_" + debtStatusName);
+            if ("FIRST_COORDINATE".equals(debtStatus) || "SECOND_COORDINATE".equals(debtStatus) || "CLEAR_DEBTS".equals(debtStatus)) {
+                if ("AUDIT".equals(applyStatus)) {
+                    info.setApplyStatus("批复中");
+                } else if ("PASS".equals(applyStatus) || "REFUSE".equals(applyStatus)) {
+                    info.setApplyStatus("已申请");
+                } else {
+                    info.setApplyStatus("未申请");
+                }
+            }
 
 
             info.setCustomerType(enterpriseType);
             info.setCustomerType(enterpriseType);
             info.setDebtStatus(debtStatusName);
             info.setDebtStatus(debtStatusName);

@@ -6,6 +6,7 @@ import com.lframework.xingyun.sc.vo.ledger.detail.QueryFundOrderingUnitDetailVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -23,4 +24,12 @@ public interface FundOrderingUnitDetailMapper extends BaseMapper<FundOrderingUni
     List<FundOrderingUnitDetail> query(@Param("vo") QueryFundOrderingUnitDetailVo vo);
     List<FundOrderingUnitDetail> query(@Param("vo") QueryFundOrderingUnitDetailVo vo);
 
 
     void batchAdd(@Param("list") List<FundOrderingUnitDetail> list);
     void batchAdd(@Param("list") List<FundOrderingUnitDetail> list);
+
+    /**
+     * 根据应收款台账ID获取协调状态
+     *
+     * @param ledgerIds 应收款台账ID集合
+     * @return          List<Map<String, Object>>
+     */
+    List<Map<String, Object>> queryFundsCoordinateStatus(@Param("ledgerIds") List<String> ledgerIds);
 }
 }

@@ -7,6 +7,7 @@ import com.lframework.xingyun.sc.vo.ledger.detail.CreateFundOrderingUnitDetailVo
 import com.lframework.xingyun.sc.vo.ledger.detail.QueryFundOrderingUnitDetailVo;
 import com.lframework.xingyun.sc.vo.ledger.detail.QueryFundOrderingUnitDetailVo;
 import com.lframework.xingyun.sc.vo.ledger.detail.UpdateFundOrderingUnitDetailVo;
 import com.lframework.xingyun.sc.vo.ledger.detail.UpdateFundOrderingUnitDetailVo;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 资金协调手续订货单位明细表 Service
  * 资金协调手续订货单位明细表 Service
@@ -57,4 +58,12 @@ public interface FundOrderingUnitDetailService extends BaseMpService<FundOrderin
      * 批量新增
      * 批量新增
      */
      */
     void batchAdd(List<CreateFundOrderingUnitDetailVo> createFundOrderingUnitDetailVoList);
     void batchAdd(List<CreateFundOrderingUnitDetailVo> createFundOrderingUnitDetailVoList);
+
+    /**
+     * 根据应收款台账ID获取协调明细记录
+     *
+     * @param ledgerIds  应收款台账ID集合
+     * @return           List<Map<String, Object>>
+     */
+    List<Map<String, Object>> listByLedgerIds(List<String> ledgerIds);
 }
 }

@@ -96,4 +96,15 @@
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
+
+    <select id="queryFundsCoordinateStatus" resultType="java.util.Map">
+        select fud.ledger_id,fud.status as debt_status,fc.status
+        from fund_ordering_unit_detail fud
+        left join fund_ordering_unit fu on fud.fund_ordering_unit_id = fu.id
+        left join fund_coordination fc on fu.fund_id = fc.id
+        where fud.ledger_id in
+        <foreach collection="ledgerIds" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
 </mapper>