Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java

@@ -0,0 +1,41 @@
+package com.yxt.anrui.base.api.basevehiclestate;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 车辆持久状态
+ * @author: dimengzhe
+ * @date: 2023/7/19
+ **/
+@Data
+public class BaseVehicleState extends BaseEntity {
+    private static final long serialVersionUID = -8658861219326308912L;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busSid;
+    @ApiModelProperty("业务阶段序号")
+    private String busNo;
+    @ApiModelProperty("业务阶段名称")
+    private String busName;
+    @ApiModelProperty("业务状态")
+    private String busState;
+    @ApiModelProperty("款项状态")
+    private String finState;
+    @ApiModelProperty("发票状态")
+    private String invoiceState;
+    @ApiModelProperty("欠款提车状态")
+    private String carryVehicleState;
+    @ApiModelProperty("欠款开票状态")
+    private String carryInvoiceState;
+    @ApiModelProperty("包牌业务")
+    private String packageBusiness;
+    @ApiModelProperty("合同状态")
+    private String contractState;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.base.api.basevehiclestate;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/7/19
+ **/
+@Data
+public class BaseVehicleStateDto implements Dto {
+    private static final long serialVersionUID = -3250371728132610725L;
+
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busSid;
+    @ApiModelProperty("操作类型")
+    private String operateType;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -0,0 +1,80 @@
+package com.yxt.anrui.base.api.basevehiclestate;
+
+import lombok.Getter;
+
+/**
+ * @description: 车辆持久状态
+ * @author: dimengzhe
+ * @date: 2023/7/19
+ **/
+public class BaseVehicleStateEnum {
+
+    @Getter
+    public static enum BusNoEnum {
+        /**
+         * 车辆业务阶段序号
+         */
+        DDBA("200", "订单备案"),
+        CKKP("400", "出库开票"),
+        JC("500", "交车"),
+        YWJS("600", "业务结束"),
+        ;
+
+        private String busNoKey;
+        private String busNoValue;
+
+        BusNoEnum(String busNoKey, String busNoValue) {
+            this.busNoKey = busNoKey;
+            this.busNoValue = busNoValue;
+        }
+    }
+
+
+    @Getter
+    public static enum BusStateEnum {
+        /**
+         * 车辆阶段状态
+         */
+        CKKP_STATE_1("401", "待出库"),
+        CKKP_STATE_2("402", "出库中"),
+        JC_STATE_1("501", "待准备"),
+        JC_STATE_2("502", "待交车"),
+        JC_STATE_3("503", "已交车"),
+        YWJS_STATE_1("601", "业务完成"),
+        YWJS_STATE_2("602", "业务终止"),
+
+        ;
+
+        private String stateKey;
+        private String stateValue;
+
+        BusStateEnum(String stateKey, String stateValue) {
+            this.stateKey = stateKey;
+            this.stateValue = stateValue;
+        }
+    }
+
+    @Getter
+    public static enum OperateTypeEnum {
+        /**
+         * 操作类型
+         */
+        DDBA_SUBMIT("1", "订单提交"),
+        DDBA_PASS("2", "订单审核通过"),
+        CKKP_PASS("3", "出库开票审核通过"),
+        JC_PASS("4", "交车审核通过"),
+        BUS_STOP("5", "业务终止"),
+
+        ;
+
+        private String typeKey;
+        private String typeValue;
+
+        OperateTypeEnum(String typeKey, String typeValue) {
+            this.typeKey = typeKey;
+            this.typeValue = typeValue;
+        }
+    }
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.base.api.basevehiclestate;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/7/19
+ **/
+@Api(tags = "车辆持久状态")
+@FeignClient(
+        contextId = "anrui-base-BaseVehicleState",
+        name = "anrui-base",
+        path = "v1/BaseVehicleState",
+        fallback = BaseVehicleStateFeignFallback.class)
+public interface BaseVehicleStateFeign {
+
+    @PostMapping("saveOrUpdate")
+    ResultBean saveOrUpdate(@RequestBody List<BaseVehicleStateDto> dto);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeignFallback.java

@@ -0,0 +1,9 @@
+package com.yxt.anrui.base.api.basevehiclestate;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/7/19
+ **/
+public class BaseVehicleStateFeignFallback {
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.base.biz.basevehiclestate;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/7/19
+ **/
+@Mapper
+public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
+    BaseVehicleState selectOnes(String busSid);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.base.biz.basevehiclestate.BaseVehicleStateMapper">
+    <select id="selectOnes" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
+        select *
+        from base_vehicle_state
+        where busSid = #{busSid}
+    </select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.base.biz.basevehiclestate;
+
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/7/19
+ **/
+
+@Api(tags = "车辆持久状态")
+@RestController
+@RequestMapping("v1/BaseVehicleState")
+public class BaseVehicleStateRest implements BaseVehicleStateFeign {
+
+    @Autowired
+    private BaseVehicleStateService baseVehicleStateService;
+
+    @Override
+    public ResultBean saveOrUpdate(List<BaseVehicleStateDto> dto) {
+        return baseVehicleStateService.saveOrUpdateState(dto);
+    }
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -0,0 +1,64 @@
+package com.yxt.anrui.base.biz.basevehiclestate;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/7/19
+ **/
+@Service
+public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleStateMapper, BaseVehicleState> {
+
+    public ResultBean saveOrUpdateState(List<BaseVehicleStateDto> dtoList) {
+        ResultBean rb = ResultBean.fireFail();
+        dtoList.stream().forEach(dto -> {
+            String operateType = dto.getOperateType();
+            String busSid = dto.getBusSid();
+            BaseVehicleState baseVehicleState = baseMapper.selectOnes(busSid);
+            if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_SUBMIT.getTypeKey().equals(operateType)) {
+                //销售订单提交时
+                baseVehicleState = new BaseVehicleState();
+                BeanUtil.copyProperties(dto, baseVehicleState, "sid");
+                baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.DDBA.getBusNoKey());
+                baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.DDBA.getBusNoValue());
+                baseMapper.insert(baseVehicleState);
+            } else if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey().equals(operateType)) {
+                //销售订单办理通过后更新业务阶段为出库开票、小状态为待出库，款项状态为0
+                baseVehicleState.setFinState("0");
+                baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
+                baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
+                baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
+            } else if (BaseVehicleStateEnum.OperateTypeEnum.CKKP_PASS.getTypeKey().equals(operateType)) {
+                //出库通过后更新业务阶段为交车，小状态为待准备501
+                baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.JC.getBusNoKey());
+                baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.JC.getBusNoValue());
+                baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JC_STATE_1.getStateKey());
+
+            } else if (BaseVehicleStateEnum.OperateTypeEnum.JC_PASS.getTypeKey().equals(operateType)) {
+                //交车确认通过后更新业务状态为业务结束，小状态为业务完成601
+                baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.YWJS.getBusNoKey());
+                baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.YWJS.getBusNoValue());
+                baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.YWJS_STATE_1.getStateKey());
+            } else if (BaseVehicleStateEnum.OperateTypeEnum.BUS_STOP.getTypeKey().equals(operateType)) {
+                //如果为终止或作废，则更新小状态为业务终止602
+                baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.YWJS_STATE_2.getStateKey());
+            }
+
+            //认款办理确认以及结转审核通过的更新款项状态为1，否则为0
+
+            baseMapper.updateById(baseVehicleState);
+        });
+
+
+        return rb.success();
+    }
+}

anrui-base/anrui-base-biz/src/main/resources/application-devv.yml

@@ -25,5 +25,5 @@ image:
   upload:
     path: D:\\anrui\\upload\\
   url:
-    prefix: http://127.0.0.1:8111/upload/
+    prefix: http://192.168.1.104:8111/upload/
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -15,6 +15,7 @@ import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
 import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
@@ -35,6 +36,7 @@ import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWait;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.busvehicledatahandover.BusVehicleDataHandoverDto;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDetailsListVo;
@@ -1942,6 +1944,10 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         variables.put("businessSid", businessSid);
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        String customerName = busHandover.getCustomerName();
+        String contractNo = busHandover.getContractNo();
+        String orderNames = "<" + customerName + ">" + contractNo + "交车确认";
+        variables.put("orderNames", orderNames);
         BusHandover busHandover1 = fetchBySid(businessSid);
         //用户的部门全路径sid
         bv.setOrgSidPath(busHandover1.getOrgSidPath());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -31,6 +31,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery;
 import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
 import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
@@ -46,6 +47,9 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
@@ -180,6 +184,7 @@ import com.yxt.messagecenter.api.messagelist.MessageList;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -197,6 +202,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -314,6 +320,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BaseDiscountpackageFeign baseDiscountpackageFeign;
     @Autowired
     private DocPdfComponent docPdfComponent;
+    @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
 
     /**
      * 构造查询条件
@@ -4783,6 +4791,35 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count));
                 }
             }
+            //==============================新增车辆的持久状态组装数据
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                Future future1 = pool.submit(() -> {
+                    List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                    List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(businessSid);
+                    vehicleList.removeAll(Collections.singleton(null));
+                    if (!vehicleList.isEmpty()) {
+                        vehicleList.stream().forEach(v -> {
+                            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_SUBMIT.getTypeKey());
+                            if (StringUtils.isNotBlank(v.getLinkSid())) {
+                                baseVehicleStateDto.setVinSid(v.getLinkSid());
+                                baseVehicleStateDto.setVinNo(v.getLinkNo());
+                            }
+                            baseVehicleStateDto.setBusSid(v.getSid());
+                            dtoList.add(baseVehicleStateDto);
+                        });
+                        ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            //==============================
             //如果创建人与部门主管一样，则自动到下一环节。
             if (busSalesOrder.get().getCreateBySid().equals(nextNodeUserSids_)) {
                 busSalesOrderOne = fetchBySid(businessSid);
@@ -4799,18 +4836,29 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 bv.setComment("因与申请人相同，系统自动处理，需以下一级审批人审批意见为准！");
                 return complete(bv);
             }
-            //极光推送
-            busSalesOrder.set(fetchBySid(businessSid));
-            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-            MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(ufVo, messageFlowVo);
-            messageFlowableQuery.setUfVo(messageFlowVo);
-            messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
-            messageFlowableQuery.setBusinessSid(businessSid);
-            messageFlowableQuery.setModuleName("销售订单申请");
-            messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-            messageFlowableQuery.setMsgTitle("销售订单");
-            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                Future future1 = pool.submit(() -> {
+                    //极光推送
+                    busSalesOrder.set(fetchBySid(businessSid));
+                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                    MessageFlowVo messageFlowVo = new MessageFlowVo();
+                    BeanUtil.copyProperties(ufVo, messageFlowVo);
+                    messageFlowableQuery.setUfVo(messageFlowVo);
+                    messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
+                    messageFlowableQuery.setBusinessSid(businessSid);
+                    messageFlowableQuery.setModuleName("销售订单申请");
+                    messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                    messageFlowableQuery.setMsgTitle("销售订单");
+                    ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             return voResultBean;
         }
         if (r == 2) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java

@@ -3,7 +3,7 @@ package com.yxt.anrui.fin.api.kingdee;
 public enum KingDeeBillId {
     AP_PAYABLE("AP_Payable", "应付单"),
     AR_RECEIVABLE("AR_receivable", "应收单"),
-    AR_OTHERRECEIVABLE("AR_OTHERRECEIVABLE", "其他应收单"),
+    AR_OTHERRECEIVABLE("AR_OtherRecAble", "其他应收单"),
     AP_PAYBILL("AP_PAYBILL", "付款单"),
     AR_RECEIVEBILL("AR_RECEIVEBILL", "收款单"),
     STK_INSTOCK("STK_InStock", "采购入库单"),

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/otherarreceivable/OtherReceivable.java

@@ -16,15 +16,15 @@ import java.util.List;
 public class OtherReceivable {
 
     @ApiModelProperty("单据类型")
-    public String billType = "其他应收单";
+    public String billType = "QTYSD01_SYS";
     @ApiModelProperty("往来单位类型")
-    public String commUnitType = "客户";
+    public String commUnitType = "BD_Customer";
     @ApiModelProperty("往来单位")
     public String commUnit;
     @ApiModelProperty("收款组织")
     public String collectionOrg;
     @ApiModelProperty("币别")
-    public String currency = "人民币";
+    public String currency = "PRE001";
     @ApiModelProperty("业务日期")
     public String bussDate;
     @ApiModelProperty("收款明细")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -201,22 +201,22 @@
     <select id="jyddkydjListPage"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo">
         SELECT
-        fsrd.sid,
+        fcc.sid,
         fcc.useOrgSid,
         fcc.staffDeptName,
         fcc.staffUserSid AS staffSid,
         fcc.staffName,
         fcc.`billNo`,
-        fsrd.`customerName`,
+        fcc.`payerName`,
         bd.`draweeMobile` AS phone,
         fcc.collectionDate,
         fcc.collectionMoney,
         (
-        fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
+        fcc.collectionMoney - COALESCE(SUM(ffc.`thisUseMoney`), 0)
         ) AS balance
         FROM
-        fin_selected_receivables_detailed fsrd
-        LEFT JOIN fin_collection_confirmation fcc
+        fin_collection_confirmation fcc
+        LEFT JOIN fin_selected_receivables_detailed fsrd
         ON fcc.`sid` = fsrd.`collSid`
         LEFT JOIN anrui_buscenter.`bus_deposit` bd
         ON fcc.`busSid` = bd.`billSid`

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -2761,7 +2761,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 return p;
             }
         }
-        qw.gt("fcc.balance", 0);
         if (StringUtils.isNotBlank(query.getStaffDeptName())) {
             qw.like("fcc.staffDeptName", query.getStaffDeptName());
         }
@@ -2786,8 +2785,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             qw.and(wrapper -> wrapper.like("fcc.billNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("fcc.payerName", query.getName()).or().like("bd.draweeMobile", query.getName()));
         }
         qw.isNotNull("fcc.busSid");
-        qw.groupBy("fsrd.sid");
-        qw.having("balance >=", query.getCollectionSmallMoney()).having("balance <=", query.getCollectionBigMoney());
+        qw.groupBy("fcc.sid");
+        if (StringUtils.isNotBlank(query.getCollectionSmallMoney()) && StringUtils.isNotBlank(query.getCollectionBigMoney())){
+            qw.having("balance > 0").having("balance >= {0}", query.getCollectionSmallMoney()).having("balance <= {0}", query.getCollectionBigMoney());
+        }else {
+            qw.having("balance > 0");
+        }
         IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
         IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw);
         List<FinCollectionConfirmationJYDDKYDJVo> records = pagging.getRecords();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.java

@@ -73,4 +73,7 @@ public interface FinFundsCarriedForwardApplyMapper extends BaseMapper<FinFundsCa
 
 	@Update("update fin_funds_carried_forward_apply set pdfPath = #{pdfPath} where sid = #{businessSid}")
 	void updatePathBySid(@Param("pdfPath") String pdfPath,@Param("businessSid") String businessSid);
+
+	@Update("update fin_funds_carried_forward_apply set nodeState = #{nodeState} where sid = #{sid}")
+    void updateNodeStateBySid(@Param("nodeState") String nodeState,@Param("sid") String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -53,13 +53,11 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
 import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService;
 import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
-import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.fin.biz.kingdee.otherreceivablebill.OtherReceivableBillService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -147,8 +145,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     private OtherReceivableBillService otherReceivableBillService;
     @Autowired
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
-    @Autowired
-    private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
 
     public PagerVo<FinFundsCarriedForwardApplyVo> listPageVo(PagerQuery<FinFundsCarriedForwardApplyQuery> pq) {
         FinFundsCarriedForwardApplyQuery query = pq.getParams();
@@ -292,7 +288,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             appFinFundsCarriedForwardYXYSKXVo.setPayTypeKey(finSelectedReceivablesDetailedVo.getPayTypeKey());
             appFinFundsCarriedForwardYXYSKXVo.setUseOrgSid(finSelectedReceivablesDetailedVo.getUseOrgSid());
             appFinFundsCarriedForwardYXYSKXVo.setSubscribedOf(finSelectedReceivablesDetailedVo.getSubscribedOf());
-            appFinFundsCarriedForwardYXYSKXVo.setSid(finSelectedReceivablesDetailedVo.getCollSid());
+            appFinFundsCarriedForwardYXYSKXVo.setSid(finSelectedReceivablesDetailedVo.getSid());
             String currentReceivableMoney = finSelectedReceivablesDetailedVo.getCurrentReceivableMoney();
             String subscriptionMoney = finSelectedReceivablesDetailedVo.getSubscriptionMoney();
             BigDecimal surplusReceivable = new BigDecimal(currentReceivableMoney).subtract(new BigDecimal(subscriptionMoney));
@@ -600,39 +596,49 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos1 = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                 String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
                 baseMapper.updatePathBySid(pdfPath, sid);
-                for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                    FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                    if (finUncollectedReceivablesDetailed != null) {
-                        BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                        finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
-                        finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
-                    }
-                }
-                List<String> jzCustNos = new ArrayList<>();
-                List<String> ysCustNos = new ArrayList<>();
+                List<Map<String,String>> jzCustNos = new ArrayList<>();
+                List<Map<String,String>> ysCustNos = new ArrayList<>();
                 for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo2 : finFundsCarriedForwardVehDetailsVos1) {
                     FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo2.getBusSid());
                     String custNo = "";
                     if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
+                        Map<String, String> map = new HashMap<>();
                         custNo = finSelectedReceivablesDetailed.getContractNo();
+                        map.put("type","全款");
+                        map.put("custNo",custNo);
+                        jzCustNos.add(map);
                     } else {//贷款
                         BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
                         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
                         custNo = busSalesOrderVehicle.getTemporaryNo();
+                        Map<String, String> map = new HashMap<>();
+                        map.put("type","贷款");
+                        map.put("custNo",custNo);
+                        jzCustNos.add(map);
                     }
-                    jzCustNos.add(custNo);
                 }
                 jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
-                for (String jzCustNo : jzCustNos) {
+                for (Map jzCustNo : jzCustNos) {
+                    String custNo = (String) jzCustNo.get("custNo");
                     OtherReceivable otherReceivable = new OtherReceivable();
-                    otherReceivable.setCommUnit(jzCustNo);
+                    otherReceivable.setCommUnit(custNo);
                     otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
                     otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                    OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                    collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                    jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2);
-                    String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid());
-                    collectionDetailDto.setExTaxMoney(jzMoney);
+                    List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
+                    List<String> stringList;
+                    if (jzCustNo.get("type").equals("全款")){
+                        stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                    }else {
+                        custNo = custNo.substring(0, custNo.length() - 2);
+                        stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                    }
+                    for (String s : stringList) {
+                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                        collectionDetailDto.setExTaxMoney(s);
+                        collectionDetailDtoList.add(collectionDetailDto);
+                    }
+                    otherReceivable.setCollectionDetails(collectionDetailDtoList);
                     otherReceivableBillService.otherReceivableBillService(otherReceivable);
                 }
                 for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos1) {
@@ -640,26 +646,45 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                     String custNo = "";
                     if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
                         custNo = finSelectedReceivablesDetailed.getContractNo();
+                        Map<String, String> map = new HashMap<>();
+                        map.put("type","全款");
+                        map.put("custNo",custNo);
+                        ysCustNos.add(map);
                     } else {//贷款
                         BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
                         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
-                        custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
+                        custNo = busSalesOrderVehicle.getTemporaryNo();
+                        Map<String, String> map = new HashMap<>();
+                        map.put("type","贷款");
+                        map.put("custNo",custNo);
+                        ysCustNos.add(map);
                     }
-                    ysCustNos.add(custNo);
                 }
                 ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
-                for (String ysCustNo : ysCustNos) {
+                for (Map ysCustNo : ysCustNos) {
                     OtherReceivable otherReceivable = new OtherReceivable();
-                    otherReceivable.setCommUnit(ysCustNo);
+                    String custNo = (String)ysCustNo.get("custNo");
+                    otherReceivable.setCommUnit(custNo);
                     otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
                     otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                    OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                    collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                    ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2);
-                    String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid());
-                    collectionDetailDto.setExTaxMoney("-" + jzMoney);
+                    List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
+                    List<String> stringList;
+                    if (ysCustNo.get("type").equals("全款")){
+                        stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                    }else {
+                        custNo = custNo.substring(0, custNo.length() - 2);
+                        stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                    }
+                    for (String s : stringList) {
+                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                        collectionDetailDto.setExTaxMoney("-" + s);
+                        collectionDetailDtoList.add(collectionDetailDto);
+                    }
+                    otherReceivable.setCollectionDetails(collectionDetailDtoList);
                     otherReceivableBillService.otherReceivableBillService(otherReceivable);
                 }
+                //baseMapper.updateNodeStateBySid("已办结",finFundsCarriedForwardApply.getSid());
                 return rb.success();
             }
         }
@@ -715,14 +740,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxyskxVos) {
                 finSelectedReceivablesDetailedService.updateAuditStateBySid(1, appFinFundsCarriedForwardYXYSKXVo.getSid());
             }
-            for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                if (finUncollectedReceivablesDetailed != null) {
-                    BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                    finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
-                    finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
-                }
-            }
             //极光推送
             finFundsCarriedForwardApply = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@@ -868,14 +885,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 updateFlowFiled(map);
                 FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
                 List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
-                if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
-                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                        BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                        finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
-                        finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
-                    }
-                }
                 //极光推送
                 finFundsCarriedForwardApply = fetchBySid(businessSid);
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@@ -922,16 +931,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                 FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
                 List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
-                if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
-                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                        if (finUncollectedReceivablesDetailed != null) {
-                            BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                            finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
-                            finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
-                        }
-                    }
-                }
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -963,16 +962,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 updateFlowFiled(map);
                 FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
                 List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
-                if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
-                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                        if (finUncollectedReceivablesDetailed != null) {
-                            BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                            finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
-                            finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
-                        }
-                    }
-                }
                 return rb.success().setData(resultBean.getData());
             } else {
                 if (businessTaskId.equals(query.getTaskId())) {
@@ -986,16 +975,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                     updateFlowFiled(map);
                     FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
                     List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
-                    if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
-                        for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                            FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                            if (finUncollectedReceivablesDetailed != null) {
-                                BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                                finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
-                                finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
-                            }
-                        }
-                    }
                     return rb.success().setData(resultBean.getData());
                 }
             }
@@ -1042,102 +1021,166 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                     finSelectedReceivablesDetailedService.updateAuditStateBySid(3, appFinFundsCarriedForwardYXYSKXVo.getSid());
                 }
                 List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
-                List<String> jzCustNos = new ArrayList<>();
-                List<String> ysCustNos = new ArrayList<>();
+                List<Map<String,String>> jyddNos = new ArrayList<>();
+                List<Map<String,String>> jzCustNos = new ArrayList<>();
+                List<Map<String,String>> ysCustNos = new ArrayList<>();
                 if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) {
                     List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = finFundsCarriedForwardVehService.fetchByMainSidAndGroupCustPhone(finFundsCarriedForwardApply.getSid());
                     for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos1) {
                         FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
                         CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finSelectedReceivablesDetailed.getCustomerSid()).getData();
-                        jzCustNos.add(crmCustomerTempVo.getCustomerNo());
+                        Map<String, String> map = new HashMap<>();
+                        map.put("custSid",crmCustomerTempVo.getSid());
+                        map.put("custNo",crmCustomerTempVo.getCustomerNo());
+                        jyddNos.add(map);
                     }
-                    jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
-                    for (String jzCustNo : jzCustNos) {
+                    jyddNos = jyddNos.stream().distinct().collect(Collectors.toList());
+                    for (Map<String, String> jyddNo : jyddNos) {
                         OtherReceivable otherReceivable = new OtherReceivable();
-                        otherReceivable.setCommUnit(jzCustNo);
+                        String custNo = jyddNo.get("custNo");
+                        otherReceivable.setCommUnit(custNo);
                         otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
                         otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                        jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2);
-                        String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid());
-                        collectionDetailDto.setExTaxMoney(jzMoney);
+                        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
+                        String custSid = jyddNo.get("custSid");
+                        List<String> stringList = finFundsCarriedForwardVehService.fetchJzMoneyByCustSidAndMainSid(custSid, finFundsCarriedForwardApply.getSid());
+                        for (String s : stringList) {
+                            OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                            collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                            collectionDetailDto.setExTaxMoney(s);
+                            collectionDetailDtoList.add(collectionDetailDto);
+                        }
+                        otherReceivable.setCollectionDetails(collectionDetailDtoList);
                         otherReceivableBillService.otherReceivableBillService(otherReceivable);
                     }
-                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos) {
+                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo2.getSid());
                         String custNo = "";
                         if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
                             custNo = finSelectedReceivablesDetailed.getContractNo();
+                            Map<String, String> map = new HashMap<>();
+                            map.put("type","全款");
+                            map.put("custNo",custNo);
+                            ysCustNos.add(map);
                         } else {//贷款
                             BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
                             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
-                            custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
+                            custNo = busSalesOrderVehicle.getTemporaryNo();
+                            Map<String, String> map = new HashMap<>();
+                            map.put("type","贷款");
+                            map.put("custNo",custNo);
+                            ysCustNos.add(map);
                         }
-                        ysCustNos.add(custNo);
                     }
                     ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
-                    for (String ysCustNo : ysCustNos) {
+                    for (Map ysCustNo : ysCustNos) {
                         OtherReceivable otherReceivable = new OtherReceivable();
-                        otherReceivable.setCommUnit(ysCustNo);
+                        String custNo = (String)ysCustNo.get("custNo");
+                        otherReceivable.setCommUnit(custNo);
                         otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
                         otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                        ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2);
-                        String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid());
-                        collectionDetailDto.setExTaxMoney("-" + jzMoney);
+                        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
+                        List<String> stringList;
+                        if (ysCustNo.get("type").equals("全款")){
+                            stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                        }else {
+                            custNo = custNo.substring(0, custNo.length() - 2);
+                            stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                        }
+                        for (String s : stringList) {
+                            OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                            collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                            collectionDetailDto.setExTaxMoney("-" + s);
+                            collectionDetailDtoList.add(collectionDetailDto);
+                        }
+                        otherReceivable.setCollectionDetails(collectionDetailDtoList);
                         otherReceivableBillService.otherReceivableBillService(otherReceivable);
                     }
                 } else if ("已认款".equals(finFundsCarriedForwardApply.getSource())) {
-                    for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
-                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
+                    for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo2 : finFundsCarriedForwardVehDetailsVos) {
+                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo2.getBusSid());
                         String custNo = "";
                         if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
+                            Map<String, String> map = new HashMap<>();
                             custNo = finSelectedReceivablesDetailed.getContractNo();
+                            map.put("type","全款");
+                            map.put("custNo",custNo);
+                            jzCustNos.add(map);
                         } else {//贷款
                             BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
                             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
                             custNo = busSalesOrderVehicle.getTemporaryNo();
+                            Map<String, String> map = new HashMap<>();
+                            map.put("type","贷款");
+                            map.put("custNo",custNo);
+                            jzCustNos.add(map);
                         }
-                        jzCustNos.add(custNo);
                     }
                     jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
-                    for (String jzCustNo : jzCustNos) {
+                    for (Map jzCustNo : jzCustNos) {
+                        String custNo = (String) jzCustNo.get("custNo");
                         OtherReceivable otherReceivable = new OtherReceivable();
-                        otherReceivable.setCommUnit(jzCustNo);
+                        otherReceivable.setCommUnit(custNo);
                         otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
                         otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                        jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2);
-                        String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid());
-                        collectionDetailDto.setExTaxMoney(jzMoney);
+                        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
+                        List<String> stringList;
+                        if (jzCustNo.get("type").equals("全款")){
+                            stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                        }else {
+                            custNo = custNo.substring(0, custNo.length() - 2);
+                            stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                        }
+                        for (String s : stringList) {
+                            OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                            collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                            collectionDetailDto.setExTaxMoney(s);
+                            collectionDetailDtoList.add(collectionDetailDto);
+                        }
+                        otherReceivable.setCollectionDetails(collectionDetailDtoList);
                         otherReceivableBillService.otherReceivableBillService(otherReceivable);
                     }
-                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                    for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos) {
+                        FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo2.getSid());
                         String custNo = "";
                         if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
                             custNo = finSelectedReceivablesDetailed.getContractNo();
+                            Map<String, String> map = new HashMap<>();
+                            map.put("type","全款");
+                            map.put("custNo",custNo);
+                            ysCustNos.add(map);
                         } else {//贷款
                             BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
                             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
-                            custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
+                            custNo = busSalesOrderVehicle.getTemporaryNo();
+                            Map<String, String> map = new HashMap<>();
+                            map.put("type","贷款");
+                            map.put("custNo",custNo);
+                            ysCustNos.add(map);
                         }
-                        ysCustNos.add(custNo);
                     }
                     ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
-                    for (String ysCustNo : ysCustNos) {
+                    for (Map ysCustNo : ysCustNos) {
                         OtherReceivable otherReceivable = new OtherReceivable();
-                        otherReceivable.setCommUnit(ysCustNo);
+                        String custNo = (String)ysCustNo.get("custNo");
+                        otherReceivable.setCommUnit(custNo);
                         otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
                         otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
-                        OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
-                        collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
-                        ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2);
-                        String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid());
-                        collectionDetailDto.setExTaxMoney("-" + jzMoney);
+                        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
+                        List<String> stringList;
+                        if (ysCustNo.get("type").equals("全款")){
+                            stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                        }else {
+                            custNo = custNo.substring(0, custNo.length() - 2);
+                            stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
+                        }
+                        for (String s : stringList) {
+                            OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
+                            collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
+                            collectionDetailDto.setExTaxMoney("-" + s);
+                            collectionDetailDtoList.add(collectionDetailDto);
+                        }
+                        otherReceivable.setCollectionDetails(collectionDetailDtoList);
                         otherReceivableBillService.otherReceivableBillService(otherReceivable);
                     }
                 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java

@@ -79,5 +79,7 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper<FinFundsCarr
 
 	List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSidAndGroupCustPhone(String sid);
 
-    String fetchJzMoneyByContractNoAndMainSid(@Param("jzCustNo") String jzCustNo,@Param("sid") String sid);
+    List<String> fetchJzMoneyByContractNoAndMainSid(@Param("jzCustNo") String jzCustNo,@Param("sid") String sid);
+
+	List<String> fetchJzMoneyByCustSidAndMainSid(@Param("custSid") String custSid,@Param("sid") String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml

@@ -58,9 +58,16 @@
     </select>
 
     <select id="fetchJzMoneyByContractNoAndMainSid" resultType="java.lang.String">
-        SELECT SUM(ffc.`thisUseMoney`) AS jzMoney
+        SELECT ffc.`thisUseMoney` AS jzMoney
         FROM fin_funds_carried_forward_veh ffc
         WHERE ffc.busBillNo = #{jzCustNo}
           AND ffc.mainSid = #{sid}
     </select>
+
+    <select id="fetchJzMoneyByCustSidAndMainSid" resultType="java.lang.String">
+        SELECT ffc.`thisUseMoney` AS jzMoney
+        FROM fin_funds_carried_forward_veh ffc
+        WHERE ffc.customerSid = #{custSid}
+          AND ffc.mainSid = #{sid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java

@@ -166,7 +166,11 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService<FinFund
 		return baseMapper.fetchByMainSidAndGroupCustPhone(sid);
 	}
 
-	public String fetchJzMoneyByContractNoAndMainSid(String jzCustNo, String sid) {
+	public List<String> fetchJzMoneyByContractNoAndMainSid(String jzCustNo, String sid) {
 		return baseMapper.fetchJzMoneyByContractNoAndMainSid(jzCustNo,sid);
 	}
+
+	public List<String> fetchJzMoneyByCustSidAndMainSid(String custSid, String sid) {
+		return baseMapper.fetchJzMoneyByCustSidAndMainSid(custSid,sid);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -156,7 +156,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     @Update("update fin_selected_receivables_detailed set balance = #{balance} where sid = #{busSid}")
     void updateYeBySid(@Param("balance") String balance,@Param("busSid") String busSid);
 
-    String fetchJzMoneyByContractNoAndMainSid(@Param("ysCustNo") String ysCustNo,@Param("sid") String sid);
+    List<String> fetchJzMoneyByContractNoAndMainSid(@Param("ysCustNo") String ysCustNo,@Param("sid") String sid);
 
     String selectBalanceByReceivedSid(String receivablesSid);
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -352,6 +352,7 @@
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo">
         SELECT
         ferd.sid,
+        fcc.createBySid AS createBySid,
         fcc.`useOrgSid`,
         fcc.`staffDeptName`,
         fcc.staffUserSid AS staffSid,
@@ -377,9 +378,13 @@
         AND fcc.`useOrgSid` = bv.`createOrgSid`
         LEFT JOIN `fin_funds_carried_forward_veh` ffc
         ON ffc.`busSid` = ferd.`sid`
+        <where>
+            ${ew.SqlSegment}
+        </where>
         UNION
         SELECT
         ferd.sid,
+        ffcfa.createBySid AS createBySid,
         ffcfa.useOrgSid,
         ffcfa.saleDeptName AS staffDeptName,
         ffcfa.staffSid,
@@ -410,13 +415,6 @@
         </where>
     </select>
 
-    <select id="fetchJzMoneyByContractNoAndMainSid" resultType="java.lang.String">
-        SELECT SUM(fsr.`subscriptionMoney`) AS jzMoney
-        FROM fin_selected_receivables_detailed fsr
-        WHERE fsr.`contractNo` = #{ysCustNo}
-          AND fsr.`collSid` = #{sid}
-    </select>
-
     <select id="selectBalanceByReceivedSid"
             resultType="java.lang.String">
         select ifnull(sum(balance), 0)
@@ -482,4 +480,11 @@
         having dbalance &lt;= 0
         order by furd.contractNo desc
     </select>
+
+    <select id="fetchJzMoneyByContractNoAndMainSid" resultType="java.lang.String">
+        SELECT fsr.subscriptionMoney AS jzMoney
+        FROM fin_selected_receivables_detailed fsr
+        WHERE fsr.`contractNo` = #{ysCustNo}
+          AND fsr.`collSid` = #{sid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -525,6 +525,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         FinSelectedReceivablesPaymentDetailsWCKCLRKQuery query = pagerQuery.getParams();
         QueryWrapper<FinSelectReceivablesDetailedWCKCLRKVo> qw = new QueryWrapper<>();
         //========================================数据授权开始
+        String orgLevelKey = "";
         if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
@@ -541,7 +542,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
                 int i2 = orgSidPath.indexOf("/", i1 + 1);
                 int i3 = orgSidPath.indexOf("/", i2 + 1);
                 int i4 = orgSidPath.indexOf("/", i3 + 1);
-                String orgLevelKey = defaultIdReltBean.getData();
+                orgLevelKey = defaultIdReltBean.getData();
                 if ("1".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i1);
                     qw.like("fcc.orgSidPath", orgSidPath);
@@ -555,7 +556,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
                     orgSidPath = orgSidPath.substring(0, i4);
                     qw.like("fcc.orgSidPath", orgSidPath);
                 } else if ("5".equals(orgLevelKey)) {
-                    qw.eq("fcc.createBySid", query.getUserSid());
+                    //qw.eq("fcc.createBySid", query.getUserSid());
                 } else {
                     PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = new PagerVo<>();
                     return p;
@@ -589,7 +590,16 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
             qw.and(wrapper -> wrapper.like("ferd.contractNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("ffcfa.saleDeptName",query.getName()).or().like("ffcfa.staffName",query.getName()).or().like("fcc.staffName", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName()));
         }
         qw.groupBy("ferd.sid");
-        qw.having("reveivableMoney >=",query.getBalanceSmallMoney()).having("reveivableMoney <=",query.getBalanceBigMoney());
+        if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney()) && !"5".equals(orgLevelKey)){
+            qw.having("reveivableMoney >= {0}",query.getBalanceSmallMoney()).having("reveivableMoney <= {0}",query.getBalanceBigMoney());
+        }else if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney()) && "5".equals(orgLevelKey)){
+            qw.having("createBySid = {0}",query.getUserSid()).having("reveivableMoney >= {0}",query.getBalanceSmallMoney()).having("reveivableMoney <= {0}",query.getBalanceBigMoney());
+        }else if (StringUtils.isBlank(query.getBalanceSmallMoney()) && StringUtils.isBlank(query.getBalanceBigMoney()) && "5".equals(orgLevelKey)){
+            qw.having("createBySid = {0}",query.getUserSid());
+        }else {
+            PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = new PagerVo<>();
+            return p;
+        }
         IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
         IPage<FinSelectReceivablesDetailedWCKCLRKVo> pagging = baseMapper.noOutVehRecPageList(page, qw);
         for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) {
@@ -609,7 +619,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         return baseMapper.selectBalanceByReceivedSid(receivablesSid);
     }
 
-    public String fetchJzMoneyByContractNoAndMainSid(String ysCustNo, String sid) {
+    public List<String> fetchJzMoneyByContractNoAndMainSid(String ysCustNo, String sid) {
         return baseMapper.fetchJzMoneyByContractNoAndMainSid(ysCustNo,sid);
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java

@@ -27,12 +27,22 @@ public class OtherReceivableBillService extends FinKingDeeService {
         //业务表的主表数据集合
         Map<String,String> map_fEntityModel_=new HashMap<>();
         //物料的数组集合
+        //业务日期
         if(otherReceivable.getBussDate()==null){
             return rb.setMsg("业务日期不能为空");
         }
-        //业务日期
         map_fEntityModel_.put("FDATE",otherReceivable.getBussDate());
-
+        //客户
+        if(otherReceivable.getCommUnit()==null){
+            return rb.setMsg("客户编码不能为空");
+        }
+        map_fEntityModel_.put("FCONTACTUNIT",otherReceivable.getCommUnit());
+        //收款组织
+        if(otherReceivable.getCollectionOrg()==null){
+            return rb.setMsg("收款组织不能为空");
+        }
+        map_fEntityModel_.put("FPAYORGID",otherReceivable.getCollectionOrg());
+        map_fEntityModel_.put("FSETTLEORGID",otherReceivable.getCollectionOrg());
         List<OtherReceivable.CollectionDetailDto> collectionDetails = otherReceivable.getCollectionDetails()==null?new ArrayList<>(): otherReceivable.getCollectionDetails();
         //准备 物料列表的数据
         ResultBean<List<Map<String, String>>>  vehicleListMap = createVehicleListsForReceivableBill(collectionDetails);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data.json

@@ -1,4 +1,4 @@
 {
-  "formId": "AR_OTHERRECEIVABLE",
+  "formId": "AR_OtherRecAble",
   "data": "@KD_data"
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json

@@ -1,10 +1,33 @@
 {
+  "FEntryID": "0",
+  "FCOSTID": {
+    "FNumber": ""
+  },
   "FCOSTDEPARTMENTID": {
     "FNumber": "@KD_FCOSTDEPARTMENTID"
   },
   "FINVOICETYPE": "普通发票",
   "FNOTAXAMOUNTFOR": "@KD_FNOTAXAMOUNTFOR",
+  "FTAXAMOUNTFOR": "0",
+  "FAMOUNTFOR_D": "0",
   "F_PAEZ_Assistant1": {
     "FNumber": "调账申请"
-  }
+  },
+  "F_PAEZ_Amount": "0",
+  "FNOTAXAMOUNT_D": "0",
+  "FTAXAMOUNT_D": "0",
+  "F_PMZC_Assistant": {
+    "FNumber": ""
+  },
+  "F_PMZC_Base": {
+    "FNUMBER": ""
+  },
+  "F_PMZC_Assistant2": {
+    "FNumber": ""
+  },
+  "FCOMMENT": "",
+  "FSourceBillNo": "",
+  "FCREATEINVOICE": "false",
+  "FIVAmountFor": "0",
+  "FEntryTaxRate": "0"
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json

@@ -1,21 +1,67 @@
 {
   "FID": "0",
   "FBillTypeID": {
-    "FNUMBER": "其他应收单"
+    "FNUMBER": "QTYSD01_SYS"
   },
-  "FDATE": "@KD_bussDate",
-  "FCONTACTUNITTYPE": "客户",
+  "FBillNo": "",
+  "FDATE": "@KD_FDATE",
+  "FENDDATE_H": "1900-01-01",
+  "FISINIT": "false",
+  "FCONTACTUNITTYPE": "BD_Customer",
   "FCONTACTUNIT": {
-    "FNumber": "@KD_commUnit"
+    "FNumber": "@KD_FCONTACTUNIT"
+  },
+  "FAMOUNTFOR": "0",
+  "FCURRENCYID": {
+    "FNumber": "PRE001"
+  },
+  "FDEPARTMENTID": {
+    "FNumber": ""
   },
   "FSETTLEORGID": {
-    "FNumber": "@KD_collectionOrg"
+    "FNumber": "@KD_FSETTLEORGID"
   },
   "FPAYORGID": {
-    "FNumber": "@KD_collectionOrg"
+    "FNumber": "@KD_FPAYORGID"
   },
-  "FCURRENCYID": {
-    "FNumber": "人民币"
+  "FSALEDEPTID": {
+    "FNumber": ""
+  },
+  "FSALEORGID": {
+    "FNumber": ""
+  },
+  "FSALEGROUPID": {
+    "FNumber": ""
+  },
+  "FSALEERID": {
+    "FNumber": ""
+  },
+  "FACCNTTIMEJUDGETIME": "1900-01-01",
+  "FSettleTypeID": {
+    "FNumber": ""
+  },
+  "FMAINBOOKSTDCURRID": {
+    "FNumber": ""
+  },
+  "FEXCHANGETYPE": {
+    "FNumber": ""
+  },
+  "FExchangeRate": "0",
+  "FNOTAXAMOUNT": "0",
+  "FTAXAMOUNT": "0",
+  "FCancelStatus": "",
+  "FAR_OtherRemarks": "",
+  "FScanPoint": {
+    "FNUMBER": ""
+  },
+  "F_PAEZ_Base": {
+    "FNUMBER": ""
+  },
+  "F_PAEZ_Base1": {
+    "FNUMBER": ""
+  },
+  "F_PMZC_Assistant1": {
+    "FNumber": ""
   },
   "FEntity": []
 }

anrui-portal/anrui-portal-biz/src/main/resources/application-devv.yml

@@ -25,7 +25,7 @@ image:
   upload:
     path: D:\\anrui\\upload\\
   url:
-    prefix: http://192.168.1.112:8111/upload/
+    prefix: http://192.168.1.104:8111/upload/
   login:
     path: D:\\images\\pic-click
 config:

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java

@@ -61,6 +61,11 @@ public interface LoanPreloanCreditApplyFeign {
     @ResponseBody
     public ResultBean submitSave(@RequestBody LoanPreloanCreditApplyDto dto);
 
+    @ApiOperation("金融内勤确认")
+    @PostMapping("/finStaffConfirm")
+    @ResponseBody
+    public ResultBean finStaffConfirm(@RequestBody LoanPreloanCreditApplyDto dto);
+
     @ApiOperation("公司风控提交")
     @PostMapping("/submitCompanyRisk")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -49,11 +50,17 @@ public class LoanPreloanCreditApplyFeignFallback implements LoanPreloanCreditApp
 		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanpreloancreditapply/save无法访问");
 	}
 
-	@Override
+	@ApiOperation("提交保存")
+    @Override
 	public ResultBean submitSave(LoanPreloanCreditApplyDto dto) {
 		return null;
 	}
 
+	@Override
+	public ResultBean finStaffConfirm(LoanPreloanCreditApplyDto dto) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
 		return null;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java

@@ -54,6 +54,6 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
     @Update("update loan_preloan_credit_apply set capitalBalance = #{capitalBalance},zffkjg = #{zfshjg},zfshDate = #{zfshDate},zfshRemarks = #{zfshRemarks} where sid=#{dtoSid}")
     void submitCapitalRisk(@Param("dtoSid") String dtoSid, @Param("zfshjg") String zfshjg, @Param("zfshDate") String zfshDate, @Param("zfshRemarks") String zfshRemarks, @Param("capitalBalance") String capitalBalance);
 
-    @Update("update loan_preloan_credit_apply set state = 0 where sid = #{sid}")
-    void updateStateBySid(String sid);
+    @Update("update loan_preloan_credit_apply set state = #{state} where sid = #{sid}")
+    void updateStateBySid(@Param("sid") String sid,@Param("state") Integer state);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java

@@ -67,11 +67,17 @@ public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign {
 		return loanPreloanCreditApplyService.saveOrUpdateDto(dto);
 	}
 
+	@ApiOperation("提交保存")
 	@Override
 	public ResultBean submitSave(LoanPreloanCreditApplyDto dto) {
 		return loanPreloanCreditApplyService.submitSave(dto);
 	}
 
+	@Override
+	public ResultBean finStaffConfirm(LoanPreloanCreditApplyDto dto) {
+		return loanPreloanCreditApplyService.finStaffConfirm(dto);
+	}
+
 	@Override
 	public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
 		return loanPreloanCreditApplyService.submitCompanyRisk(dto);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -188,7 +188,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                 return p;
             }
         }
-        qw.eq("state", 0);
+        qw.ne("state", 1);
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
             qw.like("useOrgName", query.getUseOrgName());
         }
@@ -362,7 +362,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             return rb.setMsg("保存失败");
         }
         String sid = stringResultBean.getData();
-        baseMapper.updateStateBySid(sid);
+        baseMapper.updateStateBySid(sid,0);
         return rb.success();
     }
 
@@ -388,22 +388,32 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         LoanPreloanCreditApply entity = fetchBySid(sid);
         LoanPreloanCreditApplyDetailsVo vo = new LoanPreloanCreditApplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);
-        CommonAppendixSelectQuery commonAppendixSelectQuery1 = new CommonAppendixSelectQuery();
-        commonAppendixSelectQuery1.setLinkSid(sid);
-        commonAppendixSelectQuery1.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
-        List<CommonAppendixVo> data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery1).getData();
-        CommonAppendixSelectQuery commonAppendixSelectQuery2 = new CommonAppendixSelectQuery();
-        commonAppendixSelectQuery2.setLinkSid(sid);
-        commonAppendixSelectQuery2.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
-        List<CommonAppendixVo> data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery2).getData();
+        CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery();
+        commonAppendixSelectQuery.setLinkSid(sid);
+        commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
+        List<CommonAppendixVo> data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
+        commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
+        List<CommonAppendixVo> data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
+        commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
+        List<CommonAppendixVo> data4 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
+        commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
+        List<CommonAppendixVo> data5 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
         List<String> idCardImages = new ArrayList<>();
         List<String> comFkFiles = new ArrayList<>();
+        List<String> gsQueryResults = new ArrayList<>();
+        List<String> zfQueryResults = new ArrayList<>();
         for (CommonAppendixVo commonAppendixVo : data1) {
             idCardImages.add(commonAppendixVo.getFilePath());
         }
         for (CommonAppendixVo commonAppendixVo : data2) {
             comFkFiles.add(commonAppendixVo.getFilePath());
         }
+        for (CommonAppendixVo commonAppendixVo : data4) {
+            gsQueryResults.add(commonAppendixVo.getFilePath());
+        }
+        for (CommonAppendixVo commonAppendixVo : data5) {
+            zfQueryResults.add(commonAppendixVo.getFilePath());
+        }
         List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid);
         List<String> idCardPeoImages = new ArrayList<>();
         for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeoDetailsVo : loanPreloanCreditPeoDetailsVos) {
@@ -419,6 +429,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         vo.setIdCardImages(idCardImages);
         vo.setComFkFiles(comFkFiles);
         vo.setLoanPreloanCreditPeos(loanPreloanCreditPeoDetailsVos);
+        vo.setGsQueryResults(gsQueryResults);
+        vo.setZfQueryResults(zfQueryResults);
         return vo;
     }
 
@@ -470,4 +482,14 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         return rb.success();
     }
 
+    public ResultBean finStaffConfirm(LoanPreloanCreditApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
+        if (!stringResultBean.getSuccess()) {
+            return rb.setMsg("保存失败");
+        }
+        String sid = stringResultBean.getData();
+        baseMapper.updateStateBySid(sid,2);
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-devv.yml

@@ -24,4 +24,4 @@ image:
   upload:
     path: D:\\anrui\\upload\\
   url:
-    prefix: http://192.168.1.112:8111/upload/
+    prefix: http://192.168.1.104:8111/upload/

doc/databases/base_tables.sql

@@ -935,7 +935,7 @@ CREATE TABLE `base_vehicle_out`
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='车辆出库信息';
 
-DROP TABLE IF EXISTS `base_vehicle_state`;
+/*DROP TABLE IF EXISTS `base_vehicle_state`;
 CREATE TABLE `base_vehicle_state`
 (
     `id`           int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
@@ -952,10 +952,10 @@ CREATE TABLE `base_vehicle_state`
     `vinNo`        VARCHAR(64)          DEFAULT NULL COMMENT '车架号',
     `vinSid`       varchar(64)          DEFAULT NULL COMMENT '车辆sid',
     `busSid`       varchar(64)          DEFAULT NULL COMMENT '业务sid',
-    `arrears`      varchar(64)                  DEFAULT NULL COMMENT '欠款开票：1是0否',
-    `carArrears`   varchar(64)         DEFAULT NULL COMMENT '欠款提车:1是，0否',
+    `arrears`      varchar(64)          DEFAULT NULL COMMENT '欠款开票：1是0否',
+    `carArrears`   varchar(64)          DEFAULT NULL COMMENT '欠款提车:1是，0否',
     `depositState` varchar(255)         DEFAULT NULL COMMENT '款项-订金状态',
-    `carState`     varchar(255)          DEFAULT NULL COMMENT '款项-车款状态',
+    `carState`     varchar(255)         DEFAULT NULL COMMENT '款项-车款状态',
     `invoiceState` varchar(255)         DEFAULT NULL COMMENT '发票状态',
     `deliverState` varchar(255)         DEFAULT NULL COMMENT '交车状态',
     `blueState`    varchar(255)         DEFAULT NULL COMMENT '蓝票来票状态',
@@ -964,6 +964,39 @@ CREATE TABLE `base_vehicle_state`
     KEY `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='车辆业务状态表';
+*/
+
+
+DROP TABLE IF EXISTS `base_vehicle_state`;
+CREATE TABLE `base_vehicle_state`
+(
+    `id`                int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`               varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`       int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`        timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`        timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`          int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`             int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`          int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`           varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`       varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`       varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `vinNo`             VARCHAR(64)          DEFAULT NULL COMMENT '车架号',
+    `vinSid`            varchar(64)          DEFAULT NULL COMMENT '车辆sid',
+    `busSid`            varchar(64)          DEFAULT NULL COMMENT '业务sid',
+    `busNo`             varchar(64)          DEFAULT NULL COMMENT '业务阶段序号',
+    `busName`           varchar(64)          DEFAULT NULL COMMENT '业务阶段名称',
+    `busState`          varchar(64)          DEFAULT NULL COMMENT '业务状态',
+    `finState`          varchar(64)          DEFAULT NULL COMMENT '款项状态',
+    `invoiceState`      varchar(64)          DEFAULT NULL COMMENT '发票状态',
+    `carryVehicleState` varchar(64)          DEFAULT NULL COMMENT '欠款提车状态',
+    `carryInvoiceState` varchar(64)          DEFAULT NULL COMMENT '欠款开票状态',
+    `packageBusiness`   varchar(64)          DEFAULT NULL COMMENT '包牌业务',
+    `contractState`     varchar(64)          DEFAULT NULL COMMENT '合同状态',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='车辆业务状态表';