Browse Source

款项结转模块开发

master
God 2 years ago
parent
commit
39bce4838a
  1. 83
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXDto.java
  2. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java
  3. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApply.java
  4. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java
  5. 8
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDto.java
  6. 41
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java
  7. 40
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java
  8. 54
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/flowable/FinFundsApplyCompleteDto.java
  9. 23
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/flowable/FinFundsApplyNodeQuery.java
  10. 45
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/flowable/FinFundsApplyTaskQuery.java
  11. 25
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/flowable/SubmitFinFundsApplyDto.java
  12. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDetailsVo.java
  13. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java
  14. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java
  15. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  16. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.java
  17. 31
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
  18. 59
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java
  19. 517
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  20. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java
  21. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java
  22. 1
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  23. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java

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

@ -0,0 +1,83 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(销售相关) <br/>
* File: FinCustomerBillDetailedDto.java <br/>
* Class: com.yxt.anrui.fin.api.fincustomerbilldetailed.FinCustomerBillDetailedDto <br/>
* Description: 客户账单明细表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-12 17:57:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "客户账单明细表 数据传输对象", description = "客户账单明细表 数据传输对象")
@Data
public class AppFinFundsCarriedForwardYXYSKXDto implements Dto {
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同号")
private String contractId;
@ApiModelProperty("客户名")
private String name;
@ApiModelProperty("应收项目")
private String projectName;
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("应收金额")
private String receivable;
@ApiModelProperty("认款金额")
private String confirmMoney;
private Boolean checked;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("认款日期")
private String confirmDate;
private String state;
private String sid;
@ApiModelProperty("应收未收sid")
private String receivablesSid;
@ApiModelProperty("付款方式value")
private String payType;
@ApiModelProperty("付款方式key:1全款、2贷款")
private String payTypeKey;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
private int subscribedOf;
}

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

@ -83,4 +83,6 @@ public class AppFinFundsCarriedForwardYXYSKXVo implements Dto {
@ApiModelProperty("使用组织sid")
private String useOrgSid;
private int subscribedOf;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid; // 采购系统sid
}

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

@ -84,5 +84,9 @@ public class FinFundsCarriedForwardApply extends BaseEntity {
private String taskId; // 任务id
@ApiModelProperty("申请编号")
private String billNo; // 申请编号
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid; // 采购系统sid
@ApiModelProperty("采购系统名称")
private String purchaseSystem; // 采购系统名称
}

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

@ -87,12 +87,16 @@ public class FinFundsCarriedForwardApplyDetailsVo implements Vo {
private String orgSidPath; // 组织全路径
@ApiModelProperty("申请编号")
private String billNo; // 申请编号
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid; // 采购系统sid
@ApiModelProperty("采购系统名称")
private String purchaseSystem; // 采购系统名称
@ApiModelProperty("款项确认书附件")
private List<String> kxqrsImages;
private List<String> kxqrsImages = new ArrayList<>();
@ApiModelProperty("款项结转车辆列表")
private List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = new ArrayList<>();
@ApiModelProperty("应收未收款项明细")
private List<AppFinFundsCarriedForwardYXYSKXVo> yswsFinFundsCarriedForwardYXYSKXVos = new ArrayList<>();
/* @ApiModelProperty("应收未收款项明细")
private List<AppFinFundsCarriedForwardYXYSKXVo> yswsFinFundsCarriedForwardYXYSKXVos = new ArrayList<>();*/
@ApiModelProperty("已选应收款项明细")
private List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = new ArrayList<>();
}

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

@ -82,6 +82,14 @@ public class FinFundsCarriedForwardApplyDto implements Dto {
private String orgSidPath; // 组织全路径
@ApiModelProperty("申请编号")
private String billNo; // 申请编号
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid; // 采购系统sid
@ApiModelProperty("采购系统名称")
private String purchaseSystem; // 采购系统名称
@ApiModelProperty("款项确认书附件")
private List<String> kxqrsImages = new ArrayList<>();
@ApiModelProperty("款项结转车辆列表")
private List<FinFundsCarriedForwardVehDto> finFundsCarriedForwardVehDetailsVos = new ArrayList<>();
@ApiModelProperty("已选应收款项明细")
private List<AppFinFundsCarriedForwardYXYSKXDto> yxysFinFundsCarriedForwardYXYSKXVos = new ArrayList<>();
}

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

@ -25,14 +25,25 @@
*********************************************************/
package com.yxt.anrui.fin.api.finfundscarriedforwardapply;
import com.yxt.anrui.fin.api.finbillapplication.SubmitFinBillApplicationDto;
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.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;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
@ -80,4 +91,34 @@ public interface FinFundsCarriedForwardApplyFeign {
@PostMapping("/init")
@ResponseBody
public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(@RequestBody FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery);
/****************************************************审批流程*****************************************************/
@ApiOperation("款项结转审批流程")
@PostMapping("/submitFinFundsApply")
public ResultBean submitFinFundsApply(@RequestBody @Valid SubmitFinFundsApplyDto dto);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody FinFundsApplyCompleteDto query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap FinFundsApplyNodeQuery query);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap FinFundsApplyNodeQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody FinFundsApplyTaskQuery query);
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody FinFundsApplyTaskQuery query);
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody FinFundsApplyTaskQuery query);
}

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

@ -25,6 +25,11 @@
*********************************************************/
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.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;
@ -74,4 +79,39 @@ public class FinFundsCarriedForwardApplyFeignFallback implements FinFundsCarried
public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) {
return null;
}
@Override
public ResultBean submitFinFundsApply(SubmitFinFundsApplyDto dto) {
return null;
}
@Override
public ResultBean complete(FinFundsApplyCompleteDto query) {
return null;
}
@Override
public ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(FinFundsApplyNodeQuery query) {
return null;
}
@Override
public ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(FinFundsApplyNodeQuery query) {
return null;
}
@Override
public ResultBean reject(FinFundsApplyTaskQuery query) {
return null;
}
@Override
public ResultBean revokeProcess(FinFundsApplyTaskQuery query) {
return null;
}
@Override
public ResultBean breakProcess(FinFundsApplyTaskQuery query) {
return null;
}
}

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

@ -0,0 +1,54 @@
package com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable;
import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/9/6 14:57
* @Description
*/
@Data
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")
@NotBlank(message = "参数错误:instanceId")
private String instanceId;
@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<>();
}

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

@ -0,0 +1,23 @@
package com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:04
* @Description
*/
@Data
public class FinFundsApplyNodeQuery implements Query {
private static final long serialVersionUID = 9117613683840483366L;
@ApiModelProperty(value = "环节定义id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
}

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

@ -0,0 +1,45 @@
package com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:06
* @Description
*/
@Data
public class FinFundsApplyTaskQuery implements Query {
private static final long serialVersionUID = 1288615499873178778L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
private String instanceId;
}

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

@ -0,0 +1,25 @@
package com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liuguohui
* @version 1.0
* @description
* @date 2022/04/13
*/
@ApiModel("提交")
@Data
public class SubmitFinFundsApplyDto extends FinFundsCarriedForwardApplyDto {
@ApiModelProperty("意见")
private String comment;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

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

@ -51,8 +51,6 @@ public class FinFundsCarriedForwardVehDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
@ApiModelProperty("业务编号")

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

@ -51,8 +51,6 @@ public class FinFundsCarriedForwardVehDto implements Dto {
private String sid; // sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
@ApiModelProperty("业务编号")
@ -71,5 +69,4 @@ public class FinFundsCarriedForwardVehDto implements Dto {
private String balance; // 剩余金额
@ApiModelProperty("本次使用金额")
private String thisUseMoney; // 本次使用金额
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java

@ -56,4 +56,6 @@ public class AppFinUncollectedReceivablesDetailedVo implements Vo {
@ApiModelProperty("应收未收sid")
private String receivablesSid;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
}

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

@ -1069,6 +1069,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (collList.isEmpty()) {
collList = finSelectedReceivablesDetailedService.getPaymentList(qw, "");
for (AppFinUncollectedReceivablesDetailedVo record : collList) {
record.setPurchaseSystemSid(pagerQuery.getParams().getPurchaseSystemSid());
record.setReceivablesSid(record.getSid());
record.setSubscribedOf(0);
record.setConfirmDate(dateFormat.format(new Date()));
@ -1095,6 +1096,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
} else {
for (AppFinUncollectedReceivablesDetailedVo record : collList) {
record.setPurchaseSystemSid(pagerQuery.getParams().getPurchaseSystemSid());
record.setReceivablesSid(record.getSid());
record.setSubscribedOf(0);
record.setConfirmDate(dateFormat.format(new Date()));

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

@ -36,6 +36,7 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardA
import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApplyVo;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-fin(款项结转申请) <br/>
@ -62,4 +63,10 @@ public interface FinFundsCarriedForwardApplyMapper extends BaseMapper<FinFundsCa
@Select("select * from fin_funds_carried_forward_apply")
List<FinFundsCarriedForwardApplyVo> selectListVo();
String selectNum(String billNo);
int selectBySid(String join);
int updateFlowFiled(Map<String, Object> map);
}

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

@ -33,4 +33,35 @@
${ew.sqlSegment}
</where>
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT(billNo, 4)
from fin_funds_carried_forward_apply
where billNo LIKE concat(#{billNo}, '%')
order by billNo desc
limit 1
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM fin_funds_carried_forward_apply
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
<update id="updateFlowFiled">
UPDATE fin_funds_carried_forward_apply
SET nodeState=#{nodeState}
, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid = #{sid}
</update>
</mapper>

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

@ -25,7 +25,15 @@
*********************************************************/
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.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;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -71,31 +79,64 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody FinFundsCarriedForwardApplyDto dto){
ResultBean rb = ResultBean.fireFail();
finFundsCarriedForwardApplyService.saveOrUpdateDto(dto);
return rb.success();
return finFundsCarriedForwardApplyService.saveOrUpdateAll(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
finFundsCarriedForwardApplyService.delBySids(sids);
return rb.success();
return finFundsCarriedForwardApplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<FinFundsCarriedForwardApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
FinFundsCarriedForwardApplyDetailsVo vo = finFundsCarriedForwardApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
return finFundsCarriedForwardApplyService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean<FinFundsCarriedForwardApplyDetailsVo> init(FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery) {
return finFundsCarriedForwardApplyService.init(finFundsCarriedForwardApplyInitQuery);
}
@Override
public ResultBean submitFinFundsApply(SubmitFinFundsApplyDto dto) {
return finFundsCarriedForwardApplyService.submitFinFundsApply(dto);
}
@Override
public ResultBean complete(FinFundsApplyCompleteDto query) {
BusinessVariables bv=new BusinessVariables();
BeanUtil.copyProperties(query,bv);
bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
bv.setFormVariables(BeanUtil.beanToMap(query));
return finFundsCarriedForwardApplyService.complete(bv);
}
@Override
public ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(FinFundsApplyNodeQuery query) {
return finFundsCarriedForwardApplyService.getPreviousNodesForReject(query);
}
@Override
public ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(FinFundsApplyNodeQuery query) {
return finFundsCarriedForwardApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean reject(FinFundsApplyTaskQuery query) {
return finFundsCarriedForwardApplyService.reject(query);
}
@Override
public ResultBean revokeProcess(FinFundsApplyTaskQuery query) {
return finFundsCarriedForwardApplyService.revokeProcess(query);
}
@Override
public ResultBean breakProcess(FinFundsApplyTaskQuery query) {
return finFundsCarriedForwardApplyService.breakProcess(query);
}
}

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

@ -27,21 +27,59 @@ package com.yxt.anrui.fin.biz.finfundscarriedforwardapply;
import cn.hutool.core.bean.BeanUtil;
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.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;
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.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.PagerUtil;
@ -52,9 +90,9 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: anrui-fin(款项结转申请) <br/>
@ -82,6 +120,18 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
private FinCollectionConfirmationService finCollectionConfirmationService;
@Autowired
private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService;
@Autowired
private FinFundsCarriedForwardVehService finFundsCarriedForwardVehService;
@Autowired
private CommonAppendixFeign commonAppendixFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private MessageFeign messageFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
public PagerVo<FinFundsCarriedForwardApplyVo> listPageVo(PagerQuery<FinFundsCarriedForwardApplyQuery> pq) {
FinFundsCarriedForwardApplyQuery query = pq.getParams();
@ -137,6 +187,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (bacva.createTime,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(applyEndDate), "date_format (bacva.createTime,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
);
qw.groupBy("fa.sid");
IPage<FinFundsCarriedForwardApply> page = PagerUtil.queryToPage(pq);
IPage<FinFundsCarriedForwardApplyVo> pagging = baseMapper.selectPageVo(page, qw, query.getJzSmallMoney(), query.getJzBigMoney());
PagerVo<FinFundsCarriedForwardApplyVo> p = PagerUtil.pageToVo(pagging, null);
@ -168,11 +219,47 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
baseMapper.updateById(entity);
}
public FinFundsCarriedForwardApplyDetailsVo fetchDetailsVoBySid(String sid) {
public ResultBean<FinFundsCarriedForwardApplyDetailsVo> fetchDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
FinFundsCarriedForwardApply entity = fetchBySid(sid);
FinFundsCarriedForwardApplyDetailsVo vo = new FinFundsCarriedForwardApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
vo.setCreateByDate(DateUtil.formatDate(entity.getCreateTime()));
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) {
@ -192,12 +279,12 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
for (String busSid : busSids) {
FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo = new FinFundsCarriedForwardVehDetailsVo();
finFundsCarriedForwardVehDetailsVo.setBusSid(busSid);
if ("简易订单订金".equals(finFundsCarriedForwardApplyInitQuery.getSource())){
if ("简易订单订金".equals(finFundsCarriedForwardApplyInitQuery.getSource())) {
finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(busSid);
finFundsCarriedForwardVehDetailsVo.setBusBillNo(finCollectionConfirmation.getBillNo());
finFundsCarriedForwardVehDetailsVo.setCustomerName(finCollectionConfirmation.getPayerName());
finFundsCarriedForwardVehDetailsVo.setBalance(finCollectionConfirmation.getBalance().toString());
}else if ("已认款".equals(finFundsCarriedForwardApplyInitQuery.getSource())){
} else if ("已认款".equals(finFundsCarriedForwardApplyInitQuery.getSource())) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(busSid);
finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(finSelectedReceivablesDetailed.getCollSid());
finFundsCarriedForwardVehDetailsVo.setBusBillNo(finSelectedReceivablesDetailed.getContractNo());
@ -220,4 +307,420 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
finFundsCarriedForwardApplyDetailsVo.setUseOrgName(useOrgName);
return rb.success().setData(finFundsCarriedForwardApplyDetailsVo);
}
public ResultBean<String> saveOrUpdateAll(FinFundsCarriedForwardApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<String> kxqrsImages = dto.getKxqrsImages();
List<FinFundsCarriedForwardVehDto> finFundsCarriedForwardVehDetailsVos = dto.getFinFundsCarriedForwardVehDetailsVos();
List<AppFinFundsCarriedForwardYXYSKXDto> yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos();
if (StringUtils.isBlank(dtoSid)) {//新增
FinFundsCarriedForwardApply finFundsCarriedForwardApply = new FinFundsCarriedForwardApply();
BeanUtil.copyProperties(dto, finFundsCarriedForwardApply, "sid");
//生成单据编号
String billNo = "";
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
billNo = "XSCKD" + sysOrganizationVo.getOrgCode() + date;
String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(billNo, 0);
}
finFundsCarriedForwardApply.setBillNo(billNo);
finFundsCarriedForwardApply.setNodeState("待提交");
save(finFundsCarriedForwardApply);
for (String filePath : kxqrsImages) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
commonAppendixDto.setLinkSid(finFundsCarriedForwardApply.getSid());
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(filePath);
commonAppendixFeign.save(commonAppendixDto);
}
for (FinFundsCarriedForwardVehDto finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
FinFundsCarriedForwardVeh finFundsCarriedForwardVeh = new FinFundsCarriedForwardVeh();
BeanUtil.copyProperties(finFundsCarriedForwardVehDetailsVo, finFundsCarriedForwardVeh, "sid");
finFundsCarriedForwardVeh.setMainSid(finFundsCarriedForwardApply.getSid());
finFundsCarriedForwardVehService.save(finFundsCarriedForwardVeh);
}
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
finSelectedReceivablesDetailed.setContractSid(yxysFinFundsCarriedForwardYXYSKXVo.getContractSid());
finSelectedReceivablesDetailed.setContractNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
finSelectedReceivablesDetailed.setCustomerName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
finSelectedReceivablesDetailed.setCustomerSid(yxysFinFundsCarriedForwardYXYSKXVo.getCustomerSid());
finSelectedReceivablesDetailed.setReceivablesName(yxysFinFundsCarriedForwardYXYSKXVo.getProjectName());
finSelectedReceivablesDetailed.setCustomerPhone(yxysFinFundsCarriedForwardYXYSKXVo.getMobile());
finSelectedReceivablesDetailed.setCurrentReceivableMoney(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getReceivable()));
finSelectedReceivablesDetailed.setSubscriptionMoney(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
finSelectedReceivablesDetailed.setVIN(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
finSelectedReceivablesDetailed.setSubscriptionDate(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmDate());
finSelectedReceivablesDetailed.setReceivablesSid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
finSelectedReceivablesDetailed.setPayType(yxysFinFundsCarriedForwardYXYSKXVo.getPayType());
finSelectedReceivablesDetailed.setPayTypeKey(yxysFinFundsCarriedForwardYXYSKXVo.getPayTypeKey());
finSelectedReceivablesDetailed.setUseOrgSid(yxysFinFundsCarriedForwardYXYSKXVo.getUseOrgSid());
finSelectedReceivablesDetailed.setSubscribedOf(yxysFinFundsCarriedForwardYXYSKXVo.getSubscribedOf());
finSelectedReceivablesDetailed.setCollSid(finFundsCarriedForwardApply.getSid());
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
}
return rb.success().setData(finFundsCarriedForwardApply.getSid());
}
updateByDto(dto);
commonAppendixFeign.deleteFiles(dtoSid);
for (String filePath : kxqrsImages) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
commonAppendixDto.setLinkSid(dtoSid);
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setFilePath(filePath);
commonAppendixFeign.save(commonAppendixDto);
}
finFundsCarriedForwardVehService.deleteByMainSid(dtoSid);
for (FinFundsCarriedForwardVehDto finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
FinFundsCarriedForwardVeh finFundsCarriedForwardVeh = new FinFundsCarriedForwardVeh();
BeanUtil.copyProperties(finFundsCarriedForwardVehDetailsVo, finFundsCarriedForwardVeh, "sid");
finFundsCarriedForwardVeh.setMainSid(dtoSid);
finFundsCarriedForwardVehService.save(finFundsCarriedForwardVeh);
}
finSelectedReceivablesDetailedService.deleteByCollSid(dtoSid);
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
finSelectedReceivablesDetailed.setContractSid(yxysFinFundsCarriedForwardYXYSKXVo.getContractSid());
finSelectedReceivablesDetailed.setContractNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
finSelectedReceivablesDetailed.setCustomerName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
finSelectedReceivablesDetailed.setCustomerSid(yxysFinFundsCarriedForwardYXYSKXVo.getCustomerSid());
finSelectedReceivablesDetailed.setReceivablesName(yxysFinFundsCarriedForwardYXYSKXVo.getProjectName());
finSelectedReceivablesDetailed.setCustomerPhone(yxysFinFundsCarriedForwardYXYSKXVo.getMobile());
finSelectedReceivablesDetailed.setCurrentReceivableMoney(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getReceivable()));
finSelectedReceivablesDetailed.setSubscriptionMoney(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
finSelectedReceivablesDetailed.setVIN(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
finSelectedReceivablesDetailed.setSubscriptionDate(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmDate());
finSelectedReceivablesDetailed.setReceivablesSid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
finSelectedReceivablesDetailed.setPayType(yxysFinFundsCarriedForwardYXYSKXVo.getPayType());
finSelectedReceivablesDetailed.setPayTypeKey(yxysFinFundsCarriedForwardYXYSKXVo.getPayTypeKey());
finSelectedReceivablesDetailed.setUseOrgSid(yxysFinFundsCarriedForwardYXYSKXVo.getUseOrgSid());
finSelectedReceivablesDetailed.setSubscribedOf(yxysFinFundsCarriedForwardYXYSKXVo.getSubscribedOf());
finSelectedReceivablesDetailed.setCollSid(dtoSid);
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
}
return rb.success().setData(dtoSid);
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("删除的数据中包含已经提交审批的数据,删除失败");
}
delBySids(sids);
for (String sid : sids) {
commonAppendixFeign.deleteFiles(sid);
finFundsCarriedForwardVehService.deleteByMainSid(sid);
finSelectedReceivablesDetailedService.deleteByCollSid(sid);
}
return rb.success().setMsg("删除成功");
}
public ResultBean submitFinFundsApply(SubmitFinFundsApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
//用户的组织全路径
FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(dto.getSid());
int r = submitBusinessDataPc(dto, finFundsCarriedForwardApply);
if (r == 3) {
return rb.setMsg("该申请不存在");
}
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
//新增修改保存
ResultBean<String> resultBean = saveOrUpdateAll(dto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
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());
}
//用户的部门全路径sid
bv.setOrgSidPath(dto.getOrgSidPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getCreateBySid());
//流程定义id
bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
bv.setFormVariables(variables);
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());
}
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
finFundsCarriedForwardApply = fetchBySid(businessSid);
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(finFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("款项结转申请");
messageFeign.pushMessage(messageFlowableQuery);
return voResultBean;
}
if (r == 2) {
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
bv.setTaskId(finFundsCarriedForwardApply.getTaskId());
bv.setTaskDefKey(finFundsCarriedForwardApply.getNodeSid());
bv.setComment("重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
}
return null;
}
/**
* 更新流程相关的状态
*
* @param map
* @return
*/
private int updateFlowFiled(Map<String, Object> map) {
return baseMapper.updateFlowFiled(map);
}
private int submitBusinessDataPc(SubmitFinFundsApplyDto dto, FinFundsCarriedForwardApply finFundsCarriedForwardApply) {
int r = 0;
if (StringUtils.isBlank(dto.getSid())) {
r = 1;
} else {
if (finFundsCarriedForwardApply != null) {
String businessTaskId = finFundsCarriedForwardApply.getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交
r = 1;
} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
//二次提交//只有数据一致的时候才能进行下一步
r = 2;
}
} else {
r = 3;
}
}
return r;
}
public ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(FinFundsApplyNodeQuery query) {
ResultBean<List<FinBillNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
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());
return rb.success().setData(voList);
}
public ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(FinFundsApplyNodeQuery query) {
ResultBean<List<FinBillNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
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());
return rb.success().setData(voList);
}
public ResultBean reject(FinFundsApplyTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
String businessSid = query.getBusinessSid();
FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(businessSid);
if (finFundsCarriedForwardApply == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = finFundsCarriedForwardApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见");
}
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
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);
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
finFundsCarriedForwardApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = finFundsCarriedForwardApply.getProcInstSid();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(finFundsCarriedForwardApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("款项结转申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(finFundsCarriedForwardApply.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(finFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("款项结转申请");
messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean revokeProcess(FinFundsApplyTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(query.getBusinessSid());
String businessTaskId = finFundsCarriedForwardApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败,提交的数据不一致!");
}
public ResultBean breakProcess(FinFundsApplyTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见");
}
FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(query.getBusinessSid());
String businessTaskId = finFundsCarriedForwardApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if(query.getUserSid().equals(finFundsCarriedForwardApply.getCreateBySid())){
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
return rb.success().setData(resultBean.getData());
}else{
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
return rb.success().setData(resultBean.getData());
}
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean complete(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);
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("操作失败!提交的数据不一致");
}
}
}

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

@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -66,4 +68,10 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper<FinFundsCarr
String fetchDJSumMoneyByBusSid(String busSid);
String fetchSKSumMoneyByBusSid(String busSid);
@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}")
List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSid(String sid);
}

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

@ -115,4 +115,12 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService<FinFund
public String fetchSKSumMoneyByBusSid(String busSid) {
return baseMapper.fetchSKSumMoneyByBusSid(busSid);
}
public void deleteByMainSid(String dtoSid) {
baseMapper.deleteByMainSid(dtoSid);
}
public List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSid(String sid) {
return baseMapper.fetchByMainSid(sid);
}
}

1
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -50,6 +50,7 @@ public enum ProcDefEnum {
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_ncifet6k:4:1747504"),
BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),
BASETRAILEROUTAPPLY("挂车出库申请", "process_tkw6vhfw:1:1705004"),
FINFUNDSAPPLY("款项结转申请", "process_ypafrrvg:1:2257504"),
BUSHANDOVER("交车确认", "process_e8feloik:5:1747508"),

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java

@ -47,4 +47,7 @@ public class UncollectedReceivablesDetailedVo implements Vo {
@ApiModelProperty("是否是已认款的选择:0不是(应收未收),1是(已认款)")
private int subscribedOf;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
}

Loading…
Cancel
Save