账期：资金协调手续-根据客户简称获取基础数据

@@ -1008,6 +1008,9 @@ CREATE TABLE `fund_coordination` (
      `credit_limit` varchar(100) DEFAULT NULL COMMENT '授权额度',
      `order_date` date DEFAULT NULL COMMENT '订货日期',
      `order_quantity` decimal(15,4) DEFAULT NULL COMMENT '订货数量',
+     `total_accounts_receivable` varchar(100) DEFAULT NULL COMMENT '总计应收款',
+     `overdue_receivables` varchar(100) DEFAULT NULL COMMENT '超期应收款',
+     `agreed_internal_receivables` varchar(100) DEFAULT NULL COMMENT '约定内应收款',
      `requirement_specification` text DEFAULT NULL COMMENT '协调事由需求说明',
      `office_clerk` varchar(32) DEFAULT NULL COMMENT '办事处内勤ID',
      `office_clerk_opinion` text DEFAULT NULL COMMENT '办事处内勤审核意见',

@@ -117,6 +117,24 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
     private BigDecimal orderQuantity;
 
     /**
+     * 总计应收款
+     */
+    @ApiModelProperty("总计应收款")
+    private String totalAccountsReceivable;
+
+    /**
+     * 超期应收款
+     */
+    @ApiModelProperty("超期应收款")
+    private String overdueReceivables;
+
+    /**
+     * 约定内应收款
+     */
+    @ApiModelProperty("约定内应收款")
+    private String agreedInternalReceivables;
+
+    /**
      * 协调事由需求说明
      */
     @ApiModelProperty("协调事由需求说明")

@@ -109,6 +109,24 @@ public class QueryFundCoordinationBo extends BaseBo<FundCoordination> {
     private BigDecimal orderQuantity;
 
     /**
+     * 总计应收款
+     */
+    @ApiModelProperty("总计应收款")
+    private String totalAccountsReceivable;
+
+    /**
+     * 超期应收款
+     */
+    @ApiModelProperty("超期应收款")
+    private String overdueReceivables;
+
+    /**
+     * 约定内应收款
+     */
+    @ApiModelProperty("约定内应收款")
+    private String agreedInternalReceivables;
+
+    /**
      * 协调事由需求说明
      */
     @ApiModelProperty("协调事由需求说明")

@@ -22,12 +22,14 @@ import com.lframework.xingyun.sc.bo.ledger.fund.QueryFundCoordinationBo;
 import com.lframework.xingyun.sc.bo.ledger.rel.GetFundOrderingUnitBo;
 import com.lframework.xingyun.sc.entity.FundCoordination;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
+import com.lframework.xingyun.sc.entity.UnlimitedGuaranteeLetter;
 import com.lframework.xingyun.sc.service.ledger.FundCoordinationService;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
+import com.lframework.xingyun.sc.service.ledger.UnlimitedGuaranteeLetterService;
 import com.lframework.xingyun.sc.vo.ledger.fund.CreateFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.QueryFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.UpdateFundCoordinationVo;
-import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
+import com.lframework.xingyun.sc.vo.ledger.guarantee.QueryUnlimitedGuaranteeLetterVo;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
@@ -39,6 +41,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -67,6 +71,8 @@ public class FundCoordinationController extends DefaultBaseController {
     private ReceiptLedgerInfoService receiptLedgerInfoService;
     @Resource
     private SysDataDicItemService sysDataDicItemService;
+    @Resource
+    private UnlimitedGuaranteeLetterService unlimitedGuaranteeLetterService;
 
     /**
      * 查询列表
@@ -166,14 +172,11 @@ public class FundCoordinationController extends DefaultBaseController {
 
     @ApiOperation("查询")
     @PostMapping("/getBaseInfo")
-    public InvokeResult<List<GetFundCoordinationBo>> getBaseInfo(@RequestBody(required = false) List<String> ids) {
-        if (CollectionUtil.isEmpty(ids)) {
+    public InvokeResult<List<GetFundCoordinationBo>> getBaseInfo(@RequestBody(required = false) List<String> names) {
+        if (CollectionUtil.isEmpty(names)) {
             return InvokeResultBuilder.success(CollectionUtil.emptyList());
         }
-        QueryReceiptLedgerInfoVo vo = new QueryReceiptLedgerInfoVo();
-        vo.setCustomerShortId(ids.get(0));
-        vo.setIncludeEndAccountReceivable(true);
-        List<ReceiptLedgerInfo> query = receiptLedgerInfoService.query(vo);
+        List<ReceiptLedgerInfo> query = receiptLedgerInfoService.queryByCustomerShortName(names.get(0));
         if (CollectionUtil.isEmpty(query)) {
             return InvokeResultBuilder.success(CollectionUtil.emptyList());
         }
@@ -196,12 +199,35 @@ public class FundCoordinationController extends DefaultBaseController {
         Map<String, List<ReceiptLedgerInfo>> map = query.stream()
                 .collect(Collectors.groupingBy(ReceiptLedgerInfo::getCustomerId));
         StringBuilder customerNameStr = new StringBuilder();
+        //无限担保书
+        StringBuilder unlimitedGuaranteeLetterStr = new StringBuilder();
         //订货单位集合
         List<GetFundOrderingUnitBo> fundOrderingUnitList = new ArrayList<>();
+        //总计应收款
+        BigDecimal totalAccountsReceivable = BigDecimal.ZERO;
+        //超期应收款
+        BigDecimal overdueReceivables = BigDecimal.ZERO;
+        //一次协调
+        BigDecimal firstCoordinate = BigDecimal.ZERO;
+        //二次协调
+        BigDecimal second = BigDecimal.ZERO;
+        //清欠
+        BigDecimal clearDebts = BigDecimal.ZERO;
+        //约定内应收款
+        BigDecimal agreedInternalReceivables = BigDecimal.ZERO;
         for (Map.Entry<String, List<ReceiptLedgerInfo>> entry : map.entrySet()) {
             String customerId = entry.getKey();
             List<ReceiptLedgerInfo> receiptList = entry.getValue();
             customerNameStr.append(receiptList.get(0).getCustomerName()).append("、");
+            //无限担保书
+            QueryUnlimitedGuaranteeLetterVo vo1 = new QueryUnlimitedGuaranteeLetterVo();
+            vo1.setOrderingUnit(customerId);
+            List<UnlimitedGuaranteeLetter> query1 = unlimitedGuaranteeLetterService.query(vo1);
+            if (CollectionUtil.isEmpty(query1)) {
+                unlimitedGuaranteeLetterStr.append("无").append("，");
+            } else {
+                unlimitedGuaranteeLetterStr.append("有").append("，");
+            }
             GetFundOrderingUnitBo bo = new GetFundOrderingUnitBo();
             bo.setOrderingUnit(customerId);
             bo.setOrderingUnitName(receiptList.get(0).getCustomerName());
@@ -215,8 +241,46 @@ public class FundCoordinationController extends DefaultBaseController {
                     bo1.setAccountsReceivable(receipt.getStartAccountReceivable().stripTrailingZeros().toPlainString());
                 }
                 SysDataDicItem sysDataDicItem = sysDataDicItemService.findByCode("DEBT_STATUS", receipt.getDebtStatus());
+                if (sysDataDicItem != null && sysDataDicItem.getCode().equals("FIRST_COORDINATE")) {
+                    if (receipt.getStartAccountReceivable() != null) {
+                        //一次协调
+                        firstCoordinate = firstCoordinate.add(receipt.getStartAccountReceivable());
+                        //超期应收款
+                        overdueReceivables = overdueReceivables.add(receipt.getStartAccountReceivable());
+                        //总计应收款
+                        totalAccountsReceivable = totalAccountsReceivable.add(receipt.getStartAccountReceivable());
+                    }
+                }
+                if (sysDataDicItem != null && sysDataDicItem.getCode().equals("SECOND_COORDINATE")) {
+                    if (receipt.getStartAccountReceivable() != null) {
+                        //二次协调
+                        second = second.add(receipt.getStartAccountReceivable());
+                        //超期应收款
+                        overdueReceivables = overdueReceivables.add(receipt.getStartAccountReceivable());
+                        //总计应收款
+                        totalAccountsReceivable = totalAccountsReceivable.add(receipt.getStartAccountReceivable());
+                    }
+                }
+                if (sysDataDicItem != null && sysDataDicItem.getCode().equals("CLEAR_DEBTS")) {
+                    if (receipt.getStartAccountReceivable() != null) {
+                        //清欠
+                        clearDebts = clearDebts.add(receipt.getStartAccountReceivable());
+                        //超期应收款
+                        overdueReceivables = overdueReceivables.add(receipt.getStartAccountReceivable());
+                        //总计应收款
+                        totalAccountsReceivable = totalAccountsReceivable.add(receipt.getStartAccountReceivable());
+                    }
+                }
+                if (sysDataDicItem != null && sysDataDicItem.getCode().equals("AGREEMENT")) {
+                    if (receipt.getStartAccountReceivable() != null) {
+                        //约定内应收款
+                        agreedInternalReceivables = agreedInternalReceivables.add(receipt.getStartAccountReceivable());
+                        //总计应收款
+                        totalAccountsReceivable = totalAccountsReceivable.add(receipt.getStartAccountReceivable());
+                    }
+                }
                 if (!(sysDataDicItem != null && (sysDataDicItem.getCode().equals("FIRST_COORDINATE")
-                        || sysDataDicItem.getCode().equals("SECOND") || sysDataDicItem.getCode().equals("CLEAR_DEBTS")))) {
+                        || sysDataDicItem.getCode().equals("SECOND_COORDINATE") || sysDataDicItem.getCode().equals("CLEAR_DEBTS")))) {
                     continue;
                 }
                 bo1.setStatus(sysDataDicItem.getName());
@@ -241,6 +305,50 @@ public class FundCoordinationController extends DefaultBaseController {
             customerNameStr.deleteCharAt(customerNameStr.length() - 1);
         }
         getFundCoordinationBo.setOrderingUnitName(customerNameStr.toString());
+        //无限担保书
+        if (unlimitedGuaranteeLetterStr.length() > 0) {
+            unlimitedGuaranteeLetterStr.deleteCharAt(unlimitedGuaranteeLetterStr.length() - 1);
+        }
+        getFundCoordinationBo.setUnlimitedGuaranteeLetter(unlimitedGuaranteeLetterStr.toString());
+        //总计应收款
+        if (totalAccountsReceivable.compareTo(BigDecimal.ZERO) > 0) {
+            getFundCoordinationBo.setTotalAccountsReceivable(totalAccountsReceivable.stripTrailingZeros().toPlainString());
+        }
+        //超期应收款
+        StringBuilder overdueReceivablesStr = new StringBuilder();
+        if (overdueReceivables.compareTo(BigDecimal.ZERO) > 0) {
+            BigDecimal amountInWan = overdueReceivables.divide(BigDecimal.valueOf(10000), 10, RoundingMode.HALF_UP);
+            String string = amountInWan.stripTrailingZeros().toPlainString();
+            overdueReceivablesStr.append(string).append("万").append("（其中");
+        }
+        if (firstCoordinate.compareTo(BigDecimal.ZERO) > 0) {
+            BigDecimal amountInWan = firstCoordinate.divide(BigDecimal.valueOf(10000), 10, RoundingMode.HALF_UP);
+            String string = amountInWan.stripTrailingZeros().toPlainString();
+            overdueReceivablesStr.append("一次协调").append(string).append("万，");
+        }
+        //二次协调
+        if (second.compareTo(BigDecimal.ZERO) > 0) {
+            BigDecimal amountInWan = second.divide(BigDecimal.valueOf(10000), 10, RoundingMode.HALF_UP);
+            String string = amountInWan.stripTrailingZeros().toPlainString();
+            overdueReceivablesStr.append("二次协调").append(string).append("万，");
+        }
+        //清欠
+        if (clearDebts.compareTo(BigDecimal.ZERO) > 0) {
+            BigDecimal amountInWan = clearDebts.divide(BigDecimal.valueOf(10000), 10, RoundingMode.HALF_UP);
+            String string = amountInWan.stripTrailingZeros().toPlainString();
+            overdueReceivablesStr.append("清欠").append(string).append("万，");
+        }
+        if (overdueReceivablesStr.length() > 0) {
+            overdueReceivablesStr.deleteCharAt(overdueReceivablesStr.length() - 1);
+            overdueReceivablesStr.append("）");
+            getFundCoordinationBo.setOverdueReceivables(overdueReceivablesStr.toString());
+        }
+        //约定内应收款
+        if (agreedInternalReceivables.compareTo(BigDecimal.ZERO) > 0) {
+            BigDecimal amountInWan = agreedInternalReceivables.divide(BigDecimal.valueOf(10000), 10, RoundingMode.HALF_UP);
+            String string = amountInWan.stripTrailingZeros().toPlainString();
+            getFundCoordinationBo.setAgreedInternalReceivables(string + "万");
+        }
         getFundCoordinationBo.setFundOrderingUnitList(fundOrderingUnitList);
         data.add(getFundCoordinationBo);
 

@@ -102,6 +102,21 @@ public class FundCoordination extends BaseEntity implements BaseDto {
     private BigDecimal orderQuantity;
 
     /**
+     * 总计应收款
+     */
+    private String totalAccountsReceivable;
+
+    /**
+     * 超期应收款
+     */
+    private String overdueReceivables;
+
+    /**
+     * 约定内应收款
+     */
+    private String agreedInternalReceivables;
+
+    /**
      * 协调事由需求说明
      */
     private String requirementSpecification;

@@ -97,6 +97,25 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     }
 
     @Override
+    public List<ReceiptLedgerInfo> queryByCustomerShortName(String customerShortName) {
+        List<ReceiptLedgerInfo> infoList = getBaseMapper().queryByCustomerShortName(customerShortName);
+        if (CollectionUtils.isEmpty(infoList)) {
+            return Collections.emptyList();
+        }
+        // 获取客户类型（数据字典）
+        List<SysDataDicItem> enterpriseTypeList = sysDataDicItemService.findByDicCode("ENTERPRISE_TYPE");
+        Map<String, String> enterpriseTypeMap = enterpriseTypeList.stream()
+                .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName, (v1, v2) -> v1));
+        for (ReceiptLedgerInfo info : infoList) {
+            String customerType = info.getCustomerType();
+            String enterpriseType = enterpriseTypeMap.get(customerType);
+
+            info.setCustomerType(enterpriseType);
+        }
+        return infoList;
+    }
+
+    @Override
     public ReceiptLedgerInfo findById(String id) {
         QueryReceiptLedgerInfoVo ledgerInfoVo = new QueryReceiptLedgerInfoVo();
         ledgerInfoVo.setId(id);

@@ -25,6 +25,14 @@ public interface ReceiptLedgerInfoMapper extends BaseMapper<ReceiptLedgerInfo> {
      */
     List<ReceiptLedgerInfo> query(@Param("vo") QueryReceiptLedgerInfoVo vo);
 
+    /**
+     * 查询列表
+     *
+     * @param customerShortName 查询条件
+     * @return List<ReceiptLedgerInfo>
+     */
+    List<ReceiptLedgerInfo> queryByCustomerShortName(@Param("customerShortName") String customerShortName);
+
 
     /**
      * 批量新增

@@ -32,6 +32,14 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
     List<ReceiptLedgerInfo> query(QueryReceiptLedgerInfoVo vo);
 
     /**
+     * 查询列表
+     *
+     * @param customerShortName 查询条件
+     * @return List<ReceiptLedgerInfo>
+     */
+    List<ReceiptLedgerInfo> queryByCustomerShortName(String customerShortName);
+
+    /**
      * 根据ID查询
      *
      * @param id    主键ID

@@ -6,10 +6,12 @@ import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import javax.validation.constraints.NotNull;
+import com.lframework.xingyun.sc.vo.ledger.rel.CreateFundOrderingUnitVo;
 import io.swagger.annotations.ApiModelProperty;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
+import java.util.List;
 import lombok.Data;
 
 @Data
@@ -102,10 +104,37 @@ public class CreateFundCoordinationVo implements BaseVo, Serializable {
     private BigDecimal orderQuantity;
 
     /**
+     * 总计应收款
+     */
+    @ApiModelProperty("总计应收款")
+    @Length(message = "总计应收款最多允许100个字符！")
+    private String totalAccountsReceivable;
+
+    /**
+     * 超期应收款
+     */
+    @ApiModelProperty("超期应收款")
+    @Length(message = "超期应收款最多允许100个字符！")
+    private String overdueReceivables;
+
+    /**
+     * 约定内应收款
+     */
+    @ApiModelProperty("约定内应收款")
+    @Length(message = "约定内应收款最多允许100个字符！")
+    private String agreedInternalReceivables;
+
+    /**
      * 协调事由需求说明
      */
     @ApiModelProperty("协调事由需求说明")
     @Length(message = "协调事由需求说明最多允许65,535个字符！")
     private String requirementSpecification;
 
+    /**
+     * 协调事由需求说明
+     */
+    @ApiModelProperty("协调事由需求说明")
+    private List<CreateFundOrderingUnitVo> fundOrderingUnitList;
+
 }

 package com.lframework.xingyun.sc.vo.ledger.fund;
 
+import com.lframework.xingyun.sc.vo.ledger.rel.UpdateFundOrderingUnitVo;
 import lombok.Data;
 import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
 import java.math.BigDecimal;
@@ -10,6 +11,7 @@ import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class UpdateFundCoordinationVo implements BaseVo, Serializable {
@@ -92,10 +94,37 @@ public class UpdateFundCoordinationVo implements BaseVo, Serializable {
     private BigDecimal orderQuantity;
 
     /**
+     * 总计应收款
+     */
+    @ApiModelProperty("总计应收款")
+    @Length(message = "总计应收款最多允许100个字符！")
+    private String totalAccountsReceivable;
+
+    /**
+     * 超期应收款
+     */
+    @ApiModelProperty("超期应收款")
+    @Length(message = "超期应收款最多允许100个字符！")
+    private String overdueReceivables;
+
+    /**
+     * 约定内应收款
+     */
+    @ApiModelProperty("约定内应收款")
+    @Length(message = "约定内应收款最多允许100个字符！")
+    private String agreedInternalReceivables;
+
+    /**
      * 协调事由需求说明
      */
     @ApiModelProperty("协调事由需求说明")
     @Length(message = "协调事由需求说明最多允许65,535个字符！")
     private String requirementSpecification;
 
+    /**
+     * 协调事由需求说明
+     */
+    @ApiModelProperty("协调事由需求说明")
+    private List<UpdateFundOrderingUnitVo> fundOrderingUnitList;
+
 }

@@ -73,7 +73,4 @@ public class QueryReceiptLedgerInfoVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("年份")
     private Integer createYear;
 
-    @ApiModelProperty("是否需要查询期末应收大于0")
-    private boolean includeEndAccountReceivable;
-
 }

@@ -2,9 +2,12 @@ package com.lframework.xingyun.sc.vo.ledger.rel;
 
 import javax.validation.constraints.NotBlank;
 import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.xingyun.sc.vo.ledger.detail.CreateFundOrderingUnitDetailVo;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 
 @Data
@@ -41,4 +44,7 @@ public class CreateFundOrderingUnitVo implements BaseVo, Serializable {
     @Length(message = "备注最多允许65,535个字符！")
     private String remark;
 
+    @ApiModelProperty("资金协调手续订货单位应收款明细")
+    private List<CreateFundOrderingUnitDetailVo> fundOrderingUnitDetailList;
+
 }

 package com.lframework.xingyun.sc.vo.ledger.rel;
 
+import com.lframework.xingyun.sc.vo.ledger.detail.UpdateFundOrderingUnitDetailVo;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class UpdateFundOrderingUnitVo implements BaseVo, Serializable {
@@ -40,4 +42,7 @@ public class UpdateFundOrderingUnitVo implements BaseVo, Serializable {
     @Length(message = "备注最多允许65,535个字符！")
     private String remark;
 
+    @ApiModelProperty("资金协调手续订货单位应收款明细")
+    private List<UpdateFundOrderingUnitDetailVo> fundOrderingUnitDetailList;
+
 }

@@ -18,6 +18,9 @@
         <result column="credit_limit" property="creditLimit"/>
         <result column="order_date" property="orderDate"/>
         <result column="order_quantity" property="orderQuantity"/>
+        <result column="total_accounts_receivable" property="totalAccountsReceivable"/>
+        <result column="overdue_receivables" property="overdueReceivables"/>
+        <result column="agreed_internal_receivables" property="agreedInternalReceivables"/>
         <result column="requirement_specification" property="requirementSpecification"/>
         <result column="office_clerk" property="officeClerk"/>
         <result column="office_clerk_opinion" property="officeClerkOpinion"/>
@@ -62,6 +65,9 @@
             tb.credit_limit,
             tb.order_date,
             tb.order_quantity,
+            tb.total_accounts_receivable,
+            tb.overdue_receivables,
+            tb.agreed_internal_receivables,
             tb.requirement_specification,
             tb.office_clerk,
             tb.office_clerk_opinion,

@@ -120,8 +120,16 @@
             <if test="vo.deptName != null and vo.deptName != ''">
                 AND d.name LIKE CONCAT('%', #{vo.deptName}, '%')
             </if>
-            <if test="vo.includeEndAccountReceivable == true">
-                AND tb.end_account_receivable >0
+        </where>
+    </select>
+
+    <select id="queryByCustomerShortName" resultMap="ReceiptLedgerInfo">
+        <include refid="ReceiptLedgerInfo_sql"/>
+        <where>
+            AND tb.del_flag = false
+            AND tb.end_account_receivable >0
+            <if test="customerShortName != null and customerShortName != ''">
+                AND cs.short_name = #{customerShortName}
             </if>
         </where>
     </select>