Merge remote-tracking branch 'origin/master'

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

@@ -36,6 +36,8 @@ public class BaseVehicleState extends BaseEntity {
     private String packageBusiness;
     @ApiModelProperty("合同状态")
     private String contractState;
+    private String saleTypeKey;
+    private String finSourceKey;
 
 
 }

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

@@ -21,4 +21,8 @@ public class BaseVehicleStateDto implements Dto {
     private String busSid;
     @ApiModelProperty("操作类型")
     private String operateType;
+    @ApiModelProperty("销售类型：1全款，2贷款")
+    private String saleTypeKey;
+    @ApiModelProperty("款项来源：1自有资金、2三方金融、3担保、4非担保")
+    private String finSourceKey;
 }

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

@@ -71,6 +71,8 @@ public class BaseVehicleStateEnum {
         DDBA_SAVEVIN("6", "录入车架号"),
         FIN_RQ("7", "认款完成"),
         FIN_WRQ("8", "认款未完成"),
+        CKTJ("9", "出库提交"),
+        CKZZ("10", "出库终止、驳回以及撤回到第一环节时"),
 
         ;
 

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

@@ -61,6 +61,12 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
             }else if(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey().equals(operateType)){
                 //认款办理确认以及结转审核通过的更新款项状态为1  已交清，否则为0
                 baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_WJQ.getStateKey());
+            }else if(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey().equals(operateType)){
+                //出库提交申请后，将小状态修改为出库中402
+                baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_2.getStateKey());
+            }else if(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey().equals(operateType)){
+                //出库申请终止后，将小状态修改为401待出库
+                baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
             }
 
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@@ -99,7 +99,8 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
 
     List<String> selectByState();
 
-    IPage<BusDeliveredVo> selectListsVos(IPage<BusDelivered> page, @Param(Constants.WRAPPER)QueryWrapper<BusDelivered> qw);
+    IPage<BusDeliveredVo> selectListsVoNew(IPage<BusDelivered> page, @Param(Constants.WRAPPER)QueryWrapper<BusDelivered> qw);
 
     IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER)QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
+    IPage<AppBusDeliveredPageVo> getRetrievalNotListNew(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER)QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -155,24 +155,6 @@
           and finState = '1'
     </select>
 
-    <select id="selectListsVos" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
-        SELECT bv.sid,
-               bo.contractNo,
-               bo.customerName name,
-               bv.sid busVinSid,
-               '正常交款' as subscription,
-               bo.payType paymentMethod,
-               RIGHT(bv.linkNo, 8) as vinNo,
-               bv.linkSid          as vinSid
-        FROM bus_sales_order_vehicle bv
-                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
-        left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
-        <where>
-            ${ew.sqlSegment}
-              and length(bv.linkSid) > 0 and bbv.vehicleStateValue != '出库'
-        </where>
-    </select>
-
     <resultMap id="listMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
         <result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
         <collection property="vinList" ofType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo"
@@ -296,4 +278,57 @@
         GROUP BY
         ds.contractNo order by ds.contractNo desc
     </select>
+
+    <select id="selectListsVoNew" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
+        select
+        bo.contractNo,
+        bo.customerName as name,
+        bo.payType paymentMethod,
+        RIGHT(bv.linkNo, 8) as vinNo,
+        bv.linkSid vinSid,
+        bv.sid busVinSid
+        from  (select busSid from anrui_base.base_vehicle_state where busState = '401' and finState = '1') as bs
+        left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
+        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
+        <where>
+            ${ew.sqlSegment}
+            and length(bv.linkSid) > 0
+        </where>
+        order by bo.contractNo desc
+
+    </select>
+
+    <select id="getRetrievalNotListNew" resultMap="listMaps">
+        select
+        bo.contractNo,
+        bo.customerName as name,
+        bo.payType paymentMethod
+        from  (select busSid from anrui_base.base_vehicle_state where busState = '401' and finState = '1') as bs
+            left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
+            left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+            left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
+        <where>
+            ${ew.sqlSegment}
+            and length(bv.linkSid) > 0
+        </where>
+        group by contractNo
+        order by bo.contractNo desc
+    </select>
+
+    <resultMap id="listMaps" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
+        <result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="paymentMethod" jdbcType="VARCHAR" property="paymentMethod"/>
+        <collection property="vinList" ofType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo"
+                    select="vinLists" column="contractNo">
+        </collection>
+    </resultMap>
+    <select id="vinLists" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
+        select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
+        from (select busSid from anrui_base.base_vehicle_state where busState = '401' and finState = '1') as bs
+        left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
+            left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java

@@ -68,7 +68,7 @@ public class BusDeliveredRest implements BusDeliveredFeign {
     @Override
     public ResultBean<PagerVo<BusDeliveredVo>> listPage(@RequestBody PagerQuery<BusDeliveredQuery> pq) {
         ResultBean<PagerVo<BusDeliveredVo>> rb = ResultBean.fireFail();
-        PagerVo<BusDeliveredVo> pv = busDeliveredService.listPageVo(pq);
+        PagerVo<BusDeliveredVo> pv = busDeliveredService.listPageVoNew(pq);
         return rb.success().setData(pv);
     }
 
@@ -102,7 +102,7 @@ public class BusDeliveredRest implements BusDeliveredFeign {
     @Override
     public ResultBean<PagerVo<AppBusDeliveredPageVo>> getRetrievalNotList(PagerQuery<AppBusDeliveredPageQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
-        IPage<AppBusDeliveredPageVo> voIPage = busDeliveredService.getRetrievalNotList(pq);
+        IPage<AppBusDeliveredPageVo> voIPage = busDeliveredService.getRetrievalNotListNew(pq);
         return rb.success().setData(voIPage);
     }
 
@@ -118,7 +118,7 @@ public class BusDeliveredRest implements BusDeliveredFeign {
 
     @Override
     public ResultBean<List<AppCarListVo>> selectInfo(DeliverDetailsQuery query) {
-        return busDeliveredService.selectInfo(query);
+        return busDeliveredService.selectInfoNew(query);
     }
 
     @Override

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -160,23 +160,17 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         return p;
     }
 
-    /**
+    public PagerVo<BusDeliveredVo> listPageVoNew(PagerQuery<BusDeliveredQuery> pq) {
-     * 待出库车辆分页列表
-     *
-     * @param pq 查询条件
-     * @return 待出库车辆分页列表的数据
-     */
-    public PagerVo<BusDeliveredVo> listPageVos(PagerQuery<BusDeliveredQuery> pq) {
         BusDeliveredQuery query = pq.getParams();
         QueryWrapper<BusDelivered> qw = new QueryWrapper<>();
         if (query != null) {
             //合同编号
             if (StringUtils.isNotBlank(query.getContractNo())) {
-                qw.like("bd.contractNo", query.getContractNo());
+                qw.like("bo.contractNo", query.getContractNo());
             }
             //客户名称
             if (StringUtils.isNotBlank(query.getName())) {
-                qw.like("bd.name", query.getName());
+                qw.like("bo.name", query.getName());
             }
             //车架号
             if (StringUtils.isNotBlank(query.getVinNo())) {
@@ -187,20 +181,15 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 qw.notIn("bv.linkSid", query.getVinSid());
             }
             //待出库：1，出库申请：0
-            qw.eq("bd.state", 1);
             if (StringUtils.isNotBlank(query.getUserSid())) {
-                qw.eq("bd.createBySid", query.getUserSid());
+                qw.eq("bo.createBySid", query.getUserSid());
             }
         }
-        //查询所有待出库的车辆busVinSid
-        List<String> busVinSidList = baseMapper.selectByState();
-        //查询销售订单中申请人是当前登录人且已办结的，linkSid有值，且在车辆台账中不为出库的。
         IPage<BusDelivered> page = PagerUtil.queryToPage(pq);
-        IPage<BusDeliveredVo> pagging = baseMapper.selectListsVos(page, qw);
+        IPage<BusDeliveredVo> pagging = baseMapper.selectListsVoNew(page, qw);
         PagerVo<BusDeliveredVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-
     public void saveOrUpdateDto(BusDeliveredDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
@@ -271,7 +260,26 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         return iPage;
     }
 
-    public IPage<AppBusDeliveredPageVo> getRetrievalNotLists(PagerQuery<AppBusDeliveredPageQuery> pq) {
+    public IPage<AppBusDeliveredPageVo> getRetrievalNotListNew(PagerQuery<AppBusDeliveredPageQuery> pq) {
+        QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
+        String name = pq.getParams().getName();
+        IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
+        String orgPath = pq.getParams().getOrgPath();
+        String orgSid = "";
+        if (StringUtils.isNotBlank(orgPath)) {
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        } else {
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
+        }
+        qw.eq("bo.useOrgSid", orgSid);
+        if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
+            qw.eq("bo.createBySid", pq.getParams().getUserSid());
+        }
+        IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotListNew(page, qw, name);
+        return iPage;
+    }
+
+   /* public IPage<AppBusDeliveredPageVo> getRetrievalNotLists(PagerQuery<AppBusDeliveredPageQuery> pq) {
         QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
         String name = pq.getParams().getName();
         IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
@@ -298,7 +306,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             record.setVinList(vinListVo);
         }
         return iPage;
-    }
+    }*/
 
     public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
         ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail();
@@ -405,10 +413,9 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid);
                 AppCarListVo appCarListVo = new AppCarListVo();
                 appCarListVo.setVinSid(list.get(i));
-//                appCarListVo.setDiscount(appOrderPriceInfoVo.getSingleCarDiscountPrice());
                 //查询该车辆是否有挂车
                 ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, contractNo);
-                if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
+                if (trailerList.getData() != null && trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
                     appCarListVo.setShowHandCarBtn(false);
                 } else {
                     appCarListVo.setShowHandCarBtn(true);
@@ -601,7 +608,6 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                         discountLeaveNum = count - intCount - giveNum;
                     }
                 }
-//                int discountLeaveNum = count - intCount - giveNum;
                 deliveredLeavesVo.setDiscountLeaveNum(discountLeaveNum);
                 discountLeave.add(deliveredLeavesVo);
             }
@@ -694,6 +700,64 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         return rb.success().setData(list);
     }
 
+    public ResultBean<List<AppCarListVo>> selectInfoNew(DeliverDetailsQuery query) {
+        ResultBean<List<AppCarListVo>> rb = ResultBean.fireFail();
+        //移动端：排除已选车辆后的所有未提交及未出库的车辆集合
+        //PC端：前端传的已勾选的所有的车辆的集合
+        String contractNo = query.getContractNo();
+        List<String> vinSelectSid = query.getVinSelectsid();
+        vinSelectSid.removeAll(Collections.singleton(null));
+        List<String> vinSids = query.getVinSids();
+        vinSids.removeAll(Collections.singleton(null));
+        List<AppCarListVo> list = new ArrayList<>();
+        List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByNoAndVinSidsNew(contractNo);
+        for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
+            AppCarListVo appCarListVo = new AppCarListVo();
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
+            String vinSid = busSalesOrderVehicle.getLinkSid();
+            if (!vinSelectSid.isEmpty()) {
+                if (vinSelectSid.contains(vinSid)) {
+                    continue;
+                }
+            }
+            if (!vinSids.isEmpty()) {
+                if (vinSids.contains(vinSid)) {
+                    appCarListVo.setVinSid(vinSid);
+                } else {
+                    continue;
+                }
+            } else {
+                appCarListVo.setVinSid(vinSid);
+            }
+            ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, query.getContractNo());
+            if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
+                appCarListVo.setShowHandCarBtn(false);
+            } else {
+                appCarListVo.setShowHandCarBtn(true);
+            }
+            //优惠包使用情况
+            List<BusDeliveredDetailsDiscountsVo> discountList = new ArrayList<>();
+            List<BusSalesOrderDiscount> busSalesOrderDiscountList = busSalesOrderDiscountService.selectListByContractNo(contractNo);
+            for (int j = 0; j < busSalesOrderDiscountList.size(); j++) {
+                BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
+                BusSalesOrderDiscount orderDiscountVo = busSalesOrderDiscountList.get(j);
+                busDeliveredDetailsDiscountsVo.setDiscountInfo(orderDiscountVo.getDiscountExplain());
+                busDeliveredDetailsDiscountsVo.setDiscountSid(orderDiscountVo.getSid());
+                busDeliveredDetailsDiscountsVo.setDiscountPrice(orderDiscountVo.getPrice());
+                busDeliveredDetailsDiscountsVo.setDiscountNum(0);
+                busDeliveredDetailsDiscountsVo.setTotalNum(orderDiscountVo.getNum());
+                busDeliveredDetailsDiscountsVo.setDiscountName(orderDiscountVo.getName());
+                discountList.add(busDeliveredDetailsDiscountsVo);
+            }
+            appCarListVo.setDiscountUse(discountList);
+            BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo();
+            deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
+            appCarListVo.setRealBuyer(deliveredUseMessagesVo);
+            list.add(appCarListVo);
+        }
+        return rb.success().setData(list);
+    }
+
     public BusDelivered getState(String contractNo, String vinSid) {
         return baseMapper.getState(contractNo,vinSid);
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -42,6 +42,9 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto;
+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.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
@@ -213,6 +216,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
     @Autowired
     private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
+    @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
 
 
     /**
@@ -780,6 +785,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 baseMapper.updateStateBySid(3, bv.getBusinessSid());
+
+                //==============================修改车辆的持久状态组装数据
+                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<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(bv.getBusinessSid());
+                        vinSidList.removeAll(Collections.singleton(null));
+                        if (!vinSidList.isEmpty()) {
+                            vinSidList.stream().forEach(v -> {
+                                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_PASS.getTypeKey());
+                                baseVehicleStateDto.setBusSid(v);
+                                dtoList.add(baseVehicleStateDto);
+                            });
+                            ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
@@ -835,11 +865,35 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             } else {
                 if ("重新提交".equals(bv.getComment())) {
                     //将待出库中的车辆更改状态为出库申请0
-                    List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid());
+                    List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(bv.getBusinessSid());
-                    for (int i = 0; i < stringList.size(); i++) {
+                    //==============================新增车辆的持久状态组装数据
+                    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());
+                        BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
+                        Future future1 = pool.submit(() -> {
+                            List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                            vinSidList.removeAll(Collections.singleton(null));
+                            if (!vinSidList.isEmpty()) {
+                                vinSidList.stream().forEach(v -> {
+                                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey());
+                                    baseVehicleStateDto.setBusSid(v);
+                                    dtoList.add(baseVehicleStateDto);
+                                });
+                                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    /*for (int i = 0; i < stringList.size(); i++) {
                         String vinNo = stringList.get(i);
                         busDeliveredService.updateState(vinNo, 0);
-                    }
+                    }*/
                     //更改申请的状态为待审核2
                     baseMapper.updateStateBySid(2, bv.getBusinessSid());
                 }
@@ -1378,7 +1432,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 if ("发起申请".equals(nextName)) {
                     List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
                     //更新该合同的该车架号的状态为1
-                    busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
+//                    busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
+                    //==============================新增车辆的持久状态组装数据
+                    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());
+                        BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
+                        Future future1 = pool.submit(() -> {
+                            List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                            vinSidList.removeAll(Collections.singleton(null));
+                            if (!vinSidList.isEmpty()) {
+                                vinSidList.stream().forEach(v -> {
+                                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey());
+                                    baseVehicleStateDto.setBusSid(v);
+                                    dtoList.add(baseVehicleStateDto);
+                                });
+                                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                     baseMapper.updateStateBySid(1, query.getBusinessSid());
                 }
                 //极光推送
@@ -1477,7 +1555,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 if ("发起申请".equals(nextName)) {
                     List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
                     //更新该合同的该车架号的状态为1
-                    busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
+//                    busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
+                    //==============================新增车辆的持久状态组装数据
+                    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());
+                        BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
+                        Future future1 = pool.submit(() -> {
+                            List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                            vinSidList.removeAll(Collections.singleton(null));
+                            if (!vinSidList.isEmpty()) {
+                                vinSidList.stream().forEach(v -> {
+                                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey());
+                                    baseVehicleStateDto.setBusSid(v);
+                                    dtoList.add(baseVehicleStateDto);
+                                });
+                                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                     baseMapper.updateStateBySid(1, query.getBusinessSid());
                 }
 
@@ -1516,7 +1618,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                 List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
                 //更新该合同的该车架号的状态为1
-                busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
+//                busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
+                //==============================新增车辆的持久状态组装数据
+                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());
+                    BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
+                    Future future1 = pool.submit(() -> {
+                        List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                        vinSidList.removeAll(Collections.singleton(null));
+                        if (!vinSidList.isEmpty()) {
+                            vinSidList.stream().forEach(v -> {
+                                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey());
+                                baseVehicleStateDto.setBusSid(v);
+                                dtoList.add(baseVehicleStateDto);
+                            });
+                            ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 return rb.success().setData(resultBean.getData());
             } else {
                 if (businessTaskId.equals(query.getTaskId())) {
@@ -1530,7 +1656,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                     List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
                     //更新该合同的该车架号的状态为1
-                    busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
+//                    busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
+                    //==============================新增车辆的持久状态组装数据
+                    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());
+                        BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
+                        Future future1 = pool.submit(() -> {
+                            List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                            vinSidList.removeAll(Collections.singleton(null));
+                            if (!vinSidList.isEmpty()) {
+                                vinSidList.stream().forEach(v -> {
+                                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey());
+                                    baseVehicleStateDto.setBusSid(v);
+                                    dtoList.add(baseVehicleStateDto);
+                                });
+                                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                     return rb.success().setData(resultBean.getData());
                 }
             }
@@ -1720,6 +1870,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDeliveredApplyDetails.setSingleCarDiscountPrice(appCarListVo.getDiscount());
                 busDeliveredApplyDetails.setVinSid(appCarListVo.getVinSid());
                 busDeliveredApplyDetails.setApplySid(busDeliveredApply.getSid());
+                //根据合同编号和车架号查询busVinSId
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),appCarListVo.getVinSid());
+                busDeliveredApplyDetails.setBusVinSid(busSalesOrderVehicle.getSid());
                 BusDeliveredUseMessagesVo busDeliveredUseMessagesVo = appCarListVo.getRealBuyer();
                 busDeliveredApplyDetails.setVinNo(busDeliveredUseMessagesVo.getVin());
                 //赠送套餐
@@ -1868,6 +2021,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDeliveredApplyDetails.setApplySid(busDeliveredApply.getSid());
                 BusDeliveredUseMessagesVo busDeliveredUseMessagesVo = appCarListVo.getRealBuyer();
                 busDeliveredApplyDetails.setVinNo(busDeliveredUseMessagesVo.getVin());
+                //根据合同编号和车架号查询busVinSId
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),appCarListVo.getVinSid());
+                busDeliveredApplyDetails.setBusVinSid(busSalesOrderVehicle.getSid());
                 //赠送套餐
                 BigDecimal discountAll = BigDecimal.ZERO;
                 StringBuilder discountRemarks = new StringBuilder();
@@ -2190,21 +2346,59 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             //将该申请的车架号的待出库中的状态修改为出库中
             List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
             //更新该合同的该车架号的状态为0
-            busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0);
+//            busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0);
+
             //更新出库申请的状态为待审核2
             baseMapper.updateStateBySid(2, sid);
-            //极光推送
             busDeliveredApply = fetchBySid(businessSid);
-            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            //==============================新增车辆的持久状态组装数据
-            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            try {
-            BeanUtil.copyProperties(ufVo, messageFlowVo);
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            messageFlowableQuery.setUfVo(messageFlowVo);
+                        .setNameFormat("demo-pool-%d").build();
-            messageFlowableQuery.setAppMap(appMap);
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
-            messageFlowableQuery.setBusinessSid(businessSid);
+                        0L, TimeUnit.MILLISECONDS,
-            messageFlowableQuery.setModuleName("出库申请");
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-            messageFlowableQuery.setMsgContent(busDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
-            messageFlowableQuery.setMsgTitle("出库申请");
+                Future future1 = pool.submit(() -> {
-            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                    List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                    vinSidList.removeAll(Collections.singleton(null));
+                    if (!vinSidList.isEmpty()) {
+                        vinSidList.stream().forEach(v -> {
+                            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey());
+                            baseVehicleStateDto.setBusSid(v);
+                            dtoList.add(baseVehicleStateDto);
+                        });
+                        ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            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());
+                BusDeliveredApply finalBusDeliveredApply = busDeliveredApply;
+                Future future1 = pool.submit(() -> {
+                    //极光推送
+                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                    MessageFlowVo messageFlowVo = new MessageFlowVo();
+                    BeanUtil.copyProperties(ufVo, messageFlowVo);
+                    messageFlowableQuery.setUfVo(messageFlowVo);
+                    messageFlowableQuery.setAppMap(appMap);
+                    messageFlowableQuery.setBusinessSid(businessSid);
+                    messageFlowableQuery.setModuleName("出库申请");
+                    messageFlowableQuery.setMsgContent(finalBusDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                    messageFlowableQuery.setMsgTitle("出库申请");
+                    ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
             return voResultBean;
         }
         if (r == 2) {
@@ -2219,7 +2413,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             //将该申请的车架号的待出库中的状态修改为出库中
             List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
             //更新该合同的该车架号的状态为0
-            busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0);
+//            busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0);
+            //==============================新增车辆的持久状态组装数据
+            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());
+                BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
+                Future future1 = pool.submit(() -> {
+                    List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                    vinSidList.removeAll(Collections.singleton(null));
+                    if (!vinSidList.isEmpty()) {
+                        vinSidList.stream().forEach(v -> {
+                            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey());
+                            baseVehicleStateDto.setBusSid(v);
+                            dtoList.add(baseVehicleStateDto);
+                        });
+                        ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             //更新出库申请的状态为待审核2
             baseMapper.updateStateBySid(2, sid);
             return complete(bv);
@@ -2315,43 +2533,4 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         return rb.success().setData(deliveredFinVo);
     }
-
-//    public ResultBean<AppDeliveredApplyInfoVo> getRetrievalDetail(String contractSid) {
-//        ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
-//        AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
-//        BusDeliveredApply busDeliveredApply = fetchBySid(contractSid);
-//        BeanUtils.copyProperties(busDeliveredApply,vo);
-//
-//        if (vo.getIsTerminal().equals(1)) {
-//            List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
-//            voList.removeAll(Collections.singleton(null));
-//            if (!voList.isEmpty()) {
-//                for (AppCarListVo v : voList) {
-//                    CrmCustomerTempVo data = crmCustomerTempFeign.selByMobile(vo.getMobile()).getData();
-//                    AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
-//                    appUseInfoVo.setMobile(data.getMobile());
-//                    appUseInfoVo.setCustomer(data.getName());
-//                    appUseInfoVo.setAddress(data.getAddress());
-//                    appUseInfoVo.setIdNumber(data.getIDNumber());
-//                    v.setUseInfo(appUseInfoVo);
-//                }
-//            }
-//            vo.setCarList(voList);
-//
-//        } else if (vo.getIsTerminal().equals(0)) {
-//            //根据出库申请单的sid查询需要出库的车辆信息
-//            List<AppCarListVo> voList = busDeliveredApplyDetailsService.appDetailsList(contractSid);
-//            for (int i = 0; i < voList.size(); i++) {
-//                BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
-//                AppUseInfoVo appUseInfoVo = new AppUseInfoVo();
-//                appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile());
-//                appUseInfoVo.setCustomer(busDeliveredUseMessage.getName());
-//                appUseInfoVo.setAddress(busDeliveredUseMessage.getAddress());
-//                appUseInfoVo.setIdNumber(busDeliveredUseMessage.getIdNo());
-//                voList.get(i).setUseInfo(appUseInfoVo);
-//            }
-//            vo.setCarList(voList);
-//        }
-//        return rb.success().setData(vo);
-//    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java

@@ -139,4 +139,6 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
     String selectNum(String bill);
 
     int updateModify(@Param("date") Date date, @Param("sid") String businessSid);
+
+    String selectUseMainMoney(String busMainSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -381,4 +381,29 @@
         set modifyTime = #{date}
         where sid = #{sid}
     </update>
+
+    <select id="selectUseMainMoney" resultType="java.lang.String">
+        SELECT
+            COALESCE ( SUM( f.`thisUseMoney` ), 0 ) as useDeposit
+        FROM
+            anrui_fin.fin_selected_receivables_detailed d
+                left join anrui_fin.fin_collection_confirmation fc on fc.sid = d.collSid
+                LEFT JOIN (
+                SELECT
+                    f.busSid,
+                    f.thisUseMoney
+                FROM
+                    anrui_fin.fin_funds_carried_forward_veh f
+                        JOIN anrui_fin.`fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+                WHERE
+                    fa.`nodeState` != '终止'
+            ) f ON f.`busSid` = d.`sid`
+        WHERE
+            (d.`auditState` = 3 or d.auditState = 1)
+          and fc.busSid = '3cb0600c-0a26-4278-9120-99565327c84d'
+        GROUP BY
+            d.`sid`
+
+
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -70,6 +70,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowFeign;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
@@ -173,6 +174,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
 
     @Autowired
     private FlowableFeign flowableFeign;
+    @Autowired
+    private FlowFeign flowFeign;
 
     @Autowired
     private SysFormLinkFeign sysFormLinkFeign;
@@ -1209,27 +1212,44 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             return rb.setMsg("当前所在的组织机构不存在");
         }
         if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
-            return rb.setMsg("当前所在的组织机构未设置主管人员");
+//            return rb.setMsg("当前所在的组织机构未设置主管人员");
+            sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
         }
         String nextNodeUserSids_ = sysOrganization.getManagerSid();
         bv.setNextNodeUserSids(nextNodeUserSids_);
         if (r == 1) {
-            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
             busMainDeposit = fetchBySid(businessSid);
-            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            if ("Event_end".equals(ufVo.getTaskDefKey())) {
-            MessageFlowVo messageFlowVo = new MessageFlowVo();
+                pushFin(businessSid);
-            BeanUtil.copyProperties(ufVo, messageFlowVo);
+            }else{
-            ufVo.setProcInsId(busMainDeposit.getProcInsId());
+                try {
-            messageFlowableQuery.setUfVo(messageFlowVo);
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            messageFlowableQuery.setAppMap(appMap);
+                            .setNameFormat("demo-pool-%d").build();
-            messageFlowableQuery.setBusinessSid(businessSid);
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
-            messageFlowableQuery.setModuleName("简易订单-订金申请");
+                            0L, TimeUnit.MILLISECONDS,
-            messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-            messageFlowableQuery.setMsgTitle("简易订单");
+                    BusMainDeposit finalBusMainDeposit = busMainDeposit;
-            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                    Future future1 = pool.submit(() -> {
+                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                        MessageFlowVo messageFlowVo = new MessageFlowVo();
+                        BeanUtil.copyProperties(ufVo, messageFlowVo);
+                        ufVo.setProcInsId(finalBusMainDeposit.getProcInsId());
+                        messageFlowableQuery.setUfVo(messageFlowVo);
+                        messageFlowableQuery.setAppMap(appMap);
+                        messageFlowableQuery.setBusinessSid(businessSid);
+                        messageFlowableQuery.setModuleName("简易订单-订金申请");
+                        messageFlowableQuery.setMsgContent(finalBusMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        messageFlowableQuery.setMsgTitle("简易订单");
+                        ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
             return voResultBean;
         }
         if (r == 2) {
@@ -1370,40 +1390,45 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
-            try {
+            if ("Event_end".equals(ufVo.getTaskDefKey())) {
-                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                pushFin(businessSid);
-                        .setNameFormat("demo-pool-%d").build();
+            }else{
-                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                try {
-                        0L, TimeUnit.MILLISECONDS,
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                            .setNameFormat("demo-pool-%d").build();
-                Future future1 = pool.submit(() -> {
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
-                    //更新已选择的车架号的状态为审批中
+                            0L, TimeUnit.MILLISECONDS,
-                    List<String> list = dto.getCarList().stream().map(AppBusDepositVehicleCarListDto::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-                    BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+                    Future future1 = pool.submit(() -> {
-                    busMainDepositUpdateQuery.setVinSidList(list);
+                        //更新已选择的车架号的状态为审批中
-                    busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+                        List<String> list = dto.getCarList().stream().map(AppBusDepositVehicleCarListDto::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                    busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
+                        BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
-                    baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+                        busMainDepositUpdateQuery.setVinSidList(list);
-                });
+                        busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
-                Future future2 = pool.submit(() -> {
+                        busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
-                    //极光推送
+                        baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
-                    busMainDeposit.set(fetchBySid(businessSid));
+                    });
-                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                    Future future2 = pool.submit(() -> {
-                    MessageFlowVo messageFlowVo = new MessageFlowVo();
+                        //极光推送
-                    BeanUtil.copyProperties(ufVo, messageFlowVo);
+                        busMainDeposit.set(fetchBySid(businessSid));
-                    ufVo.setProcInsId(busMainDeposit.get().getProcInsId());
+                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                    messageFlowableQuery.setUfVo(messageFlowVo);
+                        MessageFlowVo messageFlowVo = new MessageFlowVo();
-                    messageFlowableQuery.setAppMap(appMap);
+                        BeanUtil.copyProperties(ufVo, messageFlowVo);
-                    messageFlowableQuery.setBusinessSid(businessSid);
+                        ufVo.setProcInsId(busMainDeposit.get().getProcInsId());
-                    messageFlowableQuery.setModuleName("简易订单-订车申请");
+                        messageFlowableQuery.setUfVo(messageFlowVo);
-                    messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        messageFlowableQuery.setAppMap(appMap);
-                    messageFlowableQuery.setMsgTitle("简易订单");
+                        messageFlowableQuery.setBusinessSid(businessSid);
-                    ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                        messageFlowableQuery.setModuleName("简易订单-订车申请");
-                });
+                        messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        messageFlowableQuery.setMsgTitle("简易订单");
+                        ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                    });
 
-            } catch (Exception e) {
+                } catch (Exception e) {
-                e.printStackTrace();
+                    e.printStackTrace();
+                }
             }
+
             return voResultBean;
         }
         if (r == 2) {
@@ -1465,7 +1490,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 messageFlowableQuery.setMsgTitle("简易订单");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             } else {
-                //更新修改时间
+                /*//更新修改时间
                 baseMapper.updateModify(new Date(), bv.getBusinessSid());
                 //如果类型为订金，推送款项确认
                 if (DictCommonEnum.DepositBillType.JYDD_DJ.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
@@ -1541,7 +1566,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.LOCK.getCode());
                     busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.LOCK.getRemarks());
                     baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
-                }
+                }*/
+                pushFin(bv.getBusinessSid());
 
             }
             return rb.success().setData(resultBean.getData());
@@ -1550,6 +1576,87 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
     }
 
+    public void pushFin(String businessSid){
+        BusMainDeposit busMainDeposit = fetchBySid(businessSid);
+        //更新修改时间
+        baseMapper.updateModify(new Date(), businessSid);
+        //如果类型为订金，推送款项确认
+        if (DictCommonEnum.DepositBillType.JYDD_DJ.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
+            BusDeposit busDeposit = busDepositService.selectByBillSid(businessSid);
+            //推送款项确认
+            FinConfirmDto finConfirmDto = new FinConfirmDto();
+            //收款日期
+            finConfirmDto.setCollectionDate(DateUtil.format(busDeposit.getPaymentDate(), "yyyy-MM-dd"));
+            //收款银行key
+            finConfirmDto.setCollectionBankKey(busDeposit.getProBankKey());
+            //收款银行value
+            finConfirmDto.setCollectionBank(busDeposit.getProBankValue());
+            //收款银行账号key
+            finConfirmDto.setCollectionBankNumKey(busDeposit.getProBankAccKey());
+            //收款银行账号value
+            finConfirmDto.setCollectionBankNum(busDeposit.getProBankAccValue());
+            //收款方式key
+            finConfirmDto.setCollectionTypeKey(busDeposit.getPayTypeKey());
+            //收款银行value
+            finConfirmDto.setCollectionTypeValue(busDeposit.getPayType());
+            //付款方名称
+            finConfirmDto.setPayerName(busDeposit.getDraweeName());
+            //收款金额
+            finConfirmDto.setCollectionMoney(busDeposit.getDeposit().toString());
+            //分公司sid
+            finConfirmDto.setUseOrgSid(busDeposit.getOrgSid());
+            finConfirmDto.setPayerName(busDeposit.getDraweeName());
+            //余额
+            finConfirmDto.setBanlance(busDeposit.getDeposit().toString());
+            //创建人sid
+            finConfirmDto.setCreateBySid(busMainDeposit.getCreateBySid());
+            finConfirmDto.setPushMessgae(1);
+            finConfirmDto.setBusSid(busMainDeposit.getSid());
+            finConfirmDto.setBusNo(busMainDeposit.getBillNo());
+            finConfirmDto.setAuditState(1);
+            finConfirmDto.setCreateByName(busDeposit.getStaffName());
+            finConfirmDto.setRemarks(busDeposit.getRemarks());
+            //ToDo:赋值
+            //查询打款凭证
+            finConfirmDto.setPaymentVoucherUrl(busDeposit.getPaymentProof());
+            //申请部门
+            List<String> orgList = Arrays.asList(busMainDeposit.getOrgSidPath().split("/"));
+            String deptSid = orgList.get(orgList.size() - 1);
+            ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid);
+            if (sysOrganizationVoResultBean.getData() != null) {
+                finConfirmDto.setCreateDept(sysOrganizationVoResultBean.getData().getName());
+                finConfirmDto.setCreateDeptSid(deptSid);
+            }
+            //申请日期
+            finConfirmDto.setCreateDate(DateUtil.today());
+            //收款账户名称
+            finConfirmDto.setReceivingName(busDeposit.getCollectionAccountName());
+            //付款账号后4位
+            finConfirmDto.setPayAccount(busDeposit.getPayBankAcc());
+            //付款银行
+            finConfirmDto.setPayBank(busDeposit.getDepositBank());
+            finConfirmDto.setPurchaseSystemName(busDeposit.getPurchaseSystemName());
+            finConfirmDto.setPurchaseSystemSid(busDeposit.getPurchaseSystemSid());
+            ResultBean<String> codeString = finCollectionConfirmationFeign.getApplyCode(busMainDeposit.getOrgSid());
+            finConfirmDto.setBillNo(codeString.getData());
+            finConfirmDto.setStaffName(busDeposit.getStaffName());
+            finConfirmDto.setStaffUserSid(busMainDeposit.getCreateBySid());
+            finConfirmDto.setStaffDeptName(finConfirmDto.getCreateDept());
+            finConfirmDto.setStaffDeptSid(finConfirmDto.getCreateDeptSid());
+            finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
+        }
+        if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
+            //更新已选择的车架号的状态为简易订单锁定
+            AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(businessSid).getData();
+            List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+            busMainDepositUpdateQuery.setVinSidList(list);
+            busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.LOCK.getCode());
+            busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.LOCK.getRemarks());
+            baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+        }
+    }
+
     /**
      * 判断提交的流程是否被允许
      *
@@ -1772,4 +1879,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 
+    public String getUseFin(String busMainSid){
+        //根据已审核通过的简易订单订金查询已款项结转通过的
+        String useMainMoney = baseMapper.selectUseMainMoney(busMainSid);
+
+        return null;
+    }
+
 }

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

@@ -4775,9 +4775,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
-            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
+           /* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
-            AppOrderDetailsVo vo = resultBean.getData();
+            AppOrderDetailsVo vo = resultBean.getData();*/
-            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
+            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) {
                 //更新已选择的车架号的状态为审批中
                 List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
                 BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@@ -4798,12 +4798,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
             //==============================新增车辆的持久状态组装数据
+            busSalesOrderOne = fetchBySid(businessSid);
             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());
+                BusSalesOrder finalBusSalesOrderOne = busSalesOrderOne;
                 Future future1 = pool.submit(() -> {
                     List<BaseVehicleStateDto> dtoList = new ArrayList<>();
                     List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(businessSid);
@@ -4816,6 +4818,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                 baseVehicleStateDto.setVinSid(v.getLinkSid());
                                 baseVehicleStateDto.setVinNo(v.getLinkNo());
                             }
+                            baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrderOne.getPayTypeKey());
+                            baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
                             baseVehicleStateDto.setBusSid(v.getSid());
                             dtoList.add(baseVehicleStateDto);
                         });
@@ -4861,9 +4865,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             bv.setInstanceId(dto.getProcInsId());
             //流程定义id
             bv.setModelId(busSalesOrder.get().getProcDefId());
-            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
+           /* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
-            AppOrderDetailsVo vo = resultBean.getData();
+            AppOrderDetailsVo vo = resultBean.getData();*/
-            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
+            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) {
                 //更新已选择的车架号的状态为审批中
                 List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
                 BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -435,4 +435,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     public List<BusSalesOrderDeposit> getListByOrderSid(String saleOrderSid) {
         return baseMapper.getListByOrderSid(saleOrderSid);
     }
+
+
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -114,6 +114,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     BusSalesOrderVehicle selectByNoAndVinSid(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid);
 
     List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo);
+    List<BusSalesOrderVehicle> selectByNoAndVinSidsNew(String contractNo);
 
     List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -98,6 +98,15 @@
           and length(bv.linkSid) > 0
     </select>
 
+    <select id="selectByNoAndVinSidsNew"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select bv.linkSid,bv.sid,bv.linkNo
+        from (select busSid from anrui_base.base_vehicle_state where busState = '401' and finState = '1') as bs
+        left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
+        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}
+    </select>
+
     <select id="appVehicleQKKPList" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo">
         SELECT bsov.linkNo AS vinNo,
         bsov.`linkSid` AS vehSid,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -278,6 +278,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByNoAndVinSids(contractNo);
     }
 
+    public List<BusSalesOrderVehicle> selectByNoAndVinSidsNew(String contractNo) {
+        return baseMapper.selectByNoAndVinSidsNew(contractNo);
+    }
+
     public List<BusSalesOrderVehicle> selectListByOrderSid(String saleOrderSid) {
         return baseMapper.selectByOrderSid(saleOrderSid);
     }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java

@@ -72,4 +72,8 @@ public class FinCollectionConfirmationJYDDKYDJVo implements Vo {
     private String collectionMoney;
     @ApiModelProperty("余额")
     private String balance;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java

@@ -94,11 +94,16 @@ public interface FinFundsCarriedForwardApplyFeign {
     @ResponseBody
     public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(@RequestBody FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery);
 
-    @ApiOperation("生成款项结转PDF")
+    @ApiOperation("生成款项结转PDF(PC)")
     @PostMapping("/createPdf")
     @ResponseBody
     public ResultBean<String> createPdf(@RequestParam("sid") String sid, @RequestParam("pdfType") String pdfType);
 
+    @ApiOperation("生成款项结转PDF(APP)")
+    @PostMapping("/createPdf2")
+    @ResponseBody
+    public ResultBean<String> createPdf2(@RequestParam("sid") String sid, @RequestParam("pdfType") String pdfType);
+
     /****************************************************审批流程*****************************************************/
 
     @ApiOperation("款项结转审批流程")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java

@@ -87,6 +87,11 @@ public class FinFundsCarriedForwardApplyFeignFallback implements FinFundsCarried
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> createPdf2(String sid, String pdfType) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submitFinFundsApply(SubmitFinFundsApplyDto dto) {
 		return null;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java

@@ -63,6 +63,8 @@ public class FinFundsCarriedForwardApplyQuery implements Query {
     private String jzSmallMoney;
     @ApiModelProperty("最大结转金额")
     private String jzBigMoney;
+    @ApiModelProperty("单据编号")
+    private String billNo;
 	@ApiModelProperty("组织全路径")
     private String orgSidPath;
     private String menuUrl;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-fin(款项结转申请) <br/>
  * File: FinFundsCarriedForwardApplyVo.java <br/>
@@ -59,7 +62,8 @@ public class FinFundsCarriedForwardApplyVo implements Vo {
 	@ApiModelProperty("申请人")
     private String createByName;
 	@ApiModelProperty("申请日期")
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 	@ApiModelProperty("来源")
     private String source;
     @ApiModelProperty("结转金额")

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

@@ -211,6 +211,8 @@
         bd.`draweeMobile` AS phone,
         fcc.collectionDate,
         fcc.collectionMoney,
+        fsrd.purchaseSystemSid,
+        fsrd.purchaseSystemName,
         (
         fcc.collectionMoney - COALESCE(SUM(ffc.`thisUseMoney`), 0)
         ) AS balance

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

@@ -1207,6 +1207,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
         }
+        if("2".equals(confirmation.getAuditState())){
+            return rb.setMsg("该申请已驳回，不允许重复操作");
+        }
+        if("3".equals(confirmation.getAuditState())){
+            return rb.setMsg("该申请已审核通过，不允许驳回");
+        }
+        if("4".equals(confirmation.getAuditState())){
+            return rb.setMsg("该申请已撤回，不允许驳回");
+        }
         if (confirmation.getFirst() == 1) {
             return rb.setMsg("不是首次，不允许驳回");
         }
@@ -1610,6 +1619,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
         }
+        if("3".equals(confirmation.getAuditState())){
+            return rb.setMsg("该申请已审核通过，不允许重复操作");
+        }
+        if("2".equals(confirmation.getAuditState())){
+            return rb.setMsg("该申请已驳回，不允许确认");
+        }
+        if("4".equals(confirmation.getAuditState())){
+            return rb.setMsg("该申请已撤回，不允许确认");
+        }
         finSelectedReceivablesDetailedService.updateAuditStateBySid(1, sid);
         //推送收款单
         ARReceivebill arReceivebill = new ARReceivebill();
@@ -1900,8 +1918,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
                                     dtoList.add(baseVehicleStateDto);
                                 }
-                               //根据busVinSid查询待出库中是否存在该数据
+                                //根据busVinSid查询待出库中是否存在该数据
-                                ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                               /* ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
                                 if (busDeliveredResultBean.getData() == null) {
                                     if (leftAll.compareTo(rightAll) <= 0) {//推送待出库
                                         BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
@@ -1937,7 +1955,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         busDeliveredDto.setBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
                                         ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
                                     }
-                                }
+                                }*/
 
                             }
                         }
@@ -2558,7 +2576,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean<String> crmResultBean = crmCustomerTempFeign.saveOrUpdateAppCustomerTemp(crmCustomerTemp);
         FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
         finSelectedReceivablesDetailed.setCollSid(confirmation.getSid());
-        finSelectedReceivablesDetailed.setReceivablesName("订金");
+        finSelectedReceivablesDetailed.setReceivablesName("简易订单订金");
         finSelectedReceivablesDetailed.setSubscribedOf(1);
         finSelectedReceivablesDetailed.setAuditState(1);
         finSelectedReceivablesDetailed.setCreateBySid(confirmation.getCreateBySid());
@@ -2570,6 +2588,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finSelectedReceivablesDetailed.setSubscriptionMoney(confirmation.getCollectionMoney());
         finSelectedReceivablesDetailed.setUseOrgSid(confirmation.getUseOrgSid());
         finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
+        finSelectedReceivablesDetailed.setPurchaseSystemSid(confirmation.getPurchaseSystemSid());
+        finSelectedReceivablesDetailed.setPurchaseSystemName(confirmation.getPurchaseSystemName());
         finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
         if (StringUtils.isNotBlank(confirmation.getPaymentVoucherUrl())) {
             //添加进附件表
@@ -2722,6 +2742,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
         }
+        if("3".equals(confirmation.getAuditState())){
+            return rb.setMsg("该申请已审核通过，不允许撤回");
+        }
+        if("4".equals(confirmation.getAuditState())){
+            return rb.setMsg("该申请已撤回，不允许重复撤回");
+        }
+        if("2".equals(confirmation.getAuditState())){
+            return rb.setMsg("该申请已驳回，不允许撤回");
+        }
         if (!userSid.equals(confirmation.getCreateBySid())) {
             return rb.setMsg("当前登录人员与发起人员不是同一人，不允许撤回");
         }
@@ -2742,6 +2771,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         });
         confirmation.setAuditState(4);
         confirmation.setReason("申请人已撤回");
+        confirmation.setConfirmDate("");
+        confirmation.setConfirmName("");
+        confirmation.setConfirmNameSid("");
         baseMapper.updateById(confirmation);
         return rb.success().setMsg("撤回成功");
     }
@@ -2796,6 +2828,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 return p;
             }
         }
+        qw.eq("fsrd.auditState", 3);
         if (StringUtils.isNotBlank(query.getStaffDeptName())) {
             qw.like("fcc.staffDeptName", query.getStaffDeptName());
         }

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

@@ -109,6 +109,11 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp
 		return finFundsCarriedForwardApplyService.createPdf(sid,userName);
 	}
 
+	@Override
+	public ResultBean<String> createPdf2(String sid, String pdfType) {
+		return finFundsCarriedForwardApplyService.createPdf2(sid,pdfType);
+	}
+
 	@Override
 	public ResultBean submitFinFundsApply(SubmitFinFundsApplyDto dto) {
 		return finFundsCarriedForwardApplyService.submitFinFundsApply(dto);

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

@@ -215,6 +215,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         if (StringUtils.isNotBlank(query.getCreateByName())) {
             qw.like("fa.createByName", query.getCreateByName());
         }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("fa.billNo", query.getBillNo());
+        }
         String applyStartDate = query.getApplyStartDate();
         String applyEndDate = query.getApplyEndDate();
         qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (bacva.createTime,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
@@ -229,7 +232,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         IPage<FinFundsCarriedForwardApplyVo> pagging = baseMapper.selectPageVo(page, qw, query.getJzSmallMoney(), query.getJzBigMoney());
         for (FinFundsCarriedForwardApplyVo record : pagging.getRecords()) {
             record.setShowUpdateBtn(false);
-            if (StringUtils.isNotBlank(record.getDownloadUrl())) {
+            if ("已办结".equals(record.getNodeState())) {
                 record.setShowDownloadBtn(true);
             } else {
                 record.setShowDownloadBtn(false);
@@ -385,7 +388,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchYeBySid(busSid);
             finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(finSelectedReceivablesDetailed.getCollSid());
             finFundsCarriedForwardApply = fetchBySid(finSelectedReceivablesDetailed.getCollSid());
-            finFundsCarriedForwardVehDetailsVo.setBusBillNo(finSelectedReceivablesDetailed.getContractNo());
+            if (StringUtils.isNotBlank(finSelectedReceivablesDetailed.getContractNo())) {
+                finFundsCarriedForwardVehDetailsVo.setBusBillNo(finSelectedReceivablesDetailed.getContractNo());
+            } else {
+                finFundsCarriedForwardVehDetailsVo.setBusBillNo(finCollectionConfirmation.getBillNo());
+            }
             finFundsCarriedForwardVehDetailsVo.setCustomerSid(finSelectedReceivablesDetailed.getCustomerSid());
             finFundsCarriedForwardVehDetailsVo.setCustomerName(finSelectedReceivablesDetailed.getCustomerName());
             finFundsCarriedForwardVehDetailsVo.setVinNo(finSelectedReceivablesDetailed.getVIN());
@@ -395,11 +402,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             finFundsCarriedForwardApplyDetailsVo.setPurchaseSystem(finSelectedReceivablesDetailed.getPurchaseSystemName());
         }
         SysUserVo sysUserVo1 = null;
-        if (finCollectionConfirmation != null){
+        if (finCollectionConfirmation != null) {
             finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finCollectionConfirmation.getStaffDeptSid());
             finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finCollectionConfirmation.getStaffDeptName());
             sysUserVo1 = sysUserFeign.fetchBySid(finCollectionConfirmation.getStaffUserSid()).getData();
-        }else {
+        } else {
             finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finFundsCarriedForwardApply.getSaleDeptSid());
             finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finFundsCarriedForwardApply.getSaleDeptName());
             sysUserVo1 = sysUserFeign.fetchBySid(finFundsCarriedForwardApply.getCreateBySid()).getData();
@@ -577,19 +584,24 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         BigDecimal rkje = new BigDecimal("0");
         for (FinFundsCarriedForwardVehDto finFundsCarriedForwardVehDto : finFundsCarriedForwardVehDetailsVos) {
             String thisUseMoney = finFundsCarriedForwardVehDto.getThisUseMoney();
+            if (StringUtils.isBlank(thisUseMoney)) {
+                return rb.setMsg("请填写本次使用金额");
+            }
             jzjehj = jzjehj.add(new BigDecimal(thisUseMoney));
         }
         for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
+            BigDecimal receivable = new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getReceivable());
+            if (StringUtils.isBlank(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())) {
+                return rb.setMsg("请填写认款金额");
+            }
+            BigDecimal confirmMoney = new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney());
             if (yxysFinFundsCarriedForwardYXYSKXVo.getProjectName().equals("订金")) {
-                BigDecimal receivable = new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getReceivable());
-                BigDecimal confirmMoney = new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney());
                 int i = confirmMoney.compareTo(receivable);
                 if (i == 1) {
                     return rb.setMsg("订金的认款金额不能大于应收金额");
                 }
             }
-            String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney();
+            rkje = rkje.add(confirmMoney);
-            rkje = rkje.add(new BigDecimal(confirmMoney));
         }
         int i = rkje.compareTo(jzjehj);
         if (i != 0) {
@@ -653,7 +665,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             }
             if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
                 bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
-            }else {
+            } else {
                 bv.setNextNodeUserSids(sysOrganization.getManagerSid());
             }
         } else {
@@ -877,7 +889,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     private List<TzDto> manyHB(List<TzDto> list) {
         //转出为多条，转入为一条
         List<TzDto> manyRemoveList = new ArrayList<>();
-        if (list.get(0).getTzType().equals("转出")){
+        if (list.get(0).getTzType().equals("转出")) {
             list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
                 transfer.stream().reduce((a, b) -> new TzDto(
                         a.getTzType(),
@@ -890,7 +902,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                         a.getDcje() + b.getDcje(),
                         a.getDrje())).ifPresent(manyRemoveList::add);
             });
-        }else {
+        } else {
             list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
                 transfer.stream().reduce((a, b) -> new TzDto(
                         a.getTzType(),
@@ -1042,11 +1054,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 Map<String, Object> map = BeanUtil.beanToMap(ufVo);
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
-                if ("发起申请".equals(ufVo.getNodeState())){
+                if ("发起申请".equals(ufVo.getNodeState())) {
                     FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
                     List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                     for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
                     }
                 }
                 //极光推送
@@ -1094,11 +1106,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                 UpdateFlowFieldVo ufv = resultBean.getData();
-                if ("发起申请".equals(ufv.getNodeState())){
+                if ("发起申请".equals(ufv.getNodeState())) {
                     FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
                     List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                     for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
                     }
                 }
                 return rb.success().setData(resultBean.getData());
@@ -1133,7 +1145,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
                 List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                 for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                    finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                    finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
                 }
                 return rb.success().setData(resultBean.getData());
             } else {
@@ -1149,7 +1161,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                     FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
                     List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                     for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
                     }
                 }
             }
@@ -1158,7 +1170,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 
-    public ResultBean complete(BusinessVariables bv,String pdfType) {
+    public ResultBean complete(BusinessVariables bv, String pdfType) {
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(businessSid);
@@ -1177,7 +1189,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         }
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finFundsCarriedForwardApply.getOrgSidPath());
-        if ("Activity_1kve61q".equals(bv.getTaskDefKey())){
+        if ("Activity_1kve61q".equals(bv.getTaskDefKey())) {
             List<String> orgPathList = Arrays.asList(finFundsCarriedForwardApply.getOrgSidPath().split("/"));
             SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
             if (sysOrganization == null) {
@@ -1185,7 +1197,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             }
             if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
                 bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
-            }else {
+            } else {
                 bv.setNextNodeUserSids(sysOrganization.getManagerSid());
             }
         }
@@ -1448,35 +1460,38 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             for (FinFundsCarriedForwardVeh v : finFundsCarriedForwardVehList) {
                 String busSid = v.getBusSid();
                 FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(busSid);
-                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
+                if (StringUtils.isNotBlank(finSelectedReceivablesDetailed.getReceivablesSid())) {
-                //结转金额
+                    FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
-                //查询该车的所有认款，是否都已认完
+                    //结转金额
-                String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    //查询该车的所有认款，是否都已认完
-                String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) <= 0) {
+                    String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                    //已认款完成
+                    if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
-                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        //已认款完成
-                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
-                    dtoList.add(baseVehicleStateDto);
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                } else {
+                        dtoList.add(baseVehicleStateDto);
-                    //认款未完成
+                    } else {
-                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        //认款未完成
-                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
-                    dtoList.add(baseVehicleStateDto);
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    }
                 }
+
             }
         }
         List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectByOneCollSid(sid);
         finSelectedReceivablesDetailedVos.removeAll(Collections.singleton(null));
-        if(!finSelectedReceivablesDetailedVos.isEmpty()){
+        if (!finSelectedReceivablesDetailedVos.isEmpty()) {
-            for(FinSelectedReceivablesDetailed v : finSelectedReceivablesDetailedVos){
+            for (FinSelectedReceivablesDetailed v : finSelectedReceivablesDetailedVos) {
                 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
                 //查询该车的所有认款，是否都已认完
                 String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
                 String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) <= 0) {
+                if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
                     //已认款完成
                     BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
                     baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
@@ -1509,4 +1524,77 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             e.printStackTrace();
         }
     }
+
+    public ResultBean<String> createPdf2(String sid, String pdfType) {
+        ResultBean rb = ResultBean.fireFail();
+        FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(sid).getData();
+        List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
+        List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
+        Map<String, Object> dataMap = new HashMap();
+        if (StringUtils.isNotBlank(data.getProcInsId())) {
+            List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(data.getProcInsId(), "1").getData();
+            if (flowRecordVo != null) {
+                for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
+                    if (flowTask.getFlowableRecordVo() != null) {
+                        Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
+                        String taskDefKey = (String) flowableRecordVo.get("taskDefKey");
+                        List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
+                        String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
+                        String finishTime = (String) flowableRecordVo.get("finishTime");
+                        finishTime = finishTime.substring(0, 10);
+                        if ("Activity_17mi28e".equals(taskDefKey)) {
+                            dataMap.put("spName", assigneeName + finishTime);
+                        }
+                    }
+                }
+            }
+        }
+        List<TzDto> tzList = new ArrayList<>();
+        for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
+            TzDto tzDto = new TzDto();
+            tzDto.setTzType("转出");
+            tzDto.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo());
+            tzDto.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName());
+            tzDto.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo());
+            String thisUseMoney = finFundsCarriedForwardVehDetailsVo.getThisUseMoney();
+            int index = thisUseMoney.indexOf(".");
+            tzDto.setDcje(Integer.parseInt(thisUseMoney.substring(0, index)));
+            tzList.add(tzDto);
+        }
+        for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
+            TzDto tzDto = new TzDto();
+            tzDto.setTzType("转入");
+            tzDto.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
+            tzDto.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
+            tzDto.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
+            tzDto.setDrje(Integer.parseInt(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+            tzList.add(tzDto);
+        }
+        dataMap.put("saleDate", DateUtil.formatDate(new Date()));
+        dataMap.put("applyDept", data.getApplyDeptName());
+        dataMap.put("applyPeo", data.getCreateByName());
+        dataMap.put("billNo", data.getBillNo());
+        dataMap.put("tzList", tzList);
+        dataMap.put("makeName", data.getCreateByName() + data.getCreateByDate());
+        //获取模板
+        //模板路径
+        String sourcePath = "D:\\anrui\\upload\\template\\";
+        //生成word文件名
+        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+        long seconds = System.currentTimeMillis();
+        String typeName = dateStr + seconds + ".doc";
+        //  生成文件路径
+        String targetPath = sourcePath + dateStr;
+        if (pdfType.equals("针孔式打印机")) {
+            WordUtils.creatWord(dataMap, "jzsqzks", sourcePath, targetPath, typeName);
+        } else if (pdfType.equals("激光打印机")) {
+            WordUtils.creatWord(dataMap, "jzsqjg", sourcePath, targetPath, typeName);
+        }
+        //新生成的word路径
+        String wordPath = targetPath + "\\" + typeName;
+        //生成出门证文件名
+        String pdfName = "款项结转_" + dateStr + seconds + ".pdf";
+        WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
+        return rb.success().setData(fileUploadComponent.getUrlPrefix() + "/template/" + dateStr + "/" + pdfName);
+    }
 }

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

@@ -78,7 +78,7 @@
             and length(furd.busVinSid)
               >0
         </where>
-        group by furd.sid
+        group by furd.sid,furd.contractNo
         having receivable>0
         order by furd.contractNo desc
     </select>
@@ -363,7 +363,7 @@
                  left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
         <where>
             ${ew.sqlSegment}
-              and fd.receivablesName != '订金'
+              and fd.receivablesName not like '%订金%'
               and fd.auditState = 3
             <if test="name != null and name != ''">
                 and concat(IFNULL(fd.customerName
@@ -498,7 +498,7 @@
         ) df ON df.receivablesSid = furd.`sid`
         <where>
             ${ew.sqlSegment}
-              and fd.receivablesName != '订金'
+              and fd.receivablesName not like '%订金%'
               and fd.auditState = 3
             <if test="name != null and name != ''">
                 and concat(IFNULL(fd.customerName

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -93,7 +93,7 @@
             ${ew.sqlSegment}
               and length(furd.busVinSid) > 0
         </where>
-        group by furd.sid,currentReceivableMoney,furd.contractNo
+        group by furd.sid,currentReceivableMoney>0,furd.contractNo
         having currentReceivableMoney>0
         order by furd.contractNo desc
     </select>
@@ -172,10 +172,21 @@
                furd.reveivableMoney,
                furd.sid                  as receivablesSid,
                (
-                   SELECT sum(subscriptionMoney)
+        select ifnull(sum(dbalance), 0) as subscriptionMoney
-                   FROM fin_selected_receivables_detailed
+        from (SELECT d.receivablesSid,
-                   WHERE receivablesSid = furd.sid
+        cast((
-                     AND auditState = 3) as subscriptionMoneyAll,
+        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
+        FROM fin_selected_receivables_detailed d
+        LEFT JOIN (
+        SELECT f.busSid,
+        f.thisUseMoney
+        FROM fin_funds_carried_forward_veh f
+        JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+        WHERE fa.`nodeState` != '终止'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE d.auditState = 3
+        GROUP BY d.`sid`) d
+        WHERE d.receivablesSid = furd.sid) as subscriptionMoneyAll,
                (
                    SELECT group_concat(length(remarks) > 0, ',')
                    FROM fin_selected_receivables_detailed

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

@@ -38,6 +38,8 @@ public class OtherReceivableBillService extends FinKingDeeService {
             return rb.setMsg("业务日期不能为空");
         }
         map_fEntityModel_.put("FDATE", otherReceivable.getBussDate());
+        //到期日期
+        map_fEntityModel_.put("FENDDATE_H",otherReceivable.getBussDate());
         //客户
         if (otherReceivable.getCommUnit() == null) {
             return rb.setMsg("客户编码不能为空");
@@ -48,7 +50,14 @@ public class OtherReceivableBillService extends FinKingDeeService {
             return rb.setMsg("收款组织不能为空");
         }
         map_fEntityModel_.put("FPAYORGID", otherReceivable.getCollectionOrg());
+        //收款组织
         map_fEntityModel_.put("FSETTLEORGID", otherReceivable.getCollectionOrg());
+        //销售组织
+        map_fEntityModel_.put("FSALEORGID",otherReceivable.getCollectionOrg());
+        //销售部门
+        map_fEntityModel_.put("FSALEDEPTID",otherReceivable.getCollectionDetails().get(0).getDearDept());
+        //申请部门
+        map_fEntityModel_.put("FDEPARTMENTID",otherReceivable.getCollectionDetails().get(0).getDearDept());
         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_model.json

@@ -5,7 +5,7 @@
   },
   "FBillNo": "@KD_FBillNo",
   "FDATE": "@KD_FDATE",
-  "FENDDATE_H": "@KD_FDATE",
+  "FENDDATE_H": "@KD_FENDDATE_H",
   "FISINIT": "false",
   "FCONTACTUNITTYPE": "BD_Customer",
   "FCONTACTUNIT": {
@@ -16,7 +16,7 @@
     "FNumber": "PRE001"
   },
   "FDEPARTMENTID": {
-    "FNumber": ""
+    "FNumber": "@KD_FDEPARTMENTID"
   },
   "FSETTLEORGID": {
     "FNumber": "@KD_FSETTLEORGID"
@@ -25,10 +25,10 @@
     "FNumber": "@KD_FPAYORGID"
   },
   "FSALEDEPTID": {
-    "FNumber": ""
+    "FNumber": "@KD_FSALEDEPTID"
   },
   "FSALEORGID": {
-    "FNumber": ""
+    "FNumber": "@KD_FSALEORGID"
   },
   "FSALEGROUPID": {
     "FNumber": ""

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

@@ -217,7 +217,15 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                 return p;
             }
         }
-        qw.ne("state", 1);
+        if (StringUtils.isNotBlank(query.getType())) {
+            if ("1".equals(query.getType())) {
+                qw.eq("state", 0);
+            } else {
+                qw.eq("state", 2);
+            }
+        }else {
+            qw.ne("state", 1);
+        }
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
             qw.like("useOrgName", query.getUseOrgName());
         }
@@ -257,11 +265,23 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             String state = record.getState();
             if ("0".equals(state)) {
                 record.setIsEdit(true);
+                record.setShowUpdateBtn(true);
                 record.setIsDelete(false);
+                record.setShowDeleteBtn(false);
             } else {
                 record.setIsEdit(false);
+                record.setShowUpdateBtn(false);
                 record.setIsDelete(false);
+                record.setShowDeleteBtn(false);
             }
+            if ("002".equals(record.getGsfkjgKey())){
+                record.setIsHandle(true);
+                record.setShowHandleBtn(true);
+            }else {
+                record.setShowHandleBtn(false);
+                record.setIsHandle(false);
+            }
+            record.setPublishInfo(record.getApplyDeptName() + "-" + record.getCreateByName());
         }
         PagerVo<LoanPreloanCreditApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
@@ -378,7 +398,9 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         }
         loanPreloanCreditPeoService.delByMainSid(dtoSid);
         for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
+            loanPreloanCreditPeo.setMainSid(dtoSid);
             String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
+            commonAppendixFeign.deleteFiles(peoSid);
             List<String> idCardImages1 = loanPreloanCreditPeo.getIdCardImages();
             for (String s : idCardImages1) {
                 CommonAppendixDto commonAppendixDto = new CommonAppendixDto();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java

@@ -0,0 +1,38 @@
+package com.yxt.anrui.terminal.api.risk.creditreview;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class CreditReviewDetailsOffVo extends CreditReviewDetailsVo{
+
+    @ApiModelProperty("查询结果截图（公司）")
+    private List<String> searchResultImages;
+    @ApiModelProperty("审核结果key（公司）")
+    private String examineResultKey;
+    @ApiModelProperty("审核结果（公司）")
+    private String examineResult;
+    @ApiModelProperty("审核日期（公司）")
+    private String examineDate;
+    @ApiModelProperty("审核备注（公司）")
+    private String examineRemarks;
+    @ApiModelProperty("资方剩余额度")
+    private String manageLeave;
+    @ApiModelProperty("查询结果截图（资方）")
+    private List<String> searchResultImages2;
+    @ApiModelProperty("审核结果key（资方）")
+    private String examineResultKey2;
+    @ApiModelProperty("审核结果key（资方）")
+    private String examineResult2;
+    @ApiModelProperty("审核日期（资方）")
+    private String examineDate2;
+    @ApiModelProperty("审核备注（资方）")
+    private String examineRemarks2;
+    @ApiModelProperty("公司风控结果")
+    private List<IdentityDetailsVo> companyResultDict = new ArrayList<>();
+    @ApiModelProperty("资方风控结果")
+    private List<IdentityDetailsVo> managementResultDict = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java

@@ -29,16 +29,21 @@ import java.util.List;
         fallback = CreditReviewFeignFallback.class)
 public interface CreditReviewFeign {
 
-    @ApiOperation("获取贷前信用审核列表")
+    @ApiOperation("初始化贷前信用审核")
-    @PostMapping("/getCreditReviewList")
-    @ResponseBody
-    public ResultBean<PagerVo<CreditReviewVo>> getCreditReviewList(@RequestBody PagerQuery<CreditReviewQuery> pagerQuery);
-
-    @ApiOperation("获取贷前信用审核 个人/企业")
     @GetMapping("/initCreditReviewInfo")
     @ResponseBody
     public ResultBean<CreditReviewDetailsVo> initCreditReviewInfo(@SpringQueryMap CreditReviewDetailsQuery query);
 
+    @ApiOperation("初始化金融内勤审核")
+    @GetMapping("/initCreditReviewInfo2")
+    @ResponseBody
+    public ResultBean<CreditReviewDetailsOffVo> initCreditReviewInfo2(@SpringQueryMap CreditReviewDetailsQuery query);
+
+    @ApiOperation("详情")
+    @GetMapping("/getCreditReviewInfo")
+    @ResponseBody
+    public ResultBean<CreditReviewDetailsOffVo> getCreditReviewInfo(@RequestParam("sid") String sid);
+
     @ApiOperation("查询车型信息")
     @GetMapping("/selModelByUseOrgSid")
     @ResponseBody
@@ -49,13 +54,23 @@ public interface CreditReviewFeign {
     @ResponseBody
     public ResultBean<List<IdentityDetailsVo>> getTRCList(@SpringQueryMap CreditReviewDetailsQuery query);
 
-    @ApiOperation("保存贷前信用审核申请")
+    @ApiOperation("保存贷前信用审核")
     @PostMapping("/saveCreditReviewInfo")
     @ResponseBody
     public ResultBean saveCreditReviewInfo(@RequestBody CreditReviewDto dto);
 
-    @ApiOperation("保存贷前信用审核申请1")
+    @ApiOperation("提交贷前信用审核申请")
-    @PostMapping("/saveCreditReviewInfo1")
+    @PostMapping("/submitCreditReviewInfo")
+    @ResponseBody
+    public ResultBean submitCreditReviewInfo(@RequestBody CreditReviewDto dto);
+
+    @ApiOperation("保存金融内勤审核")
+    @PostMapping("/saveCreditReviewInfo2")
+    @ResponseBody
+    public ResultBean saveCreditReviewInfo2(@RequestBody CreditReviewOffDto dto);
+
+    @ApiOperation("提交金融内勤审核")
+    @PostMapping("/submitCreditReviewInfo2")
     @ResponseBody
-    public ResultBean saveCreditReviewInfo1(@RequestBody CreditReviewOffDto dto);
+    public ResultBean submitCreditReviewInfo2(@RequestBody CreditReviewOffDto dto);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java

@@ -19,14 +19,18 @@ import java.util.List;
 @Component
 public class CreditReviewFeignFallback implements CreditReviewFeign {
 
+    @Override
+    public ResultBean<CreditReviewDetailsVo> initCreditReviewInfo(CreditReviewDetailsQuery query) {
+        return null;
+    }
 
     @Override
-    public ResultBean<PagerVo<CreditReviewVo>> getCreditReviewList(PagerQuery<CreditReviewQuery> pagerQuery) {
+    public ResultBean<CreditReviewDetailsOffVo> initCreditReviewInfo2(CreditReviewDetailsQuery query) {
         return null;
     }
 
     @Override
-    public ResultBean<CreditReviewDetailsVo> initCreditReviewInfo(CreditReviewDetailsQuery query) {
+    public ResultBean<CreditReviewDetailsOffVo> getCreditReviewInfo(String sid) {
         return null;
     }
 
@@ -46,7 +50,18 @@ public class CreditReviewFeignFallback implements CreditReviewFeign {
     }
 
     @Override
-    public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) {
+    public ResultBean saveCreditReviewInfo2(CreditReviewOffDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean submitCreditReviewInfo(CreditReviewDto dto) {
+        return null;
+    }
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java

@@ -25,7 +25,7 @@ public class CreditReviewOffDto extends CreditReviewDto{
     @ApiModelProperty("查询结果截图（资方）")
     private List<String> searchResultImages2 = new ArrayList<>();
     @ApiModelProperty("审核结果key（资方）")
-    private String examineResult2Key;
+    private String examineResultKey2;
     @ApiModelProperty("审核结果（资方）")
     private String examineResult2;
     @ApiModelProperty("审核日期（资方）")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java

@@ -30,13 +30,18 @@ public class CreditReviewRest implements CreditReviewFeign {
     private CreditReviewService creditReviewService;
 
     @Override
-    public ResultBean<PagerVo<CreditReviewVo>> getCreditReviewList(PagerQuery<CreditReviewQuery> pagerQuery) {
+    public ResultBean<CreditReviewDetailsVo> initCreditReviewInfo(CreditReviewDetailsQuery query) {
-        return creditReviewService.getCreditReviewList(pagerQuery);
+        return creditReviewService.initCreditReviewInfo(query);
     }
 
     @Override
-    public ResultBean<CreditReviewDetailsVo> initCreditReviewInfo(CreditReviewDetailsQuery query) {
+    public ResultBean<CreditReviewDetailsOffVo> initCreditReviewInfo2(CreditReviewDetailsQuery query) {
-        return creditReviewService.initCreditReviewInfo(query);
+        return creditReviewService.initCreditReviewInfo2(query);
+    }
+
+    @Override
+    public ResultBean<CreditReviewDetailsOffVo> getCreditReviewInfo(String sid) {
+        return creditReviewService.getCreditReviewInfo(sid);
     }
 
     @Override
@@ -55,7 +60,17 @@ public class CreditReviewRest implements CreditReviewFeign {
     }
 
     @Override
-    public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) {
+    public ResultBean saveCreditReviewInfo2(CreditReviewOffDto dto) {
-        return null;
+        return creditReviewService.saveCreditReviewInfo2(dto);
+    }
+
+    @Override
+    public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) {
+        return creditReviewService.submitCreditReviewInfo2(dto);
+    }
+
+    @Override
+    public ResultBean submitCreditReviewInfo(CreditReviewDto dto) {
+        return creditReviewService.submitCreditReviewInfo(dto);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

@@ -63,47 +63,11 @@ public class CreditReviewService {
     @Autowired
     private LoanFinBankFeign loanFinBankFeign;
 
-    public ResultBean<PagerVo<CreditReviewVo>> getCreditReviewList(PagerQuery<CreditReviewQuery> pagerQuery) {
-        ResultBean<PagerVo<CreditReviewVo>> rb = ResultBean.fireFail();
-        PagerQuery<LoanPreloanCreditApplyQuery> pq = new PagerQuery<>();
-        CreditReviewQuery params = pagerQuery.getParams();
-        LoanPreloanCreditApplyQuery loanParams = new LoanPreloanCreditApplyQuery();
-        loanParams.setOrgSidPath(params.getOrgPath());
-        loanParams.setUserSid(params.getUserSid());
-        loanParams.setType(params.getType());
-        loanParams.setMenuSid(params.getMenuSid());
-        loanParams.setName(params.getNames());
-        pq.setParams(loanParams);
-        PagerVo<LoanPreloanCreditApplyVo> loanPreloanCreditApplyVoPagerVo = loanPreloanCreditApplyFeign.listPage(pq).getData();
-        PagerVo<CreditReviewVo> v = new PagerVo<>();
-        List<CreditReviewVo> creditReviewVos = new ArrayList<>();
-        for (LoanPreloanCreditApplyVo record : loanPreloanCreditApplyVoPagerVo.getRecords()) {
-            CreditReviewVo creditReviewVo = new CreditReviewVo();
-            creditReviewVo.setSid(record.getSid());
-            creditReviewVo.setCreateDate(DateUtil.formatDate(record.getCreateTime()));
-            creditReviewVo.setName(record.getKhqyName());
-            creditReviewVo.setMobile(record.getPhone());
-            creditReviewVo.setModel(record.getModelName());
-            creditReviewVo.setManagement(record.getCapitalName());
-            creditReviewVo.setExamineDate(record.getGsshDate());
-            creditReviewVo.setCompanyResults(record.getGsfkjg());
-            creditReviewVo.setManagementResults(record.getZffkjg());
-            creditReviewVo.setShowDeleteBtn(record.getIsDelete());
-            creditReviewVo.setShowUpdateBtn(record.getIsEdit());
-            creditReviewVo.setShowHandleBtn(record.getIsHandle());
-            creditReviewVo.setCustomerKey(record.getCustTypeKey());
-            creditReviewVo.setAppealResults(record.getSsjg());
-            creditReviewVos.add(creditReviewVo);
-        }
-        v.setRecords(creditReviewVos);
-        return rb.success().setData(v);
-    }
-
     public ResultBean<CreditReviewDetailsVo> initCreditReviewInfo(CreditReviewDetailsQuery query) {
         ResultBean rb = ResultBean.fireFail();
         CreditReviewDetailsVo creditReviewDetailsVo = new CreditReviewDetailsVo();
-        if (StringUtils.isBlank(query.getSid())){//新增初始化
+        if (StringUtils.isBlank(query.getSid())) {//新增初始化
-            if (query.getCreateSource() == 0){
+            if (query.getCreateSource() == 0) {
                 SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
                 SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
                 creditReviewDetailsVo.setUserSid(query.getUserSid());
@@ -112,12 +76,12 @@ public class CreditReviewService {
                 creditReviewDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
                 creditReviewDetailsVo.setCustomerTypeKey(query.getCustomerTypeKey());
                 creditReviewDetailsVo.setCustomerType(query.getCustomerTypeValue());
-            }else if (query.getCreateSource() == 1){//意向车型发起
+            } else if (query.getCreateSource() == 1) {//意向车型发起
 
-            }else if (query.getCreateSource() == 2){//销售订单发起
+            } else if (query.getCreateSource() == 2) {//销售订单发起
 
             }
-        }else {//修改回显
+        } else {//修改回显
             LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData();
             creditReviewDetailsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid());
             creditReviewDetailsVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName());
@@ -159,13 +123,13 @@ public class CreditReviewService {
         }
         //构建人员类型下拉选数据
         List<IdentityDetailsVo> identityDetailsVos = new ArrayList<>();
-        if ("1".equals(query.getCustomerTypeKey())){
+        if ("1".equals(query.getCustomerTypeKey())) {
             IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo();
             identityDetailsVo.setSid("003");
             identityDetailsVo.setDictKey("003");
             identityDetailsVo.setDictValue("担保人");
             identityDetailsVos.add(identityDetailsVo);
-        }else {
+        } else {
             IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo();
             identityDetailsVo.setSid("001");
             identityDetailsVo.setDictKey("001");
@@ -186,6 +150,102 @@ public class CreditReviewService {
         return rb.success().setData(creditReviewDetailsVo);
     }
 
+    public ResultBean<CreditReviewDetailsOffVo> initCreditReviewInfo2(CreditReviewDetailsQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        CreditReviewDetailsOffVo creditReviewDetailsoffVo = new CreditReviewDetailsOffVo();
+        if (StringUtils.isBlank(query.getSid())) {//新增初始化
+            if (query.getCreateSource() == 0) {
+                SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
+                SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
+                creditReviewDetailsoffVo.setUserSid(query.getUserSid());
+                creditReviewDetailsoffVo.setOrgPath(query.getOrgPath());
+                creditReviewDetailsoffVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName());
+                creditReviewDetailsoffVo.setCreateTime(DateUtil.formatDate(new Date()));
+                creditReviewDetailsoffVo.setCustomerTypeKey(query.getCustomerTypeKey());
+                creditReviewDetailsoffVo.setCustomerType(query.getCustomerTypeValue());
+            } else if (query.getCreateSource() == 1) {//意向车型发起
+
+            } else if (query.getCreateSource() == 2) {//销售订单发起
+
+            }
+        } else {//修改回显
+            LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData();
+            creditReviewDetailsoffVo.setSid(loanPreloanCreditApplyDetailsVo.getSid());
+            creditReviewDetailsoffVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName());
+            creditReviewDetailsoffVo.setCreateTime(DateUtil.formatDate(loanPreloanCreditApplyDetailsVo.getCreateTime()));
+            creditReviewDetailsoffVo.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey());
+            creditReviewDetailsoffVo.setCustomerType(loanPreloanCreditApplyDetailsVo.getCustTypeValue());
+            creditReviewDetailsoffVo.setModel(loanPreloanCreditApplyDetailsVo.getModelName());
+            creditReviewDetailsoffVo.setModelSid(loanPreloanCreditApplyDetailsVo.getModelSid());
+            creditReviewDetailsoffVo.setLegalPersonName(loanPreloanCreditApplyDetailsVo.getCustName());
+            creditReviewDetailsoffVo.setLegalPersonSid(loanPreloanCreditApplyDetailsVo.getCustSid());
+            creditReviewDetailsoffVo.setLegalPersonMobile(loanPreloanCreditApplyDetailsVo.getPhone());
+            creditReviewDetailsoffVo.setLegalPersonIdNumber(loanPreloanCreditApplyDetailsVo.getIdCard());
+            creditReviewDetailsoffVo.setLegalPersonIdCardImages(loanPreloanCreditApplyDetailsVo.getIdCardImages());
+            creditReviewDetailsoffVo.setUserSid(loanPreloanCreditApplyDetailsVo.getCreateBySid());
+            creditReviewDetailsoffVo.setOrgPath(loanPreloanCreditApplyDetailsVo.getOrgSidPath());
+            creditReviewDetailsoffVo.setCompanyName(loanPreloanCreditApplyDetailsVo.getQyName());
+            creditReviewDetailsoffVo.setCompanySid(loanPreloanCreditApplyDetailsVo.getQySid());
+            creditReviewDetailsoffVo.setMaterialImages(loanPreloanCreditApplyDetailsVo.getComFkFiles());
+            creditReviewDetailsoffVo.setManagementSid(loanPreloanCreditApplyDetailsVo.getCapitalSid());
+            creditReviewDetailsoffVo.setManagementName(loanPreloanCreditApplyDetailsVo.getCapitalName());
+            //creditReviewDetailsoffVo.setDownUrl();
+            //参数优化
+            query.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey());
+            //风控要求的其他人员
+            List<ShareholderDetailsVo> shareholderDetailsVos = new ArrayList<>();
+            List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeos = loanPreloanCreditApplyDetailsVo.getLoanPreloanCreditPeos();
+            for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeo : loanPreloanCreditPeos) {
+                ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo();
+                shareholderDetailsVo.setShareholderName(loanPreloanCreditPeo.getPeoName());
+                shareholderDetailsVo.setShareholderMobile(loanPreloanCreditPeo.getPhone());
+                shareholderDetailsVo.setShareholderIdNumber(loanPreloanCreditPeo.getIdCard());
+                shareholderDetailsVo.setShareholderRemarks(loanPreloanCreditPeo.getRemarks());
+                shareholderDetailsVo.setShareholderTypeKey(loanPreloanCreditPeo.getPeoTypeKey());
+                shareholderDetailsVo.setShareholderTypeValue(loanPreloanCreditPeo.getPeoTypeValue());
+                shareholderDetailsVo.setShareholderIdCardImages(loanPreloanCreditPeo.getIdCardImages());
+                shareholderDetailsVos.add(shareholderDetailsVo);
+            }
+            creditReviewDetailsoffVo.setShareholderList(shareholderDetailsVos);
+            //公司风控
+            creditReviewDetailsoffVo.setSearchResultImages(loanPreloanCreditApplyDetailsVo.getGsQueryResults());
+            creditReviewDetailsoffVo.setExamineResultKey(loanPreloanCreditApplyDetailsVo.getGsfkjgKey());
+            creditReviewDetailsoffVo.setExamineResult(loanPreloanCreditApplyDetailsVo.getGsfkjg());
+            creditReviewDetailsoffVo.setExamineDate(loanPreloanCreditApplyDetailsVo.getGsshDate());
+            creditReviewDetailsoffVo.setExamineRemarks(loanPreloanCreditApplyDetailsVo.getGsshRemarks());
+            //资方风控
+            creditReviewDetailsoffVo.setManageLeave(loanPreloanCreditApplyDetailsVo.getCapitalBalance());
+            creditReviewDetailsoffVo.setSearchResultImages2(loanPreloanCreditApplyDetailsVo.getZfQueryResults());
+            creditReviewDetailsoffVo.setExamineResultKey2(loanPreloanCreditApplyDetailsVo.getZffkjgKey());
+            creditReviewDetailsoffVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg());
+            creditReviewDetailsoffVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate());
+            creditReviewDetailsoffVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks());
+        }
+        //构建人员类型下拉选数据
+        List<IdentityDetailsVo> companyResultDict = new ArrayList<>();
+        List<IdentityDetailsVo> managementResultDict = new ArrayList<>();
+        IdentityDetailsVo identityDetailsVo1 = new IdentityDetailsVo();
+        identityDetailsVo1.setSid("001");
+        identityDetailsVo1.setDictKey("001");
+        identityDetailsVo1.setDictValue("通过");
+        companyResultDict.add(identityDetailsVo1);
+        managementResultDict.add(identityDetailsVo1);
+        IdentityDetailsVo identityDetailsVo2 = new IdentityDetailsVo();
+        identityDetailsVo2.setSid("002");
+        identityDetailsVo2.setDictKey("002");
+        identityDetailsVo2.setDictValue("不通过");
+        companyResultDict.add(identityDetailsVo2);
+        managementResultDict.add(identityDetailsVo2);
+        IdentityDetailsVo identityDetailsVo3 = new IdentityDetailsVo();
+        identityDetailsVo3.setSid("003");
+        identityDetailsVo3.setDictKey("003");
+        identityDetailsVo3.setDictValue("暂无法判定");
+        managementResultDict.add(identityDetailsVo3);
+        creditReviewDetailsoffVo.setCompanyResultDict(companyResultDict);
+        creditReviewDetailsoffVo.setManagementResultDict(managementResultDict);
+        return rb.success().setData(creditReviewDetailsoffVo);
+    }
+
     public ResultBean<List<IdentityDetailsVo>> selModelByUseOrgSid(CreditReviewDetailsQuery query) {
         ResultBean rb = ResultBean.fireFail();
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
@@ -257,11 +317,173 @@ public class CreditReviewService {
             loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto);
         }
         loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos);
+        loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages());
+        loanPreloanCreditApplyFeign.save(loanPreloanCreditApplyDto);
+        return rb.success();
+    }
+
+    public ResultBean submitCreditReviewInfo(CreditReviewDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto();
+        loanPreloanCreditApplyDto.setSid(dto.getSid());
+        loanPreloanCreditApplyDto.setCreateBySid(dto.getUserSid());
+        String[] publishInfos = dto.getPublishInfo().split("-");
+        loanPreloanCreditApplyDto.setApplyDeptName(publishInfos[0]);
+        loanPreloanCreditApplyDto.setCreateByName(publishInfos[1]);
+        SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(dto.getOrgPath()).getData();
+        loanPreloanCreditApplyDto.setApplyDeptSid(sysOrganizationVoBM.getSid());
+        loanPreloanCreditApplyDto.setModelSid(dto.getModelSid());
+        loanPreloanCreditApplyDto.setModelName(dto.getModel());
+        loanPreloanCreditApplyDto.setCustTypeKey(dto.getCustomerTypeKey());
+        loanPreloanCreditApplyDto.setCustTypeValue(dto.getCustomerType());
+        loanPreloanCreditApplyDto.setQySid(dto.getCompanySid());
+        loanPreloanCreditApplyDto.setQyName(dto.getCompanyName());
+        loanPreloanCreditApplyDto.setIdCard(dto.getLegalPersonIdNumber());
+        loanPreloanCreditApplyDto.setCustSid(dto.getLegalPersonSid());
+        loanPreloanCreditApplyDto.setCustName(dto.getLegalPersonName());
+        loanPreloanCreditApplyDto.setPhone(dto.getLegalPersonMobile());
+        loanPreloanCreditApplyDto.setCapitalSid(dto.getManagementSid());
+        loanPreloanCreditApplyDto.setCapitalName(dto.getManagementName());
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        SysOrganizationVo sysOrganizationVoGS = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+        loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid);
+        loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName());
+        loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath());
+        loanPreloanCreditApplyDto.setIdCardImages(dto.getLegalPersonIdCardImages());
+        List<ShareholderDetailsVo> shareholderList = dto.getShareholderList();
+        List<LoanPreloanCreditPeoDto> loanPreloanCreditPeoDtos = new ArrayList<>();
+        for (ShareholderDetailsVo shareholderDetailsVo : shareholderList) {
+            LoanPreloanCreditPeoDto loanPreloanCreditPeoDto = new LoanPreloanCreditPeoDto();
+            loanPreloanCreditPeoDto.setPeoTypeKey(shareholderDetailsVo.getShareholderTypeKey());
+            loanPreloanCreditPeoDto.setPeoTypeValue(shareholderDetailsVo.getShareholderTypeValue());
+            loanPreloanCreditPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber());
+            loanPreloanCreditPeoDto.setPeoName(shareholderDetailsVo.getShareholderName());
+            loanPreloanCreditPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile());
+            loanPreloanCreditPeoDto.setIdCardImages(shareholderDetailsVo.getShareholderIdCardImages());
+            loanPreloanCreditPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks());
+            loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto);
+        }
+        loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos);
+        loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages());
+        loanPreloanCreditApplyFeign.submitSave(loanPreloanCreditApplyDto);
+        return rb.success();
+    }
+
+    public ResultBean saveCreditReviewInfo2(CreditReviewOffDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto();
+        loanPreloanCreditApplyDto.setSid(dto.getSid());
+        loanPreloanCreditApplyDto.setCreateBySid(dto.getUserSid());
+        String[] publishInfos = dto.getPublishInfo().split("-");
+        loanPreloanCreditApplyDto.setApplyDeptName(publishInfos[0]);
+        loanPreloanCreditApplyDto.setCreateByName(publishInfos[1]);
+        SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(dto.getOrgPath()).getData();
+        loanPreloanCreditApplyDto.setApplyDeptSid(sysOrganizationVoBM.getSid());
+        loanPreloanCreditApplyDto.setModelSid(dto.getModelSid());
+        loanPreloanCreditApplyDto.setModelName(dto.getModel());
+        loanPreloanCreditApplyDto.setCustTypeKey(dto.getCustomerTypeKey());
+        loanPreloanCreditApplyDto.setCustTypeValue(dto.getCustomerType());
+        loanPreloanCreditApplyDto.setQySid(dto.getCompanySid());
+        loanPreloanCreditApplyDto.setQyName(dto.getCompanyName());
+        loanPreloanCreditApplyDto.setIdCard(dto.getLegalPersonIdNumber());
+        loanPreloanCreditApplyDto.setCustSid(dto.getLegalPersonSid());
+        loanPreloanCreditApplyDto.setCustName(dto.getLegalPersonName());
+        loanPreloanCreditApplyDto.setPhone(dto.getLegalPersonMobile());
+        loanPreloanCreditApplyDto.setCapitalSid(dto.getManagementSid());
+        loanPreloanCreditApplyDto.setCapitalName(dto.getManagementName());
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        SysOrganizationVo sysOrganizationVoGS = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+        loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid);
+        loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName());
+        loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath());
+        loanPreloanCreditApplyDto.setIdCardImages(dto.getLegalPersonIdCardImages());
+        List<ShareholderDetailsVo> shareholderList = dto.getShareholderList();
+        List<LoanPreloanCreditPeoDto> loanPreloanCreditPeoDtos = new ArrayList<>();
+        for (ShareholderDetailsVo shareholderDetailsVo : shareholderList) {
+            LoanPreloanCreditPeoDto loanPreloanCreditPeoDto = new LoanPreloanCreditPeoDto();
+            loanPreloanCreditPeoDto.setPeoTypeKey(shareholderDetailsVo.getShareholderTypeKey());
+            loanPreloanCreditPeoDto.setPeoTypeValue(shareholderDetailsVo.getShareholderTypeValue());
+            loanPreloanCreditPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber());
+            loanPreloanCreditPeoDto.setPeoName(shareholderDetailsVo.getShareholderName());
+            loanPreloanCreditPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile());
+            loanPreloanCreditPeoDto.setIdCardImages(shareholderDetailsVo.getShareholderIdCardImages());
+            loanPreloanCreditPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks());
+            loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto);
+        }
+        loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos);
+        loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages());
+        loanPreloanCreditApplyDto.setGsfkjgKey(dto.getExamineResultKey());
+        loanPreloanCreditApplyDto.setGsfkjg(dto.getExamineResult());
+        loanPreloanCreditApplyDto.setGsshDate(dto.getExamineDate());
+        loanPreloanCreditApplyDto.setGsshRemarks(dto.getExamineRemarks());
+        loanPreloanCreditApplyDto.setGsQueryResults(dto.getSearchResultImages());
+        loanPreloanCreditApplyDto.setCapitalBalance(dto.getManageLeave());
+        loanPreloanCreditApplyDto.setZffkjgKey(dto.getExamineResultKey2());
+        loanPreloanCreditApplyDto.setZffkjg(dto.getExamineResult2());
+        loanPreloanCreditApplyDto.setZfshDate(dto.getExamineDate2());
+        loanPreloanCreditApplyDto.setZfshRemarks(dto.getExamineRemarks2());
+        loanPreloanCreditApplyDto.setZfQueryResults(dto.getSearchResultImages2());
         loanPreloanCreditApplyFeign.save(loanPreloanCreditApplyDto);
         return rb.success();
     }
 
-    public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) {
+
+    public ResultBean<CreditReviewDetailsOffVo> getCreditReviewInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(sid).getData();
+        CreditReviewDetailsOffVo creditReviewDetailsOffVo = new CreditReviewDetailsOffVo();
+        creditReviewDetailsOffVo.setSid(loanPreloanCreditApplyDetailsVo.getSid());
+        creditReviewDetailsOffVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName());
+        creditReviewDetailsOffVo.setCreateTime(DateUtil.formatDate(loanPreloanCreditApplyDetailsVo.getCreateTime()));
+        creditReviewDetailsOffVo.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey());
+        creditReviewDetailsOffVo.setCustomerType(loanPreloanCreditApplyDetailsVo.getCustTypeValue());
+        creditReviewDetailsOffVo.setModel(loanPreloanCreditApplyDetailsVo.getModelName());
+        creditReviewDetailsOffVo.setModelSid(loanPreloanCreditApplyDetailsVo.getModelSid());
+        creditReviewDetailsOffVo.setLegalPersonName(loanPreloanCreditApplyDetailsVo.getCustName());
+        creditReviewDetailsOffVo.setLegalPersonSid(loanPreloanCreditApplyDetailsVo.getCustSid());
+        creditReviewDetailsOffVo.setLegalPersonMobile(loanPreloanCreditApplyDetailsVo.getPhone());
+        creditReviewDetailsOffVo.setLegalPersonIdNumber(loanPreloanCreditApplyDetailsVo.getIdCard());
+        creditReviewDetailsOffVo.setLegalPersonIdCardImages(loanPreloanCreditApplyDetailsVo.getIdCardImages());
+        creditReviewDetailsOffVo.setUserSid(loanPreloanCreditApplyDetailsVo.getCreateBySid());
+        creditReviewDetailsOffVo.setOrgPath(loanPreloanCreditApplyDetailsVo.getOrgSidPath());
+        creditReviewDetailsOffVo.setCompanyName(loanPreloanCreditApplyDetailsVo.getQyName());
+        creditReviewDetailsOffVo.setCompanySid(loanPreloanCreditApplyDetailsVo.getQySid());
+        creditReviewDetailsOffVo.setMaterialImages(loanPreloanCreditApplyDetailsVo.getComFkFiles());
+        creditReviewDetailsOffVo.setManagementSid(loanPreloanCreditApplyDetailsVo.getCapitalSid());
+        creditReviewDetailsOffVo.setManagementName(loanPreloanCreditApplyDetailsVo.getCapitalName());
+        //风控要求的其他人员
+        List<ShareholderDetailsVo> shareholderDetailsVos = new ArrayList<>();
+        List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeos = loanPreloanCreditApplyDetailsVo.getLoanPreloanCreditPeos();
+        for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeo : loanPreloanCreditPeos) {
+            ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo();
+            shareholderDetailsVo.setShareholderName(loanPreloanCreditPeo.getPeoName());
+            shareholderDetailsVo.setShareholderMobile(loanPreloanCreditPeo.getPhone());
+            shareholderDetailsVo.setShareholderIdNumber(loanPreloanCreditPeo.getIdCard());
+            shareholderDetailsVo.setShareholderRemarks(loanPreloanCreditPeo.getRemarks());
+            shareholderDetailsVo.setShareholderTypeKey(loanPreloanCreditPeo.getPeoTypeKey());
+            shareholderDetailsVo.setShareholderTypeValue(loanPreloanCreditPeo.getPeoTypeValue());
+            shareholderDetailsVo.setShareholderIdCardImages(loanPreloanCreditPeo.getIdCardImages());
+            shareholderDetailsVos.add(shareholderDetailsVo);
+        }
+        creditReviewDetailsOffVo.setShareholderList(shareholderDetailsVos);
+        //公司风控
+        creditReviewDetailsOffVo.setSearchResultImages(loanPreloanCreditApplyDetailsVo.getGsQueryResults());
+        creditReviewDetailsOffVo.setExamineResultKey(loanPreloanCreditApplyDetailsVo.getGsfkjgKey());
+        creditReviewDetailsOffVo.setExamineResult(loanPreloanCreditApplyDetailsVo.getGsfkjg());
+        creditReviewDetailsOffVo.setExamineDate(loanPreloanCreditApplyDetailsVo.getGsshDate());
+        creditReviewDetailsOffVo.setExamineRemarks(loanPreloanCreditApplyDetailsVo.getGsshRemarks());
+        //资方风控
+        creditReviewDetailsOffVo.setManageLeave(loanPreloanCreditApplyDetailsVo.getCapitalBalance());
+        creditReviewDetailsOffVo.setSearchResultImages2(loanPreloanCreditApplyDetailsVo.getZfQueryResults());
+        creditReviewDetailsOffVo.setExamineResultKey2(loanPreloanCreditApplyDetailsVo.getZffkjgKey());
+        creditReviewDetailsOffVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg());
+        creditReviewDetailsOffVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate());
+        creditReviewDetailsOffVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks());
+        return rb.success().setData(creditReviewDetailsOffVo);
+    }
+
+
+    public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto();
         loanPreloanCreditApplyDto.setSid(dto.getSid());
@@ -288,16 +510,34 @@ public class CreditReviewService {
         loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid);
         loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName());
         loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath());
-        loanPreloanCreditApplyDto.setGsfkjgKey("");
+        loanPreloanCreditApplyDto.setIdCardImages(dto.getLegalPersonIdCardImages());
+        List<ShareholderDetailsVo> shareholderList = dto.getShareholderList();
+        List<LoanPreloanCreditPeoDto> loanPreloanCreditPeoDtos = new ArrayList<>();
+        for (ShareholderDetailsVo shareholderDetailsVo : shareholderList) {
+            LoanPreloanCreditPeoDto loanPreloanCreditPeoDto = new LoanPreloanCreditPeoDto();
+            loanPreloanCreditPeoDto.setPeoTypeKey(shareholderDetailsVo.getShareholderTypeKey());
+            loanPreloanCreditPeoDto.setPeoTypeValue(shareholderDetailsVo.getShareholderTypeValue());
+            loanPreloanCreditPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber());
+            loanPreloanCreditPeoDto.setPeoName(shareholderDetailsVo.getShareholderName());
+            loanPreloanCreditPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile());
+            loanPreloanCreditPeoDto.setIdCardImages(shareholderDetailsVo.getShareholderIdCardImages());
+            loanPreloanCreditPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks());
+            loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto);
+        }
+        loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos);
+        loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages());
+        loanPreloanCreditApplyDto.setGsfkjgKey(dto.getExamineResultKey());
         loanPreloanCreditApplyDto.setGsfkjg(dto.getExamineResult());
         loanPreloanCreditApplyDto.setGsshDate(dto.getExamineDate());
         loanPreloanCreditApplyDto.setGsshRemarks(dto.getExamineRemarks());
         loanPreloanCreditApplyDto.setGsQueryResults(dto.getSearchResultImages());
-        loanPreloanCreditApplyDto.setZffkjgKey("");
+        loanPreloanCreditApplyDto.setCapitalBalance(dto.getManageLeave());
+        loanPreloanCreditApplyDto.setZffkjgKey(dto.getExamineResultKey2());
         loanPreloanCreditApplyDto.setZffkjg(dto.getExamineResult2());
+        loanPreloanCreditApplyDto.setZfshDate(dto.getExamineDate2());
         loanPreloanCreditApplyDto.setZfshRemarks(dto.getExamineRemarks2());
         loanPreloanCreditApplyDto.setZfQueryResults(dto.getSearchResultImages2());
-        //loanPreloanCreditApplyFeign.save()
+        loanPreloanCreditApplyFeign.finStaffConfirm(loanPreloanCreditApplyDto);
-        return null;
+        return rb.success();
     }
 }

工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl

@@ -90,14 +90,17 @@
                             </w:tblCellMar>
                         </w:tblPr>
                         <w:tblGrid>
+                            <w:gridCol w:w="1069"/>
+                            <w:gridCol w:w="877"/>
+                            <w:gridCol w:w="678"/>
+                            <w:gridCol w:w="1050"/>
+                            <w:gridCol w:w="218"/>
                             <w:gridCol w:w="1946"/>
-                            <w:gridCol w:w="974"/>
+                            <w:gridCol w:w="986"/>
-                            <w:gridCol w:w="972"/>
+                            <w:gridCol w:w="960"/>
-                            <w:gridCol w:w="1946"/>
+                            <w:gridCol w:w="594"/>
-                            <w:gridCol w:w="2"/>
+                            <w:gridCol w:w="955"/>
-                            <w:gridCol w:w="1944"/>
+                            <w:gridCol w:w="397"/>
-                            <w:gridCol w:w="976"/>
-                            <w:gridCol w:w="970"/>
                             <w:gridCol w:w="1951"/>
                         </w:tblGrid>
                         <w:tr>
@@ -125,7 +128,7 @@
                             <w:tc>
                                 <w:tcPr>
                                     <w:tcW w:w="11681" w:type="dxa"/>
-                                    <w:gridSpan w:val="9"/>
+                                    <w:gridSpan w:val="12"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
                                         <w:left w:val="nil"/>
@@ -203,8 +206,7 @@
                             </w:trPr>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="2920" w:type="dxa"/>
+                                    <w:tcW w:w="1069" w:type="dxa"/>
-                                    <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
                                         <w:left w:val="nil"/>
@@ -244,7 +246,8 @@
                                     </w:pPr>
                                     <w:r>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
                                             <w:b w:val="0"/>
                                             <w:bCs w:val="0"/>
                                             <w:sz w:val="16"/>
@@ -258,8 +261,8 @@
                             </w:tc>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="2920" w:type="dxa"/>
+                                    <w:tcW w:w="1555" w:type="dxa"/>
-                                    <w:gridSpan w:val="3"/>
+                                    <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
                                         <w:left w:val="nil"/>
@@ -299,7 +302,7 @@
                                     </w:pPr>
                                     <w:r>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
                                                       w:cs="宋体"/>
                                             <w:b w:val="0"/>
                                             <w:bCs w:val="0"/>
@@ -314,7 +317,61 @@
                             </w:tc>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="2920" w:type="dxa"/>
+                                    <w:tcW w:w="1050" w:type="dxa"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="nil"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="top"/>
+                                </w:tcPr>
+                                <w:p>
+                                    <w:pPr>
+                                        <w:keepNext w:val="0"/>
+                                        <w:keepLines w:val="0"/>
+                                        <w:pageBreakBefore w:val="0"/>
+                                        <w:kinsoku/>
+                                        <w:wordWrap/>
+                                        <w:overflowPunct/>
+                                        <w:topLinePunct w:val="0"/>
+                                        <w:autoSpaceDE/>
+                                        <w:autoSpaceDN/>
+                                        <w:bidi w:val="0"/>
+                                        <w:adjustRightInd/>
+                                        <w:snapToGrid/>
+                                        <w:spacing w:line="240" w:lineRule="auto"/>
+                                        <w:jc w:val="right"/>
+                                        <w:textAlignment w:val="auto"/>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                        <w:t>申请部门：</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="2164" w:type="dxa"/>
                                     <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
@@ -325,6 +382,61 @@
                                     <w:noWrap w:val="0"/>
                                     <w:vAlign w:val="top"/>
                                 </w:tcPr>
+                                <w:p>
+                                    <w:pPr>
+                                        <w:keepNext w:val="0"/>
+                                        <w:keepLines w:val="0"/>
+                                        <w:pageBreakBefore w:val="0"/>
+                                        <w:kinsoku/>
+                                        <w:wordWrap/>
+                                        <w:overflowPunct/>
+                                        <w:topLinePunct w:val="0"/>
+                                        <w:autoSpaceDE/>
+                                        <w:autoSpaceDN/>
+                                        <w:bidi w:val="0"/>
+                                        <w:adjustRightInd/>
+                                        <w:snapToGrid/>
+                                        <w:spacing w:line="240" w:lineRule="auto"/>
+                                        <w:jc w:val="left"/>
+                                        <w:textAlignment w:val="auto"/>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                        <w:t>${applyDept!}</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="986" w:type="dxa"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="nil"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="top"/>
+                                </w:tcPr>
                                 <w:p>
                                     <w:pPr>
                                         <w:keepNext w:val="0"/>
@@ -363,13 +475,124 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
+                                        <w:t>申请人：</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="1554" w:type="dxa"/>
+                                    <w:gridSpan w:val="2"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="nil"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="top"/>
+                                </w:tcPr>
+                                <w:p>
+                                    <w:pPr>
+                                        <w:keepNext w:val="0"/>
+                                        <w:keepLines w:val="0"/>
+                                        <w:pageBreakBefore w:val="0"/>
+                                        <w:kinsoku/>
+                                        <w:wordWrap/>
+                                        <w:overflowPunct/>
+                                        <w:topLinePunct w:val="0"/>
+                                        <w:autoSpaceDE/>
+                                        <w:autoSpaceDN/>
+                                        <w:bidi w:val="0"/>
+                                        <w:adjustRightInd/>
+                                        <w:snapToGrid/>
+                                        <w:spacing w:line="240" w:lineRule="auto"/>
+                                        <w:jc w:val="left"/>
+                                        <w:textAlignment w:val="auto"/>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                        <w:t>${applyPeo!}</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="955" w:type="dxa"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="nil"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="top"/>
+                                </w:tcPr>
+                                <w:p>
+                                    <w:pPr>
+                                        <w:keepNext w:val="0"/>
+                                        <w:keepLines w:val="0"/>
+                                        <w:pageBreakBefore w:val="0"/>
+                                        <w:kinsoku/>
+                                        <w:wordWrap/>
+                                        <w:overflowPunct/>
+                                        <w:topLinePunct w:val="0"/>
+                                        <w:autoSpaceDE/>
+                                        <w:autoSpaceDN/>
+                                        <w:bidi w:val="0"/>
+                                        <w:adjustRightInd/>
+                                        <w:snapToGrid/>
+                                        <w:spacing w:line="240" w:lineRule="auto"/>
+                                        <w:jc w:val="right"/>
+                                        <w:textAlignment w:val="auto"/>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
                                         <w:t>单据编号：</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="2921" w:type="dxa"/>
+                                    <w:tcW w:w="2348" w:type="dxa"/>
                                     <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
@@ -410,7 +633,7 @@
                                     </w:pPr>
                                     <w:r>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
                                                       w:cs="宋体"/>
                                             <w:b w:val="0"/>
                                             <w:bCs w:val="0"/>
@@ -447,6 +670,7 @@
                             <w:tc>
                                 <w:tcPr>
                                     <w:tcW w:w="1946" w:type="dxa"/>
+                                    <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                         <w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -495,7 +719,7 @@
                             <w:tc>
                                 <w:tcPr>
                                     <w:tcW w:w="1946" w:type="dxa"/>
-                                    <w:gridSpan w:val="2"/>
+                                    <w:gridSpan w:val="3"/>
                                     <w:tcBorders>
                                         <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                         <w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -641,7 +865,7 @@
                             <w:tc>
                                 <w:tcPr>
                                     <w:tcW w:w="1946" w:type="dxa"/>
-                                    <w:gridSpan w:val="2"/>
+                                    <w:gridSpan w:val="3"/>
                                     <w:tcBorders>
                                         <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                         <w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -760,6 +984,7 @@
                                 <w:tc>
                                     <w:tcPr>
                                         <w:tcW w:w="1946" w:type="dxa"/>
+                                        <w:gridSpan w:val="2"/>
                                         <w:tcBorders>
                                             <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                             <w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -805,7 +1030,7 @@
                                 <w:tc>
                                     <w:tcPr>
                                         <w:tcW w:w="1946" w:type="dxa"/>
-                                        <w:gridSpan w:val="2"/>
+                                        <w:gridSpan w:val="3"/>
                                         <w:tcBorders>
                                             <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                             <w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -927,7 +1152,7 @@
                                 <w:tc>
                                     <w:tcPr>
                                         <w:tcW w:w="1946" w:type="dxa"/>
-                                        <w:gridSpan w:val="2"/>
+                                        <w:gridSpan w:val="3"/>
                                         <w:tcBorders>
                                             <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                             <w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -1020,6 +1245,8 @@
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
                         </w:pPr>
+                        <w:bookmarkStart w:id="0" w:name="_GoBack"/>
+                        <w:bookmarkEnd w:id="0"/>
                     </w:p>
                     <w:sectPr>
                         <w:headerReference r:id="rId3" w:type="default"/>
@@ -1084,14 +1311,14 @@
                         xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
                 <Template>Normal.dotm</Template>
                 <Pages>1</Pages>
-                <Words>46</Words>
+                <Words>57</Words>
-                <Characters>130</Characters>
+                <Characters>164</Characters>
                 <Lines>0</Lines>
                 <Paragraphs>0</Paragraphs>
-                <TotalTime>1</TotalTime>
+                <TotalTime>2</TotalTime>
                 <ScaleCrop>false</ScaleCrop>
                 <LinksUpToDate>false</LinksUpToDate>
-                <CharactersWithSpaces>132</CharactersWithSpaces>
+                <CharactersWithSpaces>164</CharactersWithSpaces>
                 <Application>WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA</Application>
                 <DocSecurity>0</DocSecurity>
             </Properties>
@@ -1107,7 +1334,7 @@
                 <dcterms:created xsi:type="dcterms:W3CDTF">2014-10-29T12:08:00Z</dcterms:created>
                 <dc:creator>God</dc:creator>
                 <cp:lastModifiedBy>文档存本地丢失不负责</cp:lastModifiedBy>
-                <dcterms:modified xsi:type="dcterms:W3CDTF">2023-07-26T02:06:08Z</dcterms:modified>
+                <dcterms:modified xsi:type="dcterms:W3CDTF">2023-07-27T03:16:23Z</dcterms:modified>
             </cp:coreProperties>
         </pkg:xmlData>
     </pkg:part>
@@ -1120,7 +1347,7 @@
                     <vt:lpwstr>2052-11.1.0.14309</vt:lpwstr>
                 </property>
                 <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="3" name="ICV">
-                    <vt:lpwstr>4492228D1E0D435FAB03EB9C741608A2_13</vt:lpwstr>
+                    <vt:lpwstr>2D380203F5044904B1BE9AE51DA87754_13</vt:lpwstr>
                 </property>
             </Properties>
         </pkg:xmlData>
@@ -1196,14 +1423,6 @@
                     <w:sig w:usb0="E4002EFF" w:usb1="C000247B" w:usb2="00000009" w:usb3="00000000" w:csb0="200001FF"
                            w:csb1="00000000"/>
                 </w:font>
-                <w:font w:name="Cambria">
-                    <w:panose1 w:val="02040503050406030204"/>
-                    <w:charset w:val="00"/>
-                    <w:family w:val="auto"/>
-                    <w:pitch w:val="default"/>
-                    <w:sig w:usb0="E00006FF" w:usb1="420024FF" w:usb2="02000000" w:usb3="00000000" w:csb0="2000019F"
-                           w:csb1="00000000"/>
-                </w:font>
             </w:fonts>
         </pkg:xmlData>
     </pkg:part>
@@ -1318,26 +1537,7 @@
                                         <w:u w:val="none"/>
                                         <w:lang w:val="en-US" w:eastAsia="zh-CN" w:bidi="ar"/>
                                     </w:rPr>
-                                    <w:t>申请</w:t>
+                                    <w:t>申请人：</w:t>
-                                </w:r>
-                                <w:bookmarkStart w:id="0" w:name="_GoBack"/>
-                                <w:bookmarkEnd w:id="0"/>
-                                <w:r>
-                                    <w:rPr>
-                                        <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
-                                                  w:cs="宋体"/>
-                                        <w:b w:val="0"/>
-                                        <w:bCs w:val="0"/>
-                                        <w:i w:val="0"/>
-                                        <w:iCs w:val="0"/>
-                                        <w:color w:val="000000"/>
-                                        <w:kern w:val="0"/>
-                                        <w:sz w:val="16"/>
-                                        <w:szCs w:val="16"/>
-                                        <w:u w:val="none"/>
-                                        <w:lang w:val="en-US" w:eastAsia="zh-CN" w:bidi="ar"/>
-                                    </w:rPr>
-                                    <w:t>人：</w:t>
                                 </w:r>
                             </w:p>
                         </w:tc>
@@ -1678,7 +1878,6 @@
                     <w:rsid w:val="0BFA53FB"/>
                     <w:rsid w:val="0C55445D"/>
                     <w:rsid w:val="0C781EB3"/>
-                    <w:rsid w:val="0CCE2B10"/>
                     <w:rsid w:val="0D786F20"/>
                     <w:rsid w:val="0E5133DC"/>
                     <w:rsid w:val="0E741495"/>
@@ -1691,7 +1890,6 @@
                     <w:rsid w:val="114F1D45"/>
                     <w:rsid w:val="12F928B1"/>
                     <w:rsid w:val="13533D6F"/>
-                    <w:rsid w:val="139D323C"/>
                     <w:rsid w:val="14587163"/>
                     <w:rsid w:val="15227E9D"/>
                     <w:rsid w:val="15593193"/>
@@ -1707,7 +1905,6 @@
                     <w:rsid w:val="1C8C02F2"/>
                     <w:rsid w:val="1C9F0025"/>
                     <w:rsid w:val="1D385D84"/>
-                    <w:rsid w:val="1E195BB5"/>
                     <w:rsid w:val="1E2C3B3A"/>
                     <w:rsid w:val="1E831280"/>
                     <w:rsid w:val="1E8C1C92"/>
@@ -1723,7 +1920,6 @@
                     <w:rsid w:val="24207C9D"/>
                     <w:rsid w:val="248C70E1"/>
                     <w:rsid w:val="25282E96"/>
-                    <w:rsid w:val="2547125A"/>
                     <w:rsid w:val="26AA4A11"/>
                     <w:rsid w:val="2705317A"/>
                     <w:rsid w:val="27054F28"/>
@@ -1731,6 +1927,7 @@
                     <w:rsid w:val="283D06F2"/>
                     <w:rsid w:val="28890D09"/>
                     <w:rsid w:val="28BB61E6"/>
+                    <w:rsid w:val="29DB01C2"/>
                     <w:rsid w:val="2B0D4CF3"/>
                     <w:rsid w:val="2CDE6947"/>
                     <w:rsid w:val="2D6D7CCB"/>
@@ -1743,19 +1940,13 @@
                     <w:rsid w:val="32CC2D9E"/>
                     <w:rsid w:val="33AD497E"/>
                     <w:rsid w:val="33C223E2"/>
-                    <w:rsid w:val="34321327"/>
                     <w:rsid w:val="343D03F7"/>
                     <w:rsid w:val="345E3ECA"/>
                     <w:rsid w:val="34713BFD"/>
                     <w:rsid w:val="34B00BC9"/>
                     <w:rsid w:val="3578196E"/>
-                    <w:rsid w:val="377A726D"/>
-                    <w:rsid w:val="37C624B2"/>
                     <w:rsid w:val="38256CB0"/>
-                    <w:rsid w:val="3881462B"/>
                     <w:rsid w:val="391F631E"/>
-                    <w:rsid w:val="39F33306"/>
-                    <w:rsid w:val="3B2714BA"/>
                     <w:rsid w:val="3B432342"/>
                     <w:rsid w:val="3B5B4C72"/>
                     <w:rsid w:val="3C137C90"/>
@@ -1765,13 +1956,18 @@
                     <w:rsid w:val="3D736C38"/>
                     <w:rsid w:val="3E0B0C1F"/>
                     <w:rsid w:val="3E1D0952"/>
+                    <w:rsid w:val="3E502AD5"/>
+                    <w:rsid w:val="3F290AD8"/>
                     <w:rsid w:val="3F4F215C"/>
                     <w:rsid w:val="3FA94B93"/>
+                    <w:rsid w:val="3FD414E4"/>
                     <w:rsid w:val="41B8730F"/>
                     <w:rsid w:val="437E00E5"/>
                     <w:rsid w:val="43BF2BD7"/>
                     <w:rsid w:val="45ED50AE"/>
+                    <w:rsid w:val="46AA2F9F"/>
                     <w:rsid w:val="46F04E55"/>
+                    <w:rsid w:val="48873598"/>
                     <w:rsid w:val="49C64593"/>
                     <w:rsid w:val="4A203CA4"/>
                     <w:rsid w:val="4A3414FD"/>
@@ -1787,7 +1983,6 @@
                     <w:rsid w:val="50C7131D"/>
                     <w:rsid w:val="513A1AEF"/>
                     <w:rsid w:val="51D04201"/>
-                    <w:rsid w:val="530002C1"/>
                     <w:rsid w:val="530879CB"/>
                     <w:rsid w:val="542D2C45"/>
                     <w:rsid w:val="54684BC5"/>
@@ -1825,28 +2020,27 @@
                     <w:rsid w:val="6A3D7B02"/>
                     <w:rsid w:val="6A4315BC"/>
                     <w:rsid w:val="6A9A31A7"/>
-                    <w:rsid w:val="6C586E75"/>
                     <w:rsid w:val="6D003795"/>
                     <w:rsid w:val="6D321474"/>
                     <w:rsid w:val="6D396CA7"/>
-                    <w:rsid w:val="6D463172"/>
                     <w:rsid w:val="6D9E6B0A"/>
                     <w:rsid w:val="6DF02A58"/>
-                    <w:rsid w:val="6ED22F0F"/>
                     <w:rsid w:val="6F767D3E"/>
                     <w:rsid w:val="727704D5"/>
                     <w:rsid w:val="73591E51"/>
+                    <w:rsid w:val="73661E78"/>
                     <w:rsid w:val="738D38A8"/>
                     <w:rsid w:val="73B61051"/>
                     <w:rsid w:val="758D4034"/>
                     <w:rsid w:val="75A03D67"/>
+                    <w:rsid w:val="78EF46BD"/>
+                    <w:rsid w:val="793A3C69"/>
                     <w:rsid w:val="7997722F"/>
                     <w:rsid w:val="79C1605A"/>
                     <w:rsid w:val="79EA1A55"/>
                     <w:rsid w:val="79F503F9"/>
                     <w:rsid w:val="7A106FE1"/>
                     <w:rsid w:val="7A1E16FE"/>
-                    <w:rsid w:val="7BDA1655"/>
                     <w:rsid w:val="7CCD4D16"/>
                     <w:rsid w:val="7D5453FC"/>
                     <w:rsid w:val="7D6C2781"/>

工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl

@@ -87,13 +87,17 @@
                             </w:tblCellMar>
                         </w:tblPr>
                         <w:tblGrid>
-                            <w:gridCol w:w="1950"/>
+                            <w:gridCol w:w="1165"/>
-                            <w:gridCol w:w="975"/>
+                            <w:gridCol w:w="785"/>
-                            <w:gridCol w:w="975"/>
+                            <w:gridCol w:w="974"/>
-                            <w:gridCol w:w="1950"/>
+                            <w:gridCol w:w="976"/>
-                            <w:gridCol w:w="1950"/>
+                            <w:gridCol w:w="170"/>
-                            <w:gridCol w:w="975"/>
+                            <w:gridCol w:w="1778"/>
-                            <w:gridCol w:w="975"/>
+                            <w:gridCol w:w="2"/>
+                            <w:gridCol w:w="1043"/>
+                            <w:gridCol w:w="907"/>
+                            <w:gridCol w:w="972"/>
+                            <w:gridCol w:w="978"/>
                             <w:gridCol w:w="1950"/>
                         </w:tblGrid>
                         <w:tr>
@@ -120,7 +124,7 @@
                             <w:tc>
                                 <w:tcPr>
                                     <w:tcW w:w="11700" w:type="dxa"/>
-                                    <w:gridSpan w:val="8"/>
+                                    <w:gridSpan w:val="12"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
                                         <w:left w:val="nil"/>
@@ -198,8 +202,7 @@
                             </w:trPr>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="2925" w:type="dxa"/>
+                                    <w:tcW w:w="1165" w:type="dxa"/>
-                                    <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
                                         <w:left w:val="nil"/>
@@ -239,7 +242,8 @@
                                     </w:pPr>
                                     <w:r>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
                                             <w:b w:val="0"/>
                                             <w:bCs w:val="0"/>
                                             <w:sz w:val="16"/>
@@ -253,7 +257,7 @@
                             </w:tc>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="2925" w:type="dxa"/>
+                                    <w:tcW w:w="1759" w:type="dxa"/>
                                     <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
@@ -294,7 +298,7 @@
                                     </w:pPr>
                                     <w:r>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
                                                       w:cs="宋体"/>
                                             <w:b w:val="0"/>
                                             <w:bCs w:val="0"/>
@@ -309,7 +313,7 @@
                             </w:tc>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="2925" w:type="dxa"/>
+                                    <w:tcW w:w="1146" w:type="dxa"/>
                                     <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
@@ -358,13 +362,123 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>单据编号：</w:t>
+                                        <w:t>申请部门：</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="1778" w:type="dxa"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="nil"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="top"/>
+                                </w:tcPr>
+                                <w:p>
+                                    <w:pPr>
+                                        <w:keepNext w:val="0"/>
+                                        <w:keepLines w:val="0"/>
+                                        <w:pageBreakBefore w:val="0"/>
+                                        <w:kinsoku/>
+                                        <w:wordWrap/>
+                                        <w:overflowPunct/>
+                                        <w:topLinePunct w:val="0"/>
+                                        <w:autoSpaceDE/>
+                                        <w:autoSpaceDN/>
+                                        <w:bidi w:val="0"/>
+                                        <w:adjustRightInd/>
+                                        <w:snapToGrid/>
+                                        <w:spacing w:line="240" w:lineRule="auto"/>
+                                        <w:jc w:val="left"/>
+                                        <w:textAlignment w:val="auto"/>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                        <w:t>${applyDept!}</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="1045" w:type="dxa"/>
+                                    <w:gridSpan w:val="2"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="nil"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="top"/>
+                                </w:tcPr>
+                                <w:p>
+                                    <w:pPr>
+                                        <w:keepNext w:val="0"/>
+                                        <w:keepLines w:val="0"/>
+                                        <w:pageBreakBefore w:val="0"/>
+                                        <w:kinsoku/>
+                                        <w:wordWrap/>
+                                        <w:overflowPunct/>
+                                        <w:topLinePunct w:val="0"/>
+                                        <w:autoSpaceDE/>
+                                        <w:autoSpaceDN/>
+                                        <w:bidi w:val="0"/>
+                                        <w:adjustRightInd/>
+                                        <w:snapToGrid/>
+                                        <w:spacing w:line="240" w:lineRule="auto"/>
+                                        <w:jc w:val="right"/>
+                                        <w:textAlignment w:val="auto"/>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                        <w:t>申请人：</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="2925" w:type="dxa"/>
+                                    <w:tcW w:w="1879" w:type="dxa"/>
                                     <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:top w:val="nil"/>
@@ -405,7 +519,117 @@
                                     </w:pPr>
                                     <w:r>
                                         <w:rPr>
-                                            <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                        <w:t>${applyPeo!}</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="978" w:type="dxa"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="nil"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="top"/>
+                                </w:tcPr>
+                                <w:p>
+                                    <w:pPr>
+                                        <w:keepNext w:val="0"/>
+                                        <w:keepLines w:val="0"/>
+                                        <w:pageBreakBefore w:val="0"/>
+                                        <w:kinsoku/>
+                                        <w:wordWrap/>
+                                        <w:overflowPunct/>
+                                        <w:topLinePunct w:val="0"/>
+                                        <w:autoSpaceDE/>
+                                        <w:autoSpaceDN/>
+                                        <w:bidi w:val="0"/>
+                                        <w:adjustRightInd/>
+                                        <w:snapToGrid/>
+                                        <w:spacing w:line="240" w:lineRule="auto"/>
+                                        <w:jc w:val="right"/>
+                                        <w:textAlignment w:val="auto"/>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                        <w:t>单据编号：</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="1950" w:type="dxa"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="nil"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="top"/>
+                                </w:tcPr>
+                                <w:p>
+                                    <w:pPr>
+                                        <w:keepNext w:val="0"/>
+                                        <w:keepLines w:val="0"/>
+                                        <w:pageBreakBefore w:val="0"/>
+                                        <w:kinsoku/>
+                                        <w:wordWrap/>
+                                        <w:overflowPunct/>
+                                        <w:topLinePunct w:val="0"/>
+                                        <w:autoSpaceDE/>
+                                        <w:autoSpaceDN/>
+                                        <w:bidi w:val="0"/>
+                                        <w:adjustRightInd/>
+                                        <w:snapToGrid/>
+                                        <w:spacing w:line="240" w:lineRule="auto"/>
+                                        <w:jc w:val="left"/>
+                                        <w:textAlignment w:val="auto"/>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
+                                                      w:cs="宋体"/>
+                                            <w:b w:val="0"/>
+                                            <w:bCs w:val="0"/>
+                                            <w:sz w:val="16"/>
+                                            <w:szCs w:val="16"/>
+                                            <w:vertAlign w:val="baseline"/>
+                                            <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
                                                       w:cs="宋体"/>
                                             <w:b w:val="0"/>
                                             <w:bCs w:val="0"/>
@@ -442,6 +666,7 @@
                             <w:tc>
                                 <w:tcPr>
                                     <w:tcW w:w="1950" w:type="dxa"/>
+                                    <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                         <w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -539,6 +764,7 @@
                             <w:tc>
                                 <w:tcPr>
                                     <w:tcW w:w="1950" w:type="dxa"/>
+                                    <w:gridSpan w:val="3"/>
                                     <w:tcBorders>
                                         <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                         <w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -587,6 +813,7 @@
                             <w:tc>
                                 <w:tcPr>
                                     <w:tcW w:w="1950" w:type="dxa"/>
+                                    <w:gridSpan w:val="2"/>
                                     <w:tcBorders>
                                         <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                         <w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -754,6 +981,7 @@
                                 <w:tc>
                                     <w:tcPr>
                                         <w:tcW w:w="1950" w:type="dxa"/>
+                                        <w:gridSpan w:val="2"/>
                                         <w:tcBorders>
                                             <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                             <w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -840,6 +1068,7 @@
                                 <w:tc>
                                     <w:tcPr>
                                         <w:tcW w:w="1950" w:type="dxa"/>
+                                        <w:gridSpan w:val="3"/>
                                         <w:tcBorders>
                                             <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                             <w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -880,6 +1109,7 @@
                                 <w:tc>
                                     <w:tcPr>
                                         <w:tcW w:w="1950" w:type="dxa"/>
+                                        <w:gridSpan w:val="2"/>
                                         <w:tcBorders>
                                             <w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
                                             <w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@@ -1044,14 +1274,14 @@
                         xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
                 <Template>Normal.dotm</Template>
                 <Pages>1</Pages>
-                <Words>46</Words>
+                <Words>57</Words>
-                <Characters>130</Characters>
+                <Characters>164</Characters>
                 <Lines>0</Lines>
                 <Paragraphs>0</Paragraphs>
                 <TotalTime>1</TotalTime>
                 <ScaleCrop>false</ScaleCrop>
                 <LinksUpToDate>false</LinksUpToDate>
-                <CharactersWithSpaces>130</CharactersWithSpaces>
+                <CharactersWithSpaces>164</CharactersWithSpaces>
                 <Application>WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA</Application>
                 <DocSecurity>0</DocSecurity>
             </Properties>
@@ -1067,7 +1297,7 @@
                 <dcterms:created xsi:type="dcterms:W3CDTF">2014-10-29T12:08:00Z</dcterms:created>
                 <dc:creator>God</dc:creator>
                 <cp:lastModifiedBy>文档存本地丢失不负责</cp:lastModifiedBy>
-                <dcterms:modified xsi:type="dcterms:W3CDTF">2023-07-26T02:10:32Z</dcterms:modified>
+                <dcterms:modified xsi:type="dcterms:W3CDTF">2023-07-27T03:17:59Z</dcterms:modified>
             </cp:coreProperties>
         </pkg:xmlData>
     </pkg:part>
@@ -1080,7 +1310,7 @@
                     <vt:lpwstr>2052-11.1.0.14309</vt:lpwstr>
                 </property>
                 <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="3" name="ICV">
-                    <vt:lpwstr>9E93676032D7485AB417A9E0980BAF53_13</vt:lpwstr>
+                    <vt:lpwstr>21863D8A3CFD4FDB924FD0A9161B1128_13</vt:lpwstr>
                 </property>
             </Properties>
         </pkg:xmlData>
@@ -1465,7 +1695,6 @@
                     <w:rsid w:val="024617F2"/>
                     <w:rsid w:val="02C941D1"/>
                     <w:rsid w:val="030B47EA"/>
-                    <w:rsid w:val="032F2286"/>
                     <w:rsid w:val="039A553A"/>
                     <w:rsid w:val="03EC63C9"/>
                     <w:rsid w:val="0433224A"/>
@@ -1477,7 +1706,6 @@
                     <w:rsid w:val="09C556F2"/>
                     <w:rsid w:val="09E87633"/>
                     <w:rsid w:val="0A713735"/>
-                    <w:rsid w:val="0AAE6186"/>
                     <w:rsid w:val="0AD04A10"/>
                     <w:rsid w:val="0AEC3153"/>
                     <w:rsid w:val="0AF23507"/>
@@ -1498,7 +1726,7 @@
                     <w:rsid w:val="13533D6F"/>
                     <w:rsid w:val="14587163"/>
                     <w:rsid w:val="15593193"/>
-                    <w:rsid w:val="165D6CB3"/>
+                    <w:rsid w:val="16EB2510"/>
                     <w:rsid w:val="17300E42"/>
                     <w:rsid w:val="17D42FA4"/>
                     <w:rsid w:val="18CA6DC6"/>
@@ -1517,13 +1745,13 @@
                     <w:rsid w:val="1F1840BF"/>
                     <w:rsid w:val="1F330EF8"/>
                     <w:rsid w:val="1F4924CA"/>
+                    <w:rsid w:val="20607ACB"/>
                     <w:rsid w:val="20BE47F2"/>
                     <w:rsid w:val="212D426F"/>
                     <w:rsid w:val="21843C8D"/>
                     <w:rsid w:val="21920158"/>
                     <w:rsid w:val="21DA5F4C"/>
                     <w:rsid w:val="2208596B"/>
-                    <w:rsid w:val="2268392E"/>
                     <w:rsid w:val="22CC58EC"/>
                     <w:rsid w:val="23977482"/>
                     <w:rsid w:val="239B0E1A"/>
@@ -1543,6 +1771,7 @@
                     <w:rsid w:val="2D6D7CCB"/>
                     <w:rsid w:val="2DDD09AD"/>
                     <w:rsid w:val="2E840E29"/>
+                    <w:rsid w:val="2EE52190"/>
                     <w:rsid w:val="2F8A2102"/>
                     <w:rsid w:val="304545E8"/>
                     <w:rsid w:val="30FA3624"/>
@@ -1565,10 +1794,11 @@
                     <w:rsid w:val="3C137C90"/>
                     <w:rsid w:val="3C6F136A"/>
                     <w:rsid w:val="3D736C38"/>
+                    <w:rsid w:val="3DCB6F17"/>
+                    <w:rsid w:val="3DF15DAF"/>
                     <w:rsid w:val="3E0B0C1F"/>
                     <w:rsid w:val="3E1D0952"/>
                     <w:rsid w:val="41B8730F"/>
-                    <w:rsid w:val="423D15C3"/>
                     <w:rsid w:val="42B1472E"/>
                     <w:rsid w:val="437E00E5"/>
                     <w:rsid w:val="43BF2BD7"/>
@@ -1583,7 +1813,6 @@
                     <w:rsid w:val="4B257098"/>
                     <w:rsid w:val="4CB16E35"/>
                     <w:rsid w:val="4D0708F5"/>
-                    <w:rsid w:val="4E192EE4"/>
                     <w:rsid w:val="4E5403C0"/>
                     <w:rsid w:val="4E807407"/>
                     <w:rsid w:val="4F31425D"/>
@@ -1633,7 +1862,7 @@
                     <w:rsid w:val="6D321474"/>
                     <w:rsid w:val="6D396CA7"/>
                     <w:rsid w:val="6D9E6B0A"/>
-                    <w:rsid w:val="6DA02882"/>
+                    <w:rsid w:val="6F0926A9"/>
                     <w:rsid w:val="6F767D3E"/>
                     <w:rsid w:val="727704D5"/>
                     <w:rsid w:val="73591E51"/>
@@ -1649,7 +1878,6 @@
                     <w:rsid w:val="7A106FE1"/>
                     <w:rsid w:val="7A1E16FE"/>
                     <w:rsid w:val="7A661095"/>
-                    <w:rsid w:val="7BC260B9"/>
                     <w:rsid w:val="7CCD4D16"/>
                     <w:rsid w:val="7D5453FC"/>
                     <w:rsid w:val="7D6C2781"/>

工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(激光打印机).doc

@@ -1,7 +1,6 @@
 
 |调账申请                                                                                  |
-|单据日期：            |${saleDate!}          |单据编号：            |${billNo!}            |
+|单据日期：    |${saleDate!}  |申请部门：    |${applyDept!} |申请人：      |${applyPeo!}  |
-|调账类型      |合同编号      |客户名称      |物料编码      |调出金额      |调入金额      |
 |${tz.tzType!} |${tz.conNo!}  |${tz.name!}   |${tz.vinNo!}  |${tz.dcje!}   |${tz.drje!}   |
 
 -----------------------

工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc

@@ -1,6 +1,5 @@
 
 |调账申请                                                                                  |
-|单据日期：            |${saleDate!}          |单据编号：            |${billNo!}            |
+|单据日期：    |${saleDate!}  |申请部门：    |${applyDept!} |申请人：      |${applyPeo!}  |
-|调账类型      |合同编号      |客户名称      |物料编码      |调出金额      |调入金额      |
 |${tz.tzType!} |${tz.conNo!}  |${tz.name!}   |${tz.vinNo!}  |${tz.dcje!}   |${tz.drje!}   |