Browse Source

提前开票接口添加及修改

master
hp 3 years ago
parent
commit
7dd8934958
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java
  4. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
  5. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
  6. 13
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  7. 15
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AdCarListDto.java
  8. 11
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java
  9. 17
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java
  10. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java
  11. 55
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageVo.java
  12. 22
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceVinDto.java
  13. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/AppAdvanceInvoiceQuery.java
  14. 43
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/AppAdvanceInvoiceTaskQuery.java
  15. 35
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/AppCompleteAdvanceInvoiceDto.java
  16. 19
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/AppSubmitAdvanceInvoiceDto.java
  17. 19
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/GetNodeQuery.java
  18. 21
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/GetNodeVo.java
  19. 11
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  20. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
  21. 17
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java
  22. 30
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageVo.java
  23. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busginvoiceapplyvehicle/BusGinvoiceapplyVehicleMapper.java
  24. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  25. 24
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  26. 16
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  27. 32
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  28. 21
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AddAdvanceInvoiceDto.java
  29. 32
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java
  30. 41
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
  31. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageQuery.java
  32. 11
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java
  33. 21
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceVinDto.java
  34. 45
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
  35. 42
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java
  36. 16
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListDto.java
  37. 20
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/AdvanceInvoiceQuery.java
  38. 42
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/AdvanceInvoiceTaskQuery.java
  39. 32
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/CompleteAdvanceInvoiceDto.java
  40. 18
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/SubmitAdvanceInvoiceDto.java
  41. 37
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java
  42. 29
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeignFallback.java
  43. 17
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java
  44. 31
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageVo.java
  45. 45
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java
  46. 154
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
  47. 65
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java
  48. 72
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@ -195,4 +195,8 @@ public interface CommonContractFeign {
@GetMapping(value = "/getContractByBusSid/{sid}")
ResultBean<CommonContract> getContractByBusSid(@PathVariable("sid") String sid);
@ApiOperation(value = "根据销售订单sid获取合同")
@GetMapping(value = "/getContractBySalesOrderSid/{busSid}")
ResultBean<CommonContractVo> getContractBySalesOrderSid(@PathVariable("busSid") String busSid);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java

@ -208,4 +208,9 @@ public class CommonContractFeignFallback implements CommonContractFeign {
public ResultBean<CommonContract> getContractByBusSid(String sid) {
return null;
}
@Override
public ResultBean<CommonContractVo> getContractBySalesOrderSid(String busSid) {
return null;
}
}

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

@ -60,6 +60,8 @@ public class CommonContractVo implements Vo {
private String appdixUrl;
@ApiModelProperty("现场签署图片附件")
private String sceneSignUrl;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("节点状态")
private String nodeState;
@ApiModelProperty("附件文件")

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java

@ -69,7 +69,7 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
CommonContractBuscenterVo selectByBusSid(String busSid);
IPage<AppCommonContractPageVo> getContractList(IPage<CommonContract> page, @Param(Constants.WRAPPER) QueryWrapper<CommonContract> qw,@Param("names")String names);
IPage<AppCommonContractPageVo> getContractList(IPage<CommonContract> page, @Param(Constants.WRAPPER) QueryWrapper<CommonContract> qw, @Param("names") String names);
/**
* 移动端-初始化合同审核
@ -88,4 +88,7 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
void updateBySidAndState(@Param("businessSid") String businessSid, @Param("state") String state);
CommonContract getContractByBusSid(String sid);
@Select("select * from common_contract where busSid = #{busSid}")
CommonContractVo getContractBySalesOrderSid(@Param("busSid") String busSid);
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java

@ -571,4 +571,9 @@ public class CommonContractRest implements CommonContractFeign {
public ResultBean<CommonContract> getContractByBusSid(String sid) {
return commonContractService.getContractByBusSid(sid);
}
@Override
public ResultBean<CommonContractVo> getContractBySalesOrderSid(String busSid) {
return commonContractService.getContractBySalesOrderSid(busSid);
}
}

13
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -1321,7 +1321,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("depositTotal", depositTotal);
map.put("address", address);
//生成合同编号
String contractNo = getApplyCode(dto.getUserSid(),appOrderModelInfoVo.getModelSid());
String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
map.put("contractNo", contractNo);
String url = "";
try {
@ -1459,7 +1459,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
return rb.success().setData(list);
}
public String getApplyCode(String userSid,String modelSid) {
public String getApplyCode(String userSid, String modelSid) {
//获取分公司sid
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
@ -1468,7 +1468,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//根据车型sid查询品牌简称
String brandCode = baseVehicleBrandService.selectShortName(modelSid);
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
String bill = brandCode+orgCode+date;
String bill = brandCode + orgCode + date;
/* BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType(BillTypeEnum.XSDD.getBillType());
@ -1665,4 +1665,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}
return rb.success().setData(commonContract);
}
public ResultBean<CommonContractVo> getContractBySalesOrderSid(String busSid) {
ResultBean<CommonContractVo> rb = ResultBean.fireFail();
CommonContractVo commonContractVo = baseMapper.getContractBySalesOrderSid(busSid);
return rb.success().setData(commonContractVo);
}
}

15
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AdCarListDto.java

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

11
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java

@ -1,5 +1,6 @@
package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -14,14 +15,14 @@ public class AppAdvanceInvoiceDto implements Dto {
private String userSid;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同id")
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户")
private String customerName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("车辆列表")
private List<AdCarListVo> carList;
private List<AdCarListDto> carList;
@ApiModelProperty("欠款金额")
private String arrearsMoney;
@ApiModelProperty("车型")
@ -38,12 +39,12 @@ public class AppAdvanceInvoiceDto implements Dto {
private String returnedMoneyDate;
@ApiModelProperty("车辆登记合同")
private List<String> registerFile;
@ApiModelProperty("提前开票原因 0手写 1选择")
@ApiModelProperty("提前开票原因 选择value")
private String advGinReasonValue;
@ApiModelProperty("提前开票原因 0手写 1选择")
private String advGinReasonKey;
@ApiModelProperty("选择原因")
private String reasonChoose;
@ApiModelProperty("提前开票原因 0手写 1选择")
private String advGinReasonType;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实列id")

17
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java

@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
@ -20,16 +21,18 @@ public class AppAdvanceInvoiceInfoVo implements Vo {
private String customerName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("车辆列表")
private List<AdCarListVo> carList;
@ApiModelProperty("选择车辆列表")
private List<AdCarListVo> carList = new ArrayList<>();
@ApiModelProperty("所有车辆列表")
private List<AdCarListVo> vinList = new ArrayList<>();
@ApiModelProperty("欠款金额")
private String arrearsMoney;
@ApiModelProperty("车型")
private String carModel;
@ApiModelProperty("开票信息确认书")
private List<String> confirmFile;
private List<String> confirmFile = new ArrayList<>();
@ApiModelProperty("客户开票申请书")
private List<String> applyFile;
private List<String> applyFile = new ArrayList<>();
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("手写原因")
@ -37,13 +40,13 @@ public class AppAdvanceInvoiceInfoVo implements Vo {
@ApiModelProperty("承诺回款日期")
private String returnedMoneyDate;
@ApiModelProperty("车辆登记合同")
private List<String> registerFile;
private List<String> registerFile = new ArrayList<>();
@ApiModelProperty("提前开票原因 0手写 1选择")
private String advGinReasonType;
@ApiModelProperty("提前开票原因 0手写 1选择")
private String advGinReasonValue;
@ApiModelProperty("提前开票原因 0手写 1选择")
private String advGinReasonKey;
@ApiModelProperty("选择原因")
private String reasonChoose;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实列id")

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceQuery.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java

@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppAdvanceInvoiceQuery implements Query {
public class AppAdvanceInvoicePageQuery implements Query {
private static final long serialVersionUID = 7668511398241906995L;
@ApiModelProperty("用户sid")

55
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageVo.java

@ -11,37 +11,72 @@ public class AppAdvanceInvoicePageVo implements Vo {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("合同状态")
private String nodeState;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("欠款金额")
private String arrearsMoney;
@ApiModelProperty("承诺汇款日期")
private String returnedMoneyDate;
@ApiModelProperty("申请人")
private String applyName;
@ApiModelProperty("数量")
private String num;
@ApiModelProperty("原因")
private String reason;
@ApiModelProperty("选择 手写 key 0 1")
private String advGinReasonType;
@ApiModelProperty("选择value")
private String advGinReasonValue;
@ApiModelProperty("选择key")
private String advGinReasonKey;
@ApiModelProperty("手写")
private String otherReasons;
@ApiModelProperty("创建日期")
private String applyDate;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("是否显示办理按钮")
private Boolean showUpdateBtn;
@ApiModelProperty("是否显示删除按钮")
private Boolean showDeleteBtn;
// @ApiModelProperty("sid")
// private String sid;
//
// @ApiModelProperty("合同状态")
// private String nodeState;
//
// @ApiModelProperty("合同编号")
// private String contractNo;
//
// @ApiModelProperty("欠款金额")
// private String arrearsMoney;
//
// @ApiModelProperty("承诺汇款日期")
// private String returnedMoneyDate;
//
// @ApiModelProperty("申请人")
// private String applyName;
//
// @ApiModelProperty("数量")
// private String num;
//
// @ApiModelProperty("原因")
// private String otherReasons;
//
// @ApiModelProperty("创建日期")
// private String applyDate;
//
// @ApiModelProperty("客户名称")
// private String customerName;
//
// @ApiModelProperty("是否显示办理按钮")
// private Boolean showUpdateBtn;
//
// @ApiModelProperty("是否显示删除按钮")
// private Boolean showDeleteBtn;
}

22
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceVinDto.java

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

20
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/AppAdvanceInvoiceQuery.java

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

43
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/AppAdvanceInvoiceTaskQuery.java

@ -0,0 +1,43 @@
package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class AppAdvanceInvoiceTaskQuery implements Query {
private static final long serialVersionUID = 3308561390435471019L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
private String instanceId;
// @ApiModelProperty("节点")
// private String targetKey;
}

35
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/AppCompleteAdvanceInvoiceDto.java

@ -0,0 +1,35 @@
package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class AppCompleteAdvanceInvoiceDto implements Dto {
private static final long serialVersionUID = 3647601312967057188L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
@NotBlank(message = "参数错误:orgSidPath")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:instanceId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
// @ApiModelProperty(value = "暂不确定是不是需要前端传的:还是有分支的时候传??")
// private Map<String, Object> formVariables;
}

19
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/AppSubmitAdvanceInvoiceDto.java

@ -0,0 +1,19 @@
package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppSubmitAdvanceInvoiceDto extends AppAdvanceInvoiceDto {
private static final long serialVersionUID = 4891793865442240715L;
@ApiModelProperty("意见")
private String comment;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

19
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/GetNodeQuery.java

@ -0,0 +1,19 @@
package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class GetNodeQuery implements Query {
private static final long serialVersionUID = -8926127081586674686L;
@ApiModelProperty(value = "环节定义id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
// @ApiModelProperty(value = "分支字段及业务字段")
// private Map<String, Object> formVariables;
}

21
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/flowable/GetNodeVo.java

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

11
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@ -31,6 +31,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -214,4 +216,13 @@ public interface BusSalesOrderFeign {
@PostMapping("/saveSaleOrderInputVin")
@ResponseBody
ResultBean saveSaleOrderInputVin(@RequestBody VinDto dto);
@ApiOperation("移动端-提前开票查询合同列表")
@PostMapping("/getApprovalContractList")
@ResponseBody
public ResultBean<PagerVo<AppRovalContractPageVo>> getApprovalContractList(@RequestBody PagerQuery<AppRovalContractPageQuery> pagerQuery);
}

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@ -31,6 +31,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -191,4 +193,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
public ResultBean saveSaleOrderInputVin(VinDto dto) {
return null;
}
@Override
public ResultBean<PagerVo<AppRovalContractPageVo>> getApprovalContractList(PagerQuery<AppRovalContractPageQuery> pagerQuery) {
return null;
}
}

17
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java

@ -0,0 +1,17 @@
package com.yxt.anrui.buscenter.api.bussalesorder.contract;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppRovalContractPageQuery implements Query {
private static final long serialVersionUID = -1449862667407636197L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("车架号 客户名称 合同编号")
private String name;
}

30
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageVo.java

@ -0,0 +1,30 @@
package com.yxt.anrui.buscenter.api.bussalesorder.contract;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppRovalContractPageVo implements Vo {
private static final long serialVersionUID = 907545793790278229L;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("销售订单sid")
private String busSid;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("车型名称")
private String modelName;
}

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busginvoiceapplyvehicle/BusGinvoiceapplyVehicleMapper.java

@ -62,11 +62,11 @@ public interface BusGinvoiceapplyVehicleMapper extends BaseMapper<BusGinvoiceapp
List<BusGinvoiceapplyVehicleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusGinvoiceapplyVehicle> qw);
@Select("select * from bus_ginvoiceapply_vehicle")
@Select("select * from bus_advance_ginvoiceapply_vehicle")
List<BusGinvoiceapplyVehicleVo> selectListVo();
@Delete("DELETE FROM bus_ginvoiceapply_vehicle WHERE advGinSid = #{sid}")
Integer delByAdvGinSid(String sid);
@Delete("DELETE FROM bus_advance_ginvoiceapply_vehicle WHERE advGinSid = #{sid}")
Integer delByAdvGinSid(@Param("sid") String sid);
List<BusGinvoiceapplyVehicleDetailsVo> fetchByAdvGinSid(String sid);

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

@ -36,8 +36,10 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderSubmi
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
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;
@ -163,4 +165,8 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
List<String> getList(String saleOrderSid);
IPage<AppRovalContractPageVo> getApprovalContractList(IPage<AppRovalContractPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppRovalContractPageVo> qw);
List<AppRovalContractPageVo> selectByContractNo(@Param("contractNo") String contractNo);
}

24
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -221,4 +221,28 @@
from bus_sales_vehicle_order
where salesOrderSid = #{saleOrderSid}
</select>
<select id="getApprovalContractList"
resultType="com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo">
SELECT bo.sid as busSid,
bo.customerName as customerName,
bo.mobile as modelName,
bsov.linkNo AS vin
FROM bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
<where>
${ew.sqlSegment}
and length( bo.contractNo ) > 1
</where>
</select>
<select id="selectByContractNo"
resultType="com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo">
SELECT bo.sid as busSid,
bo.customerName as customerName,
bo.mobile as modelName,
bsov.linkNo AS vin
FROM bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
WHERE bo.contractNo = #{contractNo}
</select>
</mapper>

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

@ -26,6 +26,7 @@
package com.yxt.anrui.buscenter.biz.bussalesorder;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
@ -33,9 +34,13 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -259,4 +264,15 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
public ResultBean saveSaleOrderInputVin(VinDto dto) {
return busSalesOrderService.saveSaleOrderInputVin(dto);
}
@Override
public ResultBean<PagerVo<AppRovalContractPageVo>> getApprovalContractList(PagerQuery<AppRovalContractPageQuery> pagerQuery) {
if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
new ResultBean<>().success().setMsg("用户sid不能为空");
}
PagerVo<AppRovalContractPageVo> page = new PagerVo<>();
IPage<AppRovalContractPageVo> iPage = busSalesOrderService.getApprovalContractList(pagerQuery);
PagerVo<AppRovalContractPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean<PagerVo<AppRovalContractPageVo>>().success().setData(pagerVo);
}
}

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

@ -45,9 +45,7 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.utils.Rule;
@ -62,6 +60,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListDto;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
@ -119,6 +119,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.common.base.config.component.FileUploadComponent;
@ -2640,7 +2641,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (vo != null) {
if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) {
vinListVo.setState(true);
}else{
} else {
vinListVo.setState(false);
}
}
@ -2685,4 +2686,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return rb.success();
}
public IPage<AppRovalContractPageVo> getApprovalContractList(PagerQuery<AppRovalContractPageQuery> pagerQuery) {
AppRovalContractPageQuery params = pagerQuery.getParams();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>();
qw.eq("bo.staffSid", sysUserVo.getStaffSid());
IPage<AppRovalContractPageVo> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppRovalContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw);
for (AppRovalContractPageVo record : iPage.getRecords()) {
String busSid = record.getBusSid();
CommonContractVo commonContract = commonContractFeign.getContractBySalesOrderSid(busSid).getData();
if (commonContract != null) {
record.setContractId(commonContract.getContractNo());
record.setContractSid(commonContract.getSid());
}
}
return iPage;
}
public List<AppRovalContractPageVo> selectByContractNo(String contractNo) {
List<AppRovalContractPageVo> list = baseMapper.selectByContractNo(contractNo);
return list;
}
}

21
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AddAdvanceInvoiceDto.java

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

32
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java

@ -1,5 +1,7 @@
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AdCarListVo;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -15,17 +17,20 @@ public class AdvanceInvoiceDto implements Dto {
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同id")
private String contractId;
@JsonProperty("contractId")
private String contractNo;
@ApiModelProperty("客户")
private String customerName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("车辆列表")
private String carList;
private List<AppCarListDto> carList;
@ApiModelProperty("欠款金额")
private String cumulativeArrearsPrice;
@JsonProperty("cumulativeArrearsPrice")
private String arrearsMoney;
@ApiModelProperty("车型")
private String modelName;
@JsonProperty("modelName")
private String carModel;
@ApiModelProperty("开票信息确认书")
private List<String> confirmFile;
@ApiModelProperty("客户开票申请书")
@ -33,17 +38,22 @@ public class AdvanceInvoiceDto implements Dto {
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("手写原因")
private String reasonWrite;
@JsonProperty("reasonWrite")
private String otherReasons;
@ApiModelProperty("承诺回款日期")
private String collectionDate;
@JsonProperty("collectionDate")
private String returnedMoneyDate;
@ApiModelProperty("车辆登记合同")
private String registerFile;
private List<String> registerFile;
@ApiModelProperty("提前开票原因 0手写 1选择")
private String reasonType;
@JsonProperty("reasonType")
private String advGinReasonType;
@ApiModelProperty("提前开票原因 0手写 1选择")
private String reasonKey;
@ApiModelProperty("选择原因")
private String reasonChoose;
@JsonProperty("reasonChoose")
private String advGinReasonValue;
@ApiModelProperty("提前开票原因 0手写 1选择")
@JsonProperty("reasonKey")
private String advGinReasonKey;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实列id")

41
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@ -1,9 +1,12 @@
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AdCarListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
@ -15,35 +18,45 @@ public class AdvanceInvoiceInfoVo implements Vo {
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同id")
private String contractId;
@JsonProperty("contractId")
private String contractNo;
@ApiModelProperty("客户")
private String customerName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("车辆列表")
private List<AppCarListVo> carList;
@ApiModelProperty("选择车辆列表")
private List<AppCarListVo> carList = new ArrayList<>();
@ApiModelProperty("所有车辆列表")
private List<AppCarListVo> vinList = new ArrayList<>();
@ApiModelProperty("欠款金额")
private String cumulativeArrearsPrice;
@JsonProperty("cumulativeArrearsPrice")
private String arrearsMoney;
@ApiModelProperty("车型")
private String modelName;
@JsonProperty("modelName")
private String carModel;
@ApiModelProperty("开票信息确认书")
private List<String> confirmFile;
private List<String> confirmFile = new ArrayList<>();
@ApiModelProperty("客户开票申请书")
private List<String> applyFile;
private List<String> applyFile = new ArrayList<>();
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("手写原因")
private String reasonWrite;
@JsonProperty("reasonWrite")
private String otherReasons;
@ApiModelProperty("承诺回款日期")
private String collectionDate;
@JsonProperty("collectionDate")
private String returnedMoneyDate;
@ApiModelProperty("车辆登记合同")
private String registerFile;
private List<String> registerFile = new ArrayList<>();
@ApiModelProperty("提前开票原因 0手写 1选择")
private String reasonType;
@JsonProperty("reasonType")
private String advGinReasonType;
@ApiModelProperty("提前开票原因 0手写 1选择")
private String reasonKey;
@ApiModelProperty("选择原因")
private String reasonChoose;
@JsonProperty("reasonChoose")
private String advGinReasonValue;
@ApiModelProperty("提前开票原因 0手写 1选择")
@JsonProperty("reasonKey")
private String advGinReasonKey;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实列id")

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceQuery.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageQuery.java

@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AdvanceInvoiceQuery implements Query {
public class AdvanceInvoicePageQuery implements Query {
private static final long serialVersionUID = -7435351433058437187L;
@ApiModelProperty("用户sid")

11
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java

@ -30,8 +30,17 @@ public class AdvanceInvoicePageVo implements Vo {
@JsonProperty("number")
private String num;
@ApiModelProperty("原因")
@JsonProperty("reason")
private String reason;
@ApiModelProperty("选择 手写 key 0 1")
private String advGinReasonType;
@ApiModelProperty("选择value")
private String advGinReasonValue;
@ApiModelProperty("选择key")
private String advGinReasonKey;
@ApiModelProperty("手写")
private String otherReasons;
@ApiModelProperty("创建日期")
@JsonProperty("date")
private String applyDate;

21
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceVinDto.java

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

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

@ -26,6 +26,10 @@
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -33,6 +37,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@ -62,7 +67,12 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
@ApiOperation("手机端-获取提前开票列表")
@PostMapping("/getAdvanceInvoiceList")
@ResponseBody
ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(@RequestBody PagerQuery<AdvanceInvoiceQuery> pagerQuery);
ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(@RequestBody PagerQuery<AdvanceInvoicePageQuery> pagerQuery);
@ApiOperation("移动端-新增提前开票申请")
@PostMapping("/addAdvanceInvoice")
@ResponseBody
public ResultBean addAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceVinDto dto);
@ApiOperation("手机端-初始化提前开票申请")
@GetMapping("/initAdvanceInvoice/{contractSid}")
@ -75,7 +85,38 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
public ResultBean saveAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceDto dto);
@ApiOperation("手机端-删除提前开票")
@GetMapping("/deleteAdvanceInvoice/{contractSid}")
@DeleteMapping("/deleteAdvanceInvoice/{contractSid}")
@ResponseBody
public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid);
@ApiOperation("提交流程")
@PostMapping("/submitAdvanceInvoiceInfo")
@ResponseBody
ResultBean submitAdvanceInvoiceInfo(@RequestBody SubmitAdvanceInvoiceDto dto);
@ApiOperation("办理")
@PutMapping("/agreeAdvanceInvoiceInfo")
@ResponseBody
ResultBean agreeAdvanceInvoiceInfo(@RequestBody CompleteAdvanceInvoiceDto dto);
@ApiOperation("驳回")
@PutMapping("/rejectAdvanceInvoiceInfo")
@ResponseBody
ResultBean rejectAdvanceInvoiceInfo(@RequestBody AdvanceInvoiceTaskQuery query);
@ApiOperation("撤回")
@PutMapping("/recallAdvanceInvoiceInfo")
@ResponseBody
ResultBean recallAdvanceInvoiceInfo(@RequestBody AdvanceInvoiceTaskQuery query);
@ApiOperation("终止")
@PutMapping("/stopAdvanceInvoiceInfo")
@ResponseBody
ResultBean stopAdvanceInvoiceInfo(@RequestBody AdvanceInvoiceTaskQuery query);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap AdvanceInvoiceQuery query);
}

42
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java

@ -25,7 +25,10 @@
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -49,7 +52,12 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
@Override
public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoiceQuery> pagerQuery) {
public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoicePageQuery> pagerQuery) {
return null;
}
@Override
public ResultBean addAdvanceInvoice(AdvanceInvoiceVinDto dto) {
return null;
}
@ -67,4 +75,34 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
public ResultBean deleteAdvanceInvoice(String contractSid) {
return null;
}
@Override
public ResultBean submitAdvanceInvoiceInfo(SubmitAdvanceInvoiceDto dto) {
return null;
}
@Override
public ResultBean agreeAdvanceInvoiceInfo(CompleteAdvanceInvoiceDto dto) {
return null;
}
@Override
public ResultBean rejectAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
return null;
}
@Override
public ResultBean recallAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
return null;
}
@Override
public ResultBean stopAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
return null;
}
@Override
public ResultBean<String> getFlowOperateTitle(AdvanceInvoiceQuery query) {
return null;
}
}

16
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListDto.java

@ -0,0 +1,16 @@
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
import com.yxt.common.core.dto.Dto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppCarListDto implements Dto {
private static final long serialVersionUID = -7003788760351399800L;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("成交价")
private String price;
}

20
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/AdvanceInvoiceQuery.java

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

42
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/AdvanceInvoiceTaskQuery.java

@ -0,0 +1,42 @@
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class AdvanceInvoiceTaskQuery implements Query {
private static final long serialVersionUID = -6952737531036706114L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
@JsonProperty("procInsId")
private String instanceId;
}

32
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/CompleteAdvanceInvoiceDto.java

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

18
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/SubmitAdvanceInvoiceDto.java

@ -0,0 +1,18 @@
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class SubmitAdvanceInvoiceDto extends AdvanceInvoiceDto {
private static final long serialVersionUID = 6134092944641545633L;
@ApiModelProperty("流程实例id")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

37
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java

@ -0,0 +1,37 @@
package com.yxt.anrui.terminal.api.autoservice.approval;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
/**
* Project: anrui-base(安瑞基础) <br/>
* File: CommonContractFeign.java <br/>
* Class: com.yxt.anrui.base.api.commoncontract.CommonContractFeign <br/>
* Description: 合同表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-10-12 14:02:40 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "合同表")
@FeignClient(
contextId = "anrui-terminal-AppRoval",
name = "anrui-terminal",
path = "/autoservice/v1/approval",
fallback = AppRovalFeignFallback.class)
public interface AppRovalFeign {
@ApiOperation("移动端-提前开票查询合同列表")
@PostMapping("/getApprovalContractList")
@ResponseBody
public ResultBean<PagerVo<RovalContractPageVo>> getApprovalContractList(@RequestBody PagerQuery<RovalContractPageQuery> pagerQuery);
}

29
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeignFallback.java

@ -0,0 +1,29 @@
package com.yxt.anrui.terminal.api.autoservice.approval;
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;
/**
* Project: anrui-base(安瑞基础) <br/>
* File: CommonContractFeignFallback.java <br/>
* Class: com.yxt.anrui.base.api.commoncontract.CommonContractFeignFallback <br/>
* Description: 合同表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-10-12 14:02:40 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class AppRovalFeignFallback implements AppRovalFeign {
@Override
public ResultBean<PagerVo<RovalContractPageVo>> getApprovalContractList(PagerQuery<RovalContractPageQuery> pagerQuery) {
return null;
}
}

17
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java

@ -0,0 +1,17 @@
package com.yxt.anrui.terminal.api.autoservice.approval;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class RovalContractPageQuery implements Query {
private static final long serialVersionUID = -1857847352706914720L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("车架号 客户名称 合同编号")
private String name;
}

31
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageVo.java

@ -0,0 +1,31 @@
package com.yxt.anrui.terminal.api.autoservice.approval;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class RovalContractPageVo implements Vo {
private static final long serialVersionUID = -8310834266355010490L;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("销售订单sid")
private String busSid;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("车型名称")
private String modelName;
}

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

@ -25,13 +25,15 @@
*********************************************************/
package com.yxt.anrui.terminal.biz.autoservice.advanceInvoice;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -57,10 +59,15 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
private AppBusAdvanceGinvoiceapplyService appBusAdvanceGinvoiceapplyService;
@Override
public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoiceQuery> pagerQuery) {
public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoicePageQuery> pagerQuery) {
return appBusAdvanceGinvoiceapplyService.getAdvanceInvoiceList(pagerQuery);
}
@Override
public ResultBean addAdvanceInvoice(AdvanceInvoiceVinDto dto) {
return appBusAdvanceGinvoiceapplyService.addAdvanceInvoice(dto);
}
@Override
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid);
@ -75,4 +82,36 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
public ResultBean deleteAdvanceInvoice(String contractSid) {
return appBusAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid);
}
@Override
public ResultBean submitAdvanceInvoiceInfo(SubmitAdvanceInvoiceDto dto) {
return appBusAdvanceGinvoiceapplyService.submitAdvanceInvoiceInfo(dto);
}
@Override
public ResultBean agreeAdvanceInvoiceInfo(CompleteAdvanceInvoiceDto dto) {
return appBusAdvanceGinvoiceapplyService.agreeAdvanceInvoiceInfo(dto);
}
@Override
public ResultBean rejectAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
return appBusAdvanceGinvoiceapplyService.rejectAdvanceInvoiceInfo(query);
}
@Override
public ResultBean recallAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
return appBusAdvanceGinvoiceapplyService.recallAdvanceInvoiceInfo(query);
}
@Override
public ResultBean stopAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
return appBusAdvanceGinvoiceapplyService.stopAdvanceInvoiceInfo(query);
}
@Override
public ResultBean<String> getFlowOperateTitle(AdvanceInvoiceQuery query) {
return appBusAdvanceGinvoiceapplyService.getFlowOperateTitle(query);
}
}

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

@ -27,16 +27,25 @@ package com.yxt.anrui.terminal.biz.autoservice.advanceInvoice;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
import com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationIInfoDto;
import com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationIInfoVo;
import com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationPageQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceInfoVo;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceQuery;
import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationPageVo;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppAdvanceInvoiceTaskQuery;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeQuery;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeVo;
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.scm.api.scmvehiclegression.flowable.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.BusOrderSalesVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -44,6 +53,12 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* Project: anrui_buscenter(销售业务) <br/>
@ -63,13 +78,27 @@ public class AppBusAdvanceGinvoiceapplyService {
@Autowired
BusAdvanceGinvoiceapplyFeign busAdvanceGinvoiceapplyFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoiceQuery> pagerQuery) {
public ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceList(PagerQuery<AdvanceInvoicePageQuery> pagerQuery) {
ResultBean<PagerVo<AdvanceInvoicePageVo>> rb = ResultBean.fireFail();
PagerQuery<AppAdvanceInvoiceQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppAdvanceInvoicePageVo>> advanceInvoiceList = busAdvanceGinvoiceapplyFeign.getAdvanceInvoiceList(pq);
PagerVo<AdvanceInvoicePageVo> vo = CoverUtils.selectPagerVo(advanceInvoiceList.getData());
return rb.success().setData(vo);
PagerQuery<AppAdvanceInvoicePageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppAdvanceInvoicePageVo>> resultBean = busAdvanceGinvoiceapplyFeign.getAdvanceInvoiceList(pq);
List<AdvanceInvoicePageVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AdvanceInvoicePageVo.class)).collect(Collectors.toList());
PagerVo<AdvanceInvoicePageVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
return rb.success().setData(v);
}
public ResultBean addAdvanceInvoice(AdvanceInvoiceVinDto dto) {
AppAdvanceInvoiceVinDto appAdvanceInvoiceVinDto = new AppAdvanceInvoiceVinDto();
BeanUtil.copyProperties(dto, appAdvanceInvoiceVinDto);
ResultBean resultBean = busAdvanceGinvoiceapplyFeign.addAdvanceInvoice(appAdvanceInvoiceVinDto);
return resultBean;
}
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(String contractSid) {
@ -95,4 +124,101 @@ public class AppBusAdvanceGinvoiceapplyService {
ResultBean resultBean = busAdvanceGinvoiceapplyFeign.deleteAdvanceInvoice(contractSid);
return resultBean;
}
public ResultBean submitAdvanceInvoiceInfo(SubmitAdvanceInvoiceDto dto) {
ResultBean rb = ResultBean.fireFail();
AppSubmitAdvanceInvoiceDto submitAdvanceInvoiceDto = new AppSubmitAdvanceInvoiceDto();
BeanUtil.copyProperties(dto, submitAdvanceInvoiceDto);
ResultBean resultBean = busAdvanceGinvoiceapplyFeign.submitAdvanceInvoiceInfo(submitAdvanceInvoiceDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean agreeAdvanceInvoiceInfo(CompleteAdvanceInvoiceDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
AppCompleteAdvanceInvoiceDto completeAdvanceInvoiceDto = new AppCompleteAdvanceInvoiceDto();
BeanUtil.copyProperties(dto, completeAdvanceInvoiceDto);
completeAdvanceInvoiceDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = busAdvanceGinvoiceapplyFeign.complete(completeAdvanceInvoiceDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
AppAdvanceInvoiceTaskQuery taskQuery = new AppAdvanceInvoiceTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = busAdvanceGinvoiceapplyFeign.taskReject(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean recallAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
AppAdvanceInvoiceTaskQuery taskQuery = new AppAdvanceInvoiceTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = busAdvanceGinvoiceapplyFeign.revokeProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean stopAdvanceInvoiceInfo(AdvanceInvoiceTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
AppAdvanceInvoiceTaskQuery taskQuery = new AppAdvanceInvoiceTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = busAdvanceGinvoiceapplyFeign.breakProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(AdvanceInvoiceQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
GetNodeQuery getNodeQuery = new GetNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<GetNodeVo>> getPreviousNodesForReject = busAdvanceGinvoiceapplyFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<GetNodeVo>> getNextNodesForSubmit = busAdvanceGinvoiceapplyFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误:next");
}
return rb.success().setData(data);
}
}

65
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.autoservice.approval;
import com.yxt.anrui.terminal.api.autoservice.approval.AppRovalFeign;
import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageQuery;
import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageVo;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* Project: anrui_buscenter(销售业务) <br/>
* File: BusAdvanceGinvoiceapplyFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyRest <br/>
* Description: 提前开票申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-03-17 16:02:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "提前开票申请")
@RestController()
@RequestMapping("/autoservice/v1/approval")
public class AppRovalRest implements AppRovalFeign {
@Autowired
private AppRovalService appRovalService;
@Override
public ResultBean<PagerVo<RovalContractPageVo>> getApprovalContractList(PagerQuery<RovalContractPageQuery> pagerQuery) {
return appRovalService.getApprovalContractList(pagerQuery);
}
}

72
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.autoservice.approval;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageQuery;
import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageQuery;
import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* Project: anrui_buscenter(销售业务) <br/>
* File: BusAdvanceGinvoiceapplyService.java <br/>
* Class: com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyService <br/>
* Description: 提前开票申请 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-03-17 16:02:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AppRovalService {
@Autowired
BusSalesOrderFeign busSalesOrderFeign;
public ResultBean<PagerVo<RovalContractPageVo>> getApprovalContractList(PagerQuery<RovalContractPageQuery> pagerQuery) {
ResultBean<PagerVo<RovalContractPageVo>> rb = ResultBean.fireFail();
PagerQuery<AppRovalContractPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppRovalContractPageVo>> approvalContractList = busSalesOrderFeign.getApprovalContractList(pq);
PagerVo<RovalContractPageVo> vo = CoverUtils.selectPagerVo(approvalContractList.getData());
return rb.success().setData(vo);
}
}
Loading…
Cancel
Save