资金协调手续-审核后续操作

@@ -1033,6 +1033,7 @@ CREATE TABLE `fund_coordination` (
      `marketing_center_supervisor_opinion` text DEFAULT NULL COMMENT '营销中心主管审核意见',
      `general_manager` varchar(32) DEFAULT NULL COMMENT '总经理ID',
      `general_manager_opinion` text DEFAULT NULL COMMENT '总经理审核意见',
+     `status` varchar(50) DEFAULT NULL COMMENT '审核状态',
      `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID',
      `create_by` varchar(20) NOT NULL COMMENT '创建人',
      `update_by_id` varchar(32) NOT NULL COMMENT '更新人ID',
@@ -1060,6 +1061,7 @@ CREATE TABLE `fund_ordering_unit` (
 CREATE TABLE `fund_ordering_unit_detail`(
     `id`                     varchar(32) NOT NULL COMMENT 'ID',
     `fund_ordering_unit_id`  varchar(32) DEFAULT NULL COMMENT '资金协调手续订货单位关联表ID',
+    `ledger_id`              varchar(32) DEFAULT NULL COMMENT '应收款台账明细ID',
     `delivery_date`          date        DEFAULT NULL COMMENT '发货日期',
     `accounts_receivable`    varchar(50) DEFAULT NULL COMMENT '应收款（元）',
     `status`                 varchar(20) DEFAULT NULL COMMENT '当前欠款状态',

@@ -165,6 +165,12 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
     @ApiModelProperty("是否能审核")
     private boolean showExamine;
 
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
     public GetFundCoordinationBo() {
 
     }

@@ -138,6 +138,18 @@ public class QueryFundCoordinationBo extends BaseBo<FundCoordination> {
     @ApiModelProperty("贸易类型")
     private String type;
 
+    /**
+     * 是否能审核
+     */
+    @ApiModelProperty("是否能审核")
+    private boolean showExamine;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
     public QueryFundCoordinationBo() {
 
     }

@@ -249,6 +249,7 @@ public class FundCoordinationController extends DefaultBaseController {
             List<FundOrderingUnitDetail> fundOrderingUnitDetailList = new ArrayList<>();
             for (ReceiptLedgerInfo receipt : receiptList) {
                 FundOrderingUnitDetail fundOrderingUnitDetail = new FundOrderingUnitDetail();
+                fundOrderingUnitDetail.setLedgerId(receipt.getId());
                 fundOrderingUnitDetail.setDeliveryDate(receipt.getShipmentDate());
                 if (receipt.getStartAccountReceivable() != null) {
                     fundOrderingUnitDetail.setAccountsReceivable(receipt.getStartAccountReceivable().stripTrailingZeros().toPlainString());

@@ -221,6 +221,12 @@ public class FundCoordination extends BaseEntity implements BaseDto {
     private String status;
 
     /**
+     * 是否能审核
+     */
+    @TableField(exist = false)
+    private boolean showExamine;
+
+    /**
      * 办事处code
      */
     @TableField(exist = false)

@@ -34,6 +34,11 @@ public class FundOrderingUnitDetail extends BaseEntity implements BaseDto {
     private String fundOrderingUnitId;
 
     /**
+     * 应收款台账ID
+     */
+    private String ledgerId;
+
+    /**
      * 发货日期
      */
     private LocalDate deliveryDate;

@@ -3,8 +3,10 @@ package com.lframework.xingyun.sc.impl.ledger;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -20,20 +22,17 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.Assert;
-import com.lframework.xingyun.sc.entity.FundCoordination;
-import com.lframework.xingyun.sc.entity.FundOrderingUnit;
-import com.lframework.xingyun.sc.entity.FundOrderingUnitDetail;
+import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.FundCoordinationMapper;
-import com.lframework.xingyun.sc.service.ledger.FundCoordinationService;
-import com.lframework.xingyun.sc.service.ledger.FundOrderingUnitDetailService;
-import com.lframework.xingyun.sc.service.ledger.FundOrderingUnitService;
-import com.lframework.xingyun.sc.service.ledger.PendingDeliveryOrderService;
+import com.lframework.xingyun.sc.service.ledger.*;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 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;
 import com.lframework.xingyun.sc.vo.ledger.fund.UpdateFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.pending.CreatePendingDeliveryOrderVo;
+import com.lframework.xingyun.sc.vo.ledger.pending.QueryPendingDeliveryOrderVo;
 import com.lframework.xingyun.sc.vo.ledger.rel.CreateFundOrderingUnitVo;
 import com.lframework.xingyun.sc.vo.ledger.rel.QueryFundOrderingUnitVo;
 import org.apache.commons.collections.CollectionUtils;
@@ -41,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinationMapper, FundCoordination> implements FundCoordinationService {
@@ -56,6 +56,12 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
     private FlowInstanceWrapperService flowInstanceWrapperService;
     @Resource
     private FundOrderingUnitDetailService fundOrderingUnitDetailService;
+    @Resource
+    private ReceiptLedgerInfoService receiptLedgerInfoService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
     @Override
@@ -66,6 +72,21 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
 
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<FundCoordination> datas = this.query(vo);
+        if (CollectionUtils.isNotEmpty(datas)) {
+            // 获取当前人员的待办任务数据
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (CollectionUtils.isEmpty(flowTaskList)) {
+                return PageResultUtil.convert(new PageInfo<>(datas));
+            }
+            List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            for (FundCoordination fundCoordination : datas) {
+                if (ids.contains(fundCoordination.getId())) {
+                    fundCoordination.setShowExamine(true);
+                } else {
+                    fundCoordination.setShowExamine(false);
+                }
+            }
+        }
 
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
@@ -236,19 +257,30 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
         QueryFundOrderingUnitVo vo = new QueryFundOrderingUnitVo();
         vo.setFundId(id);
         List<FundOrderingUnit> fundOrderingUnitList = fundOrderingUnitService.query(vo);
-        if (CollectionUtil.isNotEmpty(fundOrderingUnitList)){
+        if (CollectionUtil.isNotEmpty(fundOrderingUnitList)) {
             for (FundOrderingUnit fundOrderingUnit : fundOrderingUnitList) {
                 //资金协调手续订货单位应收款明细
                 QueryFundOrderingUnitDetailVo vo1 = new QueryFundOrderingUnitDetailVo();
                 vo1.setFundOrderingUnitId(fundOrderingUnit.getId());
                 List<FundOrderingUnitDetail> fundOrderingUnitDetailList = fundOrderingUnitDetailService.query(vo1);
                 if (CollectionUtils.isNotEmpty(fundOrderingUnitDetailList)) {
-                   //更新应收款台账的协调办理日期
-
+                    //更新应收款台账的协调办理日期
+                    for (FundOrderingUnitDetail detail : fundOrderingUnitDetailList) {
+                        receiptLedgerInfoService.updateCoordinateDate(detail.getLedgerId(),
+                                detail.getCoordinateHandleDate(), detail.getStatus());
+                    }
                 }
             }
         }
         //解封订货单
+        QueryPendingDeliveryOrderVo vo2 = new QueryPendingDeliveryOrderVo();
+        vo2.setFundId(id);
+        List<PendingDeliveryOrder> pendingDeliveryOrderList = pendingDeliveryOrderService.query(vo2);
+        if (CollectionUtils.isNotEmpty(pendingDeliveryOrderList)) {
+            List<String> purchaseOrderIdList = pendingDeliveryOrderList
+                    .stream().map(PendingDeliveryOrder::getPurchaseOrderId).collect(Collectors.toList());
+            purchaseOrderInfoService.batchUnblock(purchaseOrderIdList);
+        }
     }
 
 

@@ -65,6 +65,7 @@ public class FundOrderingUnitDetailServiceImpl extends BaseMpServiceImpl<FundOrd
         FundOrderingUnitDetail data = new FundOrderingUnitDetail();
         data.setId(IdUtil.getId());
         data.setFundOrderingUnitId(vo.getFundOrderingUnitId());
+        data.setLedgerId(vo.getLedgerId());
         if (vo.getDeliveryDate() != null) {
             data.setDeliveryDate(vo.getDeliveryDate());
         }
@@ -136,6 +137,7 @@ public class FundOrderingUnitDetailServiceImpl extends BaseMpServiceImpl<FundOrd
         for (CreateFundOrderingUnitDetailVo vo : createFundOrderingUnitDetailVoList) {
             FundOrderingUnitDetail fundOrderingUnitDetail = new FundOrderingUnitDetail();
             fundOrderingUnitDetail.setFundOrderingUnitId(vo.getFundOrderingUnitId());
+            fundOrderingUnitDetail.setLedgerId(vo.getLedgerId());
             fundOrderingUnitDetail.setDeliveryDate(vo.getDeliveryDate());
             fundOrderingUnitDetail.setAccountsReceivable(vo.getAccountsReceivable());
             fundOrderingUnitDetail.setStatus(vo.getStatus());

@@ -537,4 +537,53 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         }
         return targetValue;
     }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改应收款台账明细，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateCoordinateDate(String id, LocalDate coordinateDate, String debtStatus) {
+        ReceiptLedgerInfo data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("应收款台账明细不存在！");
+        }
+        if ("一次协调".equals(debtStatus)) {
+            LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
+                    .set(ReceiptLedgerInfo::getCoordinateDate, coordinateDate)
+                    .eq(ReceiptLedgerInfo::getId, id);
+
+            getBaseMapper().update(updateWrapper);
+        } else if ("二次协调".equals(debtStatus)) {
+            LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
+                    .set(ReceiptLedgerInfo::getCoordinateDate, coordinateDate)
+                    .set(ReceiptLedgerInfo::getSecondCoordinateDate, coordinateDate)
+                    .eq(ReceiptLedgerInfo::getId, id);
+
+            getBaseMapper().update(updateWrapper);
+        } else if ("清欠".equals(debtStatus)) {
+            if (data.getThirdCoordinateDate() == null) {
+                LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
+                        .set(ReceiptLedgerInfo::getCoordinateDate, coordinateDate)
+                        .set(ReceiptLedgerInfo::getThirdCoordinateDate, coordinateDate)
+                        .eq(ReceiptLedgerInfo::getId, id);
+
+                getBaseMapper().update(updateWrapper);
+            } else if (data.getFourthCoordinateDate() == null) {
+                LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
+                        .set(ReceiptLedgerInfo::getCoordinateDate, coordinateDate)
+                        .set(ReceiptLedgerInfo::getFourthCoordinateDate, coordinateDate)
+                        .eq(ReceiptLedgerInfo::getId, id);
+
+                getBaseMapper().update(updateWrapper);
+            } else if (data.getFifthCoordinateDate() == null) {
+                LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
+                        .set(ReceiptLedgerInfo::getCoordinateDate, coordinateDate)
+                        .set(ReceiptLedgerInfo::getFifthCoordinateDate, coordinateDate)
+                        .eq(ReceiptLedgerInfo::getId, id);
+
+                getBaseMapper().update(updateWrapper);
+            }
+        }
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(data.getId());
+    }
 }

@@ -618,6 +618,17 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
 
     @Override
+    public void batchUnblock(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);
+        updateWrapper.set(PurchaseOrderInfo::isFreeze, false)
+                .in(PurchaseOrderInfo::getId, ids);
+        getBaseMapper().update(updateWrapper);
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
 
     }

@@ -7,6 +7,7 @@ import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -95,4 +96,13 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
      * @return      PageResult<ReceiptLedgerReportBo>
      */
     PageResult<ReceiptLedgerReportBo> report(Integer pageIndex, Integer pageSize, ReceiptLedgerReportVo vo);
+
+    /**
+     * 更新协调办理日期
+     *
+     * @param id             主键
+     * @param coordinateDate 协调办事日期
+     * @param debtStatus     清欠状态
+     */
+    void updateCoordinateDate(String id, LocalDate coordinateDate, String debtStatus);
 }

@@ -139,4 +139,11 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @return
      */
     PageResult<PurchaseOrderInfo> queryFreeze(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo);
+
+    /**
+     * 批量解封
+     *
+     * @param ids
+     */
+    void batchUnblock(List<String> ids);
 }

@@ -23,6 +23,14 @@ public class CreateFundOrderingUnitDetailVo implements BaseVo, Serializable {
     private String fundOrderingUnitId;
 
     /**
+     * 应收款台账ID
+     */
+    @ApiModelProperty(value = "应收款台账ID", required = true)
+    @NotBlank(message = "请输入应收款台账ID！")
+    @Length(message = "应收款台账ID最多允许32个字符！")
+    private String ledgerId;
+
+    /**
      * 发货日期
      */
     @ApiModelProperty("发货日期")

@@ -39,4 +39,10 @@ public class QueryFundCoordinationVo extends PageVo implements BaseVo, Serializa
     @ApiModelProperty("客户简称")
     private String shortName;
 
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
 }

@@ -39,6 +39,7 @@
         <result column="marketing_center_supervisor_opinion" property="marketingCenterSupervisorOpinion"/>
         <result column="general_manager" property="generalManager"/>
         <result column="general_manager_opinion" property="generalManagerOpinion"/>
+        <result column="status" property="status"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -85,6 +86,7 @@
             tb.marketing_center_supervisor_opinion,
             tb.general_manager,
             tb.general_manager_opinion,
+            tb.status,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,
@@ -112,6 +114,9 @@
             <if test="vo.shortName != null and vo.shortName != ''">
                 AND tb.customer_short_name LIKE CONCAT('%', #{vo.shortName}, '%')
             </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
         </where>
         ORDER BY tb.create_time DESC
     </select>

@@ -5,6 +5,7 @@
     <resultMap id="FundOrderingUnitDetail" type="com.lframework.xingyun.sc.entity.FundOrderingUnitDetail">
         <id column="id" property="id"/>
         <result column="fund_ordering_unit_id" property="fundOrderingUnitId"/>
+        <result column="ledger_id" property="ledgerId"/>
         <result column="delivery_date" property="deliveryDate"/>
         <result column="accounts_receivable" property="accountsReceivable"/>
         <result column="status" property="status"/>
@@ -25,6 +26,7 @@
         SELECT
             tb.id,
             tb.fund_ordering_unit_id,
+            tb.ledger_id,
             tb.delivery_date,
             tb.accounts_receivable,
             tb.status,
@@ -56,6 +58,7 @@
         INSERT INTO fund_ordering_unit_detail (
         id,
         fund_ordering_unit_id,
+        ledger_id,
         delivery_date,
         accounts_receivable,
         status,
@@ -75,6 +78,7 @@
             (
             #{item.id},
             #{item.fundOrderingUnitId},
+            #{item.ledgerId},
             #{item.deliveryDate},
             #{item.accountsReceivable},
             #{item.status},