Browse Source

欠款提车接口

master
hp 3 years ago
parent
commit
9336592833
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java
  2. 13
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoQuery.java
  3. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java
  4. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java
  5. 16
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListDto.java
  6. 16
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java
  7. 13
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java
  8. 44
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java
  9. 45
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java
  10. 41
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java
  11. 23
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java
  12. 64
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java
  13. 70
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
  14. 59
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java
  15. 43
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppAdvanceArrearsTaskQuery.java
  16. 35
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java
  17. 17
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java
  18. 11
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java
  19. 22
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeVo.java
  20. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java
  21. 9
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java
  22. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
  23. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java
  24. 39
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml
  25. 70
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java
  26. 582
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  27. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java
  28. 7
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  29. 14
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoQuery.java
  30. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
  31. 53
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java
  32. 13
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java
  33. 55
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java
  34. 22
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java
  35. 76
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java
  36. 56
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java
  37. 22
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListDto.java
  38. 24
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java
  39. 48
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java
  40. 21
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsQuery.java
  41. 43
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsTakeCarQuery.java
  42. 32
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/CompleteArrearsTakeCarDto.java
  43. 17
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/SubmitArrearsTakeCarDto.java
  44. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java
  45. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageQuery.java
  46. 65
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java
  47. 193
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java
  48. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java
  49. 12
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java

@ -46,6 +46,8 @@ public class CommonContractVo implements Vo {
private String partyA;
@ApiModelProperty("乙方名称")
private String partyB;
@ApiModelProperty("车型Sid")
private String modelSid;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("台数")

13
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoQuery.java

@ -0,0 +1,13 @@
package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppAdvanceInvoiceInfoQuery implements Query {
private static final long serialVersionUID = -4420699298916976735L;
@ApiModelProperty("申请sid")
private String contractSid;
}

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java

@ -32,6 +32,7 @@ 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;
@ -99,9 +100,9 @@ public interface BusAdvanceGinvoiceapplyFeign {
ResultBean<PagerVo<AppAdvanceInvoicePageVo>> getAdvanceInvoiceList(@RequestBody PagerQuery<AppAdvanceInvoicePageQuery> pagerQuery);
@ApiOperation("手机端-初始化提前开票申请")
@GetMapping("/initAdvanceInvoice/{contractSid}")
@GetMapping("/initAdvanceInvoice")
@ResponseBody
public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(@PathVariable("contractSid") String contractSid);
public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(@SpringQueryMap AppAdvanceInvoiceInfoQuery query);
@ApiOperation("移动端-新增提前开票申请")
@PostMapping("/addAdvanceInvoice")
@ -114,9 +115,9 @@ public interface BusAdvanceGinvoiceapplyFeign {
public ResultBean saveAdvanceInvoice(@Valid @RequestBody AppAdvanceInvoiceDto dto);
@ApiOperation("手机端-删除提前开票")
@DeleteMapping("/deleteAdvanceInvoice/{contractSid}")
@DeleteMapping("/deleteAdvanceInvoice")
@ResponseBody
public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid);
public ResultBean deleteAdvanceInvoice(@SpringQueryMap AppAdvanceInvoiceInfoQuery query);
/*************************************************APP提前开票流程接口***************************************************/

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java

@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.*;
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.SpringQueryMap;
import org.springframework.stereotype.Component;
import java.util.List;
@ -87,7 +88,7 @@ public class BusAdvanceGinvoiceapplyFeignFallback implements BusAdvanceGinvoicea
}
@Override
public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) {
return null;
}
@ -102,7 +103,7 @@ public class BusAdvanceGinvoiceapplyFeignFallback implements BusAdvanceGinvoicea
}
@Override
public ResultBean deleteAdvanceInvoice(String contractSid) {
public ResultBean deleteAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) {
return null;
}

16
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListDto.java

@ -0,0 +1,16 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AdCarListDto implements Dto {
private static final long serialVersionUID = -1495695891564098295L;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("成交价")
private String price;
@ApiModelProperty("备注")
private String remarks;
}

16
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java

@ -0,0 +1,16 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AdCarListVo implements Vo {
private static final long serialVersionUID = -1495695891564098295L;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("成交价")
private String price;
@ApiModelProperty("备注")
private String remarks;
}

13
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java

@ -0,0 +1,13 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppAdvanceArrearsInfoQuery implements Query {
private static final long serialVersionUID = -9121199885742205263L;
@ApiModelProperty("申请sid")
private String contractSid;
}

44
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java

@ -0,0 +1,44 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class AppArrearsCarryDto implements Dto {
private static final long serialVersionUID = -1972581222399264301L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同id")
private String contractNo;
@ApiModelProperty("收款金额")
private String contractCollectionMoney;
@ApiModelProperty("合同金额")
private String contractMoney;
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("客户")
private String customerName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("回款日期")
private String commitmentMoneyDate;
@ApiModelProperty("欠款金额")
private String arrearsMoney;
@ApiModelProperty("欠款提车原因")
private String reason;
@ApiModelProperty("选择车辆列表")
private List<AdCarListDto> carList = new ArrayList<>();
@ApiModelProperty("所有车辆列表")
private List<AdCarListDto> vinList = new ArrayList<>();
@ApiModelProperty("流程实列id")
private String procInsId;
@ApiModelProperty("用户sid")
private String taskId;
}

45
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java

@ -0,0 +1,45 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class AppArrearsCarryInfoVo implements Vo {
private static final long serialVersionUID = -3423056894840667092L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同id")
private String contractNo;
@ApiModelProperty("收款金额")
private String contractCollectionMoney;
@ApiModelProperty("合同金额")
private String contractMoney;
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("客户")
private String customerName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("回款日期")
private String commitmentMoneyDate;
@ApiModelProperty("欠款金额")
private String arrearsMoney;
@ApiModelProperty("欠款提车原因")
private String reason;
@ApiModelProperty("选择车辆列表")
private List<AdCarListVo> carList = new ArrayList<>();
@ApiModelProperty("所有车辆列表")
private List<AdCarListVo> vinList = new ArrayList<>();
@ApiModelProperty("流程实列id")
private String procInsId;
@ApiModelProperty("用户sid")
private String taskId;
}

41
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java

@ -11,33 +11,28 @@ import java.math.BigDecimal;
@Data
public class AppArrearsCarryVehiclePageVo implements Vo {
@ApiModelProperty("车辆sid")
private String vehicleSid;
@ApiModelProperty("车架号")
@JsonProperty("VINNo")
private String VINNo;
private static final long serialVersionUID = -4031129440179580368L;
@ApiModelProperty("合同sid")
private String sid;
@ApiModelProperty("合同状态")
private String nodeState;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("车型Sid")
private String modelSid;
@ApiModelProperty("成交价")
private BigDecimal dealMoney;
@ApiModelProperty("申请日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("欠款金额")
private String arrearsMoney;
@ApiModelProperty("回款日期")
private String commitmentMoneyDate;
@ApiModelProperty("申请人")
private String applyName;
@ApiModelProperty("申请时间")
private String applyDate;
@ApiModelProperty("是否显示办理")
private boolean showUpdateBtn;
@ApiModelProperty("是否显示删除")
private boolean showDeleteBtn;
}

23
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVinDto.java

@ -0,0 +1,23 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AppArrearsCarryVinDto implements Dto {
private static final long serialVersionUID = 4571956522478600189L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("车架号集合")
private List<String> vinList;
@ApiModelProperty("合同sid")
private String contractSid;
}

64
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java

@ -27,43 +27,57 @@ import java.math.BigDecimal;
public class BusArrearsCarryVehicleApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("客户名称")
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("车型sid")
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车型名称")
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("合同编号")
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("合同总金额")
@ApiModelProperty("合同总金额")
private BigDecimal contractMoney;
@ApiModelProperty("合同收款金额")
@ApiModelProperty("合同收款金额")
private BigDecimal contractCollectionMoney;
@ApiModelProperty("欠款金额")
@ApiModelProperty("欠款金额")
private BigDecimal arrearsMoney;
@ApiModelProperty("承诺回款日期")
@ApiModelProperty("承诺回款日期")
private String commitmentMoneyDate;
@ApiModelProperty("申请日期")
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("申请人")
@ApiModelProperty("申请人")
private String applyName;
@ApiModelProperty("欠款提车原因")
@ApiModelProperty("欠款提车原因")
private String reason;
@ApiModelProperty("累计欠款金额")
@ApiModelProperty("累计欠款金额")
private BigDecimal cumulativeArrearsMoney;
@ApiModelProperty("流程状态")
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty(value = "节点状态")
private String nodeState;
@ApiModelProperty(value = "节点id")
private String nodeId;
@ApiModelProperty(value = "流程id")
private String procDefId;
@ApiModelProperty(value = "实例id")
private String procInstId;
@ApiModelProperty(value = "任务id")
private String taskId;
}

70
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@ -1,11 +1,17 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceDto;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceVinDto;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
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;
@ -28,7 +34,7 @@ import java.util.List;
@FeignClient(
contextId = "anrui-buscenter-BusArrearsCarryVehicleApply",
name = "anrui-buscenter",
path = "busarrearscarryvehicleapply",
path = "v1/busarrearscarryvehicleapply",
fallback = BusArrearsCarryVehicleApplyFeignFallback.class)
public interface BusArrearsCarryVehicleApplyFeign {
@ -68,13 +74,71 @@ public interface BusArrearsCarryVehicleApplyFeign {
@PostMapping("/saveArrearsAppendix")
public ResultBean saveArrearsAppendix(@RequestBody List<ArrearsAppendixDto> dto);
/********************************App接口************************************/
@ApiOperation("手机端-获取欠款提车列表")
@PostMapping("/getArrearsTakeCarList")
@ResponseBody
ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> getArrearsTakeCarList(@RequestBody PagerQuery<AppArrearsCarryVehicleQuery> pagerQuery);
@ApiOperation("手机端-初始化欠款提车申请")
@GetMapping("/initArrearsApply")
@ResponseBody
public ResultBean<AppArrearsCarryInfoVo> initArrearsApply(@SpringQueryMap AppAdvanceArrearsInfoQuery query);
@ApiOperation("移动端-新增欠款提车申请")
@PostMapping("/addArrearsApply")
@ResponseBody
public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto);
@ApiOperation("移动端-保存欠款提车申请")
@PostMapping("/saveArrearsApply")
@ResponseBody
public ResultBean saveArrearsApply(@Valid @RequestBody AppArrearsCarryDto dto);
@ApiOperation("手机端-删除欠款提车")
@GetMapping("/deleteArrearsTakeCar/{contractSid}")
@GetMapping("/deleteArrearsTakeCar")
@ResponseBody
public ResultBean deleteArrearsTakeCar(@SpringQueryMap AppAdvanceArrearsInfoQuery query);
@ApiOperation("提交流程")
@PostMapping("/submitAdvanceArrearsInfo")
@ResponseBody
ResultBean submitAdvanceArrearsInfo(@RequestBody AppSubmitAdvanceArrearsDto dto);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
@ResponseBody
public ResultBean complete(@Valid @RequestBody AppCompleteAdvanceArrearsDto query);
@ApiOperation(value = "办理(同意)")
@PostMapping("/InitiatorToAnswerInfo")
@ResponseBody
public ResultBean InitiatorToAnswerInfo(@Valid @RequestBody AppCompleteAdvanceArrearsDto query);
@ApiOperation(value = "获取上一个环节")
@PostMapping(value = "/getPreviousNodesForReject")
@ResponseBody
ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @RequestBody GetNodeQuery query);
@ApiOperation(value = "获取下一个环节")
@PostMapping(value = "/getNextNodesForSubmit")
@ResponseBody
ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
@ResponseBody
public ResultBean taskReject(@Valid @RequestBody AppAdvanceArrearsTaskQuery query);
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
@ResponseBody
public ResultBean revokeProcess(@Valid @RequestBody AppAdvanceArrearsTaskQuery query);
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
@ResponseBody
public ResultBean deleteArrearsTakeCar(@PathVariable("contractSid") String contractSid);
public ResultBean breakProcess(@Valid @RequestBody AppAdvanceArrearsTaskQuery query);
}

59
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@ -1,5 +1,7 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -75,9 +77,64 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry
return null;
}
@Override
public ResultBean<AppArrearsCarryInfoVo> initArrearsApply(AppAdvanceArrearsInfoQuery query) {
return null;
}
@Override
public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
return null;
}
@Override
public ResultBean saveArrearsApply(AppArrearsCarryDto dto) {
return null;
}
@Override
public ResultBean deleteArrearsTakeCar(AppAdvanceArrearsInfoQuery query) {
return null;
}
@Override
public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) {
return null;
}
@Override
public ResultBean complete(AppCompleteAdvanceArrearsDto query) {
return null;
}
@Override
public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return null;
}
@Override
public ResultBean taskReject(AppAdvanceArrearsTaskQuery query) {
return null;
}
@Override
public ResultBean revokeProcess(AppAdvanceArrearsTaskQuery query) {
return null;
}
@Override
public ResultBean deleteArrearsTakeCar(String contractSid) {
public ResultBean breakProcess(AppAdvanceArrearsTaskQuery query) {
return null;
}
}

43
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppAdvanceArrearsTaskQuery.java

@ -0,0 +1,43 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class AppAdvanceArrearsTaskQuery implements Query {
private static final long serialVersionUID = -2545459972114348165L;
/**
* 终止驳回撤回
*/
@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;
// @ApiModelProperty("节点")
// private String targetKey;
}

35
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java

@ -0,0 +1,35 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class AppCompleteAdvanceArrearsDto implements Dto {
private static final long serialVersionUID = -1436734962233066703L;
@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(value = "暂不确定是不是需要前端传的:还是有分支的时候传??")
// private Map<String, Object> formVariables;
}

17
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java

@ -0,0 +1,17 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppSubmitAdvanceArrearsDto extends AppArrearsCarryDto {
private static final long serialVersionUID = 9148028768206972924L;
@ApiModelProperty("意见")
private String comment;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

11
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java

@ -0,0 +1,11 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable;
import com.yxt.common.core.query.Query;
import lombok.Data;
@Data
public class GetNodeQuery implements Query {
private static final long serialVersionUID = -6541874437751241596L;
}

22
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeVo.java

@ -0,0 +1,22 @@
package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class GetNodeVo implements Vo {
private static final long serialVersionUID = 8103455420805041019L;
@ApiModelProperty(value = "节点名称")
private String name;
@ApiModelProperty(value = "节点id")
private String id;
@ApiModelProperty(value = "审批组")
private List<String> candidateGroups;
@ApiModelProperty(value = "是否是最后环节")
private String endTask;
}

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsVo.java

@ -38,5 +38,9 @@ public class BusArrearsCarryVehicleDetailsVo implements Vo {
@ApiModelProperty("成交价")
private BigDecimal dealMoney;
@ApiModelProperty("备注")
private String remarks;
}

9
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java

@ -37,6 +37,7 @@ import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -112,8 +113,8 @@ public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign
}
@Override
public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
return busAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid);
public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) {
return busAdvanceGinvoiceapplyService.initAdvanceInvoice(query);
}
@Override
@ -127,8 +128,8 @@ public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign
}
@Override
public ResultBean deleteAdvanceInvoice(String contractSid) {
return busAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid);
public ResultBean deleteAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) {
return busAdvanceGinvoiceapplyService.deleteAdvanceInvoice(query);
}
@Override

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@ -393,8 +393,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
return iPage;
}
public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
public ResultBean<AppAdvanceInvoiceInfoVo> initAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) {
ResultBean rb = ResultBean.fireFail();
String contractSid = query.getContractSid();
AppAdvanceInvoiceInfoVo vo = new AppAdvanceInvoiceInfoVo();
BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(contractSid);
BeanUtil.copyProperties(busAdvanceGinvoiceapply, vo, "sid");
@ -551,8 +552,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
}
}
public ResultBean deleteAdvanceInvoice(String contractSid) {
public ResultBean deleteAdvanceInvoice(AppAdvanceInvoiceInfoQuery query) {
ResultBean rb = ResultBean.fireFail();
String contractSid = query.getContractSid();
BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(contractSid);
if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getNodeState())) {
return rb.setMsg("该申请已提交,删除失败");

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java

@ -14,6 +14,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
/**
* Project: bus(bus) <br/>
@ -57,6 +58,20 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
*/
IPage<ArrearsCarryVehicleVo> getArrearsVehicleList(IPage<ArrearsCarryVehicleVo> page, @Param(Constants.WRAPPER) Wrapper<ArrearsCarryVehicleQuery> qw);
/**
* 欠款提车列表
* @param page
* @param qw
* @param name
* @return
*/
IPage<AppArrearsCarryVehiclePageVo> getAdvanceInvoiceList(IPage<AppArrearsCarryVehicleQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppArrearsCarryVehicleQuery> qw, @Param("name") String name);
/**
* 更新流程相关的状态
*
* @param map
* @return
*/
int updateFlowFiled(Map<String, Object> map);
}

39
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@ -54,8 +54,45 @@
</where>
ORDER BY bo.contractNo desc
</select>
<select id="getAdvanceInvoiceList"
resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo">
SELECT sid,
if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
if(length(nodeState) > 0, false, true ) as showUpdateBtn,
if(length(nodeState) > 0, false, true ) as showDeleteBtn,
contractNo,
modelName,
customerName,
arrearsMoney,
commitmentMoneyDate,
applyName,
applyDate
FROM bus_arrears_carry_vehicle_apply
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and customerName,contractNo LIKE concat('%'
, #{name}
, '%')
</if>
</where>
order by id desc
</select>
<update id="updateFlowFiled">
UPDATE bus_arrears_carry_vehicle_apply
SET nodeState=#{nodeState}
, nodeId=#{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>

70
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@ -1,7 +1,12 @@
package com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -156,8 +161,69 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp
}
@Override
public ResultBean deleteArrearsTakeCar(String contractSid) {
return busArrearsCarryVehicleApplyService.deleteArrearsTakeCar(contractSid);
public ResultBean<AppArrearsCarryInfoVo> initArrearsApply(AppAdvanceArrearsInfoQuery query) {
return busArrearsCarryVehicleApplyService.initArrearsApply(query);
}
@Override
public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
return busArrearsCarryVehicleApplyService.addArrearsApply(dto);
}
@Override
public ResultBean saveArrearsApply(AppArrearsCarryDto dto) {
return busArrearsCarryVehicleApplyService.saveArrearsApply(dto);
}
@Override
public ResultBean deleteArrearsTakeCar(AppAdvanceArrearsInfoQuery query) {
return busArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query);
}
@Override
public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) {
return busArrearsCarryVehicleApplyService.submitAdvanceArrearsInfo(dto);
}
@Override
public ResultBean complete(AppCompleteAdvanceArrearsDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
return busArrearsCarryVehicleApplyService.complete(bv);
}
@Override
public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
return busArrearsCarryVehicleApplyService.InitiatorToAnswerInfo(bv);
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return busArrearsCarryVehicleApplyService.getPreviousNodesForReject(query);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return busArrearsCarryVehicleApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean taskReject(AppAdvanceArrearsTaskQuery query) {
return busArrearsCarryVehicleApplyService.taskReject(query);
}
@Override
public ResultBean revokeProcess(AppAdvanceArrearsTaskQuery query) {
return busArrearsCarryVehicleApplyService.revokeProcess(query);
}
@Override
public ResultBean breakProcess(AppAdvanceArrearsTaskQuery query) {
return busArrearsCarryVehicleApplyService.breakProcess(query);
}

582
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@ -1,34 +1,65 @@
package com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply;
import cn.hutool.core.bean.BeanUtil;
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.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.flow.FlowableService;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
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.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
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.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
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.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: bus(bus) <br/>
@ -58,6 +89,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private CommonAppendixFeign commonAppendixFeign;
@ -67,6 +101,26 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
@Autowired
private BusArrearsCarryVehicleDetailsService busArrearsCarryVehicleDetailsService;
@Autowired
private CommonContractFeign commonContractFeign;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BusSalesOrderService busSalesOrderService;
@Autowired
private MessageFeign messageFeign;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
/**
* 欠款提车分页列表查询条件
@ -373,8 +427,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
return rb.success();
}
public ResultBean deleteArrearsTakeCar(String contractSid) {
public ResultBean deleteArrearsTakeCar(AppAdvanceArrearsInfoQuery query) {
ResultBean rb = ResultBean.fireFail();
String contractSid = query.getContractSid();
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(contractSid);
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getNodeState())) {
return rb.setMsg("该申请已提交,删除失败");
@ -394,4 +449,529 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
IPage<AppArrearsCarryVehiclePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
return iPage;
}
public ResultBean<AppArrearsCarryInfoVo> initArrearsApply(AppAdvanceArrearsInfoQuery query) {
ResultBean rb = ResultBean.fireFail();
String contractSid = query.getContractSid();
List<AdCarListVo> carList = new ArrayList<>();
List<AdCarListVo> vinList = new ArrayList<>();
AppArrearsCarryInfoVo vo = new AppArrearsCarryInfoVo();
//根据申请sid查询
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(contractSid);
BeanUtil.copyProperties(busArrearsCarryVehicleApply, vo, "sid");
vo.setUserSid(busArrearsCarryVehicleApply.getCreateBySid()); // 返回创建人sid
vo.setContractSid(contractSid);//返回申请sid
//根据申请sid查询车辆数据
List<BusArrearsCarryVehicleDetailsVo> carLists = busArrearsCarryVehicleDetailsService.selByArrearsSid(contractSid);
if (carLists.size() > 0) {
for (BusArrearsCarryVehicleDetailsVo carryVehicleDetailsVo : carLists) {
AdCarListVo adCarListVo = new AdCarListVo();
adCarListVo.setPrice(String.valueOf(carryVehicleDetailsVo.getDealMoney())); //成交价
adCarListVo.setVin(carryVehicleDetailsVo.getVinNo());//车架号
adCarListVo.setRemarks(carryVehicleDetailsVo.getRemarks());//备注
carList.add(adCarListVo);
}
}
vo.setCarList(carList);
List<AppRovalContractPageVo> vinLists = busSalesOrderService.selectByContractNo(busArrearsCarryVehicleApply.getContractNo());
if (carLists.size() > 0) {
for (AppRovalContractPageVo appRovalContractPageVo : vinLists) {
AdCarListVo adCarListVo = new AdCarListVo();
adCarListVo.setVin(appRovalContractPageVo.getVin());
CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData();
if (commonContractVo != null) {
adCarListVo.setPrice(commonContractVo.getPrice());
}
vinList.add(adCarListVo);
}
}
vo.setVinList(vinList);
return rb.success().setData(vo);
}
/**
* 移动端-新增欠款提车申请
*
* @param dto
* @return
*/
public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) {
ResultBean rb = ResultBean.fireFail();
// 取出分公司sid
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
// 取出分公司名称
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
// 取出当前登录用户信息
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
// 时间转换
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
String price = "";
String modelName = "";
String modelSid = "";
String customerName = "";
String contractNo = "";
String contractAmount = "";
if (StringUtils.isNotBlank(dto.getContractSid())) {
// 根据合同Sid取出 合同编号 车型名称 车型sid
CommonContractVo commonContractVo = commonContractFeign.fetchBySid(dto.getContractSid()).getData();
if (commonContractVo != null) {
// 根据客户sid取出 客户名称
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(commonContractVo.getCustomerSid()).getData();
if (crmCustomerTempVo != null) {
customerName = crmCustomerTempVo.getName();
}
price = commonContractVo.getPrice();
contractNo = commonContractVo.getContractNo();
modelName = commonContractVo.getModelName();
modelSid = commonContractVo.getModelSid();
contractAmount = commonContractVo.getContractAmount();
}
}
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = new BusArrearsCarryVehicleApply();
busArrearsCarryVehicleApply.setCreateBySid(dto.getUserSid());//创建人sid
busArrearsCarryVehicleApply.setApplyName(sysUserVo.getName());//申请人
busArrearsCarryVehicleApply.setApplyDate(sf.format(new Date()));//申请日期
busArrearsCarryVehicleApply.setUseOrgSid(useOrgSid);//分公司sid
busArrearsCarryVehicleApply.setUseOrgName(sysOrganizationVo.getName());//分公司名称
busArrearsCarryVehicleApply.setModelSid(modelSid);// 车型sid
busArrearsCarryVehicleApply.setModelName(modelName);// 车型名称
busArrearsCarryVehicleApply.setCustomerName(customerName);// 客户名称
busArrearsCarryVehicleApply.setContractNo(contractNo);// 合同编号
busArrearsCarryVehicleApply.setContractMoney(new BigDecimal(contractAmount));//合同总金额
// busArrearsCarryVehicleApply.setContractCollectionMoney(new BigDecimal());//合同收款金额
// busArrearsCarryVehicleApply.setArrearsMoney();//欠款金额
// 添加欠款提车 车辆表数据
if (dto.getVinList().size() > 0) {
List<String> vinList = dto.getVinList();
for (String vinNo : vinList) {
BusArrearsCarryVehicleDetails busArrearsCarryVehicle = new BusArrearsCarryVehicleDetails();
busArrearsCarryVehicle.setArrearsVehicleSid(busArrearsCarryVehicleApply.getSid()); // 申请表sid
busArrearsCarryVehicle.setVinNo(vinNo); // 车架号
//获取车辆sid
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo, useOrgSid).getData();
if (baseVehicle != null) {
busArrearsCarryVehicle.setVehicleSid(baseVehicle.getSid());
}
//成交价
busArrearsCarryVehicle.setDealMoney(new BigDecimal(price));
busArrearsCarryVehicleDetailsService.save(busArrearsCarryVehicle);
}
}
save(busArrearsCarryVehicleApply);
return rb.success().setData(busArrearsCarryVehicleApply.getSid());
}
/**
* 移动端-保存欠款提车申请
*
* @param dto
* @return
*/
public ResultBean saveArrearsApply(AppArrearsCarryDto dto) {
ResultBean rb = ResultBean.fireFail();
// 取出分公司sid
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
// 取出当前登录用户信息
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
//根据申请sid查询数据
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply);
//根据欠款提车Sid删除车辆信息 并重新添加
busArrearsCarryVehicleDetailsService.deleteByArrearsVehicleSid(dto.getContractSid());
// 添加欠款提车 车辆表数据
if (dto.getCarList().size() > 0) {
List<AdCarListDto> carList = dto.getCarList();
for (AdCarListDto adCarListDto : carList) {
BusArrearsCarryVehicleDetails busArrearsCarryVehicle = new BusArrearsCarryVehicleDetails();
busArrearsCarryVehicle.setArrearsVehicleSid(busArrearsCarryVehicleApply.getSid()); // 申请表sid
busArrearsCarryVehicle.setVinNo(adCarListDto.getVin()); // 车架号
//获取车辆sid
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(adCarListDto.getVin(), useOrgSid).getData();
if (baseVehicle != null) {
busArrearsCarryVehicle.setVehicleSid(baseVehicle.getSid());
}
//成交价
busArrearsCarryVehicle.setDealMoney(new BigDecimal(adCarListDto.getPrice()));
busArrearsCarryVehicle.setRemarks(adCarListDto.getRemarks());// 备注
busArrearsCarryVehicleDetailsService.save(busArrearsCarryVehicle);
}
}
//修改欠款提车申请
updateById(busArrearsCarryVehicleApply);
return rb.success().setData(busArrearsCarryVehicleApply.getSid());
}
public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
int r = submitBusinessData(dto, busArrearsCarryVehicleApply);
if (r == 3) {
return rb.setMsg("该申请不存在");
}
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
//新增修改保存
ResultBean<String> resultBean = saveArrearsApply(dto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getUserSid());
bv.setFormVariables(variables);
//若app移动端有此功能,则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。
appMap.put("contractSid", businessSid);
variables.put("app", appMap);
//流程定义id
bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
busArrearsCarryVehicleApply = 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(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("欠款提车申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return voResultBean;
}
if (r == 2) {
// ToDo:驳回到发起人后再次提交
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
bv.setTaskId(busArrearsCarryVehicleApply.getTaskId());
bv.setTaskDefKey(busArrearsCarryVehicleApply.getNodeId());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId());
// return complete(bv);
}
return rb;
}
/**
* 判断提交的流程是否被允许
*
* @param dto
* @return
*/
private synchronized int submitBusinessData(AppSubmitAdvanceArrearsDto dto, BusArrearsCarryVehicleApply busArrearsCarryVehicleApply) {
int r = 0;
if (StringUtils.isBlank(dto.getContractSid())) {
r = 1;
} else {
if (busArrearsCarryVehicleApply != null) {
String businessTaskId = busArrearsCarryVehicleApply.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;
}
/**
* 更新流程相关的状态
*
* @param map
* @return
*/
private int updateFlowFiled(Map<String, Object> map) {
return baseMapper.updateFlowFiled(map);
}
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(bv.getUserSid()).getData();
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("contractSid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
if (bv.getTaskId().equals(busArrearsCarryVehicleApply.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(ufVo.getTaskDefKey())) {
//极光推送
busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
ufVo.setProcInsId(busArrearsCarryVehicleApply.getProcInstId());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(busArrearsCarryVehicleApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("欠款提车申请");
messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("欠款提车申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
} else {
AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
Map<String, Object> appMaps = new HashMap<>();
appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
List<String> recipientSidList = new ArrayList<>();
// 风控中心总经理角色用户
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid("537bea8f-75e8-430c-9a5f-3140bda41f39");
List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
for (SysUserVo userVo : list1) {
recipientSidList.add(userVo.getSid());
}
// 分公司会计角色用户
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a");
userQuery.setOrgSidPath(bv.getOrgSidPath());
List<SysUserVo> list = sysUserFeign.getUserByRole(userQuery).getData();
for (SysUserVo userVo : list) {
recipientSidList.add(userVo.getSid());
}
//财务中心总经理角色用户
UserRoleQuery userRoleQuery3 = new UserRoleQuery();
userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155");
List<SysUserVo> list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData();
for (SysUserVo userVo : list3) {
recipientSidList.add(userVo.getSid());
}
//事业部运营经理角色用户
UserRoleQuery userRoleQuery2 = new UserRoleQuery();
userRoleQuery2.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725");
List<SysUserVo> list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData();
for (SysUserVo userVo : list2) {
recipientSidList.add(userVo.getSid());
}
query.setRecipientSidList(recipientSidList);
query.setAppMap(appMaps);
query.setMsgTitle("业务");
query.setMsgContent(sysUserVo.getName() + "提交的欠款提车申请,请查阅");
query.setMsgSource("业务");
query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri());
query.setApp_type("2");
query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
query.setName("业务");
// 消息推送
messageFeign.sendAutoserviceMessage(query);
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public ResultBean InitiatorToAnswerInfo(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("contractSid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
String sid = sysUserVo.getSid();
nextNodeUserSids.append(sid).append(",");
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
return rb.setMsg("下一环节暂无操作人员");
}
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
return rb.success().setData(resultBean1.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
// Map<String, Object> formVariables = query.getFormVariables();
//判断流程分支
// Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
// bv.setFormVariables(map);
bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
// Map<String, Object> formVariables = query.getFormVariables();
//判断流程分支
// Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
// bv.setFormVariables(map);
bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
public ResultBean taskReject(AppAdvanceArrearsTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("意见不能为空");
}
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
if (busArrearsCarryVehicleApply == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = busArrearsCarryVehicleApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("contractSid", query.getBusinessSid());
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(resultBean.getData());
//更新业务中的流程相关的参数
updateFlowFiled(map);
busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = busArrearsCarryVehicleApply.getProcInstId();
ufVo.setProcInsId(procId);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
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(busArrearsCarryVehicleApply.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("提前开票申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean revokeProcess(AppAdvanceArrearsTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
//根据业务sid查询移库申请
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
String businessTaskId = busArrearsCarryVehicleApply.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("操作失败!");
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败,提交的数据不一致!");
}
public ResultBean breakProcess(AppAdvanceArrearsTaskQuery 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("意见不能为空");
}
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
String businessTaskId = busArrearsCarryVehicleApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
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());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java

@ -120,7 +120,7 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService<Bus
* @param sid
* @return
*/
public int deleteByArrearsVehicleSid(String sid) {
public int deleteByArrearsVehicleSid(String sid) {
return baseMapper.deleteByArrearsVehicleSid(sid);
}
}

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

@ -12,9 +12,10 @@ public enum ProcDefEnum {
SALESPOLICY("销售政策审批流程", "sales_policy_oxeeyzhr:1:247508"),
FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
// ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:2:665066"), //本地
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//测试
ARREARSCARRYVEHICLE("欠款提车审批流程", "arrears_carryvehicle:1:232589"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:2:665066"), //本地
// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//测试
// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_ll25axqj:1:687508"),//本地
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
// VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
// RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO

14
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoQuery.java

@ -0,0 +1,14 @@
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AdvanceInvoiceInfoQuery implements Query {
private static final long serialVersionUID = 8149076217652242268L;
@ApiModelProperty("申请sid")
private String contractSid;
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java

@ -75,9 +75,9 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
public ResultBean addAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceVinDto dto);
@ApiOperation("手机端-初始化提前开票申请")
@GetMapping("/initAdvanceInvoice/{contractSid}")
@GetMapping("/initAdvanceInvoice")
@ResponseBody
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(@PathVariable("contractSid") String contractSid);
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
@ApiOperation("移动端-保存提前开票申请")
@PostMapping("/saveAdvanceInvoice")
@ -85,9 +85,9 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
public ResultBean saveAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceDto dto);
@ApiOperation("手机端-删除提前开票")
@DeleteMapping("/deleteAdvanceInvoice/{contractSid}")
@DeleteMapping("/deleteAdvanceInvoice")
@ResponseBody
public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid);
public ResultBean deleteAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
@ApiOperation("提交流程")

53
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java

@ -0,0 +1,53 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class AdvanceArrearsDto implements Dto {
private static final long serialVersionUID = 6445736018244517900L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("合同sid")
@JsonProperty("contractSid")
private String sid;
@ApiModelProperty("合同id")
@JsonProperty("contractId")
private String contractNo;
@ApiModelProperty("收款金额")
@JsonProperty("collectedPrice")
private String contractCollectionMoney;
@ApiModelProperty("合同金额")
@JsonProperty("contractPrice")
private String contractMoney;
@ApiModelProperty("车型")
@JsonProperty("model")
private String modelName;
@ApiModelProperty("客户")
private String customerName;
@ApiModelProperty("申请日期")
@JsonProperty("applicationDate")
private String applyDate;
@ApiModelProperty("回款日期")
@JsonProperty("paymentDate")
private String commitmentMoneyDate;
@ApiModelProperty("欠款金额")
@JsonProperty("cumulativeArrearsPrice")
private String arrearsMoney;
@ApiModelProperty("欠款提车原因")
private String reason;
@ApiModelProperty("选择车辆列表")
private List<AppCarListDto> carList = new ArrayList<>();
@ApiModelProperty("所有车辆列表")
private List<AppCarListDto> vinList = new ArrayList<>();
@ApiModelProperty("流程实列id")
private String procInsId;
@ApiModelProperty("用户sid")
private String taskId;
}

13
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoQuery.java

@ -0,0 +1,13 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AdvanceArrearsInfoQuery implements Query {
private static final long serialVersionUID = -8535705004903885760L;
@ApiModelProperty("申请sid")
private String contractSid;
}

55
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java

@ -0,0 +1,55 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class AdvanceArrearsInfoVo implements Vo {
private static final long serialVersionUID = 6617819819692518547L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("合同sid")
@JsonProperty("contractSid")
private String sid;
@ApiModelProperty("合同id")
@JsonProperty("contractId")
private String contractNo;
@ApiModelProperty("收款金额")
@JsonProperty("collectedPrice")
private String contractCollectionMoney;
@ApiModelProperty("合同金额")
@JsonProperty("contractPrice")
private String contractMoney;
@ApiModelProperty("车型")
@JsonProperty("model")
private String modelName;
@ApiModelProperty("客户")
private String customerName;
@ApiModelProperty("申请日期")
@JsonProperty("applicationDate")
private String applyDate;
@ApiModelProperty("回款日期")
@JsonProperty("paymentDate")
private String commitmentMoneyDate;
@ApiModelProperty("欠款金额")
@JsonProperty("cumulativeArrearsPrice")
private String arrearsMoney;
@ApiModelProperty("欠款提车原因")
private String reason;
@ApiModelProperty("选择车辆列表")
private List<AppCarListVo> carList = new ArrayList<>();
@ApiModelProperty("所有车辆列表")
private List<AppCarListVo> vinList = new ArrayList<>();
@ApiModelProperty("流程实列id")
private String procInsId;
@ApiModelProperty("用户sid")
private String taskId;
}

22
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsVinDto.java

@ -0,0 +1,22 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AdvanceArrearsVinDto implements Dto {
private static final long serialVersionUID = -6803789056412970209L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("车架号集合")
private List<String> vinList;
@ApiModelProperty("合同sid")
private String contractSid;
}

76
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@ -1,12 +1,24 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceInfoVo;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceVinDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@ -27,19 +39,71 @@ import java.util.List;
*/
@Api(tags = "欠款提车申请")
@FeignClient(
contextId = "bus-BusArrearsCarryVehicleApply",
name = "bus",
path = "v1/busarrearscarryvehicleapply",
contextId = "anrui-terminal-BusArrearsCarryVehicleApply",
name = "anrui-terminal",
path = "autoservice/v1/arrearsTakeCar",
fallback = AppBusArrearsCarryVehicleApplyFeignFallback.class)
public interface AppBusArrearsCarryVehicleApplyFeign {
@ApiOperation("手机端-获取提前开票列表")
@ApiOperation("手机端-获取欠款提车列表")
@PostMapping("/getArrearsTakeCarList")
@ResponseBody
ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(@RequestBody PagerQuery<ArrearsCarryVehicleQuery> pagerQuery);
@ApiOperation("移动端-新增欠款提车申请")
@PostMapping("/addArrearsApply")
@ResponseBody
public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto);
@ApiOperation("手机端-初始化欠款提车申请")
@GetMapping("/initArrearsApply")
@ResponseBody
public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(@SpringQueryMap AdvanceArrearsInfoQuery query);
@ApiOperation("移动端-保存欠款提车申请")
@PostMapping("/saveArrearsApply")
@ResponseBody
public ResultBean saveArrearsApply(@Valid @RequestBody AdvanceArrearsDto dto);
@ApiOperation("手机端-删除欠款提车")
@GetMapping("/deleteArrearsTakeCar/{contractSid}")
@GetMapping("/deleteArrearsTakeCar")
@ResponseBody
public ResultBean deleteArrearsTakeCar(@SpringQueryMap AdvanceArrearsInfoQuery query);
/******************************流程接口*************************************/
@ApiOperation("提交流程")
@PostMapping("/submitArrearsApplyInfo")
@ResponseBody
ResultBean submitArrearsApplyInfo(@RequestBody SubmitArrearsTakeCarDto dto);
@ApiOperation("办理")
@PutMapping("/agreeArrearsApplyInfo")
@ResponseBody
ResultBean agreeArrearsApplyInfo(@RequestBody CompleteArrearsTakeCarDto dto);
@ApiOperation("办理 跨机构")
@PutMapping("/initiatorToAnswerInfo")
@ResponseBody
ResultBean initiatorToAnswer(@RequestBody CompleteArrearsTakeCarDto dto);
@ApiOperation("驳回")
@PutMapping("/rejectArrearsApplyInfo")
@ResponseBody
ResultBean rejectAdvanceInvoiceInfo(@RequestBody AdvanceArrearsTakeCarQuery query);
@ApiOperation("撤回")
@PutMapping("/recallArrearsApplyInfo")
@ResponseBody
ResultBean recallArrearsApplyInfo(@RequestBody AdvanceArrearsTakeCarQuery query);
@ApiOperation("终止")
@PutMapping("/stopArrearsApplyInfo")
@ResponseBody
ResultBean stopArrearsApplyInfo(@RequestBody AdvanceArrearsTakeCarQuery query);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
public ResultBean deleteArrearsTakeCar(@PathVariable("contractSid") String contractSid);
ResultBean<String> getFlowOperateTitle(@SpringQueryMap AdvanceArrearsQuery query);
}

56
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@ -1,6 +1,10 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -30,7 +34,57 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
}
@Override
public ResultBean deleteArrearsTakeCar(String contractSid) {
public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
return null;
}
@Override
public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {
return null;
}
@Override
public ResultBean saveArrearsApply(AdvanceArrearsDto dto) {
return null;
}
@Override
public ResultBean deleteArrearsTakeCar( AdvanceArrearsInfoQuery query) {
return null;
}
@Override
public ResultBean submitArrearsApplyInfo(SubmitArrearsTakeCarDto dto) {
return null;
}
@Override
public ResultBean agreeArrearsApplyInfo(CompleteArrearsTakeCarDto dto) {
return null;
}
@Override
public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto dto) {
return null;
}
@Override
public ResultBean rejectAdvanceInvoiceInfo(AdvanceArrearsTakeCarQuery query) {
return null;
}
@Override
public ResultBean recallArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) {
return null;
}
@Override
public ResultBean stopArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) {
return null;
}
@Override
public ResultBean<String> getFlowOperateTitle(AdvanceArrearsQuery query) {
return null;
}
}

22
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListDto.java

@ -0,0 +1,22 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppCarListDto implements Dto {
private static final long serialVersionUID = -5142700461134754266L;
@ApiModelProperty("车辆sid")
private String carSid;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("成交价")
private String price;
@ApiModelProperty("备注")
private String remarks;
}

24
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppCarListVo.java

@ -0,0 +1,24 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppCarListVo implements Vo {
private static final long serialVersionUID = 1080671707643102846L;
@ApiModelProperty("车辆sid")
private String carSid;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("成交价")
private String price;
@ApiModelProperty("备注")
private String remarks;
}

48
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java

@ -12,33 +12,35 @@ import java.math.BigDecimal;
public class ArrearsCarryVehiclePageVo implements Vo {
private static final long serialVersionUID = 1607000479637135351L;
@ApiModelProperty("车辆sid")
private String vehicleSid;
@ApiModelProperty("车架号")
@JsonProperty("VINNo")
private String VINNo;
@ApiModelProperty("合同sid")
@JsonProperty("contractSid")
private String sid;
@ApiModelProperty("合同状态")
@JsonProperty("contractType")
private String nodeState;
@ApiModelProperty("合同编号")
@JsonProperty("contractId")
private String contractNo;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("车型名称")
@JsonProperty("model")
private String modelName;
@ApiModelProperty("车型Sid")
private String modelSid;
@ApiModelProperty("成交价")
private BigDecimal dealMoney;
@ApiModelProperty("申请日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("欠款金额")
@JsonProperty("arrears")
private String arrearsMoney;
@ApiModelProperty("回款日期")
@JsonProperty("paymentDate")
private String commitmentMoneyDate;
@ApiModelProperty("申请人")
@JsonProperty("applicant")
private String applyName;
@ApiModelProperty("申请时间")
@JsonProperty("date")
private String applyDate;
@ApiModelProperty("是否显示办理")
private boolean showUpdateBtn;
@ApiModelProperty("是否显示删除")
private boolean showDeleteBtn;
}

21
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsQuery.java

@ -0,0 +1,21 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class AdvanceArrearsQuery implements Query {
private static final long serialVersionUID = -6443664256741305075L;
@ApiModelProperty(value = "节点key")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty(value = "0 上一环节 1下一环节")
@NotNull(message = "参数错误:next")
private Integer next;
}

43
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AdvanceArrearsTakeCarQuery.java

@ -0,0 +1,43 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class AdvanceArrearsTakeCarQuery implements Query {
private static final long serialVersionUID = -6364879849166421242L;
/**
* 终止驳回撤回
*/
@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")
@JsonProperty("procInsId")
private String instanceId;
}

32
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/CompleteArrearsTakeCarDto.java

@ -0,0 +1,32 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class CompleteArrearsTakeCarDto implements Dto {
private static final long serialVersionUID = 288881914449642282L;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:procInsId")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
}

17
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/SubmitArrearsTakeCarDto.java

@ -0,0 +1,17 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class SubmitArrearsTakeCarDto implements Dto {
private static final long serialVersionUID = 2950377650362576923L;
@ApiModelProperty("流程实例id")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

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

@ -72,4 +72,7 @@ public class ConfirmationDto implements Dto {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
}

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

@ -13,4 +13,7 @@ public class ConfirmationPageQuery implements Query {
@ApiModelProperty("付款方名称")
private String name;
@ApiModelProperty("机构sid")
private String orgPath;
}

65
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java

@ -2,9 +2,12 @@ package com.yxt.anrui.terminal.biz.arrearsTakeCar;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.AppBusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehiclePageVo;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -32,7 +35,7 @@ import java.util.List;
*/
@Api(tags = "欠款提车申请")
@RestController
@RequestMapping("v1/busarrearscarryvehicleapply")
@RequestMapping("autoservice/v1/arrearsTakeCar")
public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVehicleApplyFeign {
@Autowired
@ -45,7 +48,59 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
}
@Override
public ResultBean deleteArrearsTakeCar(String contractSid) {
return appBusArrearsCarryVehicleApplyService.deleteArrearsTakeCar(contractSid);
public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
return appBusArrearsCarryVehicleApplyService.addArrearsApply(dto);
}
@Override
public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {
return appBusArrearsCarryVehicleApplyService.initArrearsApply(query);
}
@Override
public ResultBean saveArrearsApply(AdvanceArrearsDto dto) {
return appBusArrearsCarryVehicleApplyService.saveArrearsApply(dto);
}
@Override
public ResultBean deleteArrearsTakeCar( AdvanceArrearsInfoQuery query) {
return appBusArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query);
}
/******************************************流程接口********************************************/
@Override
public ResultBean submitArrearsApplyInfo(SubmitArrearsTakeCarDto dto) {
return appBusArrearsCarryVehicleApplyService.submitArrearsApplyInfo(dto);
}
@Override
public ResultBean agreeArrearsApplyInfo(CompleteArrearsTakeCarDto dto) {
return appBusArrearsCarryVehicleApplyService.agreeArrearsApplyInfo(dto);
}
@Override
public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto dto) {
return appBusArrearsCarryVehicleApplyService.initiatorToAnswer(dto);
}
@Override
public ResultBean rejectAdvanceInvoiceInfo(AdvanceArrearsTakeCarQuery query) {
return appBusArrearsCarryVehicleApplyService.rejectAdvanceInvoiceInfo(query);
}
@Override
public ResultBean recallArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) {
return appBusArrearsCarryVehicleApplyService.recallArrearsApplyInfo(query);
}
@Override
public ResultBean stopArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) {
return appBusArrearsCarryVehicleApplyService.stopArrearsApplyInfo(query);
}
@Override
public ResultBean<String> getFlowOperateTitle(AdvanceArrearsQuery query) {
return appBusArrearsCarryVehicleApplyService.getFlowOperateTitle(query);
}
}

193
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@ -1,11 +1,20 @@
package com.yxt.anrui.terminal.biz.arrearsTakeCar;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehicleQuery;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehiclePageVo;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -13,6 +22,12 @@ 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.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* Project: bus(bus) <br/>
@ -32,18 +47,178 @@ public class AppBusArrearsCarryVehicleApplyService {
@Autowired
BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<ArrearsCarryVehicleQuery> pagerQuery) {
ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> rb = ResultBean.fireFail();
PagerQuery<AppArrearsCarryVehicleQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> advanceInvoiceList = busArrearsCarryVehicleApplyFeign.getArrearsTakeCarList(pq);
PagerVo<ArrearsCarryVehiclePageVo> vo = CoverUtils.selectPagerVo(advanceInvoiceList.getData());
ResultBean<PagerVo<AppArrearsCarryVehiclePageVo>> resultBean = busArrearsCarryVehicleApplyFeign.getArrearsTakeCarList(pq);
List<ArrearsCarryVehiclePageVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ArrearsCarryVehiclePageVo.class)).collect(Collectors.toList());
PagerVo<ArrearsCarryVehiclePageVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
return rb.success().setData(v);
}
public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) {
AppArrearsCarryVinDto advanceArrearsVinDto = new AppArrearsCarryVinDto();
BeanUtil.copyProperties(dto, advanceArrearsVinDto);
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.addArrearsApply(advanceArrearsVinDto);
return resultBean;
}
public ResultBean<AdvanceArrearsInfoVo> initArrearsApply(AdvanceArrearsInfoQuery query) {
ResultBean<AdvanceArrearsInfoVo> rb = ResultBean.fireFail();
AdvanceArrearsInfoVo vo = new AdvanceArrearsInfoVo();
AppAdvanceArrearsInfoQuery appAdvanceArrearsInfoQuery = new AppAdvanceArrearsInfoQuery();
BeanUtil.copyProperties(query, appAdvanceArrearsInfoQuery);
ResultBean<AppArrearsCarryInfoVo> resultBean = busArrearsCarryVehicleApplyFeign.initArrearsApply(appAdvanceArrearsInfoQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
AppArrearsCarryInfoVo appArrearsCarryInfoVo = resultBean.getData();
BeanUtil.copyProperties(appArrearsCarryInfoVo, vo);
return rb.success().setData(vo);
}
public ResultBean deleteArrearsTakeCar(String contractSid) {
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.deleteArrearsTakeCar(contractSid);
public ResultBean saveArrearsApply(AdvanceArrearsDto dto) {
AppArrearsCarryDto appArrearsCarryDto = new AppArrearsCarryDto();
BeanUtil.copyProperties(dto, appArrearsCarryDto);
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.saveArrearsApply(appArrearsCarryDto);
return resultBean;
}
public ResultBean deleteArrearsTakeCar(AdvanceArrearsInfoQuery query) {
AppAdvanceArrearsInfoQuery appAdvanceArrearsInfoQuery = new AppAdvanceArrearsInfoQuery();
BeanUtil.copyProperties(query, appAdvanceArrearsInfoQuery);
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.deleteArrearsTakeCar(appAdvanceArrearsInfoQuery);
return resultBean;
}
public ResultBean submitArrearsApplyInfo(SubmitArrearsTakeCarDto dto) {
ResultBean rb = ResultBean.fireFail();
AppSubmitAdvanceArrearsDto appSubmitAdvanceArrearsDto = new AppSubmitAdvanceArrearsDto();
BeanUtil.copyProperties(dto, appSubmitAdvanceArrearsDto);
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.submitAdvanceArrearsInfo(appSubmitAdvanceArrearsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean agreeArrearsApplyInfo(CompleteArrearsTakeCarDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
AppCompleteAdvanceArrearsDto appCompleteAdvanceArrearsDto = new AppCompleteAdvanceArrearsDto();
BeanUtil.copyProperties(dto, appCompleteAdvanceArrearsDto);
appCompleteAdvanceArrearsDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.complete(appCompleteAdvanceArrearsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
AppCompleteAdvanceArrearsDto appCompleteAdvanceArrearsDto = new AppCompleteAdvanceArrearsDto();
BeanUtil.copyProperties(dto, appCompleteAdvanceArrearsDto);
appCompleteAdvanceArrearsDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.InitiatorToAnswerInfo(appCompleteAdvanceArrearsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectAdvanceInvoiceInfo(AdvanceArrearsTakeCarQuery query) {
ResultBean rb = ResultBean.fireFail();
AppAdvanceArrearsTaskQuery taskQuery = new AppAdvanceArrearsTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.taskReject(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean recallArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) {
ResultBean rb = ResultBean.fireFail();
AppAdvanceArrearsTaskQuery taskQuery = new AppAdvanceArrearsTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.revokeProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean stopArrearsApplyInfo(AdvanceArrearsTakeCarQuery query) {
ResultBean rb = ResultBean.fireFail();
AppAdvanceArrearsTaskQuery taskQuery = new AppAdvanceArrearsTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = busArrearsCarryVehicleApplyFeign.breakProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(AdvanceArrearsQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
GetNodeQuery getNodeQuery = new GetNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<GetNodeVo>> getPreviousNodesForReject = busArrearsCarryVehicleApplyFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<GetNodeVo>> getNextNodesForSubmit = busArrearsCarryVehicleApplyFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误:next");
}
return rb.success().setData(data);
}
}

8
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java

@ -69,8 +69,8 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
}
@Override
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid);
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(AdvanceInvoiceInfoQuery query) {
return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(query);
}
@Override
@ -79,8 +79,8 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
}
@Override
public ResultBean deleteAdvanceInvoice(String contractSid) {
return appBusAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid);
public ResultBean deleteAdvanceInvoice(AdvanceInvoiceInfoQuery query) {
return appBusAdvanceGinvoiceapplyService.deleteAdvanceInvoice(query);
}
@Override

12
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@ -101,10 +101,12 @@ public class AppBusAdvanceGinvoiceapplyService {
return resultBean;
}
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(AdvanceInvoiceInfoQuery query) {
ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
ResultBean<AppAdvanceInvoiceInfoVo> resultBean = busAdvanceGinvoiceapplyFeign.initAdvanceInvoice(contractSid);
AppAdvanceInvoiceInfoQuery appAdvanceInvoiceInfoQuery = new AppAdvanceInvoiceInfoQuery();
BeanUtil.copyProperties(query, appAdvanceInvoiceInfoQuery);
ResultBean<AppAdvanceInvoiceInfoVo> resultBean = busAdvanceGinvoiceapplyFeign.initAdvanceInvoice(appAdvanceInvoiceInfoQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -120,8 +122,10 @@ public class AppBusAdvanceGinvoiceapplyService {
return resultBean;
}
public ResultBean deleteAdvanceInvoice(String contractSid) {
ResultBean resultBean = busAdvanceGinvoiceapplyFeign.deleteAdvanceInvoice(contractSid);
public ResultBean deleteAdvanceInvoice(AdvanceInvoiceInfoQuery query) {
AppAdvanceInvoiceInfoQuery appAdvanceInvoiceInfoQuery = new AppAdvanceInvoiceInfoQuery();
BeanUtil.copyProperties(query, appAdvanceInvoiceInfoQuery);
ResultBean resultBean = busAdvanceGinvoiceapplyFeign.deleteAdvanceInvoice(appAdvanceInvoiceInfoQuery);
return resultBean;
}

Loading…
Cancel
Save