Browse Source

经销商管理、备案模块

master
fanzongzhe 2 years ago
parent
commit
fdac11432e
  1. 29
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java
  2. 22
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java
  3. 32
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java
  4. 89
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
  5. 105
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
  6. 25
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorQuery.java
  7. 30
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java
  8. 22
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/RiskStateQuery.java
  9. 32
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java
  10. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java
  11. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java
  12. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseFileDto.java
  13. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseFileVo.java
  14. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java
  15. 15
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoVo.java
  16. 27
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppDeptVo.java
  17. 55
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppDistributorApplyVo.java
  18. 29
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppDistributorDto.java
  19. 25
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppObjectDept.java
  20. 46
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppSalesDeptVo.java
  21. 25
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppSalesman.java
  22. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/AppSubmitDistributorApplyDto.java
  23. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorCompleteDto.java
  24. 100
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApply.java
  25. 140
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyDetailsVo.java
  26. 63
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyDto.java
  27. 171
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java
  28. 161
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java
  29. 41
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyQuery.java
  30. 39
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyVo.java
  31. 17
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseSalesManger.java
  32. 23
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/AppSubmitApplyDto.java
  33. 41
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/BaseDistributorApplyCompleteDto.java
  34. 56
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/BaseDistributorApplyTaskQuery.java
  35. 26
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/GetNodeQuery.java
  36. 25
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/GetNodeVo.java
  37. 22
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/SubmitBaseDistributorApplyDto.java
  38. 40
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendix.java
  39. 38
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixDto.java
  40. 55
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixFallback.java
  41. 58
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixFeign.java
  42. 18
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixOneQuery.java
  43. 35
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixQuery.java
  44. 34
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixUploadVo.java
  45. 51
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixVo.java
  46. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
  47. 60
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
  48. 149
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
  49. 1991
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  50. 75
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyMapper.java
  51. 66
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyMapper.xml
  52. 188
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java
  53. 1995
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java
  54. 51
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapplyappendix/BaseDistributorApplyAppendixMapper.java
  55. 52
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapplyappendix/BaseDistributorApplyAppendixMapper.xml
  56. 201
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapplyappendix/BaseDistributorApplyAppendixRest.java
  57. 248
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapplyappendix/BaseDistributorApplyAppendixService.java
  58. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java
  59. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java
  60. 31
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java
  61. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java
  62. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
  63. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java
  64. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoVo.java
  65. 30
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisDetailsVo.java
  66. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisFileDto.java
  67. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisFileVo.java
  68. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisInitDetailsVo.java
  69. 39
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java
  70. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java
  71. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java
  72. 26
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/DeptVo.java
  73. 55
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/DistributorApplyVo.java
  74. 29
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/DistributorDto.java
  75. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/ObjectDept.java
  76. 47
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/SalesDeptVo.java
  77. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/Salesman.java
  78. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/flowable/SubmitDistributorApplyDto.java
  79. 36
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java
  80. 109
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java

29
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributor.java

@ -27,6 +27,7 @@ import java.util.Date;
@Data
public class BaseDistributor extends BaseEntity {
@ApiModelProperty("经销商名称")
private String disName;
@ApiModelProperty("统一社会信用代码")
@ -78,6 +79,10 @@ public class BaseDistributor extends BaseEntity {
private String isGuarantee;
@ApiModelProperty(value = "是否担保key")
private String isGuaranteeKey;
@ApiModelProperty("是否投放展车")
private String isDelivery;
@ApiModelProperty(value = "是否投放展车Key")
private String isDeliveryKey;
@ApiModelProperty("开始合作日期")
private String startCoopDate;
@ApiModelProperty("创建组织")
@ -88,28 +93,16 @@ public class BaseDistributor extends BaseEntity {
private String useOrg;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("开票联系电话")
private String invoPhone;
@ApiModelProperty("开票开户行")
private String invoBank;
@ApiModelProperty("开票银行账号")
private String invoBankNum;
@ApiModelProperty("级别key")
private String disLevelKey;
@ApiModelProperty("级别value")
private String disLevelValue;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("环节定义的sid")
private String nodeSid;
@ApiModelProperty("流程实例的id")
private String procInstId;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("使用组织全路径")
private String orgSidPath;
@ApiModelProperty("办结日期")
private Date closingDate;
@ApiModelProperty("报备状态:1已报备,0未报备,2报备中")
private int filingState;
@ApiModelProperty("风控状态:1禁用 0正常 风控中心设置的状态")
private int riskState;
@ApiModelProperty("有效期")
private String effectiveDate;
}

22
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDetailsVo.java

@ -9,6 +9,7 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -96,18 +97,23 @@ public class BaseDistributorDetailsVo implements Vo {
@ApiModelProperty("人员list")
private List<BaseDistributorStaffVo> perList;
@ApiModelProperty("营业执照附件list")
private List<BaseDistributorAppendixVo> yyzzList;
private List<String> yyzzList = new ArrayList<>();
@ApiModelProperty("道路运输许可证附件list")
private List<BaseDistributorAppendixVo> dlysxkzList;
private List<String> dlysxkzList = new ArrayList<>();
@ApiModelProperty("法人身份证附件list")
private List<BaseDistributorAppendixVo> frsfzList;
private List<String> frsfzList = new ArrayList<>();
@ApiModelProperty("其他资料附件list")
private List<BaseDistributorAppendixVo> qtzlList;
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("流程实例的sid")
private String procInsId; // 流程实例的sid
private List<String> qtzlList = new ArrayList<>();
@ApiModelProperty("合作协议附件list")
private List<String> hzxyList = new ArrayList<>();
@ApiModelProperty("userSid")
private String userSid;
private String orgSidPath;
@ApiModelProperty("是否投放展车 0是/1否")
private String isDelivery;
@ApiModelProperty(value = "是否投放展车Key")
private String isDeliveryKey;
@ApiModelProperty(value = "有效期至")
private String effectiveDate;
}

32
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java

@ -80,6 +80,10 @@ public class BaseDistributorDto implements Dto {
private String isGuarantee;
@ApiModelProperty("是否担保 0是/1否")
private String isGuaranteeKey;
@ApiModelProperty("是否投放展车 0是/1否")
private String isDelivery;
@ApiModelProperty(value = "是否投放展车Key")
private String isDeliveryKey;
@ApiModelProperty("开始合作日期")
private String startCoopDate;
@ApiModelProperty("创建组织")
@ -90,25 +94,25 @@ public class BaseDistributorDto implements Dto {
private String useOrg;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("开票联系电话")
private String invoPhone;
@ApiModelProperty("开票开户行")
private String invoBank;
@ApiModelProperty("开票银行账号")
private String invoBankNum;
// @ApiModelProperty("开票联系电话")
// private String invoPhone;
// @ApiModelProperty("开票开户行")
// private String invoBank;
// @ApiModelProperty("开票银行账号")
// private String invoBankNum;
@ApiModelProperty("级别key")
private String disLevelKey;
@ApiModelProperty("级别value")
private String disLevelValue;
@ApiModelProperty("人员list")
private List<BaseDistributorStaffDto> perList;
@ApiModelProperty("营业执照附件list")
private List<BaseDistributorAppendixDto> yyzzList;
@ApiModelProperty("道路运输许可证附件list")
private List<BaseDistributorAppendixDto> dlysxkzList;
@ApiModelProperty("法人身份证附件list")
private List<BaseDistributorAppendixDto> frsfzList;
@ApiModelProperty("其他资料附件list")
private List<BaseDistributorAppendixDto> qtzlList;
// @ApiModelProperty("营业执照附件list")
// private List<BaseDistributorAppendixDto> yyzzList;
// @ApiModelProperty("道路运输许可证附件list")
// private List<BaseDistributorAppendixDto> dlysxkzList;
// @ApiModelProperty("法人身份证附件list")
// private List<BaseDistributorAppendixDto> frsfzList;
// @ApiModelProperty("其他资料附件list")
// private List<BaseDistributorAppendixDto> qtzlList;
private String orgSidPath;
}

89
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@ -2,6 +2,8 @@ package com.yxt.anrui.base.api.basedistributor;
import com.yxt.anrui.base.api.basedistributor.app.*;
import com.yxt.anrui.base.api.basedistributor.flow.*;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApply;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyDetailsVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -85,43 +87,52 @@ public interface BaseDistributorFeign {
@PostMapping("/getDistributors")
ResultBean<List<BaseDistributorsListVo>> getDistributors(@RequestBody BaseDistributorsListQuery pagerQuery);
//---------------------------------------------- 流程接口 --------------------------------------------------/
@ApiOperation("经销商备案提交")
@PostMapping("/submit")
public ResultBean submitRecordApplication(@RequestBody @Valid SubmitBaseDistributorApplyDto dto);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody BaseDistributorCompleteDto dto);
//分公司到风控中心同意
@ApiOperation(value = "办理(同意)")
@PostMapping("/companyToDivisionOperate")
public ResultBean companyToDivisionOperate(@Valid @RequestBody BaseDistributorCompleteDto query);
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody BaseDistributorTaskQuery query);
@ApiOperation("备案回显")
@GetMapping("/recordInfo")
@ResponseBody
public ResultBean<BaseDistributorApplyDetailsVo> recordInfo(@RequestParam("sid") String sid);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody BaseDistributorTaskQuery query);
@ApiOperation("风控状态禁用、启用:riskState为1时走禁用,为0时走启用")
@PostMapping("/setRiskState")
ResultBean setRiskState(@RequestBody RiskStateQuery query);
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@RequestBody BaseDistributorTaskQuery query);
@ApiOperation(value = "流程历史流转记录")
@GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
//---------------------------------------------- 流程接口 --------------------------------------------------/
// @ApiOperation("经销商备案提交")
// @PostMapping("/submit")
// public ResultBean submitRecordApplication(@RequestBody @Valid SubmitBaseDistributorApplyDto dto);
//
// @ApiOperation(value = "办理(同意)")
// @PostMapping("/complete")
// public ResultBean complete(@Valid @RequestBody BaseDistributorCompleteDto dto);
//
// //分公司到风控中心同意
// @ApiOperation(value = "办理(同意)")
// @PostMapping("/companyToDivisionOperate")
// public ResultBean companyToDivisionOperate(@Valid @RequestBody BaseDistributorCompleteDto query);
//
// @ApiOperation(value = "撤回流程")
// @PostMapping(value = "/revokeProcess")
// public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody BaseDistributorTaskQuery query);
//
// @ApiOperation(value = "驳回任务")
// @PostMapping(value = "/reject")
// public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody BaseDistributorTaskQuery query);
//
// @ApiOperation(value = "终止任务")
// @PostMapping(value = "/breakProcess")
// public ResultBean breakProcess(@RequestBody BaseDistributorTaskQuery query);
//
// @ApiOperation(value = "流程历史流转记录")
// @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
// public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
//
// @ApiOperation(value = "获取下一个环节")
// @GetMapping(value = "/getNextNodesForSubmit")
// ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
//
// @ApiOperation(value = "获取上一个环节")
// @GetMapping(value = "/getPreviousNodesForReject")
// ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
//---------------------------------------移动端-------------------------------------------------//
@ApiOperation("移动端-销售订单-经销商分页列 表")
@ -192,8 +203,8 @@ public interface BaseDistributorFeign {
@GetMapping("/selectDisListBySid/{sid}")
ResultBean<BaseDistributorListVo> selectDisListBySid(@PathVariable("sid") String sid);
//---------------------------------------移动端流程---------------------------------------------//
@ApiOperation("经销商备案提交")
@PostMapping("/submitDistributor")
public ResultBean submitDistributor(@RequestBody @Valid AppSubmitDistributorApplyDto dto);
// //---------------------------------------移动端流程---------------------------------------------//
// @ApiOperation("经销商备案提交")
// @PostMapping("/submitDistributor")
// public ResultBean submitDistributor(@RequestBody @Valid AppSubmitDistributorApplyDto dto);
}

105
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.basedistributor;
import com.yxt.anrui.base.api.basedistributor.app.*;
import com.yxt.anrui.base.api.basedistributor.flow.*;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyDetailsVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -84,49 +85,59 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
}
@Override
public ResultBean submitRecordApplication(SubmitBaseDistributorApplyDto dto) {
return null;
}
@Override
public ResultBean complete(BaseDistributorCompleteDto dto) {
return null;
}
@Override
public ResultBean companyToDivisionOperate(BaseDistributorCompleteDto query) {
return null;
}
@Override
public ResultBean revokeProcess(BaseDistributorTaskQuery query) {
return null;
}
@Override
public ResultBean taskReject(BaseDistributorTaskQuery query) {
return null;
}
@Override
public ResultBean breakProcess(BaseDistributorTaskQuery query) {
return null;
}
@Override
public ResultBean flowRecord(String procInsId) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
public ResultBean<BaseDistributorApplyDetailsVo> recordInfo(String sid) {
return null;
}
@Override
public ResultBean setRiskState(RiskStateQuery query) {
return null;
}
// @Override
// public ResultBean submitRecordApplication(SubmitBaseDistributorApplyDto dto) {
// return null;
// }
//
// @Override
// public ResultBean complete(BaseDistributorCompleteDto dto) {
// return null;
// }
//
// @Override
// public ResultBean companyToDivisionOperate(BaseDistributorCompleteDto query) {
// return null;
// }
//
// @Override
// public ResultBean revokeProcess(BaseDistributorTaskQuery query) {
// return null;
// }
//
// @Override
// public ResultBean taskReject(BaseDistributorTaskQuery query) {
// return null;
// }
//
// @Override
// public ResultBean breakProcess(BaseDistributorTaskQuery query) {
// return null;
// }
//
// @Override
// public ResultBean flowRecord(String procInsId) {
// return null;
// }
//
// @Override
// public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
// return null;
// }
//
// @Override
// public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
// return null;
// }
@Override
public ResultBean<PagerVo<BaseDistributorsListVo>> getDistributorList(PagerQuery<BaseDistributorsListQuery> pagerQuery) {
@ -213,10 +224,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
return null;
}
@Override
public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) {
return null;
}
// @Override
// public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) {
// return null;
// }
}

25
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorQuery.java

@ -37,6 +37,9 @@ public class BaseDistributorQuery implements Query {
private String legalName;
@ApiModelProperty("是否担保 0是/1否")
private String isGuarantee;
@ApiModelProperty("是否担保 0是/1否")
private String isGuaranteeKey;
@ApiModelProperty("级别key")
private String disLevelKey;
@ApiModelProperty("上级经销商sid")
@ -45,4 +48,26 @@ public class BaseDistributorQuery implements Query {
private String relationState;
@ApiModelProperty("分公司sid")
private String createOrg;
@ApiModelProperty("是否投放展车 0是/1否")
private String isDelivery;
@ApiModelProperty(value = "是否投放展车Key")
private String isDeliveryKey;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("菜单url")
private String menuUrl;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("报备状态")
private String filingStateKey;
@ApiModelProperty("风控状态")
private String riskStateKey;
@ApiModelProperty("分公司")
private String company;
@ApiModelProperty("销售部门")
private String dept;
@ApiModelProperty("销售专员")
private String saesman;
}

30
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java

@ -78,6 +78,10 @@ public class BaseDistributorVo implements Vo {
private String isGuarantee;
@ApiModelProperty("是否担保 0是/1否")
private String isGuaranteeKey;
@ApiModelProperty("是否投放展车 0是/1否")
private String isDelivery;
@ApiModelProperty(value = "是否投放展车Key")
private String isDeliveryKey;
@ApiModelProperty("开始合作日期")
private String startCoopDate;
@ApiModelProperty("创建组织")
@ -88,12 +92,7 @@ public class BaseDistributorVo implements Vo {
private String useOrg;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("开票联系电话")
private String invoPhone;
@ApiModelProperty("开票开户行")
private String invoBank;
@ApiModelProperty("开票银行账号")
private String invoBankNum;
@ApiModelProperty("本年销售台数")
private String curYearSaleNum;
@ApiModelProperty("累计销售台数")
@ -106,9 +105,18 @@ public class BaseDistributorVo implements Vo {
private String isRelation;
@ApiModelProperty("备案状态")
private String state;
private String procDefId;
@ApiModelProperty("实例id")
private String procInstId;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("风控状态:1禁用 0正常 风控中心设置的状态")
private String riskState;
@ApiModelProperty("分公司")
private String company;
@ApiModelProperty("销售部门")
private String dept;
@ApiModelProperty("销售专员")
private String salesman;
@ApiModelProperty("联系电话")
private String invoPhone;
}

22
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/RiskStateQuery.java

@ -0,0 +1,22 @@
package com.yxt.anrui.base.api.basedistributor;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/19 17:00
*/
@Data
public class RiskStateQuery {
@ApiModelProperty("sids")
private List<String> sidsList = new ArrayList<>();
@ApiModelProperty("riskState为1时走禁用,为0时走启用")
private String riskState;
private String userSid;
}

32
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDisDetailsVo.java

@ -1,9 +1,12 @@
package com.yxt.anrui.base.api.basedistributor.app;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppSalesDeptVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppSalesman;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
@ -16,13 +19,36 @@ public class BaseDisDetailsVo implements Vo {
private static final long serialVersionUID = 5373789509599475050L;
@ApiModelProperty(value = "经销商基础信息")
private BaseInfoVo baseInfo;
@ApiModelProperty(value = "开票信息")
private BaseInvoiceInfoVo invoiceInfo;
// @ApiModelProperty(value = "开票信息")
// private BaseInvoiceInfoVo invoiceInfo;
@ApiModelProperty(value = "附件清单")
private BaseFileVo fileInfo;
@ApiModelProperty(value = "人员列表")
private List<BaseRecordsVo> records;
private String procInstId;
@ApiModelProperty(value = "经销商")
private String disName;
@ApiModelProperty(value = "统一信用代码")
private String registNum;
@ApiModelProperty(value = "注册地址")
private String registDetailAddress;
@ApiModelProperty(value = "开户行")
private String invoBank;
@ApiModelProperty(value = "银行账号")
private String invoBankNum;
@ApiModelProperty("开票联系电话")
private String invoPhone;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
private String beiAnSid;
private String jxsSid;
private AppSalesDeptVo salesDeptVo;
private String taskId;
private String procInsId;
private String publishInfo;
private String sid;
private List<AppSalesman> users = new ArrayList<>();
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java

@ -19,6 +19,6 @@ public class BaseDistributorsQuery implements Query {
@ApiModelProperty("机构sid")
private String orgPath;
private String menuSid;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java

@ -31,6 +31,9 @@ public class BaseDistributorsVo implements Vo {
private String invoPhone;
@ApiModelProperty(value = "成立日期")
private String setUpTime;
private String isDelivery;
//private String nodeState;
private boolean updateBtn;
private boolean reportBtn;
private boolean deleteBtn;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseFileDto.java

@ -24,6 +24,8 @@ public class BaseFileDto implements Dto {
private List<String> corporateIdCard = new ArrayList<>();
@ApiModelProperty(value = "其他资料")
private List<String> otherInfo = new ArrayList<>();
@ApiModelProperty(value = "其他资料")
private List<String> agreement = new ArrayList<>();
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseFileVo.java

@ -23,6 +23,8 @@ public class BaseFileVo implements Vo {
private List<String> corporateIdCard = new ArrayList<>();
@ApiModelProperty(value = "其他资料")
private List<String> otherInfo = new ArrayList<>();
@ApiModelProperty(value = "合作协议")
private List<String> agreement = new ArrayList<>();
private String distributorSid;
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java

@ -22,11 +22,11 @@ public class BaseInfoDto implements Dto {
@ApiModelProperty(value = "经销商")
private String disName;
/* @ApiModelProperty(value = "统一信用代码")
@ApiModelProperty(value = "统一信用代码")
private String registNum;
@ApiModelProperty(value = "注册地址")
private String registDetailAddress;*/
private String registDetailAddress;
@ApiModelProperty(value = "实际经营地址")
private String managementDetailAddress;
@ -78,4 +78,6 @@ public class BaseInfoDto implements Dto {
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
private String isDelivery;
private String isDeliveryKey;
}

15
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoVo.java

@ -17,14 +17,13 @@ public class BaseInfoVo implements Vo {
private String pDistributorName;
@ApiModelProperty(value = "所属经销商sid")
private String pDistributorSid;
//
@ApiModelProperty(value = "经销商")
private String disName;
/* @ApiModelProperty(value = "统一信用代码")
@ApiModelProperty(value = "统一信用代码")
private String registNum;
@ApiModelProperty(value = "注册地址")
private String registDetailAddress;*/
private String registDetailAddress;
@ApiModelProperty(value = "实际经营地址")
private String managementDetailAddress;
@ -69,4 +68,12 @@ public class BaseInfoVo implements Vo {
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
@ApiModelProperty("是否投放展车")
private String isDelivery;
@ApiModelProperty(value = "是否投放展车Key")
private String isDeliveryKey;
@ApiModelProperty(value = "有效期至")
private String effectiveDate;
}

27
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppDeptVo.java

@ -0,0 +1,27 @@
package com.yxt.anrui.base.api.basedistributor.app.apply;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/21 13:35
*/
@Data
public class AppDeptVo implements Vo {
//第一级
private String sid;
private String checkSid;
// 必须有 一般sid
private String dictKey;
private boolean selected;
//必须有 显示的文字
private String dictValue;
private boolean mandatory;
private String dictType;
private String extra;
//额外的内容;
private AppObjectDept extra2;
}

55
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppDistributorApplyVo.java

@ -0,0 +1,55 @@
package com.yxt.anrui.base.api.basedistributor.app.apply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/22 8:51
*/
@Data
public class AppDistributorApplyVo implements Vo {
/**
* 申请日期
*/
private String applyDate;
/**
* 申请人
*/
private String applyName;
/**
* 分公司
*/
private String company;
/**
* 申请部门
*/
private String dept;
/**
* 经销商名称
*/
private String distributorName;
/**
* 有效期至
*/
private String effectiveDate;
/**
* 销售专员
*/
private String salesman;
/**
* 备案记录sid
*/
private String sid;
/**
* 流程状态
*/
private String state;
@ApiModelProperty("某某部门,某某人")
private String publishInfo;
private boolean updateBtn;
private boolean deleteBtn;
}

29
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppDistributorDto.java

@ -0,0 +1,29 @@
package com.yxt.anrui.base.api.basedistributor.app.apply;
import com.yxt.anrui.base.api.basedistributor.app.BaseFileDto;
import com.yxt.anrui.base.api.basedistributor.app.BaseInfoDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/20 16:37
*/
@Data
public class AppDistributorDto implements Dto {
private String beiAnSid;
private String jxsSid;
private BaseFileDto fileInfo;
private AppSalesDeptVo salesDeptVo;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
}

25
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppObjectDept.java

@ -0,0 +1,25 @@
package com.yxt.anrui.base.api.basedistributor.app.apply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/21 13:40
*/
@Data
public class AppObjectDept {
//第二级
@ApiModelProperty("主管人员sid")
private String mangeSid;
@ApiModelProperty("主管人员")
private String mange;
//额外的内容;
private List<AppSalesman> users = new ArrayList<>();
}

46
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppSalesDeptVo.java

@ -0,0 +1,46 @@
package com.yxt.anrui.base.api.basedistributor.app.apply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/21 9:26
*/
@Data
public class AppSalesDeptVo implements Vo {
@ApiModelProperty("申请人")
private String applyName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门")
private String dept;
@ApiModelProperty("销售部门sid")
private String salesDeptSid;
@ApiModelProperty("销售部门")
private String salesDept;
@ApiModelProperty("主管人员sid")
private String mangeSid;
@ApiModelProperty("主管人员")
private String mange;
@ApiModelProperty("销售专员sid")
private String salesmanSid;
@ApiModelProperty("销售专员")
private String salesman;
@ApiModelProperty(value = "有效期至")
private String effectiveDate;
@ApiModelProperty("1是0否")
private String agree;
@ApiModelProperty("备注")
private String remarks;
private String tempMangeSid;
private String tempMange;
}

25
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/apply/AppSalesman.java

@ -0,0 +1,25 @@
package com.yxt.anrui.base.api.basedistributor.app.apply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/21 13:40
*/
@Data
public class AppSalesman {
private String sid;
private String checkSid;
// 必须有 一般sid
private String dictKey;
private boolean selected;
//必须有 显示的文字
private String dictValue;
private boolean mandatory;
private String dictType;
private String extra;
//额外的内容;
private Object extra2;
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/AppSubmitDistributorApplyDto.java

@ -1,6 +1,7 @@
package com.yxt.anrui.base.api.basedistributor.flow;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -11,9 +12,8 @@ import lombok.Data;
* @date 2023/7/14 9:15
*/
@Data
public class AppSubmitDistributorApplyDto implements Dto {
@ApiModelProperty("distributorSid")
private String distributorSid;
public class AppSubmitDistributorApplyDto extends AppDistributorDto {
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实例id")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/flow/BaseDistributorCompleteDto.java

@ -37,6 +37,4 @@ public class BaseDistributorCompleteDto implements Dto {
private String businessSid;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
@ApiModelProperty(value = "是否能判定 01是 02否")
private String isDecided;
}

100
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApply.java

@ -0,0 +1,100 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basedistributorapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: anrui-base(经销商备案申请) <br/>
* File: BaseDiscountpackageApply.java <br/>
* Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApply <br/>
* Description: 经销商备案申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-08 17:04:45 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "经销商备案申请", description = "经销商备案申请")
@TableName("base_distributor_apply")
public class BaseDistributorApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("申请人")
private String applyName; // 申请人
@ApiModelProperty("销售专员sid")
private String salesmanSid; // 销售专员sid
@ApiModelProperty("销售专员")
private String salesman; // 销售专员
@ApiModelProperty("申请日期")
private Date applyDate; // 申请日期
@ApiModelProperty("申请部门")
private String dept;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("销售部门")
private String salesDept;
@ApiModelProperty("销售部门sid")
private String salesDeptSid;
@ApiModelProperty("销售经理主管")
private String manage;
@ApiModelProperty("销售经理主管sid")
private String manageSid;
@ApiModelProperty("经销商sid")
private String distributorSid;
@ApiModelProperty("经销商")
private String distributor;
@ApiModelProperty("有效期")
private String effectiveDate;
@ApiModelProperty("是否同意1是0否")
private String agree; // 台数
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
}

140
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyDetailsVo.java

@ -0,0 +1,140 @@
package com.yxt.anrui.base.api.basedistributorapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/18 9:57
*/
@Data
public class BaseDistributorApplyDetailsVo implements Vo {
@ApiModelProperty("userSid")
private String userSid;
private String orgSidPath;
@ApiModelProperty("经销商备案申请sid")
private String sid;
@ApiModelProperty("经销商sid")
private String distributorSid;
@ApiModelProperty("上级经销商名称")
private String pDisName;
@ApiModelProperty("经销商名称")
private String disName;
@ApiModelProperty("统一社会信用代码")
private String registNum;
@ApiModelProperty("成立时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date setUpTime;
@ApiModelProperty("注册(登记)地址")
private String registDetailAddress;
@ApiModelProperty(value = "省")
private String provinceCode;
@ApiModelProperty(value = "县区")
private String cityCode;
@ApiModelProperty("经营地址(省市县)code")
private String managementAddressCode;
@ApiModelProperty(value = "经营地址省")
private String managementDetailAddressProvince;
@ApiModelProperty(value = "经营地址市")
private String managementDetailAddressCity;
@ApiModelProperty(value = "经营地址县区")
private String managementDetailAddressCounty;
@ApiModelProperty("实际经营地址:详细地址")
private String managementDetailAddress;
@ApiModelProperty("联系人")
private String contract;
@ApiModelProperty("联系人手机号码")
private String mobile;
@ApiModelProperty("实际控制人姓名")
private String legalName;
@ApiModelProperty("实际控制人身份证号码")
private String legalIdCard;
@ApiModelProperty("实际控制人手机号码")
private String legalMobile;
@ApiModelProperty("上级经销商sid")
@JsonProperty("pDistributorSid")
private String pDistributorSid;
@ApiModelProperty("上级经销商名称")
@JsonProperty("pDistributorName")
private String pDistributorName;
@ApiModelProperty("是否担保 0是/1否")
private String isGuarantee;
@ApiModelProperty("是否担保 0是/1否")
private String isGuaranteeKey;
@ApiModelProperty("开始合作日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startCoopDate;
@ApiModelProperty("使用组织")
private String useOrg;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("开票联系电话")
private String invoPhone;
@ApiModelProperty("开票开户行")
private String invoBank;
@ApiModelProperty("开票银行账号")
private String invoBankNum;
@ApiModelProperty("级别key")
private String disLevelKey;
@ApiModelProperty("级别value")
private String disLevelValue;
@ApiModelProperty("人员list")
private List<BaseDistributorStaffVo> perList;
@ApiModelProperty("营业执照附件list")
private List<String> yyzzList = new ArrayList<>();
@ApiModelProperty("道路运输许可证附件list")
private List<String> dlysxkzList = new ArrayList<>();
@ApiModelProperty("法人身份证附件list")
private List<String> frsfzList = new ArrayList<>();
@ApiModelProperty("其他资料附件list")
private List<String> qtzlList = new ArrayList<>();
@ApiModelProperty("合作协议附件list")
private List<String> hzxyList = new ArrayList<>();
@ApiModelProperty("是否投放展车 0是/1否")
private String isDelivery;
@ApiModelProperty(value = "是否投放展车Key")
private String isDeliveryKey;
@ApiModelProperty(value = "有效期至")
private String effectiveDate;
@ApiModelProperty("是否同意 0否/1是")
private String agree;
@ApiModelProperty("申请人")
private String applyName; // 申请人
@ApiModelProperty("销售专员sid")
private String salesmanSid; // 销售专员sid
@ApiModelProperty("销售专员")
private String salesman; // 销售专员
@ApiModelProperty("申请日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date applyDate; // 申请日期
@ApiModelProperty("申请部门")
private String dept;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("销售部门")
private String salesDept;
@ApiModelProperty("销售部门sid")
private String salesDeptSid;
@ApiModelProperty("销售经理主管")
private String manage;
@ApiModelProperty("销售经理主管sid")
private String manageSid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("实例id")
private String instanceId;
}

63
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyDto.java

@ -0,0 +1,63 @@
package com.yxt.anrui.base.api.basedistributorapply;
import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
import com.yxt.anrui.base.api.basedistributorapplyappendix.BaseDistributorApplyAppendixDto;
import com.yxt.anrui.base.api.basedistributorapplyappendix.BaseDistributorApplyAppendixVo;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/18 11:37
*/
@Data
public class BaseDistributorApplyDto implements Dto {
private String sid;
private String userSid;
private String orgSidPath;
@ApiModelProperty("经销商sid")
private String distributorSid;
@ApiModelProperty(value = "有效期至")
private String effectiveDate;
@ApiModelProperty("是否同意 0否/1是")
private String agree;
@ApiModelProperty("申请人")
private String applyName; // 申请人
@ApiModelProperty("销售专员sid")
private String salesmanSid; // 销售专员sid
@ApiModelProperty("销售专员")
private String salesman; // 销售专员
@ApiModelProperty("申请日期")
private Date applyDate; // 申请日期
@ApiModelProperty("申请部门")
private String dept;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("销售部门")
private String salesDept;
@ApiModelProperty("销售部门sid")
private String salesDeptSid;
@ApiModelProperty("销售经理主管")
private String manage;
@ApiModelProperty("销售经理主管sid")
private String manageSid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("营业执照附件list")
private List<String> yyzzList = new ArrayList<>();
@ApiModelProperty("道路运输许可证附件list")
private List<String> dlysxkzList = new ArrayList<>();
@ApiModelProperty("法人身份证附件list")
private List<String> frsfzList = new ArrayList<>();
@ApiModelProperty("其他资料附件list")
private List<String> qtzlList = new ArrayList<>();
@ApiModelProperty("合作协议附件list")
private List<String> hzxyList = new ArrayList<>();
}

171
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java

@ -0,0 +1,171 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basedistributorapply;
import com.yxt.anrui.base.api.basedistributor.app.BaseDisDetailsVo;
import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDeptVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorDto;
import com.yxt.anrui.base.api.basedistributorapply.flow.*;
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 io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: anrui-base(经销商备案申请) <br/>
* File: BaseDiscountpackageApplyFeign.java <br/>
* Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyFeign <br/>
* Description: 经销商备案申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-08 17:04:45 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "经销商备案申请")
@FeignClient(
contextId = "anrui-base-BaseDistributorApply",
name = "anrui-base",
path = "v1/basedistributorapply",
fallback = BaseDistributorApplyFeignFallback.class)
public interface BaseDistributorApplyFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<BaseDistributorApplyVo>> listPage(@RequestBody PagerQuery<BaseDistributorApplyQuery> pq);
@ApiOperation("详情查看")
@GetMapping("/detail/{sid}")
@ResponseBody
public ResultBean<BaseDistributorApplyDetailsVo> detail(@PathVariable("sid") String sid);
@ApiOperation("保存修改")
@PostMapping("/save")
@ResponseBody
public ResultBean<String> save(@RequestBody BaseDistributorApplyDto dto);
@ApiOperation("批量删除")
@DeleteMapping("/deleteBySids")
@ResponseBody
public ResultBean deleteBySids(@RequestBody String[] sids);
@ApiOperation("根据销售部门sid查询主管人员")
@GetMapping("/selectMangerByDeptSid")
@ResponseBody
public ResultBean<BaseSalesManger> selectMangerByDeptSid(@RequestParam("deptSid") String deptSid);
//---------------------------------------------- 流程接口 --------------------------------------------------/
@ApiOperation("经销商备案提交")
@PostMapping("/submit")
public ResultBean submitRecordApplication(@RequestBody @Valid SubmitBaseDistributorApplyDto dto);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody BaseDistributorApplyCompleteDto dto);
//分公司到风控中心同意
@ApiOperation(value = "办理(同意)")
@PostMapping("/companyToDivisionOperate")
public ResultBean companyToDivisionOperate(@Valid @RequestBody BaseDistributorApplyCompleteDto query);
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody BaseDistributorApplyTaskQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody BaseDistributorApplyTaskQuery query);
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@RequestBody BaseDistributorApplyTaskQuery query);
@ApiOperation(value = "流程历史流转记录")
@GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
//---------------------------移动端--------------------------------------
@ApiOperation("查询本分公司下销售部门/销售专员/对应部门主管")
@GetMapping("/getSalesDept")
@ResponseBody
ResultBean<List<AppDeptVo>> getSalesDept(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
@ApiOperation("移动端-经销商开票保存修改")
@PostMapping("/saveDistributor")
@ResponseBody
ResultBean<String> saveDistributor(@RequestBody AppDistributorDto dto);
@ApiOperation("移动端-经销商备案初始化")
@GetMapping("/getDistributor1")
@ResponseBody
ResultBean<BaseDisDetailsVo> getDistributor1(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
@ApiOperation("移动端-经销商备案详情")
@GetMapping("/getDistributor2")
@ResponseBody
ResultBean<BaseDisDetailsVo> getDistributor2(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
@ApiOperation("移动端-经销商分页列表")
@PostMapping("/getDistributorApplyList")
@ResponseBody
ResultBean<PagerVo<AppDistributorApplyVo>> getDistributorApplyList(@RequestBody PagerQuery<BaseDistributorsQuery> pagerQuery);
@ApiOperation("移动端-经销商备案申请删除")
@DeleteMapping("/deleteDistributor2/{sid}")
@ResponseBody
ResultBean deleteDistributor2(@PathVariable("sid") String sid);
//---------------------------------------移动端流程---------------------------------------------//
@ApiOperation("经销商备案提交")
@PostMapping("/submitDistributor")
public ResultBean submitDistributor(@RequestBody @Valid AppSubmitApplyDto dto);
}

161
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java

@ -0,0 +1,161 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basedistributorapply;
import com.yxt.anrui.base.api.basedistributor.app.BaseDisDetailsVo;
import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDeptVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorDto;
import com.yxt.anrui.base.api.basedistributorapply.flow.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-base(经销商备案申请) <br/>
* File: BaseDiscountpackageApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyFeignFallback <br/>
* Description: 经销商备案申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-08 17:04:45 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class BaseDistributorApplyFeignFallback implements BaseDistributorApplyFeign {
@Override
public ResultBean<PagerVo<BaseDistributorApplyVo>> listPage(PagerQuery<BaseDistributorApplyQuery> pq) {
return null;
}
@Override
public ResultBean<BaseDistributorApplyDetailsVo> detail(String sid) {
return null;
}
@Override
public ResultBean<String> save(BaseDistributorApplyDto dto) {
return null;
}
@Override
public ResultBean deleteBySids(String[] sids) {
return null;
}
@Override
public ResultBean<BaseSalesManger> selectMangerByDeptSid(String deptSid) {
return null;
}
@Override
public ResultBean submitRecordApplication(SubmitBaseDistributorApplyDto dto) {
return null;
}
@Override
public ResultBean complete(BaseDistributorApplyCompleteDto dto) {
return null;
}
@Override
public ResultBean companyToDivisionOperate(BaseDistributorApplyCompleteDto query) {
return null;
}
@Override
public ResultBean revokeProcess(BaseDistributorApplyTaskQuery query) {
return null;
}
@Override
public ResultBean taskReject(BaseDistributorApplyTaskQuery query) {
return null;
}
@Override
public ResultBean breakProcess(BaseDistributorApplyTaskQuery query) {
return null;
}
@Override
public ResultBean flowRecord(String procInsId) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<AppDeptVo>> getSalesDept(String userSid, String orgPath) {
return null;
}
@Override
public ResultBean<String> saveDistributor(AppDistributorDto dto) {
return null;
}
@Override
public ResultBean<BaseDisDetailsVo> getDistributor1(String sid, String orgPath, String userSid) {
return null;
}
@Override
public ResultBean<BaseDisDetailsVo> getDistributor2(String sid, String orgPath, String userSid) {
return null;
}
@Override
public ResultBean<PagerVo<AppDistributorApplyVo>> getDistributorApplyList(PagerQuery<BaseDistributorsQuery> pagerQuery) {
return null;
}
@Override
public ResultBean deleteDistributor2(String sid) {
return null;
}
@Override
public ResultBean submitDistributor(AppSubmitApplyDto dto) {
return null;
}
}

41
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyQuery.java

@ -0,0 +1,41 @@
package com.yxt.anrui.base.api.basedistributorapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/18 8:47
*/
@Data
public class BaseDistributorApplyQuery implements Query {
@ApiModelProperty("申请人")
private String applyName; // 申请人
@ApiModelProperty("销售专员")
private String salesman; // 销售专员
@ApiModelProperty("申请开始日期")
private String applyStartDate; // 申请日期
@ApiModelProperty("申请结束日期")
private String applyEndDate; // 申请日期
@ApiModelProperty("申请部门")
private String dept;
@ApiModelProperty("经销商")
private String distributor;
@ApiModelProperty("有效期")
private String effectiveStartDate;
@ApiModelProperty("有效期")
private String effectiveEndDate;
@ApiModelProperty("分公司")
private String company; // 使用组织名称
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("菜单url")
private String menuUrl;
@ApiModelProperty("用户sid")
private String userSid;
}

39
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyVo.java

@ -0,0 +1,39 @@
package com.yxt.anrui.base.api.basedistributorapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/18 8:31
*/
@Data
public class BaseDistributorApplyVo implements Vo {
private String sid;
@ApiModelProperty("申请人")
private String applyName; // 申请人
@ApiModelProperty("销售专员")
private String salesman; // 销售专员
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("申请部门")
private String dept;
@ApiModelProperty("经销商")
private String distributor;
@ApiModelProperty("有效期")
private String effectiveDate;
@ApiModelProperty("分公司")
private String company; // 使用组织名称
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("备注")
private String remarks; // 备注
}

17
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseSalesManger.java

@ -0,0 +1,17 @@
package com.yxt.anrui.base.api.basedistributorapply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/18 16:50
*/
@Data
public class BaseSalesManger {
@ApiModelProperty("销售经理主管")
private String manage;
@ApiModelProperty("销售经理主管sid")
private String manageSid;
}

23
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/AppSubmitApplyDto.java

@ -0,0 +1,23 @@
package com.yxt.anrui.base.api.basedistributorapply.flow;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/7/14 9:15
*/
@Data
public class AppSubmitApplyDto extends AppDistributorDto {
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实例id")
@JsonProperty("procInsId")
private String instanceId;
}

41
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/BaseDistributorApplyCompleteDto.java

@ -0,0 +1,41 @@
package com.yxt.anrui.base.api.basedistributorapply.flow;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2022/6/28 9:01
* @Description
*/
@Data
public class BaseDistributorApplyCompleteDto implements Dto {
private static final long serialVersionUID = 3240453987322803352L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
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 = "意见")
@NotBlank(message = "参数错误:comment")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
}

56
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/BaseDistributorApplyTaskQuery.java

@ -0,0 +1,56 @@
package com.yxt.anrui.base.api.basedistributorapply.flow;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/6/28 17:29
* @Description 终止撤回驳回查询参数
*/
@Data
public class BaseDistributorApplyTaskQuery implements Query {
private static final long serialVersionUID = -4006020771892400451L;
/**
* 终止驳回撤回
*/
@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("用户Id")
private String userId;
@ApiModelProperty("节点")
private String targetKey;
@ApiModelProperty("流程变量信息")
private Map<String, Object> values = new HashMap<>();
@ApiModelProperty("审批人")
private String assignee;
@ApiModelProperty("候选人")
private List<String> candidateUsers = new ArrayList<>();
@ApiModelProperty("审批组")
private List<String> candidateGroups = new ArrayList<>();*/
}

26
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/GetNodeQuery.java

@ -0,0 +1,26 @@
package com.yxt.anrui.base.api.basedistributorapply.flow;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2022/6/28 10:42
* @Description
*/
@Data
public class GetNodeQuery implements Query {
private static final long serialVersionUID = -5674867230708197611L;
@ApiModelProperty(value = "环节定义id")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
}

25
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/GetNodeVo.java

@ -0,0 +1,25 @@
package com.yxt.anrui.base.api.basedistributorapply.flow;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/6/28 11:09
* @Description
*/
@Data
public class GetNodeVo implements Vo {
private static final long serialVersionUID = 8802774014747063504L;
@ApiModelProperty(value = "节点名称")
private String name;
@ApiModelProperty(value = "节点id")
private String id;
@ApiModelProperty(value = "审批组")
private List<String> candidateGroups;
@ApiModelProperty(value = "是否是最后环节")
private String endTask;
}

22
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/SubmitBaseDistributorApplyDto.java

@ -0,0 +1,22 @@
package com.yxt.anrui.base.api.basedistributorapply.flow;
import com.yxt.anrui.base.api.basedistributor.BaseDistributorDto;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/6/27 13:38
* @Description
*/
@Data
public class SubmitBaseDistributorApplyDto extends BaseDistributorApplyDto {
private static final long serialVersionUID = 378585162071125756L;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("业务sid")
private String sid;
}

40
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendix.java

@ -0,0 +1,40 @@
package com.yxt.anrui.base.api.basedistributorapplyappendix;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel(value = "经销商备案资料", description = "经销商备案资料")
@TableName("base_distributor_apply_appendix")
@Data
public class BaseDistributorApplyAppendix extends BaseEntity {
private static final long serialVersionUID = 3692073826416165453L;
@ApiModelProperty("文件名(陕汽必须字段)")
private String fileName;
@ApiModelProperty("文件类型(陕汽必须字段)")
private String fileType;
@ApiModelProperty("上传人(陕汽必须字段)")
private String name;
@ApiModelProperty("关联业务对象sid(陕汽必须字段)")
private String linkSid;
@ApiModelProperty("附件类型(陕汽必须字段)")
private String attachType;
@ApiModelProperty("文件大小(陕汽必须字段)")
private String fileSize;
@ApiModelProperty("文件路径(陕汽必须字段)")
private String filePath;
// @ApiModelProperty("关联经销商sid(陕汽必须字段)")
// private String distributorSid;
}

38
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixDto.java

@ -0,0 +1,38 @@
package com.yxt.anrui.base.api.basedistributorapplyappendix;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ApiModel(value = "经销商备案资料 数据传输对象", description = "经销商备案资料 数据传输对象")
@Data
public class BaseDistributorApplyAppendixDto implements Dto {
private static final long serialVersionUID = -2217543094762966534L;
@ApiModelProperty(value = "文件名", required = true)
private String fileName;
@ApiModelProperty(value = "文件类型", required = true)
private String fileType;
@ApiModelProperty(value = "经销商的sid", required = true)
private String linkSid;
@ApiModelProperty(value = "文件大小", required = true)
private String fileSize;
@ApiModelProperty(value = "文件路径", required = true)
private String filePath;
@ApiModelProperty(value = "上传人", required = true)
private String name;
@ApiModelProperty(value = "上传时间", required = true)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
// @ApiModelProperty("关联经销商sid(陕汽必须字段)")
// private String distributorSid;
}

55
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixFallback.java

@ -0,0 +1,55 @@
package com.yxt.anrui.base.api.basedistributorapplyappendix;
import com.yxt.common.core.result.FileUploadResult;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@Component
public class BaseDistributorApplyAppendixFallback implements BaseDistributorApplyAppendixFeign {
@Override
public ResultBean<List<BaseDistributorApplyAppendixVo>> list(BaseDistributorApplyAppendixOneQuery query) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basedistributorappendix/list无法访问");
}
@Override
public ResultBean save(BaseDistributorApplyAppendixDto dto) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basedistributorappendix/save无法访问");
}
@Override
public ResultBean update(BaseDistributorApplyAppendixDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basedistributorappendix/update无法访问");
}
@Override
public ResultBean deleteBySids(String sidsList) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basedistributorappendix/deleteBySids无法访问");
}
@Override
public ResultBean<FileUploadResult> uploadImage(MultipartFile file) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basedistributorappendix/uploadImage无法访问");
}
@Override
public ResultBean deleteFilesOss(String fullPath) {
return null;
}
@Override
public void download(HttpServletResponse response, String path) throws IOException {
}
}

58
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixFeign.java

@ -0,0 +1,58 @@
package com.yxt.anrui.base.api.basedistributorapplyappendix;
import com.yxt.common.core.result.FileUploadResult;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@Api(tags = "经销商备案资料")
@FeignClient(
contextId = "anrui-base-BaseDistributorApplyAppendix",
name = "anrui-base",
path = "v1/basedistributorapplyappendix",
fallback = BaseDistributorApplyAppendixFallback.class)
public interface BaseDistributorApplyAppendixFeign {
@ApiOperation("查询备案资料信息列表(已测试)")
@GetMapping("/list")
public ResultBean<List<BaseDistributorApplyAppendixVo>> list(BaseDistributorApplyAppendixOneQuery query);
@ApiOperation("添加备案资料信息")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseDistributorApplyAppendixDto dto);
@ApiOperation("修改备案资料信息(已测试)")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody BaseDistributorApplyAppendixDto dto, @PathVariable("sid") String sid);
@ApiOperation("批量删除备案资料信息(已测试)")
@DeleteMapping("/deleteBySids")
@ApiImplicitParam(name = "sidsList", value = "备案资料sid,若多个sid,以英文逗号分割")
public ResultBean deleteBySids(@RequestParam("sidsList") String sidsList);
@ApiOperation(value = "备案资料上传")
@ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "MultipartFile", dataTypeClass = MultipartFile.class)
@PostMapping("/upload")
public ResultBean<FileUploadResult> uploadImage(@RequestParam(value = "file") MultipartFile file);
@ApiOperation(value = "移除文件")
@ApiImplicitParam(name = "fullPath", value = "文件全路径", required = true, dataTypeClass = String.class)
@PostMapping("/deleteFilesOss")
ResultBean deleteFilesOss(@RequestParam(value = "fullPath") String fullPath);
@ApiOperation(value = "下载")
@ApiImplicitParam(name = "path", value = "文件全路径", required = true, dataTypeClass = String.class)
@PostMapping("/download")
void download(HttpServletResponse response, @RequestParam(value = "path") String path) throws IOException;
}

18
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixOneQuery.java

@ -0,0 +1,18 @@
package com.yxt.anrui.base.api.basedistributorapplyappendix;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel(value = "经销商备案资料 查询条件", description = "经销商备案资料 查询条件")
@Data
public class BaseDistributorApplyAppendixOneQuery implements Query {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("文件名称")
private String fileName;
}

35
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixQuery.java

@ -0,0 +1,35 @@
package com.yxt.anrui.base.api.basedistributorapplyappendix;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel(value = "经销商备案资料 查询条件", description = "经销商备案资料 查询条件")
@Data
public class BaseDistributorApplyAppendixQuery implements Query {
@ApiModelProperty("文件名(陕汽必须字段)")
private String fileName;
@ApiModelProperty("文件类型(陕汽必须字段)")
private String fileType;
@ApiModelProperty("上传人(陕汽必须字段)")
private String name;
@ApiModelProperty("关联业务对象sid(陕汽必须字段)")
private String linkSid;
@ApiModelProperty("附件类型(陕汽必须字段)")
private String attachType;
@ApiModelProperty("文件大小(陕汽必须字段)")
private String fileSize;
@ApiModelProperty("文件路径(陕汽必须字段)")
private String filePath;
// @ApiModelProperty("关联经销商sid(陕汽必须字段)")
// private String distributorSid;
}

34
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixUploadVo.java

@ -0,0 +1,34 @@
package com.yxt.anrui.base.api.basedistributorapplyappendix;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2021/10/14 17:47
* @description
*/
@Data
public class BaseDistributorApplyAppendixUploadVo implements Vo {
private static final long serialVersionUID = -8636977039071495698L;
@ApiModelProperty("上传的原文件名")
private String sourceFileName;
@ApiModelProperty("文件的相对路径")
private String filePath;
@ApiModelProperty("文件完整的访问URL")
private String fileFullPath;
@ApiModelProperty("文件大小")
private String size;
@ApiModelProperty(value = "文件类型")
private String fileType;
public BaseDistributorApplyAppendixUploadVo(String sourceFileName, String filePath, String fullUrl, String size, String fileType) {
this.sourceFileName = sourceFileName;
this.filePath = filePath;
this.fileFullPath = fullUrl;
this.size = size;
this.fileType = fileType;
}
}

51
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapplyappendix/BaseDistributorApplyAppendixVo.java

@ -0,0 +1,51 @@
package com.yxt.anrui.base.api.basedistributorapplyappendix;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ApiModel(value = "经销商备案资料 视图数据对象", description = "经销商备案资料 视图数据对象")
@Data
public class BaseDistributorApplyAppendixVo implements Vo {
@ApiModelProperty(value = "用户sid")
private String createBySid;
@ApiModelProperty(value = "上传人")
private String staffName;
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("文件名(陕汽必须字段)")
private String fileName;
@ApiModelProperty("文件类型(陕汽必须字段)")
private String fileType;
@ApiModelProperty("上传人(陕汽必须字段)")
private String name;
@ApiModelProperty("关联业务对象sid(陕汽必须字段)")
private String linkSid;
@ApiModelProperty("附件类型(陕汽必须字段)")
private String attachType;
@ApiModelProperty("文件大小(陕汽必须字段)")
private String fileSize;
@ApiModelProperty("文件路径(陕汽必须字段)")
private String filePath;
@ApiModelProperty(value = "上传时间", required = true)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
// @ApiModelProperty("关联经销商sid(陕汽必须字段)")
// private String distributorSid;
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@ -40,7 +40,7 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
* @param qw
* @return
*/
IPage<BaseDistributorVo> pagerList(IPage<BaseDistributorQuery> page, @Param(Constants.WRAPPER) Wrapper<BaseDistributorVo> qw);
IPage<BaseDistributorVo> pagerList(IPage<BaseDistributor> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDistributor> qw);
/**
* 根据证件号码统一号码查询是否唯一

60
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@ -3,24 +3,32 @@
<mapper namespace="com.yxt.anrui.base.biz.basedistributor.BaseDistributorMapper">
<!--经销商分页列表-->
<select id="pagerList" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorVo">
SELECT bd.sid,
bd.disName,
bd.registNum,
bd.registDetailAddress,
bd.invoPhone,
bd.invoBank,
bd.invoBankNum,
bd.setUpTime,
bd.isGuarantee,
bd.pDistributorName,
bd.procDefId,
bd.procInstId,
bd.nodeState,
case bd.state
when 1 then '未报备'
when 3 then '报备中'
when 2 then '已报备' end as `state`
FROM base_distributor bd
SELECT
bd.sid as sid,
bd.disName as disName,
bd.registNum as registNum,
bd.registDetailAddress as registDetailAddress,
bd.legalMobile as invoPhone,
bd.setUpTime as setUpTime,
bd.isGuarantee as isGuarantee,
bd.pDistributorName as pDistributorName,
bd.isDelivery as isDelivery,
case bd.filingState
when 0 then '未备案'
when 2 then '备案中'
when 1 then '已备案' end as `state`,
case bd.riskState
when 0 then '正常'
when 1 then '禁用' end as riskState,
bd.useOrgName as company,
ba.dept as dept,
ba.salesman as salesman
FROM
base_distributor as bd
LEFT JOIN
(SELECT MAX(createTime),dept,salesman,distributorSid,sid FROM base_distributor_apply WHERE isDelete = 0 and
nodeState = '已办结' GROUP BY distributorSid) as ba ON bd.sid = ba.distributorSid
<where>
${ew.sqlSegment}
</where>
@ -135,13 +143,16 @@
<select id="getDistributorListOne" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo">
SELECT bd.sid,
bd.disName,
bd.nodeState as state,
if(length(bd.pDistributorName)>0,bd.pDistributorName,'无') as pDistributorName,
bd.registNum,
bd.registDetailAddress,
bd.invoPhone,
bd.nodeState,
DATE_FORMAT(bd.setUpTime, '%Y-%m-%d') as setUpTime
DATE_FORMAT(bd.setUpTime, '%Y-%m-%d') as setUpTime,
bd.isDelivery,
bd.legalMobile as invoPhone,
case bd.filingState
when 0 then '未备案'
when 1 then '已备案'
when 2 then '备案中' end as `state`
FROM base_distributor bd
<where>
${ew.sqlSegment}
@ -168,7 +179,10 @@
bd.legalMobile,
bd.mobile,
bd.sid distributorSid,
bd.contract
bd.contract,
bd.isDeliveryKey,
bd.isDelivery,
bd.effectiveDate
from base_distributor bd
where bd.sid = #{sid}
</select>

149
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basedistributor.*;
import com.yxt.anrui.base.api.basedistributor.app.*;
import com.yxt.anrui.base.api.basedistributor.flow.*;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyDetailsVo;
import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
import com.yxt.anrui.base.biz.basedistributorlegal.BaseDistributorLegalService;
import com.yxt.anrui.base.biz.basedistributorperson.BaseDistributorPersonService;
@ -74,10 +75,8 @@ public class BaseDistributorRest implements BaseDistributorFeign {
@Override
public ResultBean<PagerVo<BaseDistributorVo>> pagerList(@RequestBody PagerQuery<BaseDistributorQuery> pagerQuery) {
ResultBean<PagerVo<BaseDistributorVo>> rb = ResultBean.fireFail();
IPage<BaseDistributorVo> page = baseDistributorService.pageList(pagerQuery);
PagerVo<BaseDistributorVo> pv = new PagerVo<>();
PagerVo<BaseDistributorVo> pv1 = PagerUtil.pageToVo(page, pv);
return rb.success().setData(pv1);
PagerVo<BaseDistributorVo> pv = baseDistributorService.pageList(pagerQuery);
return rb.success().setData(pv);
}
@Override
@ -106,8 +105,8 @@ public class BaseDistributorRest implements BaseDistributorFeign {
for (int i = 0; i < sidList.size(); i++) {
String sid = sidList.get(i);
BaseDistributor entity = baseDistributorService.fetchBySid(sid);
if (!entity.equals("待提交")) {
return rb.setMsg("删除的数据中包含已提交或已办结审批的数据,删除失败");
if (entity.getFilingState() != 0) {
return rb.setMsg("删除的数据中包含已备案或备案中的数据,删除失败");
}
int i1 = baseDistributorService.selByPDisSid(sid);
if (i1 > 0) {
@ -197,65 +196,77 @@ public class BaseDistributorRest implements BaseDistributorFeign {
return rb.success().setData(list);
}
//---------------------------------------------- 流程接口 --------------------------------------------------/
@Override
public ResultBean submitRecordApplication(SubmitBaseDistributorApplyDto dto) {
return baseDistributorService.submitRecordApplication(dto);
}
@Override
public ResultBean complete(BaseDistributorCompleteDto dto) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
String isDecide = "";
if (StringUtils.isNotBlank(dto.getIsDecided())) {
isDecide = dto.getIsDecided();
}
bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId());
return baseDistributorService.complete(bv,isDecide);
}
@Override
public ResultBean companyToDivisionOperate(BaseDistributorCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId());
return baseDistributorService.companyToDivisionOperate(bv);
}
@Override
public ResultBean revokeProcess(BaseDistributorTaskQuery query) {
return baseDistributorService.revokeProcess(query);
}
@Override
public ResultBean taskReject(BaseDistributorTaskQuery query) {
return baseDistributorService.taskReject(query);
}
@Override
public ResultBean breakProcess(BaseDistributorTaskQuery query) {
return baseDistributorService.breakProcess(query);
}
@Override
public ResultBean flowRecord(String procInsId) {
return baseDistributorService.flowRecord(procInsId);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return baseDistributorService.getNextNodesForSubmit(query);
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return baseDistributorService.getPreviousNodesForReject(query);
}
public ResultBean<BaseDistributorApplyDetailsVo> recordInfo(String sid) {
return baseDistributorService.recordInfo(sid);
}
@Override
public ResultBean setRiskState(RiskStateQuery query) {
return baseDistributorService.setRiskState(query);
}
// //---------------------------------------------- 流程接口 --------------------------------------------------/
// @Override
// public ResultBean submitRecordApplication(SubmitBaseDistributorApplyDto dto) {
// return baseDistributorService.submitRecordApplication(dto);
// }
//
// @Override
// public ResultBean complete(BaseDistributorCompleteDto dto) {
// BusinessVariables bv = new BusinessVariables();
// BeanUtil.copyProperties(dto, bv);
// String isDecide = "";
// if (StringUtils.isNotBlank(dto.getIsDecided())) {
// isDecide = dto.getIsDecided();
// }
// bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId());
// return baseDistributorService.complete(bv,isDecide);
// }
//
// @Override
// public ResultBean companyToDivisionOperate(BaseDistributorCompleteDto query) {
// BusinessVariables bv = new BusinessVariables();
// BeanUtil.copyProperties(query, bv);
// bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId());
// return baseDistributorService.companyToDivisionOperate(bv);
// }
//
// @Override
// public ResultBean revokeProcess(BaseDistributorTaskQuery query) {
// return baseDistributorService.revokeProcess(query);
// }
//
// @Override
// public ResultBean taskReject(BaseDistributorTaskQuery query) {
//
// return baseDistributorService.taskReject(query);
// }
//
// @Override
// public ResultBean breakProcess(BaseDistributorTaskQuery query) {
// return baseDistributorService.breakProcess(query);
// }
//
// @Override
// public ResultBean flowRecord(String procInsId) {
//
// return baseDistributorService.flowRecord(procInsId);
// }
//
// @Override
// public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
//
// return baseDistributorService.getNextNodesForSubmit(query);
// }
//
// @Override
// public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
//
// return baseDistributorService.getPreviousNodesForReject(query);
// }
/******************************************************************************************************/
@Override
@ -347,9 +358,9 @@ public class BaseDistributorRest implements BaseDistributorFeign {
return baseDistributorService.selectDisListBySid(sid);
}
/*-----------------------------------移动端流程------------------------------------------------*/
@Override
public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) {
return baseDistributorService.submitDistributor(dto);
}
// /*-----------------------------------移动端流程------------------------------------------------*/
// @Override
// public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) {
// return baseDistributorService.submitDistributor(dto);
// }
}

1991
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

File diff suppressed because it is too large

75
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyMapper.java

@ -0,0 +1,75 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basedistributorapply;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery;
import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo;
import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApply;
import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApply;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-base(优惠包申请) <br/>
* File: BaseDiscountpackageApplyMapper.java <br/>
* Class: com.yxt.anrui.base.biz.basediscountpackageapply.BaseDiscountpackageApplyMapper <br/>
* Description: 优惠包申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-08 17:04:45 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BaseDistributorApplyMapper extends BaseMapper<BaseDistributorApply> {
BaseDistributorApply selOneByMainSid(String mainSid);
IPage<BaseDistributorApplyVo> listPage(IPage<BaseDistributorApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDistributorApply> qw);
@Update("update base_distributor_apply set isDelete = 1 where sid =#{sid}")
void deleteBySid(String sid);
int updateFlowFiled(Map<String, Object> map);
IPage<AppDistributorApplyVo> getDistributorApplyList(IPage<BaseDistributorApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDistributorApply> qw);
}

66
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyMapper.xml

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basedistributorapply.BaseDistributorApplyMapper">
<update id="updateFlowFiled">
UPDATE base_distributor_apply
SET nodeState=#{nodeState}
, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid = #{sid}
</update>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selOneByMainSid" resultType="com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApply">
SELECT *
FROM base_distributor_apply
WHERE isDelete = 0
AND nodeState = '已办结'
AND distributorSid = #{mainSid}
ORDER BY createTime DESC LIMIT 1
</select>
<select id="listPage" resultType="com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyVo">
SELECT
sid,
nodeState,
useOrgName as company,
dept,
applyName,
date_format(applyDate, '%Y-%m-%d') as applyDate,
salesman,
distributor,
effectiveDate,
remarks,
procDefId,
procInstId
FROM base_distributor_apply
<where>
${ew.sqlSegment}
</where>
</select>
<select id="getDistributorApplyList"
resultType="com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo">
SELECT
sid,
nodeState as `state`,
useOrgName as company,
dept,
applyName,
date_format(applyDate, '%Y-%m-%d') as applyDate,
salesman,
distributor as distributorName,
effectiveDate
FROM base_distributor_apply
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

188
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java

@ -0,0 +1,188 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basedistributorapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basedistributor.app.BaseDisDetailsVo;
import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDeptVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorDto;
import com.yxt.anrui.base.api.basedistributorapply.*;
import com.yxt.anrui.base.api.basedistributorapply.flow.*;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-base(优惠包申请) <br/>
* File: BaseDiscountpackageApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.basediscountpackageapply.BaseDiscountpackageApplyRest <br/>
* Description: 优惠包申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-08 17:04:45 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "经销商备案申请")
@RestController
@RequestMapping("v1/basedistributorapply")
public class BaseDistributorApplyRest implements BaseDistributorApplyFeign {
@Autowired
private BaseDistributorApplyService baseDistributorApplyService;
@Override
public ResultBean<PagerVo<BaseDistributorApplyVo>> listPage(PagerQuery<BaseDistributorApplyQuery> pq) {
ResultBean<PagerVo<BaseDistributorApplyVo>> rb = ResultBean.fireFail();
PagerVo<BaseDistributorApplyVo> pv = baseDistributorApplyService.listPage(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean<BaseDistributorApplyDetailsVo> detail(String sid) {
return baseDistributorApplyService.detail(sid);
}
@Override
public ResultBean<String> save(BaseDistributorApplyDto dto) {
return baseDistributorApplyService.saveApply(dto);
}
@Override
public ResultBean deleteBySids(String[] sids) {
return baseDistributorApplyService.deleteBySids(sids);
}
@Override
public ResultBean<BaseSalesManger> selectMangerByDeptSid(String deptSid) {
return baseDistributorApplyService.selectMangerByDeptSid(deptSid);
}
@Override
public ResultBean submitRecordApplication(SubmitBaseDistributorApplyDto dto) {
return baseDistributorApplyService.submitRecordApplication(dto);
}
@Override
public ResultBean complete(BaseDistributorApplyCompleteDto dto) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId());
return baseDistributorApplyService.complete(bv);
}
@Override
public ResultBean companyToDivisionOperate(BaseDistributorApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.DEALERFILINGAPPLY.getProDefId());
return baseDistributorApplyService.companyToDivisionOperate(bv);
}
@Override
public ResultBean revokeProcess(BaseDistributorApplyTaskQuery query) {
return baseDistributorApplyService.revokeProcess(query);
}
@Override
public ResultBean taskReject(BaseDistributorApplyTaskQuery query) {
return baseDistributorApplyService.taskReject(query);
}
@Override
public ResultBean breakProcess(BaseDistributorApplyTaskQuery query) {
return baseDistributorApplyService.breakProcess(query);
}
@Override
public ResultBean flowRecord(String procInsId) {
return baseDistributorApplyService.flowRecord(procInsId);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return baseDistributorApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return baseDistributorApplyService.getPreviousNodesForReject(query);
}
@Override
public ResultBean<List<AppDeptVo>> getSalesDept(String userSid, String orgPath) {
return baseDistributorApplyService.getSalesDept(userSid,orgPath);
}
@Override
public ResultBean<String> saveDistributor(AppDistributorDto dto) {
return baseDistributorApplyService.saveDistributor(dto);
}
@Override
public ResultBean<BaseDisDetailsVo> getDistributor1(String sid, String orgPath, String userSid) {
return baseDistributorApplyService.getDistributor1(sid, orgPath, userSid);
}
@Override
public ResultBean<BaseDisDetailsVo> getDistributor2(String sid, String orgPath, String userSid) {
return baseDistributorApplyService.getDistributor2(sid,orgPath,userSid);
}
@Override
public ResultBean<PagerVo<AppDistributorApplyVo>> getDistributorApplyList(PagerQuery<BaseDistributorsQuery> pagerQuery) {
ResultBean<PagerVo<AppDistributorApplyVo>> rb = ResultBean.fireFail();
PagerVo<AppDistributorApplyVo> pv = baseDistributorApplyService.getDistributorApplyList(pagerQuery);
return rb.success().setData(pv);
}
@Override
public ResultBean deleteDistributor2(String sid) {
return baseDistributorApplyService.deleteDistributor2(sid);
}
@Override
public ResultBean submitDistributor(AppSubmitApplyDto dto) {
return baseDistributorApplyService.submitDistributor(dto);
}
}

1995
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java

File diff suppressed because it is too large

51
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapplyappendix/BaseDistributorApplyAppendixMapper.java

@ -0,0 +1,51 @@
package com.yxt.anrui.base.biz.basedistributorapplyappendix;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix;
import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
import com.yxt.anrui.base.api.basedistributorapplyappendix.BaseDistributorApplyAppendix;
import com.yxt.anrui.base.api.basedistributorapplyappendix.BaseDistributorApplyAppendixVo;
import org.apache.ibatis.annotations.*;
import java.util.List;
@Mapper
public interface BaseDistributorApplyAppendixMapper extends BaseMapper<BaseDistributorApplyAppendix> {
/**
* 查询备案资料信息列表
*
* @return
*/
List<BaseDistributorApplyAppendixVo> selectListVo(@Param(Constants.WRAPPER) Wrapper<BaseDistributorApplyAppendixVo> qw, @Param("path") String path);
/**
* 根据备案资料sid查询是否存在
*
* @param sid
* @return
*/
int selBySid(String sid);
int selectPath(String path);
int deletePath(String path);
@Update("update base_distributor_apply_appendix set isDelete = 1 where sid = #{sid}")
int updateBySidIsDelete(String sid);
@Delete("delete from base_distributor_apply_appendix where linkSid = #{sid}")
void delByLinkSid(String sid);
@Select("select * from base_distributor_apply_appendix where linkSid = #{sid}")
List<BaseDistributorApplyAppendixVo> selByLinkSid(String sid);
@Select("select * from base_distributor_apply_appendix where linkSid = #{sid} and attachType = #{attachType}")
List<BaseDistributorApplyAppendixVo> selByLinkSidAndAttachType(@Param("sid") String sid, @Param("attachType") String attachType);
List<String> selByLinkSidAndAttachTypeOne(@Param("sid") String sid, @Param("s") String s, @Param("path") String path);
int selectByLinkSid(String sid);
}

52
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapplyappendix/BaseDistributorApplyAppendixMapper.xml

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basedistributorapplyappendix.BaseDistributorApplyAppendixMapper">
<select id="selectListVo" resultType="com.yxt.anrui.base.api.basedistributorapplyappendix.BaseDistributorApplyAppendixVo">
SELECT bda.sid,
-- 文件名
bda.fileName,
-- 文件类型
bda.fileType,
-- 上传人
bda.createBySid,
-- 上传时间
bda.createTime,
-- 资料路径
concat(#{path}, bda.filePath) as filePath
FROM base_distributor_apply_appendix bda
<where>
${ew.sqlSegment}
</where>
</select>
<!--根据备案资料sid查询是否存在-->
<select id="selBySid" resultType="java.lang.Integer">
select count(*)
from base_distributor_apply_appendix
where sid = #{sid}
</select>
<select id="selectPath" resultType="int">
select count(*)
from base_distributor_apply_appendix
where filePath = #{path}
</select>
<delete id="deletePath">
delete
from base_distributor_apply_appendix
where filePath = #{path}
</delete>
<select id="selByLinkSidAndAttachTypeOne" resultType="java.lang.String">
select concat(#{path}, filePath) as filePath
from base_distributor_apply_appendix
where linkSid = #{sid}
and attachType = #{s}
</select>
<select id="selectByLinkSid" resultType="int">
select count(*)
from base_distributor_apply_appendix
where linkSid = #{sid}
</select>
</mapper>

201
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapplyappendix/BaseDistributorApplyAppendixRest.java

@ -0,0 +1,201 @@
package com.yxt.anrui.base.biz.basedistributorapplyappendix;
import com.auth0.jwt.JWT;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.yxt.anrui.base.api.basedistributor.BaseDistributor;
import com.yxt.anrui.base.api.basedistributorappendix.*;
import com.yxt.anrui.base.api.basedistributorapplyappendix.*;
import com.yxt.anrui.base.biz.basedistributor.BaseDistributorService;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.JWTUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.FileUploadResult;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@Api(tags = "经销商备案资料")
@RestController
@RequestMapping("v1/basedistributorapplyappendix")
public class BaseDistributorApplyAppendixRest implements BaseDistributorApplyAppendixFeign {
@Autowired
private BaseDistributorApplyAppendixService baseDistributorApplyAppendixService;
@Autowired
private HttpServletRequest request;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private BaseDistributorService baseDistributorService;
@Autowired
private FileUploadComponent fileUploadComponent;
/**
* 查询备案资料信息列表
*
* @return
*/
@Override
public ResultBean<List<BaseDistributorApplyAppendixVo>> list(BaseDistributorApplyAppendixOneQuery query) {
ResultBean rb = ResultBean.fireFail();
List<BaseDistributorApplyAppendixVo> list = baseDistributorApplyAppendixService.selectListVo(query);
for (int i = 0; i < list.size(); i++) {
String staffName = "";
String createBySid = list.get(i).getCreateBySid();
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid);
if (sysUserVoResultBean.getSuccess()) {
staffName = sysUserVoResultBean.getData().getName();//姓名
}
list.get(i).setStaffName(staffName);
}
return rb.success().setData(list);
}
@Override
public ResultBean save(BaseDistributorApplyAppendixDto dto) {
ResultBean rb = ResultBean.fireFail();
String linkSid = dto.getLinkSid();
BaseDistributor baseDistributor = baseDistributorService.fetchBySid(linkSid);
if (baseDistributor == null) {
return rb.setMsg("请先添加经销商信息");
}
//将token解密userSid
String token = request.getHeader("token");
DecodedJWT decodedJWT = JWT.decode(token);
String userSid = JWTUtil.getUserSid(decodedJWT);
BaseDistributorApplyAppendix entity = new BaseDistributorApplyAppendix();
dto.fillEntity(entity);
entity.setCreateBySid(userSid);
entity.setCreateTime(new Date());
String filePath = dto.getFilePath();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
entity.setFilePath(filePath);
baseDistributorApplyAppendixService.save(entity);
return rb.success();
}
@Override
public ResultBean update(BaseDistributorApplyAppendixDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
int i = baseDistributorApplyAppendixService.updateBySid(dto.toMap(), sid);
if (i > 0) {
return rb.success().setMsg("修改成功");
}
return rb.fail().setMsg("修改失败");
}
@Override
public ResultBean deleteBySids(String sidsList) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(sidsList)) {
return rb.setMsg("请选择要删除的数据");
}
List<String> sidList = Arrays.asList(sidsList.split(","));
for (int i = 0; i < sidList.size(); i++) {
String sid = sidList.get(i);
BaseDistributorApplyAppendix baseDistributorAppendix = baseDistributorApplyAppendixService.fetchBySid(sid);
if (baseDistributorAppendix != null) {
// baseDistributorAppendixService.deleteBySid(sid);
baseDistributorApplyAppendixService.updateBySidIsDelete(sid);
}
deleteFilesOss(baseDistributorAppendix.getFilePath());
}
return rb.success().setMsg("删除成功");
}
@Override
public ResultBean<FileUploadResult> uploadImage(MultipartFile file) {
ResultBean rb = ResultBean.fireFail();
if (file == null || file.isEmpty()) {
return rb.setMsg("文件为空");
}
rb = baseDistributorApplyAppendixService.uploadFile(file);
return rb;
}
@Override
public ResultBean deleteFilesOss(String fullPath) {
ResultBean rb = ResultBean.fireFail();
//删除服务器上的该文件
String pathT = fileUploadComponent.getUrlPrefix();
String path = "";
if (fullPath.indexOf(pathT) > -1) {
path = fullPath.replace(pathT, "");
} else {
path = fullPath;
}
String a = path.substring(0, path.lastIndexOf("/")).replace("/", File.separator);
String pathOne = fileUploadComponent.getUploadPath() + path.substring(0, path.lastIndexOf("/") + 1).replace("/", File.separator);
FileUploadComponent.deleteFiles(fullPath, pathOne);
//查询数据库,然后根据相对路径删除数据
int count = baseDistributorApplyAppendixService.selectPath(path);
if (count > 0) {
baseDistributorApplyAppendixService.deletePath(path);
}
return rb.success().setMsg("移除成功");
}
@Override
public void download(HttpServletResponse response, String path) throws IOException {
String pathT = fileUploadComponent.getUrlPrefix();
String pathT1 = fileUploadComponent.getUploadPath();
if (path.indexOf(pathT) > -1) {
path = path.replace(pathT, "");
}
String preName = "";
//查询这个文件是否存在
// BaseAffiliatCompanyAppendix baseAffiliatCompanyAppendix = baseAffiliatCompanyAppendixService.selectPathOne(path);
// if (baseAffiliatCompanyAppendix != null) {
// preName = System.currentTimeMillis() + baseAffiliatCompanyAppendix.getFileType();
// }
File fileLoad = new File(pathT1 + path);
String fileName = fileLoad.getName();
String fileTyle = fileName.substring(fileName.lastIndexOf("."), fileName.length());
preName = System.currentTimeMillis() + fileTyle;
response.setContentType("application/vnd.ms-excel");
response.addHeader("Content-Disposition", "attachment;filename=\""
+ new String((preName).getBytes("gbk"), "iso-8859-1") + "\"");
OutputStream o = response.getOutputStream();
byte b[] = new byte[1024];
fileName = java.net.URLEncoder.encode(fileName, "UTF-8"); // 处理中文文件名的问题
fileName = new String(fileName.getBytes("UTF-8"), "GBK"); // 处理中文文件名的问题
response.setHeader("Content-disposition", "attachment;filename="
+ fileName);
response.setContentType("application/x-msdownload");
long fileLength = fileLoad.length();
String length = String.valueOf(fileLength);
response.setHeader("Content_Length", length);
FileInputStream in = new FileInputStream(fileLoad);
int n = 0;
while ((n = in.read(b)) != -1) {
o.write(b, 0, n);
}
o.flush();
o.close();
in.close();
}
}

248
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapplyappendix/BaseDistributorApplyAppendixService.java

@ -0,0 +1,248 @@
package com.yxt.anrui.base.biz.basedistributorapplyappendix;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yxt.anrui.base.api.baseaffiliatcompanyappendix.BaseAffiliatCompanyAppendixUploadVo;
import com.yxt.anrui.base.api.basedistributorappendix.*;
import com.yxt.anrui.base.api.basedistributorapplyappendix.*;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@Service
public class BaseDistributorApplyAppendixService extends MybatisBaseService<BaseDistributorApplyAppendixMapper, BaseDistributorApplyAppendix> {
private static final String appendixdir = "jxs";
@Autowired
private FileUploadComponent fileUploadComponent;
/**
* 查询备案资料信息列表
*
* @return
*/
public List<BaseDistributorApplyAppendixVo> selectListVo(BaseDistributorApplyAppendixOneQuery query) {
QueryWrapper<BaseDistributorApplyAppendixVo> qw = buildQueryWrapper(query);
return baseMapper.selectListVo(qw, fileUploadComponent.getUrlPrefix());
}
/**
* 构造查询条件
*
* @param query 查询条件
* @return
*/
private QueryWrapper<BaseDistributorApplyAppendixVo> buildQueryWrapper(BaseDistributorApplyAppendixOneQuery query) {
QueryWrapper<BaseDistributorApplyAppendixVo> qw = new QueryWrapper<>();
if (query != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getFileName())) {//经销商名称
qw.like("fileName", query.getFileName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getSid())) {//经销商名称
qw.like("linkSid", query.getSid());
}
}
return qw;
}
/**
* 根据备案资料sid查询是否存在
*
* @param sid
* @return
*/
public int selBySid(String sid) {
return baseMapper.selBySid(sid);
}
/**
* 新增备案资料
*
* @param dto
*/
public void saveOrUpdateDto(BaseDistributorApplyAppendixDto dto) {
BaseDistributorApplyAppendix entity = new BaseDistributorApplyAppendix();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public ResultBean<BaseAffiliatCompanyAppendixUploadVo> uploadFile(MultipartFile file) {
return uploadFile(file, true, null);
}
public ResultBean<BaseAffiliatCompanyAppendixUploadVo> uploadFile(MultipartFile file, boolean hasDateDir, String relativePath) {
ResultBean rm = ResultBean.fireFail();
//文件大小
long size = file.getSize();
String fileSize = getPrintSize(size);
// 文件名
String fileName = file.getOriginalFilename();
// 后缀名
String suffixName = fileName.substring(fileName.lastIndexOf("."));
// 新文件名
String filePath = dateFileName() + suffixName;
if (hasDateDir) {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd");
List<String> stringList = Arrays.asList(dateStr.split("-"));
//年
String year = stringList.get(0);
//月
String month = stringList.get(1);
//日
String day = stringList.get(2);
dateStr = year + "/" + month + "/" + day;
// 增加日期目录
filePath = appendixdir + "/" + dateStr + "/" + filePath;
}
if (StringUtils.isNotBlank(relativePath)) {
// 增加指定目录
filePath = relativePath + "/" + filePath;
}
// 上传后的文件含完整路径
String path = fileUploadComponent.getUploadPath() + filePath;
// 上传后的文件
File destFile = new File(path);
if (!destFile.getParentFile().exists()) {
destFile.getParentFile().mkdirs();
}
try {
file.transferTo(destFile);
} catch (IOException e) {
e.printStackTrace();
}
String fullUrl = fileUploadComponent.getUrlPrefix() + filePath;
BaseDistributorApplyAppendixUploadVo fur = new BaseDistributorApplyAppendixUploadVo(fileName, filePath, fullUrl, fileSize, suffixName);
return rm.success().setData(fur);
}
public static String getPrintSize(long size) {
// 如果字节数少于1024,则直接以B为单位,否则先除于1024,后3位因太少无意义
if (size < 1024) {
return String.valueOf(size) + "B";
} else {
size = size / 1024;
}
// 如果原字节数除于1024之后,少于1024,则可以直接以KB作为单位
// 因为还没有到达要使用另一个单位的时候
// 接下去以此类推
if (size < 1024) {
return String.valueOf(size) + "KB";
} else {
size = size / 1024;
}
if (size < 1024) {
// 因为如果以MB为单位的话,要保留最后1位小数,
// 因此,把此数乘以100之后再取余
size = size * 100;
return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "MB";
} else {
// 否则如果要以GB为单位的,先除于1024再作同样的处理
size = size * 100 / 1024;
return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "GB";
}
}
private String dateFileName() {
return DateUtil.format(new Date(), "yyyyMMddHHmmssSSS") + RandomUtil.randomNumbers(3);
}
/**
* @param path 图片网址路径
* @param realPath 服务器内部真实路径(不能写顶级目录)
*/
public static void deleteFiles(String path, String realPath) {
//对path进行处理将网页地址转化为实际地址
//获取文件的名字
String originalFileName = path.substring(path.lastIndexOf("/") + 1);
//拼接新的地址
String filePatn = realPath + path.substring(path.lastIndexOf("/") + 1);
File file = new File(filePatn);
//如果不是文件夹就直接删除该图片文件
if (!file.isDirectory()) {
System.out.println(filePatn);
System.out.println(file.getName());
file.delete();
} else if (file.isDirectory()) {
//如果是文件夹是获取文件列表
String[] filelist = file.list();
//获取完成文件路径
for (int j = 0; j < filelist.length; j++) {
File filessFile = new File(filePatn + "/" + filelist[j]);
System.out.println(filePatn + "/" + filelist[j]);
if (!filessFile.isDirectory()) {
filessFile.delete();
} else if (filessFile.isDirectory()) {
//递归调用
deleteFiles(filePatn + "/" + filelist[j], filePatn + "/");
}
}
//最后删除该文件夹
file.delete();
}
}
public int selectPath(String path) {
return baseMapper.selectPath(path);
}
public int deletePath(String path) {
return baseMapper.deletePath(path);
}
public int updateBySidIsDelete(String sid) {
return baseMapper.updateBySidIsDelete(sid);
}
public void delByLinkSid(String sid) {
baseMapper.delByLinkSid(sid);
}
public List<BaseDistributorApplyAppendixVo> selByLinkSid(String sid) {
return baseMapper.selByLinkSid(sid);
}
public List<BaseDistributorApplyAppendixVo> selByLinkSidAndAttachType(String sid, String attachType) {
return baseMapper.selByLinkSidAndAttachType(sid, attachType);
}
public List<String> selByLinkSidAndAttachTypeOne(String sid, String s) {
String path = fileUploadComponent.getUrlPrefix();
return baseMapper.selByLinkSidAndAttachTypeOne(sid, s, path);
}
public int selectByLinkSid(String sid) {
return baseMapper.selectByLinkSid(sid);
}
public void insertAppendix(String linkSid, List<String> list, String attachType) {
list.stream().forEach(str -> {
BaseDistributorApplyAppendix appendix = new BaseDistributorApplyAppendix();
File file = new File(fileUploadComponent.getUploadPath() + str.replace("/", File.separator));
if (file != null) {
appendix.setFileSize(FileUploadComponent.getPrintSize(file.length()));
}
appendix.setLinkSid(linkSid);
appendix.setFileName(str.substring(str.lastIndexOf("/") + 1, str.lastIndexOf(".")));
appendix.setFileType(str.substring(str.lastIndexOf(".") + 1));
appendix.setAttachType(attachType);
appendix.setFilePath(str.replace(fileUploadComponent.getUrlPrefix(), ""));
baseMapper.insert(appendix);
});
}
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@ -95,6 +95,11 @@ public interface FinCompanyInvoicingFeign {
@ResponseBody
ResultBean<List<InvoicingVo>> selectInvoingList(@RequestParam("busSid") String busSid);
@ApiOperation("根据纳税人识别号查询开票信息")
@GetMapping("/selectInvoingByTaxpayerNo")
@ResponseBody
ResultBean<FinCompanyInvoicingDetailsVo> selectInvoingByTaxpayerNo(@RequestParam("taxpayerNo") String taxpayerNo);
/*************************************************企业开票信息管理***************************************************/
@ApiOperation("企业开票信息管理分页列表")

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@ -90,6 +90,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
return null;
}
@Override
public ResultBean<FinCompanyInvoicingDetailsVo> selectInvoingByTaxpayerNo(String taxpayerNo) {
return null;
}
@Override
public ResultBean<PagerVo<FinCompanyInvoicingVo>> qyListPage(PagerQuery<FinCompanyInvoicingQuery> pq) {
return null;

31
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java

@ -53,28 +53,31 @@ import java.util.List;
@Mapper
public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicing> {
//@Update("update fin_company_invoicing set name=#{msg} where id=#{id}")
//IPage<FinCompanyInvoicingVo> voPage(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) QueryWrapper<FinCompanyInvoicing> qw);
IPage<FinCompanyInvoicingVo> selectPageVoGS(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
//@Update("update fin_company_invoicing set name=#{msg} where id=#{id}")
//IPage<FinCompanyInvoicingVo> voPage(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) QueryWrapper<FinCompanyInvoicing> qw);
IPage<FinCompanyInvoicingVo> selectPageVo(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
IPage<FinCompanyInvoicingVo> selectPageVoGS(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
List<FinCompanyInvoicingVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
@Select("select * from fin_company_invoicing")
List<FinCompanyInvoicingVo> selectListVo();
IPage<FinCompanyInvoicingVo> selectPageVo(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
@Select("select * from fin_company_invoicing where useOrgSid = #{useOrgSid}")
FinCompanyInvoicingDetailsVo fetchByUseOrgSid(String useOrgSid);
List<FinCompanyInvoicingVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
@Select("select * from fin_company_invoicing")
List<FinCompanyInvoicingVo> selectListVo();
@Select("select * from fin_company_invoicing where useOrgSid = #{useOrgSid}")
FinCompanyInvoicingDetailsVo fetchByUseOrgSid(String useOrgSid);
FinCompanyInvoicingDetailsVo getDetailsByUseOrgAndSystem(@Param("useOrgSid") String useOrgSid, @Param("systemSid") String systemSid);
List<InvoicingVo> selectInvoingList(String useOrgSid);
List<InvoicingVo> selectInvoingList(String useOrgSid);
List<FinCompanyInvoicingDetailsVo> qyFetchListByName(@Param(Constants.WRAPPER) QueryWrapper qw);
List<FinCompanyInvoicingDetailsVo> qyFetchListByName(@Param(Constants.WRAPPER) QueryWrapper qw);
FinCompanyInvoicingDetailsVo selByUseOrgSidAndNameOrTaxNo(@Param(Constants.WRAPPER) QueryWrapper qw);
FinCompanyInvoicingDetailsVo selByUseOrgSidAndNameOrTaxNo(@Param(Constants.WRAPPER) QueryWrapper qw);
List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid(@Param(Constants.WRAPPER) QueryWrapper qw);
@Select("select * from fin_company_invoicing where taxpayerNo = #{taxpayerNo} and isDelete = 0")
FinCompanyInvoicingDetailsVo selectInvoingByTaxpayerNo(String taxpayerNo);
}

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@ -117,6 +117,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
return finCompanyInvoicingService.selectInvoingList(busSid);
}
@Override
public ResultBean<FinCompanyInvoicingDetailsVo> selectInvoingByTaxpayerNo(String taxpayerNo) {
return finCompanyInvoicingService.selectInvoingByTaxpayerNo(taxpayerNo);
}
@Override
public ResultBean<PagerVo<FinCompanyInvoicingVo>> qyListPage(PagerQuery<FinCompanyInvoicingQuery> pq) {
ResultBean rb = ResultBean.fireFail();

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@ -413,4 +413,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
finCompanyInvoicingDetailsVo.setStaffSid(crmCustomerTempVo.getStaffSid());
return rb.success().setData(finCompanyInvoicingDetailsVo);
}
public ResultBean<FinCompanyInvoicingDetailsVo> selectInvoingByTaxpayerNo(String taxpayerNo) {
ResultBean<FinCompanyInvoicingDetailsVo> rb = ResultBean.fireFail();
FinCompanyInvoicingDetailsVo vo = baseMapper.selectInvoingByTaxpayerNo(taxpayerNo);
return rb.success().setData(vo);
}
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java

@ -87,4 +87,6 @@ public class DisBaseInfoDto implements Dto {
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
private String isDelivery;
private String isDeliveryKey;
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoVo.java

@ -72,4 +72,12 @@ public class DisBaseInfoVo implements Vo {
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
@ApiModelProperty("是否投放展车")
private String isDelivery;
@ApiModelProperty(value = "是否投放展车Key")
private String isDeliveryKey;
@ApiModelProperty(value = "有效期至")
private String effectiveDate;
}

30
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisDetailsVo.java

@ -1,7 +1,10 @@
package com.yxt.anrui.terminal.api.autoservice.distributor;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.SalesDeptVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.Salesman;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
@ -16,14 +19,37 @@ import java.util.List;
public class DisDetailsVo implements Vo {
private static final long serialVersionUID = -5987626766518176420L;
private String sid;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
private String beiAnSid;
private String jxsSid;
private String publishInfo;
private DisBaseInfoVo baseInfo;
private DisIncoinceInfoVo invoiceInfo;
private DisFileVo fileInfo;
private SalesDeptVo salesDeptVo;
private List<DisRecordVo> records = new ArrayList<>();
@JsonProperty("procInsId")
private String procInstId;
@ApiModelProperty(value = "经销商")
private String disName;
@ApiModelProperty(value = "统一信用代码")
private String registNum;
@ApiModelProperty(value = "注册地址")
private String registDetailAddress;
@ApiModelProperty(value = "开户行")
private String invoBank;
@ApiModelProperty(value = "银行账号")
private String invoBankNum;
@ApiModelProperty("开票联系电话")
private String invoPhone;
private List<Salesman> users = new ArrayList<>();
private String taskId;
private String procInsId;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisFileDto.java

@ -24,6 +24,8 @@ public class DisFileDto implements Dto {
private List<String> corporateIdCard = new ArrayList<>();
@ApiModelProperty(value = "其他资料")
private List<String> otherInfo = new ArrayList<>();
@ApiModelProperty(value = "其他资料")
private List<String> agreement = new ArrayList<>();
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisFileVo.java

@ -23,6 +23,8 @@ public class DisFileVo implements Vo {
private List<String> corporateIdCard = new ArrayList<>();
@ApiModelProperty(value = "其他资料")
private List<String> otherInfo = new ArrayList<>();
@ApiModelProperty(value = "合作协议")
private List<String> agreement = new ArrayList<>();
private String distributorSid;
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisInitDetailsVo.java

@ -22,8 +22,5 @@ public class DisInitDetailsVo implements Vo {
private Integer invoiceInfoState;
@ApiModelProperty(value = "文件信息状态")
private Integer fileInfoState;
@JsonProperty("procInsId")
private String procInstId;
private String taskId;
private List<DisInitRecordVo> records;
}

39
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java

@ -1,5 +1,8 @@
package com.yxt.anrui.terminal.api.autoservice.distributor;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DeptVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto;
import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.CompleteDistributorDto;
import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorFlowableQuery;
import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorTaskQuery;
@ -14,6 +17,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* @Author dimengzhe
@ -92,8 +96,41 @@ public interface DistributorFeign {
@PostMapping("/saveDistributorFileInfo")
@ResponseBody
ResultBean saveDistributorFileInfo(@RequestBody DisFileDto dto);
//----------------------------------流程代码-------------------------------------------------
//----------------------经销商备案申请-----------------------------------------
@ApiOperation("移动端-经销商开票保存修改")
@PostMapping("/saveDistributor")
@ResponseBody
ResultBean<String> saveDistributor(@RequestBody DistributorDto dto);
@ApiOperation("移动端-经销商备案初始化")
@GetMapping("/getDistributor1")
@ResponseBody
ResultBean<DisDetailsVo> getDistributor1(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
@ApiOperation("移动端-经销商申请管理初始化")
@GetMapping("/getDistributor2")
@ResponseBody
ResultBean<DisDetailsVo> getDistributor2(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
@ApiOperation("查询本分公司下销售部门/销售专员/对应部门主管")
@GetMapping("/getSalesDept")
@ResponseBody
ResultBean<List<DeptVo>> getSalesDept(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
@ApiOperation("移动端-经销商分页列表")
@PostMapping("/getDistributorApplyList")
@ResponseBody
ResultBean<PagerVo<DistributorApplyVo>> getDistributorApplyList(@RequestBody PagerQuery<DistributorQuery> pagerQuery);
@ApiOperation("移动端-经销商备案申请删除")
@DeleteMapping("/deleteDistributor2/{sid}")
@ResponseBody
ResultBean deleteDistributor2(@PathVariable("sid") String sid);
////----------------------------------流程代码-------------------------------------------------
//
@ApiOperation("提交流程")
@PostMapping("/submitDistributorBaseInfo")
@ResponseBody

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java

@ -20,4 +20,5 @@ public class DistributorQuery implements Query {
private String distributorSid;
@ApiModelProperty("机构sid")
private String orgPath;
private String menuSid;
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java

@ -35,5 +35,8 @@ public class DistributorVo implements Vo {
private String setUpTime;
// private String nodeState;
private boolean updateBtn;
private String isDelivery;
//private String nodeState;
private boolean reportBtn;
private boolean deleteBtn;
}

26
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/DeptVo.java

@ -0,0 +1,26 @@
package com.yxt.anrui.terminal.api.autoservice.distributor.apply;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/21 13:35
*/
@Data
public class DeptVo implements Vo {
//第一级
private String sid;
private String checkSid;
// 必须有 一般sid
private String dictKey;
private boolean selected;
//必须有 显示的文字
private String dictValue;
private boolean mandatory;
private String dictType;
private String extra;
//额外的内容;
private ObjectDept extra2;
}

55
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/DistributorApplyVo.java

@ -0,0 +1,55 @@
package com.yxt.anrui.terminal.api.autoservice.distributor.apply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/22 8:48
*/
@Data
public class DistributorApplyVo implements Vo {
/**
* 申请日期
*/
private String applyDate;
/**
* 申请人
*/
private String applyName;
/**
* 分公司
*/
private String company;
/**
* 申请部门
*/
private String dept;
/**
* 经销商名称
*/
private String distributorName;
/**
* 有效期至
*/
private String effectiveDate;
/**
* 销售专员
*/
private String salesman;
/**
* 备案记录sid
*/
private String sid;
/**
* 流程状态
*/
private String state;
@ApiModelProperty("某某部门,某某人")
private String publishInfo;
private boolean updateBtn;
private boolean deleteBtn;
}

29
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/DistributorDto.java

@ -0,0 +1,29 @@
package com.yxt.anrui.terminal.api.autoservice.distributor.apply;
import com.yxt.anrui.terminal.api.autoservice.distributor.DisBaseInfoDto;
import com.yxt.anrui.terminal.api.autoservice.distributor.DisFileDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/20 16:37
*/
@Data
public class DistributorDto implements Dto {
private String beiAnSid;
private String jxsSid;
private DisFileDto fileInfo;
private SalesDeptVo salesDeptVo;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/ObjectDept.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.autoservice.distributor.apply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/21 13:40
*/
@Data
public class ObjectDept {
//第二级
@ApiModelProperty("主管人员sid")
private String mangeSid;
@ApiModelProperty("主管人员")
private String mange;
//额外的内容;
private List<Salesman> users = new ArrayList<>();
}

47
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/SalesDeptVo.java

@ -0,0 +1,47 @@
package com.yxt.anrui.terminal.api.autoservice.distributor.apply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/9/20 16:38
*/
@Data
public class SalesDeptVo {
@ApiModelProperty("申请人")
private String applyName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门")
private String dept;
@ApiModelProperty("销售部门sid")
private String salesDeptSid;
@ApiModelProperty("销售部门")
private String salesDept;
@ApiModelProperty("主管人员sid")
private String mangeSid;
@ApiModelProperty("主管人员")
private String mange;
@ApiModelProperty("销售专员sid")
private String salesmanSid;
@ApiModelProperty("销售专员")
private String salesman;
@ApiModelProperty(value = "有效期至")
private String effectiveDate;
@ApiModelProperty("1是0否")
private String agree;
@ApiModelProperty("备注")
private String remarks;
private String tempMangeSid;
private String tempMange;
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/apply/Salesman.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.autoservice.distributor.apply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/21 13:40
*/
@Data
public class Salesman {
private String sid;
private String checkSid;
// 必须有 一般sid
private String dictKey;
private boolean selected;
//必须有 显示的文字
private String dictValue;
private boolean mandatory;
private String dictType;
private String extra;
//额外的内容;
private Object extra2;
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/flowable/SubmitDistributorApplyDto.java

@ -1,6 +1,7 @@
package com.yxt.anrui.terminal.api.autoservice.distributor.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -11,9 +12,8 @@ import lombok.Data;
* @date 2023/7/14 9:15
*/
@Data
public class SubmitDistributorApplyDto implements Dto {
@ApiModelProperty("distributorSid")
private String distributorSid;
public class SubmitDistributorApplyDto extends DistributorDto {
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实例id")

36
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java

@ -1,6 +1,9 @@
package com.yxt.anrui.terminal.biz.autoservice.distributor;
import com.yxt.anrui.terminal.api.autoservice.distributor.*;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DeptVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto;
import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.CompleteDistributorDto;
import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorFlowableQuery;
import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorTaskQuery;
@ -13,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/7/13 16:22
@ -91,6 +96,37 @@ public class DistributorRest implements DistributorFeign {
return distributorService.saveDistributorFileInfo(dto);
}
//------------------------经销商备案----------------------
@Override
public ResultBean<String> saveDistributor(DistributorDto dto) {
return distributorService.saveDistributor(dto);
}
@Override
public ResultBean<DisDetailsVo> getDistributor1(String sid, String orgPath, String userSid) {
return distributorService.getDistributor1(sid,orgPath,userSid);
}
@Override
public ResultBean<DisDetailsVo> getDistributor2(String sid, String orgPath, String userSid) {
return distributorService.getDistributor2(sid,orgPath,userSid);
}
@Override
public ResultBean<List<DeptVo>> getSalesDept(String userSid, String orgPath) {
return distributorService.getSalesDept(userSid,orgPath);
}
@Override
public ResultBean<PagerVo<DistributorApplyVo>> getDistributorApplyList(PagerQuery<DistributorQuery> pagerQuery) {
return distributorService.getDistributorApplyList(pagerQuery);
}
@Override
public ResultBean deleteDistributor2(String sid) {
return distributorService.deleteDistributor2(sid);
}
@Override
public ResultBean submitDistributorBaseInfo(SubmitDistributorApplyDto dto) {
return distributorService.submitDistributorBaseInfo(dto);

109
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java

@ -4,15 +4,25 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign;
import com.yxt.anrui.base.api.basedistributor.app.*;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDeptVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo;
import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorDto;
import com.yxt.anrui.base.api.basedistributor.flow.AppSubmitDistributorApplyDto;
import com.yxt.anrui.base.api.basedistributor.flow.BaseDistributorCompleteDto;
import com.yxt.anrui.base.api.basedistributor.flow.BaseDistributorTaskQuery;
import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyFeign;
import com.yxt.anrui.base.api.basedistributorapply.flow.AppSubmitApplyDto;
import com.yxt.anrui.base.api.basedistributorapply.flow.BaseDistributorApplyCompleteDto;
import com.yxt.anrui.base.api.basedistributorapply.flow.BaseDistributorApplyTaskQuery;
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.riskcenter.api.loanfinpolicyrecordapply.flow.GetNodeQuery;
import com.yxt.anrui.terminal.api.autoservice.distributor.*;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DeptVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto;
import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.CompleteDistributorDto;
import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorFlowableQuery;
import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorTaskQuery;
@ -44,7 +54,8 @@ public class DistributorService {
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BaseDistributorApplyFeign baseDistributorApplyFeign;
public ResultBean<PagerVo<DistributorVo>> pageList(PagerQuery<DistributorQuery> pagerQuery) {
ResultBean<PagerVo<DistributorVo>> rb = ResultBean.fireFail();
@ -185,11 +196,77 @@ public class DistributorService {
return rb.success();
}
public ResultBean<DisDetailsVo> getDistributor1(String sid, String orgPath, String userSid) {
ResultBean<DisDetailsVo> rb = ResultBean.fireFail();
ResultBean<BaseDisDetailsVo> resultBean = baseDistributorApplyFeign.getDistributor1(sid, orgPath, userSid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
DisDetailsVo vo = new DisDetailsVo();
BeanUtil.copyProperties(resultBean.getData(), vo);
return rb.success().setData(vo);
}
public ResultBean<List<DeptVo>> getSalesDept(String userSid, String orgPath) {
ResultBean<List<DeptVo>> rb = ResultBean.fireFail();
List<DeptVo> list = new ArrayList<>();
List<AppDeptVo> data = baseDistributorApplyFeign.getSalesDept(userSid, orgPath).getData();
data.removeAll(Collections.singleton(null));
if (!data.isEmpty()) {
for (AppDeptVo datum : data) {
DeptVo deptVo = new DeptVo();
BeanUtil.copyProperties(datum, deptVo);
list.add(deptVo);
}
}
return rb.success().setData(list);
}
public ResultBean<String> saveDistributor(DistributorDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
AppDistributorDto appDistributorDto = new AppDistributorDto();
BeanUtil.copyProperties(dto, appDistributorDto);
ResultBean<String> resultBean = baseDistributorApplyFeign.saveDistributor(appDistributorDto);
if (resultBean.getSuccess()) {
rb.success().setData(resultBean.getData());
}
return rb.success();
}
public ResultBean<PagerVo<DistributorApplyVo>> getDistributorApplyList(PagerQuery<DistributorQuery> pagerQuery) {
ResultBean<PagerVo<DistributorApplyVo>> rb = ResultBean.fireFail();
PagerVo<DistributorApplyVo> pagerVo = new PagerVo<>();
PagerQuery<BaseDistributorsQuery> distributorsQueryPagerQuery = new PagerQuery<>();
BeanUtil.copyProperties(pagerQuery, distributorsQueryPagerQuery);
ResultBean<PagerVo<AppDistributorApplyVo>> distributorApplyList = baseDistributorApplyFeign.getDistributorApplyList(distributorsQueryPagerQuery);
if (distributorApplyList.getSuccess()) {
BeanUtil.copyProperties(distributorApplyList.getData(), pagerVo);
}
return rb.success().setData(pagerVo);
}
public ResultBean deleteDistributor2(String sid) {
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = baseDistributorApplyFeign.deleteDistributor2(sid);
return rb.success();
}
public ResultBean<DisDetailsVo> getDistributor2(String sid, String orgPath, String userSid) {
ResultBean<DisDetailsVo> rb = ResultBean.fireFail();
ResultBean<BaseDisDetailsVo> resultBean = baseDistributorApplyFeign.getDistributor2(sid, orgPath, userSid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
DisDetailsVo vo = new DisDetailsVo();
BeanUtil.copyProperties(resultBean.getData(), vo);
return rb.success().setData(vo);
}
public ResultBean submitDistributorBaseInfo(SubmitDistributorApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
AppSubmitDistributorApplyDto submitDistributorApplyDto = new AppSubmitDistributorApplyDto();
AppSubmitApplyDto submitDistributorApplyDto = new AppSubmitApplyDto();
BeanUtil.copyProperties(dto, submitDistributorApplyDto);
ResultBean resultBean = baseDistributorFeign.submitDistributor(submitDistributorApplyDto);
ResultBean resultBean = baseDistributorApplyFeign.submitDistributor(submitDistributorApplyDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -210,10 +287,10 @@ public class DistributorService {
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
BaseDistributorCompleteDto baseDistributorCompleteDto = new BaseDistributorCompleteDto();
BaseDistributorApplyCompleteDto baseDistributorCompleteDto = new BaseDistributorApplyCompleteDto();
BeanUtil.copyProperties(dto, baseDistributorCompleteDto);
baseDistributorCompleteDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = baseDistributorFeign.complete(baseDistributorCompleteDto);
ResultBean resultBean = baseDistributorApplyFeign.complete(baseDistributorCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -234,10 +311,10 @@ public class DistributorService {
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
BaseDistributorCompleteDto baseDistributorCompleteDto = new BaseDistributorCompleteDto();
BaseDistributorApplyCompleteDto baseDistributorCompleteDto = new BaseDistributorApplyCompleteDto();
BeanUtil.copyProperties(dto, baseDistributorCompleteDto);
baseDistributorCompleteDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = baseDistributorFeign.companyToDivisionOperate(baseDistributorCompleteDto);
ResultBean resultBean = baseDistributorApplyFeign.companyToDivisionOperate(baseDistributorCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -246,9 +323,9 @@ public class DistributorService {
public ResultBean rejectDistributorBaseInfo(DistributorTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
BaseDistributorTaskQuery taskQuery = new BaseDistributorTaskQuery();
BaseDistributorApplyTaskQuery taskQuery = new BaseDistributorApplyTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = baseDistributorFeign.taskReject(taskQuery);
ResultBean resultBean = baseDistributorApplyFeign.taskReject(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -257,9 +334,9 @@ public class DistributorService {
public ResultBean recallDistributorBaseInfo(DistributorTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
BaseDistributorTaskQuery taskQuery = new BaseDistributorTaskQuery();
BaseDistributorApplyTaskQuery taskQuery = new BaseDistributorApplyTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = baseDistributorFeign.revokeProcess(taskQuery);
ResultBean resultBean = baseDistributorApplyFeign.revokeProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -268,9 +345,9 @@ public class DistributorService {
public ResultBean stopDistributorBaseInfo(DistributorTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
BaseDistributorTaskQuery taskQuery = new BaseDistributorTaskQuery();
BaseDistributorApplyTaskQuery taskQuery = new BaseDistributorApplyTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = baseDistributorFeign.breakProcess(taskQuery);
ResultBean resultBean = baseDistributorApplyFeign.breakProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -281,11 +358,11 @@ public class DistributorService {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
com.yxt.anrui.base.api.basedistributor.flow.GetNodeQuery getNodeQuery = new com.yxt.anrui.base.api.basedistributor.flow.GetNodeQuery();
com.yxt.anrui.base.api.basedistributorapply.flow.GetNodeQuery getNodeQuery = new com.yxt.anrui.base.api.basedistributorapply.flow.GetNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<com.yxt.anrui.base.api.basedistributor.flow.GetNodeVo>> getPreviousNodesForReject = baseDistributorFeign.getPreviousNodesForReject(getNodeQuery);
ResultBean<List<com.yxt.anrui.base.api.basedistributorapply.flow.GetNodeVo>> getPreviousNodesForReject = baseDistributorApplyFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
@ -293,7 +370,7 @@ public class DistributorService {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<com.yxt.anrui.base.api.basedistributor.flow.GetNodeVo>> getNextNodesForSubmit = baseDistributorFeign.getNextNodesForSubmit(getNodeQuery);
ResultBean<List<com.yxt.anrui.base.api.basedistributorapply.flow.GetNodeVo>> getNextNodesForSubmit = baseDistributorApplyFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();

Loading…
Cancel
Save