款项结转模块开发

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

@@ -61,7 +61,7 @@ public class AppFinFundsCarriedForwardYXYSKXDto implements Dto {
     @ApiModelProperty("应收金额")
     private String receivable;
     @ApiModelProperty("认款金额")
-    private String confirmMoney;
+    private Integer confirmMoney;
     private Boolean checked;
     @ApiModelProperty("车架号")
     private String vin;

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

@@ -84,5 +84,7 @@ public class AppFinFundsCarriedForwardYXYSKXVo implements Dto {
     private String useOrgSid;
     private int subscribedOf;
     @ApiModelProperty("采购系统sid")
-    private String purchaseSystemSid; // 采购系统sid
+    private String purchaseSystemSid;
+    @ApiModelProperty("剩余应收")
+    private String surplusReceivable;
 }

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

@@ -88,5 +88,8 @@ public class FinFundsCarriedForwardApply extends BaseEntity {
     private String purchaseSystemSid; // 采购系统sid
     @ApiModelProperty("采购系统名称")
     private String purchaseSystem; // 采购系统名称
-
+    @ApiModelProperty("结转金额合计")
+    private String jzjehj; // 结转金额合计
+    @ApiModelProperty("pdf路径")
+    private String pdfPath;
 }

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

@@ -60,43 +60,49 @@ public class FinFundsCarriedForwardApplyDetailsVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("创建人sid")
-    private String createBySid; // 创建人sid
+    private String createBySid;
     @ApiModelProperty("部门-人员名")
     private String publishInfo;
 	@ApiModelProperty("创建人接口")
-    private String createByName; // 创建人接口
+    private String createByName;
 	@ApiModelProperty("申请部门sid")
-    private String applyDeptSid; // 申请部门sid
+    private String applyDeptSid;
 	@ApiModelProperty("申请部门名称")
-    private String applyDeptName; // 申请部门名称
+    private String applyDeptName;
 	@ApiModelProperty("销售部门sid")
-    private String saleDeptSid; // 销售部门sid
+    private String saleDeptSid;
 	@ApiModelProperty("销售部门名称")
-    private String saleDeptName; // 销售部门名称
+    private String saleDeptName;
 	@ApiModelProperty("业务员sid")
-    private String staffSid; // 业务员sid
+    private String staffSid;
 	@ApiModelProperty("业务员姓名")
-    private String staffName; // 业务员姓名
+    private String staffName;
 	@ApiModelProperty("来源")
-    private String source; // 来源
+    private String source;
 	@ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
+    private String useOrgSid;
 	@ApiModelProperty("分公司名称")
-    private String useOrgName; // 分公司名称
+    private String useOrgName;
 	@ApiModelProperty("组织全路径")
-    private String orgSidPath; // 组织全路径
+    private String orgSidPath;
 	@ApiModelProperty("申请编号")
-    private String billNo; // 申请编号
+    private String billNo;
     @ApiModelProperty("采购系统sid")
-    private String purchaseSystemSid; // 采购系统sid
+    private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
-    private String purchaseSystem; // 采购系统名称
+    private String purchaseSystem;
+    @ApiModelProperty("状态")
+    private String collectionBillStateValue;
+    private String procInsId;
+    private String taskId;
+    @ApiModelProperty("结转金额合计")
+    private String jzjehj; // 结转金额合计
+    @ApiModelProperty("pdf路径")
+    private String pdfPath;
     @ApiModelProperty("款项确认书附件")
     private List<String> kxqrsImages = new ArrayList<>();
     @ApiModelProperty("款项结转车辆列表")
     private List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = new ArrayList<>();
-/*    @ApiModelProperty("应收未收款项明细")
-    private List<AppFinFundsCarriedForwardYXYSKXVo> yswsFinFundsCarriedForwardYXYSKXVos = new ArrayList<>();*/
     @ApiModelProperty("已选应收款项明细")
     private List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = new ArrayList<>();
 }

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

@@ -86,6 +86,14 @@ public class FinFundsCarriedForwardApplyDto implements Dto {
     private String purchaseSystemSid; // 采购系统sid
     @ApiModelProperty("采购系统名称")
     private String purchaseSystem; // 采购系统名称
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("结转金额合计")
+    private String jzjehj; // 结转金额合计
+    @ApiModelProperty("pdf路径")
+    private String pdfPath;
+    @ApiModelProperty("是否为相同销售订单")
+    private Boolean isOneSale = false;
     @ApiModelProperty("款项确认书附件")
     private List<String> kxqrsImages = new ArrayList<>();
     @ApiModelProperty("款项结转车辆列表")

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

@@ -30,10 +30,7 @@ import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillTaskQuery;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyCompleteDto;
+import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.*;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyTaskQuery;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.SubmitFinFundsApplyDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -87,11 +84,21 @@ public interface FinFundsCarriedForwardApplyFeign {
     @ResponseBody
     public ResultBean<FinFundsCarriedForwardApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("移动端编辑回显接口")
+    @GetMapping("/appFetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<FinFundsCarriedForwardApplyDetailsVo> appFetchDetailsBySid(@PathVariable("sid") String sid);
+
     @ApiOperation("初始化款项结转申请")
     @PostMapping("/init")
     @ResponseBody
     public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(@RequestBody FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery);
 
+    @ApiOperation("生成款项结转PDF")
+    @PostMapping("/createPdf")
+    @ResponseBody
+    public ResultBean<String> createPdf(@RequestParam("sid") String sid, @RequestParam("userName") String userName);
+
     /****************************************************审批流程*****************************************************/
 
     @ApiOperation("款项结转审批流程")
@@ -104,11 +111,11 @@ public interface FinFundsCarriedForwardApplyFeign {
 
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
-    ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap FinFundsApplyNodeQuery query);
+    ResultBean<List<FinFundsApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap FinFundsApplyNodeQuery query);
 
     @ApiOperation(value = "获取下一个环节")
     @GetMapping(value = "/getNextNodesForSubmit")
-    ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap FinFundsApplyNodeQuery query);
+    ResultBean<List<FinFundsApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap FinFundsApplyNodeQuery query);
 
     @ApiOperation(value = "驳回任务")
     @PostMapping(value = "/reject")
@@ -121,4 +128,27 @@ public interface FinFundsCarriedForwardApplyFeign {
     @ApiOperation(value = "终止任务")
     @PostMapping(value = "/breakProcess")
     public ResultBean breakProcess(@Valid @RequestBody FinFundsApplyTaskQuery query);
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap FinFundsApplyNodeQuery query);
+
+    /******************************************移动端流程接口*******************************************/
+
+    @ApiOperation(value = "app撤回流程")
+    @PutMapping(value = "/revokeProcessApp")
+    public ResultBean revokeProcessApp(@Valid @RequestBody FinFundsApplyTaskQuery query);
+
+    @ApiOperation(value = "app驳回任务")
+    @PutMapping(value = "/rejectApp")
+    public ResultBean rejectApp(@Valid @RequestBody FinFundsApplyTaskQuery query);
+
+    @ApiOperation(value = "app办理（同意）")
+    @PutMapping("/completeApp")
+    public ResultBean completeApp(@Valid @RequestBody FinFundsApplyCompleteDto query);
+
+    @ApiOperation(value = "app终止任务")
+    @PutMapping(value = "/breakProcessApp")
+    public ResultBean breakProcessApp(@Valid @RequestBody FinFundsApplyTaskQuery query);
 }

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

@@ -26,10 +26,7 @@
 package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
 
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyCompleteDto;
+import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.*;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyTaskQuery;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.SubmitFinFundsApplyDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -75,11 +72,21 @@ public class FinFundsCarriedForwardApplyFeignFallback implements FinFundsCarried
 		return rb.setMsg("接口anrui-fin/finfundscarriedforwardapply/fetchDetailsBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<FinFundsCarriedForwardApplyDetailsVo> appFetchDetailsBySid(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) {
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> createPdf(String sid, String userName) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submitFinFundsApply(SubmitFinFundsApplyDto dto) {
 		return null;
@@ -91,12 +98,12 @@ public class FinFundsCarriedForwardApplyFeignFallback implements FinFundsCarried
 	}
 
 	@Override
-	public ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(FinFundsApplyNodeQuery query) {
+	public ResultBean<List<FinFundsApplyNodeVo>> getPreviousNodesForReject(FinFundsApplyNodeQuery query) {
 		return null;
 	}
 
 	@Override
-	public ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(FinFundsApplyNodeQuery query) {
+	public ResultBean<List<FinFundsApplyNodeVo>> getNextNodesForSubmit(FinFundsApplyNodeQuery query) {
 		return null;
 	}
 
@@ -114,4 +121,29 @@ public class FinFundsCarriedForwardApplyFeignFallback implements FinFundsCarried
 	public ResultBean breakProcess(FinFundsApplyTaskQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> getFlowOperateTitle(FinFundsApplyNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean revokeProcessApp(FinFundsApplyTaskQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean rejectApp(FinFundsApplyTaskQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean completeApp(FinFundsApplyCompleteDto query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean breakProcessApp(FinFundsApplyTaskQuery query) {
+		return null;
+	}
 }

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

@@ -68,4 +68,12 @@ public class FinFundsCarriedForwardApplyVo implements Vo {
     private String procDefId;
 	@ApiModelProperty("流程实例的sid")
     private String procInstSid;
+    @ApiModelProperty("pdf路径")
+    private String tzsqPath;
+    @ApiModelProperty("pdf路径")
+    private String downloadUrl;
+    @ApiModelProperty("是否可以修改")
+    private Boolean showUpdateBtn;
+    @ApiModelProperty("是否可以下载")
+    private Boolean showDownloadBtn;
 }

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ZC {
+
+    @ApiModelProperty("调账类型")
+    private String zc;
+    @ApiModelProperty("合同编号")
+    private String conNo;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("物料编码")
+    private String vinNo;
+    @ApiModelProperty("调出金额")
+    private String dcje;
+    @ApiModelProperty("调入金额")
+    private String drje;
+    @ApiModelProperty("调出前余额")
+    private String dcqye;
+    @ApiModelProperty("调出后余额")
+    private String dchye;
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ZR {
+
+    @ApiModelProperty("调账类型")
+    private String zr;
+    @ApiModelProperty("合同编号")
+    private String conNo;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("物料编码")
+    private String vinNo;
+    @ApiModelProperty("调出金额")
+    private String dcje;
+    @ApiModelProperty("调入金额")
+    private String drje;
+    @ApiModelProperty("调出前余额")
+    private String dcqye;
+    @ApiModelProperty("调出后余额")
+    private String dchye;
+}

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,36 +20,20 @@ public class FinFundsApplyCompleteDto implements Dto {
     private static final long serialVersionUID = 6378752532534735663L;
 
     @ApiModelProperty(value = "用户sid")
-    @NotBlank(message = "参数错误：userSid")
     private String userSid;
-    @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
-    private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
     @ApiModelProperty(value = "任务id")
     @NotBlank(message = "参数错误：taskId")
     private String taskId;
-    @ApiModelProperty(value = "流程id")
+    @ApiModelProperty(value = "流程id(PC)")
-    @NotBlank(message = "参数错误：instanceId")
     private String instanceId;
+    @ApiModelProperty(value = "流程id(移动)")
+    private String procInsId;
     @ApiModelProperty(value = "意见")
     private String comment;
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-
-    @ApiModelProperty("客户开票申请书附件信息")
-    private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>();
-    @ApiModelProperty("款项确认书附件信息")
-    private List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>();
-    @ApiModelProperty("车辆登记合同附件信息")
-    private List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>();
-    @ApiModelProperty("证件")
-    private List<FinBillFileDto> zjApplicationAppendxs = new ArrayList<>();
-    @ApiModelProperty("附件")
-    private List<FinBillFileDto> fjApplicationAppendxs = new ArrayList<>();
-    @ApiModelProperty("欠款领票附件")
-    private List<FinBillFileDto> arrearsCollectionAppendxs = new ArrayList<>();
 }

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

@@ -20,4 +20,6 @@ public class FinFundsApplyNodeQuery implements Query {
     private String taskDefKey;
     @ApiModelProperty(value = "业务sid")
     private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    private Integer next;
 }

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

@@ -0,0 +1,26 @@
+package com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 15:03
+ * @Description
+ */
+@Data
+public class FinFundsApplyNodeVo implements Vo {
+    private static final long serialVersionUID = -833419512294877848L;
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,6 +41,9 @@ public class FinFundsApplyTaskQuery implements Query {
     /**
      * 终止
      */
-    @ApiModelProperty("流程实例Id")
+    @ApiModelProperty("流程实例Id(PC)")
     private String instanceId;
+
+    @ApiModelProperty("流程实例Id(移动)")
+    private String procInsId;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java

@@ -68,5 +68,5 @@ public class FinFundsCarriedForwardVehDto implements Dto {
 	@ApiModelProperty("剩余金额")
     private String balance; // 剩余金额
 	@ApiModelProperty("本次使用金额")
-    private String thisUseMoney; // 本次使用金额
+    private Integer thisUseMoney; // 本次使用金额
 }

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

@@ -122,4 +122,7 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     String selectCollectionMoneys(@Param("contractNo") String contractId, @Param("list") List<String> busVinSidList);
 
     IPage<FinCollectionConfirmationJYDDKYDJVo> jyddkydjListPage(IPage<FinCollectionConfirmation> page, @Param(Constants.WRAPPER)QueryWrapper<FinCollectionConfirmation> qw);
+
+    @Update("update fin_collection_confirmation set balance = #{balance} where sid = #{busSid}")
+    void updateYeBySid(@Param("balance") String balance,@Param("busSid") String busSid);
 }

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

@@ -2365,4 +2365,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         PagerVo<FinCollectionConfirmationJYDDKYDJVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public void updateYeBySid(String balance, String busSid) {
+        baseMapper.updateYeBySid(balance,busSid);
+    }
 }

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

@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApply;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.Map;
@@ -69,4 +70,7 @@ public interface FinFundsCarriedForwardApplyMapper extends BaseMapper<FinFundsCa
     int selectBySid(String join);
 
     int updateFlowFiled(Map<String, Object> map);
+
+	@Update("update fin_funds_carried_forward_apply set pdfPath = #{pdfPath} where sid = #{businessSid}")
+	void updatePathBySid(@Param("pdfPath") String pdfPath,@Param("businessSid") String businessSid);
 }

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

@@ -14,7 +14,9 @@
         fa.`createTime`,
         fa.`source`,
         SUM(fv.`thisUseMoney`) AS carryForwardMoney,
-        fa.`remarks`
+        fa.`remarks`,
+        fa.pdfPath AS downloadUrl,
+        fa.pdfPath AS tzsqPath
         FROM fin_funds_carried_forward_apply fa
         LEFT JOIN fin_funds_carried_forward_veh fv
         ON fa.`sid` = fv.`mainSid`
@@ -57,7 +59,7 @@
             , procDefId=#{procDefId}
         </if>
         <if test="procInsId != null and procInsId != ''">
-            , procInstId=#{procInsId}
+            , procInstSid=#{procInsId}
         </if>
         <if test="taskId != null and taskId != ''">
             , taskId=#{taskId}

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

@@ -28,10 +28,7 @@ package com.yxt.anrui.fin.biz.finfundscarriedforwardapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyCompleteDto;
+import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.*;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyTaskQuery;
-import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.SubmitFinFundsApplyDto;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;
@@ -39,6 +36,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Delete;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -96,11 +94,21 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp
 		return finFundsCarriedForwardApplyService.fetchDetailsVoBySid(sid);
 	}
 
+	@Override
+	public ResultBean<FinFundsCarriedForwardApplyDetailsVo> appFetchDetailsBySid(String sid) {
+		return finFundsCarriedForwardApplyService.fetchDetailsVoBySid(sid);
+	}
+
 	@Override
 	public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) {
 		return finFundsCarriedForwardApplyService.init(finFundsCarriedForwardApplyInitQuery);
 	}
 
+	@Override
+	public ResultBean<String> createPdf(String sid, String userName) {
+		return finFundsCarriedForwardApplyService.createPdf(sid,userName);
+	}
+
 	@Override
 	public ResultBean submitFinFundsApply(SubmitFinFundsApplyDto dto) {
 		return finFundsCarriedForwardApplyService.submitFinFundsApply(dto);
@@ -109,6 +117,9 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp
 	@Override
 	public ResultBean complete(FinFundsApplyCompleteDto query) {
 		BusinessVariables bv=new BusinessVariables();
+		if (StringUtils.isNotBlank(query.getProcInsId()) && StringUtils.isBlank(query.getInstanceId())){
+			query.setInstanceId(query.getProcInsId());
+		}
 		BeanUtil.copyProperties(query,bv);
 		bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
 		bv.setFormVariables(BeanUtil.beanToMap(query));
@@ -116,27 +127,77 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp
 	}
 
 	@Override
-	public ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(FinFundsApplyNodeQuery query) {
+	public ResultBean<List<FinFundsApplyNodeVo>> getPreviousNodesForReject(FinFundsApplyNodeQuery query) {
 		return finFundsCarriedForwardApplyService.getPreviousNodesForReject(query);
 	}
 
 	@Override
-	public ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(FinFundsApplyNodeQuery query) {
+	public ResultBean<List<FinFundsApplyNodeVo>> getNextNodesForSubmit(FinFundsApplyNodeQuery query) {
 		return finFundsCarriedForwardApplyService.getNextNodesForSubmit(query);
 	}
 
 	@Override
 	public ResultBean reject(FinFundsApplyTaskQuery query) {
+		if (StringUtils.isNotBlank(query.getProcInsId()) && StringUtils.isBlank(query.getInstanceId())){
+			query.setInstanceId(query.getProcInsId());
+		}
 		return finFundsCarriedForwardApplyService.reject(query);
 	}
 
 	@Override
 	public ResultBean revokeProcess(FinFundsApplyTaskQuery query) {
+		if (StringUtils.isNotBlank(query.getProcInsId()) && StringUtils.isBlank(query.getInstanceId())){
+			query.setInstanceId(query.getProcInsId());
+		}
 		return finFundsCarriedForwardApplyService.revokeProcess(query);
 	}
 
 	@Override
 	public ResultBean breakProcess(FinFundsApplyTaskQuery query) {
+		if (StringUtils.isNotBlank(query.getProcInsId()) && StringUtils.isBlank(query.getInstanceId())){
+			query.setInstanceId(query.getProcInsId());
+		}
+		return finFundsCarriedForwardApplyService.breakProcess(query);
+	}
+
+	@Override
+	public ResultBean<String> getFlowOperateTitle(FinFundsApplyNodeQuery query) {
+		return finFundsCarriedForwardApplyService.getFlowOperateTitle(query);
+	}
+
+	@Override
+	public ResultBean revokeProcessApp(FinFundsApplyTaskQuery query) {
+		if (StringUtils.isNotBlank(query.getProcInsId()) && StringUtils.isBlank(query.getInstanceId())){
+			query.setInstanceId(query.getProcInsId());
+		}
+		return finFundsCarriedForwardApplyService.revokeProcess(query);
+	}
+
+	@Override
+	public ResultBean rejectApp(FinFundsApplyTaskQuery query) {
+		if (StringUtils.isNotBlank(query.getProcInsId()) && StringUtils.isBlank(query.getInstanceId())){
+			query.setInstanceId(query.getProcInsId());
+		}
+		return finFundsCarriedForwardApplyService.reject(query);
+	}
+
+	@Override
+	public ResultBean completeApp(FinFundsApplyCompleteDto query) {
+		BusinessVariables bv=new BusinessVariables();
+		if (StringUtils.isNotBlank(query.getProcInsId()) && StringUtils.isBlank(query.getInstanceId())){
+			query.setInstanceId(query.getProcInsId());
+		}
+		BeanUtil.copyProperties(query,bv);
+		bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
+		bv.setFormVariables(BeanUtil.beanToMap(query));
+		return finFundsCarriedForwardApplyService.complete(bv);
+	}
+
+	@Override
+	public ResultBean breakProcessApp(FinFundsApplyTaskQuery query) {
+		if (StringUtils.isNotBlank(query.getProcInsId()) && StringUtils.isBlank(query.getInstanceId())){
+			query.setInstanceId(query.getProcInsId());
+		}
 		return finFundsCarriedForwardApplyService.breakProcess(query);
 	}
 }

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

@@ -30,38 +30,24 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
-import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.common.utils.Rule;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
-import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
-import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
-import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
-import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo;
-import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo;
-import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
-import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery;
+import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeVo;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyTaskQuery;
 import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.SubmitFinFundsApplyDto;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
-import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
 import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService;
 import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
-import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -69,24 +55,25 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
-import com.yxt.messagecenter.api.message.MessageFeign;
-import com.yxt.messagecenter.api.message.MessageFlowVo;
-import com.yxt.messagecenter.api.message.MessageFlowableQuery;
-import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.ConstantUtils;
 import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.WordUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -94,6 +81,8 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static java.util.Comparator.comparing;
+
 /**
  * Project: anrui-fin(款项结转申请) <br/>
  * File: FinFundsCarriedForwardApplyService.java <br/>
@@ -132,6 +121,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     private MessageFeign messageFeign;
     @Autowired
     private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
 
     public PagerVo<FinFundsCarriedForwardApplyVo> listPageVo(PagerQuery<FinFundsCarriedForwardApplyQuery> pq) {
         FinFundsCarriedForwardApplyQuery query = pq.getParams();
@@ -190,6 +181,14 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         qw.groupBy("fa.sid");
         IPage<FinFundsCarriedForwardApply> page = PagerUtil.queryToPage(pq);
         IPage<FinFundsCarriedForwardApplyVo> pagging = baseMapper.selectPageVo(page, qw, query.getJzSmallMoney(), query.getJzBigMoney());
+        for (FinFundsCarriedForwardApplyVo record : pagging.getRecords()) {
+            record.setShowUpdateBtn(false);
+            if (StringUtils.isNotBlank(record.getDownloadUrl())) {
+                record.setShowDownloadBtn(true);
+            } else {
+                record.setShowDownloadBtn(false);
+            }
+        }
         PagerVo<FinFundsCarriedForwardApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -225,6 +224,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         FinFundsCarriedForwardApplyDetailsVo vo = new FinFundsCarriedForwardApplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         vo.setCreateByDate(DateUtil.formatDate(entity.getCreateTime()));
+        vo.setProcInsId(entity.getProcInstSid());
+        vo.setPublishInfo(vo.getApplyDeptName() + "-" + vo.getCreateByName());
         List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(sid).getData();
         List<String> kxqrsImages = new ArrayList<>();
         for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
@@ -233,6 +234,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             filePath = urlPrefix + filePath;
             kxqrsImages.add(filePath);
         }
+        if ("终止".equals(entity.getNodeState())) {
+            vo.setCollectionBillStateValue("已终止");
+        } else if ("已办结".equals(entity.getNodeState())) {
+            vo.setCollectionBillStateValue("已审核");
+        } else {
+            vo.setCollectionBillStateValue("待审核");
+        }
         vo.setKxqrsImages(kxqrsImages);
         List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = finFundsCarriedForwardVehService.fetchByMainSid(sid);
         vo.setFinFundsCarriedForwardVehDetailsVos(finFundsCarriedForwardVehDetailsVos);
@@ -256,12 +264,60 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             appFinFundsCarriedForwardYXYSKXVo.setUseOrgSid(finSelectedReceivablesDetailedVo.getUseOrgSid());
             appFinFundsCarriedForwardYXYSKXVo.setSubscribedOf(finSelectedReceivablesDetailedVo.getSubscribedOf());
             appFinFundsCarriedForwardYXYSKXVo.setSid(finSelectedReceivablesDetailedVo.getCollSid());
+            String currentReceivableMoney = finSelectedReceivablesDetailedVo.getCurrentReceivableMoney();
+            String subscriptionMoney = finSelectedReceivablesDetailedVo.getSubscriptionMoney();
+            BigDecimal surplusReceivable = new BigDecimal(currentReceivableMoney).subtract(new BigDecimal(subscriptionMoney));
+            appFinFundsCarriedForwardYXYSKXVo.setSurplusReceivable(surplusReceivable.toString());
             appFinFundsCarriedForwardYXYSKXVoList.add(appFinFundsCarriedForwardYXYSKXVo);
         }
         vo.setYxysFinFundsCarriedForwardYXYSKXVos(appFinFundsCarriedForwardYXYSKXVoList);
         return rb.success().setData(vo);
     }
 
+    /*public ResultBean<FinFundsCarriedForwardApplyDetailsVo> appFetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinFundsCarriedForwardApply entity = fetchBySid(sid);
+        FinFundsCarriedForwardApplyDetailsVo vo = new FinFundsCarriedForwardApplyDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        vo.setCreateByDate(DateUtil.formatDate(entity.getCreateTime()));
+        vo.setProcInsId(entity.getProcInstSid());
+        List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(sid).getData();
+        List<String> kxqrsImages = new ArrayList<>();
+        for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
+            String filePath = commonAppendixVo.getFilePath();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            filePath = urlPrefix + filePath;
+            kxqrsImages.add(filePath);
+        }
+        vo.setKxqrsImages(kxqrsImages);
+        List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = finFundsCarriedForwardVehService.fetchByMainSid(sid);
+        vo.setFinFundsCarriedForwardVehDetailsVos(finFundsCarriedForwardVehDetailsVos);
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
+        List<AppFinFundsCarriedForwardYXYSKXVo> appFinFundsCarriedForwardYXYSKXVoList = new ArrayList<>();
+        for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
+            AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo = new AppFinFundsCarriedForwardYXYSKXVo();
+            appFinFundsCarriedForwardYXYSKXVo.setContractSid(finSelectedReceivablesDetailedVo.getContractSid());
+            appFinFundsCarriedForwardYXYSKXVo.setContractId(finSelectedReceivablesDetailedVo.getContractNo());
+            appFinFundsCarriedForwardYXYSKXVo.setName(finSelectedReceivablesDetailedVo.getCustomerName());
+            appFinFundsCarriedForwardYXYSKXVo.setCustomerSid(finSelectedReceivablesDetailedVo.getCustomerSid());
+            appFinFundsCarriedForwardYXYSKXVo.setProjectName(finSelectedReceivablesDetailedVo.getReceivablesName());
+            appFinFundsCarriedForwardYXYSKXVo.setMobile(finSelectedReceivablesDetailedVo.getCustomerPhone());
+            appFinFundsCarriedForwardYXYSKXVo.setReceivable(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney());
+            appFinFundsCarriedForwardYXYSKXVo.setConfirmMoney(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
+            appFinFundsCarriedForwardYXYSKXVo.setVin(finSelectedReceivablesDetailedVo.getVIN());
+            appFinFundsCarriedForwardYXYSKXVo.setConfirmDate(finSelectedReceivablesDetailedVo.getSubscriptionDate());
+            appFinFundsCarriedForwardYXYSKXVo.setReceivablesSid(finSelectedReceivablesDetailedVo.getReceivablesSid());
+            appFinFundsCarriedForwardYXYSKXVo.setPayType(finSelectedReceivablesDetailedVo.getPayType());
+            appFinFundsCarriedForwardYXYSKXVo.setPayTypeKey(finSelectedReceivablesDetailedVo.getPayTypeKey());
+            appFinFundsCarriedForwardYXYSKXVo.setUseOrgSid(finSelectedReceivablesDetailedVo.getUseOrgSid());
+            appFinFundsCarriedForwardYXYSKXVo.setSubscribedOf(finSelectedReceivablesDetailedVo.getSubscribedOf());
+            appFinFundsCarriedForwardYXYSKXVo.setSid(finSelectedReceivablesDetailedVo.getCollSid());
+            appFinFundsCarriedForwardYXYSKXVoList.add(appFinFundsCarriedForwardYXYSKXVo);
+        }
+        vo.setYxysFinFundsCarriedForwardYXYSKXVos(appFinFundsCarriedForwardYXYSKXVoList);
+        return rb.success().setData(vo);
+    }*/
+
     public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) {
         ResultBean rb = ResultBean.fireFail();
         List<String> busSids = finFundsCarriedForwardApplyInitQuery.getBusSids();
@@ -291,13 +347,18 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 finFundsCarriedForwardVehDetailsVo.setCustomerSid(finSelectedReceivablesDetailed.getCustomerSid());
                 finFundsCarriedForwardVehDetailsVo.setCustomerName(finSelectedReceivablesDetailed.getCustomerName());
                 finFundsCarriedForwardVehDetailsVo.setVinNo(finSelectedReceivablesDetailed.getVIN());
+                if (StringUtils.isBlank(finSelectedReceivablesDetailed.getBalance())) {
+                    finFundsCarriedForwardVehDetailsVo.setBalance(finSelectedReceivablesDetailed.getSubscriptionMoney().toString());
+                } else {
                     finFundsCarriedForwardVehDetailsVo.setBalance(finSelectedReceivablesDetailed.getBalance());
                 }
+            }
             finFundsCarriedForwardVehDetailsVos.add(finFundsCarriedForwardVehDetailsVo);
         }
         finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finCollectionConfirmation.getStaffDeptSid());
         finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finCollectionConfirmation.getStaffDeptName());
-        finFundsCarriedForwardApplyDetailsVo.setStaffSid(finCollectionConfirmation.getStaffUserSid());
+        SysUserVo sysUserVo1 = sysUserFeign.fetchBySid(finCollectionConfirmation.getStaffUserSid()).getData();
+        finFundsCarriedForwardApplyDetailsVo.setStaffSid(sysUserVo1.getStaffSid());
         finFundsCarriedForwardApplyDetailsVo.setStaffName(finCollectionConfirmation.getStaffName());
         finFundsCarriedForwardApplyDetailsVo.setSource(finFundsCarriedForwardApplyInitQuery.getSource());
         finFundsCarriedForwardApplyDetailsVo.setFinFundsCarriedForwardVehDetailsVos(finFundsCarriedForwardVehDetailsVos);
@@ -305,6 +366,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
         finFundsCarriedForwardApplyDetailsVo.setUseOrgSid(useOrgSid);
         finFundsCarriedForwardApplyDetailsVo.setUseOrgName(useOrgName);
+        finFundsCarriedForwardApplyDetailsVo.setOrgSidPath(finFundsCarriedForwardApplyInitQuery.getOrgSidPath());
         return rb.success().setData(finFundsCarriedForwardApplyDetailsVo);
     }
 
@@ -321,7 +383,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             String billNo = "";
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
             String date = DateUtil.format(DateUtil.date(), "yyyyMM");
-            billNo = "XSCKD" + sysOrganizationVo.getOrgCode() + date;
+            billNo = "KXJZ" + sysOrganizationVo.getOrgCode() + date;
             String i = baseMapper.selectNum(billNo);
             if (StringUtils.isNotBlank(i)) {
                 billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
@@ -329,7 +391,14 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 billNo = Rule.getBillNo(billNo, 0);
             }
             finFundsCarriedForwardApply.setBillNo(billNo);
+            Boolean isOneSale = dto.getIsOneSale();
+            if (isOneSale){
+                finFundsCarriedForwardApply.setNodeState("已办结");
+            }else {
                 finFundsCarriedForwardApply.setNodeState("待提交");
+            }
+            Long jzjehj = finFundsCarriedForwardVehDetailsVos.stream().collect(Collectors.summingLong(FinFundsCarriedForwardVehDto::getThisUseMoney));
+            finFundsCarriedForwardApply.setJzjehj(String.valueOf(jzjehj));
             save(finFundsCarriedForwardApply);
             for (String filePath : kxqrsImages) {
                 CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
@@ -430,6 +499,36 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         ResultBean rb = ResultBean.fireFail();
         //用户的组织全路径
         FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(dto.getSid());
+        List<FinFundsCarriedForwardVehDto> finFundsCarriedForwardVehDetailsVos = dto.getFinFundsCarriedForwardVehDetailsVos();
+        Long jzjehj = finFundsCarriedForwardVehDetailsVos.stream().collect(Collectors.summingLong(FinFundsCarriedForwardVehDto::getThisUseMoney));
+        List<AppFinFundsCarriedForwardYXYSKXDto> yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos();
+        Long rkje = yxysFinFundsCarriedForwardYXYSKXVos.stream().collect(Collectors.summingLong(AppFinFundsCarriedForwardYXYSKXDto::getConfirmMoney));
+        if (rkje < jzjehj) {
+            return rb.setMsg("认款金额不能小于填写的结转金额");
+        }
+        if ("已认款".equals(dto.getSource())) {
+            Boolean isOneSale = true;
+            for (FinFundsCarriedForwardVehDto finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
+                String busBillNo = finFundsCarriedForwardVehDetailsVo.getBusBillNo();
+                for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
+                    String contractId = yxysFinFundsCarriedForwardYXYSKXVo.getContractId();
+                    if (!busBillNo.equals(contractId)) {
+                        isOneSale = false;
+                        continue;
+                    }
+                }
+                if (!isOneSale) {
+                    continue;
+                }
+            }
+            if (isOneSale) {
+                String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), finFundsCarriedForwardApply.getCreateByName()).getData();
+                dto.setPdfPath(pdfPath);
+                dto.setIsOneSale(true);
+                saveOrUpdateAll(dto);
+                return rb.success();
+            }
+        }
         int r = submitBusinessDataPc(dto, finFundsCarriedForwardApply);
         if (r == 3) {
             return rb.setMsg("该申请不存在");
@@ -443,6 +542,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+        finFundsCarriedForwardApply = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -476,6 +576,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            updateYeBySid(businessSid);
             //极光推送
             finFundsCarriedForwardApply = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@@ -498,7 +599,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             bv.setTaskDefKey(finFundsCarriedForwardApply.getNodeSid());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
-            return complete(bv);
+            return completeTwo(bv);
         }
         return null;
     }
@@ -536,25 +637,47 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         return r;
     }
 
-    public ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(FinFundsApplyNodeQuery query) {
+    public ResultBean<List<FinFundsApplyNodeVo>> getPreviousNodesForReject(FinFundsApplyNodeQuery query) {
-        ResultBean<List<FinBillNodeVo>> rb = ResultBean.fireFail();
+        ResultBean<List<FinFundsApplyNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
         bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(query.getBusinessSid());
+        //判断发起人和销售专员是同一人
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(finFundsCarriedForwardApply.getCreateBySid()).getData();
+        if (sysUserVo.getStaffSid().equals(finFundsCarriedForwardApply.getStaffSid())) {
+            variables.put("isAdj", true);
+        } else {
+            variables.put("isAdj", false);
+        }
+        bv.setFormVariables(variables);
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
-        List<FinBillNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinBillNodeVo.class)).collect(Collectors.toList());
+        List<FinFundsApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinFundsApplyNodeVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
 
-    public ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(FinFundsApplyNodeQuery query) {
+    public ResultBean<List<FinFundsApplyNodeVo>> getNextNodesForSubmit(FinFundsApplyNodeQuery query) {
-        ResultBean<List<FinBillNodeVo>> rb = ResultBean.fireFail();
+        ResultBean<List<FinFundsApplyNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
         bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(query.getBusinessSid());
+        //判断发起人和销售专员是同一人
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(finFundsCarriedForwardApply.getCreateBySid()).getData();
+        if (sysUserVo.getStaffSid().equals(finFundsCarriedForwardApply.getStaffSid())) {
+            variables.put("isAdj", true);
+        } else {
+            variables.put("isAdj", false);
+        }
+        bv.setFormVariables(variables);
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
-        List<FinBillNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinBillNodeVo.class)).collect(Collectors.toList());
+        List<FinFundsApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinFundsApplyNodeVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
 
@@ -581,6 +704,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 appMap.put("sid", businessSid);
                 appMap.put("sourceStr", finFundsCarriedForwardApply.getSource());
                 variables.put("app", appMap);
+                //判断发起人和销售专员是同一人
+                SysUserVo sysUserVo = sysUserFeign.fetchBySid(finFundsCarriedForwardApply.getCreateBySid()).getData();
+                if (sysUserVo.getStaffSid().equals(finFundsCarriedForwardApply.getStaffSid())) {
+                    variables.put("isAdj", true);
+                } else {
+                    variables.put("isAdj", false);
+                }
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {
@@ -590,6 +720,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 Map<String, Object> map = BeanUtil.beanToMap(ufVo);
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
+                updateYeBySid(businessSid);
                 //极光推送
                 finFundsCarriedForwardApply = fetchBySid(businessSid);
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@@ -634,6 +765,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                     return rb.setMsg(resultBean.getMsg());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                updateYeBySid(query.getBusinessSid());
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -663,6 +795,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
+                updateYeBySid(query.getBusinessSid());
                 return rb.success().setData(resultBean.getData());
             } else {
                 if (businessTaskId.equals(query.getTaskId())) {
@@ -674,6 +807,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
+                    updateYeBySid(query.getBusinessSid());
                     return rb.success().setData(resultBean.getData());
                 }
             }
@@ -691,6 +825,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         appMap.put("sid", businessSid);
         appMap.put("sourceStr", finFundsCarriedForwardApply.getSource());
         variables.put("app", appMap);
+        //判断发起人和销售专员是同一人
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(finFundsCarriedForwardApply.getCreateBySid()).getData();
+        if (sysUserVo.getStaffSid().equals(finFundsCarriedForwardApply.getStaffSid())) {
+            variables.put("isAdj", true);
+        } else {
+            variables.put("isAdj", false);
+        }
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finFundsCarriedForwardApply.getOrgSidPath());
         if (bv.getTaskId().equals(finFundsCarriedForwardApply.getTaskId())) {
@@ -701,6 +842,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), finFundsCarriedForwardApply.getCreateByName()).getData();
+                baseMapper.updatePathBySid(pdfPath,businessSid);
+
             } else {
                 //极光推送
                 finFundsCarriedForwardApply = fetchBySid(businessSid);
@@ -723,4 +867,178 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         }
 
     }
+
+    public ResultBean completeTwo(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        String businessSid = bv.getBusinessSid();
+        FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(businessSid);
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        appMap.put("sourceStr", finFundsCarriedForwardApply.getSource());
+        variables.put("app", appMap);
+        //判断发起人和销售专员是同一人
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(finFundsCarriedForwardApply.getCreateBySid()).getData();
+        if (sysUserVo.getStaffSid().equals(finFundsCarriedForwardApply.getStaffSid())) {
+            variables.put("isAdj", true);
+        } else {
+            variables.put("isAdj", false);
+            SysUserVo userVo = sysUserFeign.selectByStaffsid(finFundsCarriedForwardApply.getStaffSid()).getData();
+            bv.setNextNodeUserSids(userVo.getSid());
+        }
+        bv.setFormVariables(variables);
+        bv.setOrgSidPath(finFundsCarriedForwardApply.getOrgSidPath());
+        if (bv.getTaskId().equals(finFundsCarriedForwardApply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            UpdateFlowFieldVo ufVo = resultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+            } else {
+                //极光推送
+                finFundsCarriedForwardApply = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                ufVo.setProcDefId(finFundsCarriedForwardApply.getProcDefId());
+                ufVo.setProcInsId(finFundsCarriedForwardApply.getProcInstSid());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("款项结转申请");
+                messageFlowableQuery.setMsgContent(finFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                messageFlowableQuery.setMsgTitle("款项结转申请");
+                messageFeign.pushMessage(messageFlowableQuery);
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+
+    }
+
+    private ResultBean updateYeBySid(String businessSid) {
+        ResultBean rb = ResultBean.fireFail();
+        //修改剩余金额
+        FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(businessSid);
+        List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = finFundsCarriedForwardVehService.fetchByMainSid(businessSid);
+        for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
+            //结转金额之和
+            String djjzMoney = finFundsCarriedForwardVehService.fetchDJSumMoneyByBusSid(finFundsCarriedForwardVehDetailsVo.getBusSid());
+            if (StringUtils.isBlank(djjzMoney)) {
+                djjzMoney = "0";
+            }
+            if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) {
+                FinCollectionConfirmation finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
+                //余额
+                BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
+                BigDecimal balance = collectionMoney.subtract(new BigDecimal(djjzMoney));
+                finCollectionConfirmationService.updateYeBySid(balance.toString(), finFundsCarriedForwardVehDetailsVo.getBusSid());
+                finFundsCarriedForwardVehService.updateYeByMainSid(balance.toString(), finFundsCarriedForwardVehDetailsVo.getSid());
+            } else if ("已认款".equals(finFundsCarriedForwardApply.getSource())) {
+                FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
+                //余额
+                BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
+                BigDecimal balance = subscriptionMoney.subtract(new BigDecimal(djjzMoney));
+                finSelectedReceivablesDetailedService.updateYeBySid(balance.toString(), finFundsCarriedForwardVehDetailsVo.getSid());
+                finFundsCarriedForwardVehService.updateYeByMainSid(balance.toString(), businessSid);
+            }
+        }
+        return rb.success();
+    }
+
+    public ResultBean<String> getFlowOperateTitle(FinFundsApplyNodeQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<FinFundsApplyNodeVo>> previousNodesForReject = getPreviousNodesForReject(query);
+            if (previousNodesForReject.getSuccess()) {
+                previousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = previousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(previousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<FinFundsApplyNodeVo>> nextNodesForSubmit = getNextNodesForSubmit(query);
+            if (nextNodesForSubmit.getSuccess()) {
+                nextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = nextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(nextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
+    public ResultBean<String> createPdf(String sid, String userName) {
+        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();
+        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_1nfy3ql".equals(taskDefKey)) {
+                        dataMap.put("spName", assigneeName + finishTime);
+                    }
+                }
+            }
+        }
+        List<ZC> zcList = new ArrayList<>();
+        List<ZR> zrList = new ArrayList<>();
+        for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
+            ZC zc = new ZC();
+            zc.setZc("转出");
+            zc.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo());
+            zc.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName());
+            zc.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo());
+            zc.setDcje(finFundsCarriedForwardVehDetailsVo.getThisUseMoney());
+            zc.setDcqye(finFundsCarriedForwardVehDetailsVo.getBalance());
+            zc.setDchye(new BigDecimal(finFundsCarriedForwardVehDetailsVo.getBalance()).subtract(new BigDecimal(finFundsCarriedForwardVehDetailsVo.getThisUseMoney())).toString());
+            zcList.add(zc);
+        }
+        for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
+            ZR zr = new ZR();
+            zr.setZr("转入");
+            zr.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
+            zr.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
+            zr.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
+            zr.setDrje(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney());
+            zrList.add(zr);
+        }
+        dataMap.put("saleDate", DateUtil.formatDate(new Date()));
+        dataMap.put("zcList", zcList);
+        dataMap.put("zrList", zrList);
+        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;
+        WordUtils.creatWord(dataMap, "kxjz", sourcePath, targetPath, typeName);
+        //新生成的word路径
+        String wordPath = targetPath + "\\" + typeName;
+        //生成出门证文件名
+        String pdfName = "款项结转_" + dateStr + seconds + ".pdf";
+        WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
+        return rb.success().setData("template/" + dateStr + "/" + pdfName);
+    }
 }

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

@@ -30,10 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo;
-import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehVo;
 
@@ -72,6 +69,9 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper<FinFundsCarr
 	@Delete("delete from fin_funds_carried_forward_veh where mainSid = #{dtoSid}")
     void deleteByMainSid(String dtoSid);
 
-	@Select("select * from fin_funds_carried_forward_veh where mainSid = #{dtoSid}")
+	@Select("select * from fin_funds_carried_forward_veh where mainSid = #{sid}")
 	List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSid(String sid);
+
+	@Update("update fin_funds_carried_forward_veh set balance = #{balance} where sid = #{sid}")
+	void updateYeByMainSid(@Param("balance") String balance,@Param("sid") String sid);
 }

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

@@ -25,7 +25,7 @@
                 ON fv.`mainSid` = fa.`sid`
                      LEFT JOIN fin_collection_confirmation fc
                 ON fv.`busSid` = fc.`sid`
-        WHERE fa.`nodeState` != "待提交" AND fa.`nodeState` != "终止"
+        WHERE fa.`nodeState` != "待提交" AND fa.`nodeState` != "终止" AND fa.`nodeState` != "发起申请" AND fv.busSid = #{busSid}
     </select>
 
     <select id="fetchSKSumMoneyByBusSid" resultType="java.lang.String">
@@ -35,6 +35,6 @@
                 ON fv.`mainSid` = fa.`sid`
                      LEFT JOIN fin_selected_receivables_detailed fd
                 ON fv.`busSid` = fd.`sid`
-        WHERE fa.`nodeState` != "待提交" AND fa.`nodeState` != "终止"
+        WHERE fa.`nodeState` != "待提交" AND fa.`nodeState` != "终止" AND fa.`nodeState` != "发起申请" AND fv.busSid = #{busSid}
     </select>
 </mapper>

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

@@ -26,8 +26,33 @@
 package com.yxt.anrui.fin.biz.finfundscarriedforwardveh;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
+import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFL;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderSourceLCVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDiscountListVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.common.base.utils.ConstantUtils;
+import com.yxt.common.base.utils.WordUtils;
+import com.yxt.messagecenter.api.message.Message;
+import com.yxt.messagecenter.api.messagelist.MessageList;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -43,7 +68,12 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh
 
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.util.*;
+
+import static java.util.Comparator.comparing;
 
 /**
  * Project: anrui-fin(款项结转申请) <br/>
@@ -123,4 +153,8 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService<FinFund
 	public List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSid(String sid) {
 		return baseMapper.fetchByMainSid(sid);
 	}
+
+	public void updateYeByMainSid(String balance, String sid) {
+		baseMapper.updateYeByMainSid(balance,sid);
+	}
 }

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

@@ -152,4 +152,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     List<FinSelectReceivablesDetailedVo> selectPageList(@Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
 
     IPage<FinSelectReceivablesDetailedWCKCLRKVo> noOutVehRecPageList(IPage<FinSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER)QueryWrapper<FinSelectReceivablesDetailedWCKCLRKVo> qw);
+
+    @Update("update fin_selected_receivables_detailed set balance = #{balance} where sid = #{busSid}")
+    void updateYeBySid(@Param("balance") String balance,@Param("busSid") String busSid);
 }

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

@@ -558,8 +558,15 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
             String useOrgSid = record.getUseOrgSid();
             String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
             record.setUseOrgName(useOrgName);
+            if (StringUtils.isBlank(record.getReveivableMoney())){
+                record.setReveivableMoney(record.getSubscriptionMoney());
+            }
         }
         PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public void updateYeBySid(String balance, String busSid) {
+        baseMapper.updateYeBySid(balance,busSid);
+    }
 }

工作内容需要的文档/单据模板/款项结转打印模板/款项结转（调账申请）.doc

@@ -0,0 +1,6 @@
+
+|调账申请                                                           |
+|${saleDate!}                                                       |
+|调账类|合同编号                  |客户 |物料编码                   |
+|型    |                          |名称 |                           |
+