资金协调手续：问题修复

@@ -145,4 +145,13 @@ public class CustomerShortServiceImpl extends BaseMpServiceImpl<CustomerShortMap
 
         return getBaseMapper().selectList(queryWrapper);
     }
+
+    @Override
+    public List<CustomerShort> getByShortName(String shortName) {
+        if (StringUtils.isBlank(shortName)) {
+            return null;
+        }
+
+        return getBaseMapper().getByShortName(shortName);
+    }
 }

@@ -32,4 +32,6 @@ public interface CustomerShortMapper extends BaseMapper<CustomerShort> {
      */
     List<CustomerShort> queryShortName(@Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize,
                                        @Param("vo") QueryCustomerShortVo vo);
+
+    List<CustomerShort> getByShortName(@Param("shortName") String shortName);
 }

@@ -81,4 +81,12 @@ public interface CustomerShortService extends BaseMpService<CustomerShort> {
      * @return              List<CustomerShort>
      */
     List<CustomerShort> listByCustomerId(List<String> customerIds);
+
+    /**
+     * 根据客户简称查询
+     *
+     * @param shortName 客户简称
+     * @return CustomerShortList
+     */
+    List<CustomerShort> getByShortName(String shortName);
 }

@@ -96,4 +96,13 @@
         ORDER BY create_time desc
         LIMIT #{pageIndex}, #{pageSize}
     </select>
+
+    <select id="getByShortName" resultMap="CustomerShort">
+        <include refid="CustomerShort_sql"/>
+        <where>
+            <if test="shortName != null and shortName != ''">
+                AND tb.short_name = #{shortName}
+            </if>
+        </where>
+    </select>
 </mapper>

@@ -142,6 +142,12 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
     private String requestedShipmentQuantity;
 
     /**
+     * 待交付订单量（吨）
+     */
+    @ApiModelProperty("待交付订单量")
+    private String pendingDeliveryOrderQuantity;
+
+    /**
      * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
      */
     @ApiModelProperty("贸易类型")
@@ -177,6 +183,169 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
     @ApiModelProperty("订货单位主键集合")
     private List<String> orderingUnitIds;
 
+
+    /**
+     * 办事处内勤ID
+     */
+    @ApiModelProperty("办事处内勤ID")
+    private String officeClerk;
+
+    /**
+     * 办事处内勤
+     */
+    @ApiModelProperty("办事处内勤")
+    private String officeClerkName;
+
+    /**
+     * 办事处内勤审核意见
+     */
+    @ApiModelProperty("办事处内勤审核意见")
+    private String officeClerkOpinion;
+
+    /**
+     * 办事处主管ID
+     */
+    @ApiModelProperty("办事处主管ID")
+    private String officeSupervisor;
+
+    /**
+     * 办事处主管
+     */
+    @ApiModelProperty("办事处主管")
+    private String officeSupervisorName;
+
+    /**
+     * 办事处主管审核意见
+     */
+    @ApiModelProperty("办事处主管审核意见")
+    private String officeSupervisorOpinion;
+
+    /**
+     * 营销部分管ID
+     */
+    @ApiModelProperty("营销部分管ID")
+    private String marketingDeputyDirector;
+
+    /**
+     * 营销部分管
+     */
+    @ApiModelProperty("营销部分管")
+    private String marketingDeputyDirectorName;
+
+    /**
+     * 营销部分管审核意见
+     */
+    @ApiModelProperty("营销部分管审核意见")
+    private String marketingDeputyDirectorOpinion;
+
+    /**
+     * 运作科资金管理岗ID
+     */
+    @ApiModelProperty("运作科资金管理岗ID")
+    private String fundManagementOperationDepartment;
+
+    /**
+     * 运作科资金管理岗
+     */
+    @ApiModelProperty("运作科资金管理岗")
+    private String fundManagementOperationDepartmentName;
+
+    /**
+     * 运作科资金管理岗审核意见
+     */
+    @ApiModelProperty("运作科资金管理岗审核意见")
+    private String fundManagementOperationDepartmentOpinion;
+
+    /**
+     * 运作科主管ID
+     */
+    @ApiModelProperty("运作科主管ID")
+    private String operationsDepartmentSupervisor;
+
+    /**
+     * 运作科主管
+     */
+    @ApiModelProperty("运作科主管")
+    private String operationsDepartmentSupervisorName;
+
+    /**
+     * 运作科主管审核意见
+     */
+    @ApiModelProperty("运作科主管审核意见")
+    private String operationsDepartmentSupervisorOpinion;
+
+    /**
+     * 营销部主管ID
+     */
+    @ApiModelProperty("营销部主管ID")
+    private String marketingDepartmentManager;
+
+    /**
+     * 营销部主管
+     */
+    @ApiModelProperty("营销部主管")
+    private String marketingDepartmentManagerName;
+
+    /**
+     * 营销部主管审核意见
+     */
+    @ApiModelProperty("营销部主管审核意见")
+    private String marketingDepartmentManagerOpinion;
+
+    /**
+     * 财务部副经理ID
+     */
+    @ApiModelProperty("财务部副经理ID")
+    private String financeDepartment;
+
+    /**
+     * 财务部副经理
+     */
+    @ApiModelProperty("财务部副经理")
+    private String financeDepartmentName;
+
+    /**
+     * 财务部副经理审核意见
+     */
+    @ApiModelProperty("财务部副经理审核意见")
+    private String financeDepartmentOpinion;
+
+    /**
+     * 营销中心主管ID
+     */
+    @ApiModelProperty("营销中心主管ID")
+    private String marketingCenterSupervisor;
+
+    /**
+     * 营销中心主管姓名
+     */
+    @ApiModelProperty("营销中心主管姓名")
+    private String marketingCenterSupervisorName;
+
+    /**
+     * 营销中心主管审核意见
+     */
+    @ApiModelProperty("营销中心主管审核意见")
+    private String marketingCenterSupervisorOpinion;
+
+    /**
+     * 总经理ID
+     */
+    @ApiModelProperty("总经理ID")
+    private String generalManager;
+
+    /**
+     * 总经理姓名
+     */
+    @ApiModelProperty("总经理姓名")
+    private String generalManagerName;
+
+    /**
+     * 总经理审核意见
+     */
+    @ApiModelProperty("总经理审核意见")
+    private String generalManagerOpinion;
+
     public GetFundCoordinationBo() {
 
     }

 package com.lframework.xingyun.sc.controller.ledger;
 
+import cn.hutool.core.io.resource.ClassPathResource;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
@@ -19,12 +22,17 @@ import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo;
+import com.lframework.xingyun.basedata.entity.CustomerShort;
+import com.lframework.xingyun.basedata.service.customer.CustomerShortService;
 import com.lframework.xingyun.sc.bo.ledger.fund.GetFundCoordinationBo;
 import com.lframework.xingyun.sc.bo.ledger.fund.QueryFundCoordinationBo;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.entity.*;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.ledger.*;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.utils.ExcelUtil;
+import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.vo.ledger.detail.QueryFundOrderingUnitDetailVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.CreateFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.QueryFundCoordinationVo;
@@ -39,20 +47,28 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.bind.annotation.DeleteMapping;
 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.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.net.URLEncoder;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -60,6 +76,7 @@ import java.util.stream.Collectors;
  *
  */
 @Api(tags = "资金协调手续")
+@Slf4j
 @Validated
 @RestController
 @RequestMapping("/fundCoordination")
@@ -87,6 +104,10 @@ public class FundCoordinationController extends DefaultBaseController {
     private PendingDeliveryOrderService pendingDeliveryOrderService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private CustomerShortService customerShortService;
+    @Resource
+    private CustomerCreditService customerCreditService;
 
     /**
      * 查询列表
@@ -191,11 +212,60 @@ public class FundCoordinationController extends DefaultBaseController {
             return InvokeResultBuilder.success(CollectionUtil.emptyList());
         }
         List<ReceiptLedgerInfo> query = receiptLedgerInfoService.queryByCustomerShortName(names.get(0));
+        GetFundCoordinationBo getFundCoordinationBo = new GetFundCoordinationBo();
         if (CollectionUtil.isEmpty(query)) {
+            List<CustomerShort> customerShortList = customerShortService.getByShortName(names.get(0));
+            if (CollectionUtils.isNotEmpty(customerShortList)) {
+                List<GetFundCoordinationBo> data = new ArrayList<>();
+                SysDataDicItem type = sysDataDicItemService.findByCode("ENTERPRISE_TYPE", customerShortList.get(0).getType());
+                getFundCoordinationBo.setCustomerTypeName(type == null ? "" : type.getName());
+                StringBuilder customerNameStr = new StringBuilder();
+                //无限担保书
+                StringBuilder unlimitedGuaranteeLetterStr = new StringBuilder();
+                List<String> orderingUnitIds = new ArrayList<>();
+                for (CustomerShort customerShort : customerShortList) {
+                    customerNameStr.append(customerShort.getCustomerName()).append("、");
+                    orderingUnitIds.add(customerShort.getCustomerId());
+                    //无限担保书
+                    QueryUnlimitedGuaranteeLetterVo vo1 = new QueryUnlimitedGuaranteeLetterVo();
+                    vo1.setOrderingUnit(customerShort.getCustomerId());
+                    List<UnlimitedGuaranteeLetter> query1 = unlimitedGuaranteeLetterService.query(vo1);
+                    if (CollectionUtil.isEmpty(query1)) {
+                        unlimitedGuaranteeLetterStr.append("无").append("，");
+                    } else {
+                        unlimitedGuaranteeLetterStr.append("有").append("，");
+                    }
+                }
+                //订货单位名称
+                if (customerNameStr.length() > 0) {
+                    customerNameStr.deleteCharAt(customerNameStr.length() - 1);
+                }
+                getFundCoordinationBo.setOrderingUnitName(customerNameStr.toString());
+                //订货单位IDs
+                getFundCoordinationBo.setOrderingUnitIds(orderingUnitIds);
+                //无限担保书
+                if (unlimitedGuaranteeLetterStr.length() > 0) {
+                    unlimitedGuaranteeLetterStr.deleteCharAt(unlimitedGuaranteeLetterStr.length() - 1);
+                }
+                getFundCoordinationBo.setUnlimitedGuaranteeLetter(unlimitedGuaranteeLetterStr.toString());
+                getFundCoordinationBo.setCustomerShortName(customerShortList.get(0).getShortName());
+                //授信额度、结算期限
+                CustomerCredit customerCredit = customerCreditService.getByCustomerId(customerShortList.get(0).getCustomerId());
+                if (customerCredit != null) {
+                    getFundCoordinationBo.setCreditLimit(customerCredit.getCompanyCreditLimit() == null ? ""
+                            : customerCredit.getCompanyCreditLimit() + "万");
+                    getFundCoordinationBo.setSettlementPeriod(customerCredit.getCompanySettlementPeriod() == null ? ""
+                            : customerCredit.getCompanySettlementPeriod());
+                }
+                getFundCoordinationBo.setTotalAccountsReceivable("0");
+                getFundCoordinationBo.setOverdueReceivables("0");
+                getFundCoordinationBo.setAgreedInternalReceivables("0");
+                data.add(getFundCoordinationBo);
+                return InvokeResultBuilder.success(data);
+            }
             return InvokeResultBuilder.success(CollectionUtil.emptyList());
         }
         List<GetFundCoordinationBo> data = new ArrayList<>();
-        GetFundCoordinationBo getFundCoordinationBo = new GetFundCoordinationBo();
         ReceiptLedgerInfo receiptLedgerInfo = query.get(0);
         //客户类型
         getFundCoordinationBo.setCustomerType(receiptLedgerInfo.getCustomerType());

@@ -140,6 +140,15 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
         if (vo.getOrderQuantity() != null) {
             data.setOrderQuantity(vo.getOrderQuantity());
         }
+        if (!StringUtil.isBlank(vo.getTotalAccountsReceivable())) {
+            data.setTotalAccountsReceivable(vo.getTotalAccountsReceivable());
+        }
+        if (!StringUtil.isBlank(vo.getOverdueReceivables())) {
+            data.setOverdueReceivables(vo.getOverdueReceivables());
+        }
+        if (!StringUtil.isBlank(vo.getAgreedInternalReceivables())) {
+            data.setAgreedInternalReceivables(vo.getAgreedInternalReceivables());
+        }
         if (!StringUtil.isBlank(vo.getRequirementSpecification())) {
             data.setRequirementSpecification(vo.getRequirementSpecification());
         }

@@ -125,6 +125,7 @@ public class PendingDeliveryOrderServiceImpl extends BaseMpServiceImpl<PendingDe
         for (CreatePendingDeliveryOrderVo vo : createPendingDeliveryOrderVoList) {
             PendingDeliveryOrder pendingDeliveryOrder = new PendingDeliveryOrder();
             pendingDeliveryOrder.setId(IdUtil.getId());
+            pendingDeliveryOrder.setFundId(vo.getFundId());
             pendingDeliveryOrder.setPurchaseOrderId(vo.getPurchaseOrderId());
             pendingDeliveryOrder.setTotalQuantity(vo.getTotalQuantity());
             pendingDeliveryOrder.setDispatchedQuantity(vo.getDispatchedQuantity());

@@ -45,4 +45,11 @@ public class QueryFundCoordinationVo extends PageVo implements BaseVo, Serializa
     @ApiModelProperty("审核状态")
     private String status;
 
+
+    /**
+     * 贸易类型：外贸: OUTSIDE 内贸：INSIDE
+     */
+    @ApiModelProperty("贸易类型")
+    private String type;
+
 }

@@ -21,6 +21,7 @@
         <result column="overdue_receivables" property="overdueReceivables"/>
         <result column="agreed_internal_receivables" property="agreedInternalReceivables"/>
         <result column="requirement_specification" property="requirementSpecification"/>
+        <result column="requested_shipment_quantity" property="requestedShipmentQuantity"/>
         <result column="office_clerk" property="officeClerk"/>
         <result column="office_clerk_opinion" property="officeClerkOpinion"/>
         <result column="office_supervisor" property="officeSupervisor"/>
@@ -40,6 +41,7 @@
         <result column="general_manager" property="generalManager"/>
         <result column="general_manager_opinion" property="generalManagerOpinion"/>
         <result column="status" property="status"/>
+        <result column="type" property="type"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -87,6 +89,7 @@
             tb.general_manager,
             tb.general_manager_opinion,
             tb.status,
+            tb.type,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,
@@ -117,6 +120,9 @@
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
             </if>
+            <if test="vo.type != null and vo.type != ''">
+                AND tb.type = #{vo.type}
+            </if>
         </where>
         ORDER BY tb.create_time DESC
     </select>