Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
ec3773d76a
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageQuery.java
  2. 16
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java
  3. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java
  4. 20
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDto.java
  5. 20
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApply.java
  6. 25
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDetailsVo.java
  7. 66
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDto.java
  8. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java
  9. 70
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyQuery.java
  10. 37
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyVo.java
  11. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyCompleteDto.java
  12. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/AppDiscountpackagelistDto.java
  13. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelist.java
  14. 15
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistDto.java
  15. 12
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeign.java
  16. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeignFallback.java
  17. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
  18. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
  19. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.java
  20. 48
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
  21. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java
  22. 40
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
  23. 771
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java
  24. 27
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.java
  25. 27
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.xml
  26. 72
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistRest.java
  27. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistService.java
  28. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
  29. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
  30. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
  31. 29
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  32. 114
      anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue
  33. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java
  34. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
  35. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  36. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  37. 28
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue
  38. 13
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
  39. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java
  40. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java
  41. 54
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  42. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
  43. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppDiscountpackageQuery.java

@ -15,6 +15,6 @@ public class AppDiscountpackageQuery implements Query {
private String names;
@ApiModelProperty("申请日期")
private String date;
@ApiModelProperty("1待办 2已办")
private String type;
// @ApiModelProperty("1待办 2已办")
// private String type;
}

16
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java

@ -31,7 +31,7 @@ import java.util.List;
*/
@Api(tags = "优惠包")
@FeignClient(
contextId = "basediscou-ntpackage-BaseDiscountpackage",
contextId = "basediscountpackage-BaseDiscountpackage",
name = "anrui-base",
path = "v1/basediscountpackage",
fallback = BaseDiscountpackageFeignFallback.class)
@ -65,9 +65,9 @@ public interface BaseDiscountpackageFeign {
@PostMapping("selectSalesOrderList")
ResultBean<PagerVo<BaseSalesDicountVo>> selectSalesOrderList(@RequestBody PagerQuery<BaseSalesDicountQuery> query);
@ApiOperation("移动端-销售订单获取销售政策优惠包")
@GetMapping("/getAppPackage/{userSid}")
ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@PathVariable(value = "userSid") String userSid);
@ApiOperation("查询本公司下优惠政策列表")
@GetMapping("/getAppPackageByUseOrg")
ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg);
@ApiOperation("移动端-销售订单获取销售政策优惠包:切换机构")
@GetMapping("/getAppPackage")
@ -81,6 +81,10 @@ public interface BaseDiscountpackageFeign {
@GetMapping("/selectAppDiscountpackageListByUserSid")
ResultBean<List<AppDiscountpackageListVo>> selectAppDiscountpackageListByUserSid(@SpringQueryMap AppLableQuery appLableQuery);
@ApiOperation("移动端-销售订单获取销售政策优惠包")
@GetMapping("/getAppPackage/{userSid}")
ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@PathVariable(value = "userSid") String userSid);
/*****************************销售政策流程****************************************************/
@ApiOperation("提交销售政策流程")
@ -117,11 +121,11 @@ public interface BaseDiscountpackageFeign {
@ApiOperation(value = "销售订单获取车辆的促销金额")
@GetMapping(value = "/getMoney")
ResultBean<List<String>> getMoney(@RequestParam("vinSid")String vinSid,@RequestParam("orgSid")String orgSid);
ResultBean<List<String>> getMoney(@RequestParam("vinSid") String vinSid, @RequestParam("orgSid") String orgSid);
@ApiOperation(value = "移动端销售政策详情")
@GetMapping(value = "/selectDiscountpackage/{sid}")
ResultBean<AppDiscountpackagesVo> selectDiscountpackage(@PathVariable("sid")String sid);
ResultBean<AppDiscountpackagesVo> selectDiscountpackage(@PathVariable("sid") String sid);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java

@ -63,6 +63,11 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
return null;
}
@Override
public ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg) {
return null;
}
@Override
public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
return null;

20
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDto.java

@ -90,16 +90,16 @@ public class AppDiscountpackageApplyDto implements Dto {
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("成交价")
private String price;
// @ApiModelProperty("合同sid")
// private String contractSid;
// @ApiModelProperty("车型sid")
// private String modelSid;
// @ApiModelProperty("配置sid")
// private String configSid;
// @ApiModelProperty("销售订单sid")
// private String saleOrderSid;
// @ApiModelProperty("成交价")
// private String price;
@ApiModelProperty("优惠包列表")
private List<AppDiscountpackagelistDto> discountPackageList; // 优惠包列表
}

20
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApply.java

@ -84,14 +84,14 @@ public class BaseDiscountpackageApply extends BaseEntity {
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("成交价")
private String price;
// @ApiModelProperty("合同sid")
// private String contractSid;
// @ApiModelProperty("车型sid")
// private String modelSid;
// @ApiModelProperty("配置sid")
// private String configSid;
// @ApiModelProperty("销售订单sid")
// private String saleOrderSid;
// @ApiModelProperty("成交价")
// private String price;
}

25
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDetailsVo.java

@ -26,12 +26,15 @@
package com.yxt.anrui.base.api.basediscountpackageapply;
import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-base(优惠包申请) <br/>
* File: BaseDiscountpackageApplyVo.java <br/>
@ -85,14 +88,16 @@ public class BaseDiscountpackageApplyDetailsVo implements Vo {
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("成交价")
private String price;
// @ApiModelProperty("合同sid")
// private String contractSid;
// @ApiModelProperty("车型sid")
// private String modelSid;
// @ApiModelProperty("配置sid")
// private String configSid;
// @ApiModelProperty("销售订单sid")
// private String saleOrderSid;
@ApiModelProperty("优惠包列表")
private List<BaseDiscountpackagelistDto> discountPackageList;
// @ApiModelProperty("成交价")
// private String price;
}

66
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDto.java

@ -26,12 +26,18 @@
package com.yxt.anrui.base.api.basediscountpackageapply;
import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackage;
import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageByApplyDto;
import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-base(优惠包申请) <br/>
* File: BaseDiscountpackageApplyDto.java <br/>
@ -51,48 +57,54 @@ public class BaseDiscountpackageApplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("合同编号")
@ApiModelProperty("申请人sid")
private String createBySid; // 申请人sid
@ApiModelProperty("合同编号")
private String contractId; // 合同编号
@ApiModelProperty("申请人")
@ApiModelProperty("申请人")
private String applyName; // 申请人
@ApiModelProperty("客户名称")
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("申请日期")
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("是否显示办理按钮 提交后不显示")
@ApiModelProperty("是否显示办理按钮 提交后不显示")
private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
@ApiModelProperty("车型名称")
@ApiModelProperty("车型名称")
private String model; // 车型名称
@ApiModelProperty("台数")
@ApiModelProperty("台数")
private String number; // 台数
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("taskId")
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("成交价")
private String price;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("优惠包列表")
private List<BaseDiscountpackagelistDto> discountPackageList;
// @ApiModelProperty("合同sid")
// private String contractSid;
// @ApiModelProperty("车型sid")
// private String modelSid;
// @ApiModelProperty("配置sid")
// private String configSid;
// @ApiModelProperty("销售订单sid")
// private String saleOrderSid;
// @ApiModelProperty("成交价")
// private String price;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java

@ -79,7 +79,7 @@ public interface BaseDiscountpackageApplyFeign {
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
@ -103,7 +103,7 @@ public interface BaseDiscountpackageApplyFeign {
/**************************流程接口************************************/
@ApiOperation("提交入账申请")
@ApiOperation("优惠包提交申请")
@PostMapping("/submitRecordApplication")
public ResultBean submitRecordApplication(@RequestBody @Valid SubmitBaseDiscountpackageApplyDto dto);
@ -134,4 +134,5 @@ public interface BaseDiscountpackageApplyFeign {
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
}

70
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyQuery.java

@ -49,39 +49,45 @@ import lombok.Data;
@ApiModel(value = "优惠包申请 查询条件", description = "优惠包申请 查询条件")
public class BaseDiscountpackageApplyQuery implements Query {
@ApiModelProperty("合同编号")
@ApiModelProperty("用户sid")
private String userSid; // 用户sid
@ApiModelProperty("合同编号")
private String contractId; // 合同编号
@ApiModelProperty("申请人")
private String applyName; // 申请人
@ApiModelProperty("客户名称")
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("是否显示办理按钮 提交后不显示")
private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
@ApiModelProperty("车型名称")
private String model; // 车型名称
@ApiModelProperty("台数")
private String number; // 台数
@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; // 申请人组织路径
@ApiModelProperty("申请开始时间")
private String createStartTime; // 申请开始时间
@ApiModelProperty("申请结束时间")
private String createEndTime; // 申请结束时间
// @ApiModelProperty("申请日期")
// private String applyDate; // 申请日期
// @ApiModelProperty("创建组织sid")
// private String createOrgSid; // 创建组织sid
// @ApiModelProperty("创建组织名称")
// private String createOrgName; // 创建组织名称
// @ApiModelProperty("使用组织sid")
// private String useOrgSid; // 使用组织sid
// @ApiModelProperty("使用组织名称")
// private String useOrgName; // 使用组织名称
// @ApiModelProperty("是否显示办理按钮 提交后不显示")
// private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
// @ApiModelProperty("车型名称")
// private String model; // 车型名称
// @ApiModelProperty("台数")
// private String number; // 台数
// @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; // 申请人组织路径
// @ApiModelProperty("申请人")
// private String applyName; // 申请人
}

37
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyVo.java

@ -31,6 +31,7 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
/**
* Project: anrui-base(优惠包申请) <br/>
@ -51,39 +52,41 @@ public class BaseDiscountpackageApplyVo implements Vo {
private String sid; // sid
@ApiModelProperty("合同编号")
@ApiModelProperty("合同编号")
private String contractId; // 合同编号
@ApiModelProperty("申请人")
@ApiModelProperty("申请人")
private String applyName; // 申请人
@ApiModelProperty("客户名称")
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("申请日期")
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("是否显示办理按钮 提交后不显示")
@ApiModelProperty("是否显示办理按钮 提交后不显示")
private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
@ApiModelProperty("车型名称")
@ApiModelProperty("车型名称")
private String model; // 车型名称
@ApiModelProperty("台数")
@ApiModelProperty("台数")
private String number; // 台数
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("taskId")
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("销售订单sid")
private String saleOrderSid; // 销售订单sid
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyCompleteDto.java

@ -40,6 +40,6 @@ public class BaseDiscountpackageApplyCompleteDto implements Dto {
private String businessSid;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
@ApiModelProperty("调账车辆列表")
private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
// @ApiModelProperty("调账车辆列表")
// private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/AppDiscountpackagelistDto.java

@ -55,7 +55,7 @@ public class AppDiscountpackagelistDto implements Dto {
@ApiModelProperty("数量")
private String number; // 数量
@ApiModelProperty("说明")
private String explain; // 说明
private String packageExplain; // 说明
@ApiModelProperty("优惠表申请sid")
private String discountSid; // 优惠表申请sid
@ApiModelProperty("总价值")
@ -63,4 +63,6 @@ public class AppDiscountpackagelistDto implements Dto {
@ApiModelProperty("优惠包名称")
private String discountName; // 优惠包名称
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelist.java

@ -55,7 +55,7 @@ public class BaseDiscountpackagelist extends BaseEntity {
@ApiModelProperty("数量")
private String number; // 数量
@ApiModelProperty("说明")
private String explain; // 说明
private String packageExplain; // 说明
@ApiModelProperty("优惠表申请sid")
private String discountSid; // 优惠表申请sid
@ApiModelProperty("总价值")

15
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistDto.java

@ -50,18 +50,17 @@ import lombok.Data;
public class BaseDiscountpackagelistDto implements Dto {
private String sid; // sid
@ApiModelProperty("价值")
@ApiModelProperty("价值")
private String price; // 价值
@ApiModelProperty("数量")
@ApiModelProperty("数量")
private String number; // 数量
@ApiModelProperty("说明")
private String explain; // 说明
@ApiModelProperty("优惠表申请sid")
@ApiModelProperty("说明")
private String packageExplain; // 说明
@ApiModelProperty("优惠表申请sid")
private String discountSid; // 优惠表申请sid
@ApiModelProperty("总价值")
@ApiModelProperty("总价值")
private String totalPrice; // 总价值
@ApiModelProperty("优惠包名称")
@ApiModelProperty("优惠包名称")
private String discountName; // 优惠包名称
}

12
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeign.java

@ -48,7 +48,7 @@ import java.util.List;
* @version 1.0
* @since 1.0
*/
@Api(tags = "优惠包申请")
@Api(tags = "优惠包申请优惠包列表")
@FeignClient(
contextId = "anrui-base-BaseDiscountpackagelist",
name = "anrui-base",
@ -65,14 +65,20 @@ public interface BaseDiscountpackagelistFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BaseDiscountpackagelistDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<BaseDiscountpackagelistDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("根据主表SID获取记录")
@GetMapping("/fetchDetailsByDiscountSid}")
@ResponseBody
public ResultBean<List<BaseDiscountpackagelistDto>> fetchDetailsByDiscountSid(String discountSid);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeignFallback.java

@ -69,4 +69,9 @@ public class BaseDiscountpackagelistFeignFallback implements BaseDiscountpackage
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basediscountpackagelist/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<List<BaseDiscountpackagelistDto>> fetchDetailsByDiscountSid(String discountSid) {
return null;
}
}

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

@ -72,6 +72,10 @@ public interface CommonContractFeign {
@GetMapping("/selectByBusSid")
public ResultBean<CommonContractBuscenterVo> selectByBusSid(@RequestParam("busSid") String busSid);
@ApiOperation("根据创建人sid查询合同")
@ResponseBody
@GetMapping("/selectBycreateBySid")
public ResultBean<CommonContractPackageVo> selectByCreateUserSid(@RequestParam("createBySid") String createBySid);
/************************************手机端接口*******************************************/

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

@ -71,6 +71,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
return null;
}
@Override
public ResultBean<CommonContractPackageVo> selectByCreateUserSid(String createBySid) {
return null;
}
@Override
public ResultBean updateCommonContractDeposit(String deposit, String sid) {
ResultBean rb = ResultBean.fireFail();

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.java

@ -73,4 +73,7 @@ public interface BaseDiscountpackageMapper extends BaseMapper<BaseDiscountpackag
List<AppDiscountpackageListVo> selectAppDiscountpackageListByOrgSid(String orgSid);
AppDiscountpackagesVo selectDiscountpackage(String sid);
List<BaseDiscountpackageByApplyDto> getAppPackageByUseOrg(@Param("userOrg") String userOrg);
}

48
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml

@ -20,17 +20,17 @@
<select id="selectSalesOrderList" resultType="com.yxt.anrui.base.api.basediscountpackage.BaseSalesDicountVo">
select sid,
salesPolicy,
discountType,
projectName,
projectCost,
discountMoney,
discountExplain,
effectiveDate,
case isEmploy
when '0' then '否'
when '1' then '是'
end as isEmploy
salesPolicy,
discountType,
projectName,
projectCost,
discountMoney,
discountExplain,
effectiveDate,
case isEmploy
when '0' then '否'
when '1' then '是'
end as isEmploy
from base_discountpackage
<where>
${ew.sqlSegment}
@ -48,7 +48,7 @@
<update id="updateFlowFiled">
UPDATE base_discountpackage
SET nodeState=#{nodeState}
, nodeSid=#{taskDefKey}
, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
@ -73,15 +73,31 @@
from base_discountpackage_veh bd
left join base_discountpackage bbd on bbd.sid = bd.mainSid
where bd.vehSid = #{vinSid}
and bbd.useOrg = #{orgSid} and bbd.nodeState='已办结' and bbd.salesPolicyKey = '0001'
and bbd.useOrg = #{orgSid}
and bbd.nodeState = '已办结'
and bbd.salesPolicyKey = '0001'
</select>
<select id="selectAppDiscountpackageListByOrgSid"
resultType="com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageListVo">
SELECT projectName,projectCost,discountExplain FROM base_discountpackage WHERE useOrg = #{orgSid}
SELECT projectName, projectCost, discountExplain
FROM base_discountpackage
WHERE useOrg = #{orgSid}
</select>
<select id="selectDiscountpackage" resultType="com.yxt.anrui.base.api.basediscountpackage.app.AppDiscountpackagesVo">
select *,case isEmploy when 1 then '是' when 0 then '否' end as isEmployValue from base_discountpackage where sid = #{sid}
<select id="selectDiscountpackage"
resultType="com.yxt.anrui.base.api.basediscountpackage.app.AppDiscountpackagesVo">
select *, case isEmploy when 1 then '是' when 0 then '否' end as isEmployValue
from base_discountpackage
where sid = #{sid}
</select>
<select id="getAppPackageByUseOrg"
resultType="com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageByApplyDto">
SELECT projectName as discountName,
discountMoney as price,
discountExplain as packageExplain
FROM base_discountpackage
WHERE useOrg = #{userOrg}
AND curdate() &lt;= effectiveDate
</select>
</mapper>

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java

@ -129,6 +129,16 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
return rb.success().setData(pv);
}
/**
* 查询本公司下优惠政策列表
* @param userOrg
* @return
*/
@Override
public ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg) {
return baseDiscountpackageService.getAppPackageByUseOrg(userOrg);
}
@Override
public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
AppBaseDiscountpackageQuery appBaseDiscountpackageQuery = new AppBaseDiscountpackageQuery();

40
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@ -131,9 +131,9 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
qw.apply(StringUtils.isNotEmpty(effectiveStartDate), "date_format (effectiveDate,'%Y-%m-%d') >= date_format('" + effectiveStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(effectiveEndDate), "date_format (effectiveDate,'%Y-%m-%d') <= date_format('" + effectiveEndDate + "','%Y-%m-%d')"
);
if(StringUtils.isNotBlank(pagerQuery.getOrgPath())){
if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) {
String orgSid = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getOrgPath()).getData();
qw.eq("useOrg",orgSid);
qw.eq("useOrg", orgSid);
}
}
@ -151,10 +151,10 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
String orgPath = dto.getOrgPath();
String orgSid = "";//分公司sid
String orgSidPath = "";//申请人组织机构全路径sid
if(StringUtils.isNotBlank(orgPath)){
if (StringUtils.isNotBlank(orgPath)) {
orgSidPath = orgPath;
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}else{
} else {
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid());
if (!orgByStaffSid.getSuccess()) {
@ -168,7 +168,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
}
}
BaseDiscountpackage entity = new BaseDiscountpackage();
BeanUtil.copyProperties(dto, entity,"sid");
BeanUtil.copyProperties(dto, entity, "sid");
entity.setUseOrg(orgSid);
entity.setNodeState("待提交");
entity.setOrgSidPath(orgSidPath);
@ -176,7 +176,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh,"sid");
BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh, "sid");
baseDiscountpackageVeh.setMainSid(entity.getSid());
baseDiscountpackageVehService.save(baseDiscountpackageVeh);
}
@ -187,16 +187,16 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
public ResultBean updateByDiscountSid(BaseDiscountpackageDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
BaseDiscountpackage baseDiscountpackage = fetchBySid(sid);
if(baseDiscountpackage == null){
if (baseDiscountpackage == null) {
return rb.setMsg("该申请不存在");
}
BeanUtil.copyProperties(dto,baseDiscountpackage, "sid","orgSidPath");
BeanUtil.copyProperties(dto, baseDiscountpackage, "sid", "orgSidPath");
baseMapper.updateById(baseDiscountpackage);
baseDiscountpackageVehService.deleteByMainSid(sid);
List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh,"sid");
BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh, "sid");
baseDiscountpackageVeh.setMainSid(sid);
baseDiscountpackageVehService.save(baseDiscountpackageVeh);
}
@ -395,7 +395,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
}
}
qw.eq("salesPolicyKey", "0002");
qw.eq("nodeState","已办结");
qw.eq("nodeState", "已办结");
return qw;
}
@ -434,7 +434,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
ResultBean rb = ResultBean.fireFail();
String orgSidPath = "";
if(StringUtils.isNotBlank(dto.getOrgPath())){
if (StringUtils.isNotBlank(dto.getOrgPath())) {
orgSidPath = dto.getOrgPath();
}
BaseDiscountpackage baseDiscountpackage = fetchBySid(dto.getSid());
@ -572,7 +572,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
Boolean i = false;
Map<String, Object> map = new HashMap<>();
Map<String, Object> formVariables = bv.getFormVariables();
if(StringUtils.isNotBlank(query.getDiscountTypeKey())){
if (StringUtils.isNotBlank(query.getDiscountTypeKey())) {
if ("0001".equals(query.getDiscountTypeKey())) {
i = true;
}
@ -583,7 +583,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
formVariables.put("isAdj", i);
}
}
if(StringUtils.isNotBlank(query.getBusinessSid())){
if (StringUtils.isNotBlank(query.getBusinessSid())) {
BaseDiscountpackage baseDiscountpackage = fetchBySid(query.getBusinessSid());
if ("0001".equals(baseDiscountpackage.getDiscountTypeKey())) {
i = true;
@ -733,14 +733,14 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
public ResultBean<AppDiscountpackagesVo> selectDiscountpackage(String sid) {
ResultBean<AppDiscountpackagesVo> rb = ResultBean.fireFail();
BaseDiscountpackage baseDiscountpackage = fetchBySid(sid);
if(baseDiscountpackage == null){
if (baseDiscountpackage == null) {
return rb.setMsg("该销售政策不存在");
}
AppDiscountpackagesVo appDiscountpackageVo = baseMapper.selectDiscountpackage(sid);
if(appDiscountpackageVo != null){
if("0001".equals(appDiscountpackageVo.getSalesPolicyKey())){
if (appDiscountpackageVo != null) {
if ("0001".equals(appDiscountpackageVo.getSalesPolicyKey())) {
appDiscountpackageVo.setShowList(true);
}else{
} else {
appDiscountpackageVo.setShowList(false);
}
List<BaseDiscountpackageVehDetailsVo> baseDiscountpackageVehDetailsVos = baseDiscountpackageVehService.fetchByMainSid(sid);
@ -758,4 +758,10 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
}
return rb.success().setData(appDiscountpackageVo);
}
public ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg) {
ResultBean<List<BaseDiscountpackageByApplyDto>> rb = ResultBean.fireFail();
List<BaseDiscountpackageByApplyDto> applyDtos = baseMapper.getAppPackageByUseOrg(userOrg);
return rb.success().setData(applyDtos);
}
}

771
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery;
import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo;
import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackagePageListVo;
import com.yxt.anrui.base.api.basediscountpackageapply.*;
import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeVo;
@ -39,8 +40,15 @@ import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDeta
import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDto;
import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelist;
import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.flow.FlowTaskVo;
import com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistService;
import com.yxt.anrui.base.biz.commoncontract.CommonContractService;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverFeign;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -48,6 +56,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUser;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import org.apache.commons.lang3.StringUtils;
@ -60,10 +69,8 @@ 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.List;
import java.util.Map;
import java.util.Optional;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -82,353 +89,459 @@ import java.util.stream.Collectors;
@Service
public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDiscountpackageApplyMapper, BaseDiscountpackageApply> {
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BaseDiscountpackagelistService baseDiscountpackagelistService;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BaseDiscountpackagelistService baseDiscountpackagelistService;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private CommonContractService commonContractService;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private SysUserFeign userFeign;
@Autowired
private BusDiscountpackageHandoverFeign busDiscountpackageHandoverFeign;
private QueryWrapper<BaseDiscountpackageApply> createQueryWrapper(BaseDiscountpackageApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseDiscountpackageApply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BaseDiscountpackageApplyVo> listPageVo(PagerQuery<BaseDiscountpackageApplyQuery> pq) {
BaseDiscountpackageApplyQuery query = pq.getParams();
QueryWrapper<BaseDiscountpackageApply> qw = new QueryWrapper<>();
private QueryWrapper<BaseDiscountpackageApply> createQueryWrapper(BaseDiscountpackageApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseDiscountpackageApply> qw = new QueryWrapper<>();
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
qw.eq("createOrgSid", orgSid);
qw.eq("createBySid",query.getUserSid());
if (StringUtils.isNotBlank(query.getContractId())) {
qw.like("contractId", query.getContractId());
}
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("customerName", query.getCustomerName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
return qw;
}
IPage<BaseDiscountpackageApply> page = PagerUtil.queryToPage(pq);
IPage<BaseDiscountpackageApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseDiscountpackageApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BaseDiscountpackageApplyDto dto){
public PagerVo<BaseDiscountpackageApplyVo> listPageVo(PagerQuery<BaseDiscountpackageApplyQuery> pq) {
BaseDiscountpackageApplyQuery query = pq.getParams();
QueryWrapper<BaseDiscountpackageApply> qw = createQueryWrapper(query);
IPage<BaseDiscountpackageApply> page = PagerUtil.queryToPage(pq);
IPage<BaseDiscountpackageApplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<BaseDiscountpackageApplyVo> records = pagging.getRecords();
if (null != records) {
for (BaseDiscountpackageApplyVo applyVo : records) {
applyVo.setShowHandleBtn(true);
if (StringUtils.isNotBlank(applyVo.getNodeState())) {
if (!("待提交".equals(applyVo.getNodeState()) || "销售专员申请".equals(applyVo.getNodeState()))) {
applyVo.setShowHandleBtn(false);
}
}
CommonContract contract = commonContractService.selectByNo(applyVo.getContractId()).getData();
if (null != contract) {
if (StringUtils.isNotBlank(contract.getBusSid())) {
applyVo.setSaleOrderSid(contract.getBusSid());
}
}
}
}
PagerVo<BaseDiscountpackageApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BaseDiscountpackageApplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public String insertByDto(BaseDiscountpackageApplyDto dto){
BaseDiscountpackageApply entity = new BaseDiscountpackageApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
entity.setShowHandleBtn(true);
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(BaseDiscountpackageApplyDto dto){
String dtoSid = dto.getSid();
return;
}
this.updateByDto(dto);
}
public String insertByDto(BaseDiscountpackageApplyDto dto) {
BaseDiscountpackageApply entity = new BaseDiscountpackageApply();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
entity.setShowHandleBtn(true);
entity.setApplyDate(sdf.format(new Date()));
int i = baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(BaseDiscountpackageApplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BaseDiscountpackageApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BaseDiscountpackageApplyDetailsVo fetchDetailsVoBySid(String sid){
BaseDiscountpackageApply entity = fetchBySid(sid);
BaseDiscountpackageApplyDetailsVo vo = new BaseDiscountpackageApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}
BaseDiscountpackageApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public IPage<AppDiscountpackageVo> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
IPage<AppDiscountpackageQuery> page = PagerUtil.queryToPage(pq);
QueryWrapper<AppDiscountpackageVo> qw = new QueryWrapper<>();
AppDiscountpackageQuery params = pq.getParams();
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
qw.eq("createOrgSid", orgSid);
qw.eq("state",params.getType());
qw.eq("isDelete",0);
if (StringUtils.isNotBlank(params.getNames())){
qw.and(wrapper -> wrapper.like("contractId", params.getNames()).or().like("customerName", params.getNames()));
}
if (StringUtils.isNotBlank(params.getDate())){
qw.like("applyDate",params.getDate());
}
IPage<AppDiscountpackageVo> busOrderDiscountPageListVoIPage = baseMapper.getDiscountManageApplyList(page, qw);
return busOrderDiscountPageListVoIPage;
}
public BaseDiscountpackageApplyDetailsVo fetchDetailsVoBySid(String sid) {
BaseDiscountpackageApply entity = fetchBySid(sid);
BaseDiscountpackageApplyDetailsVo vo = new BaseDiscountpackageApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
//根据优惠包申请sid查询对应优惠包列表
List<BaseDiscountpackagelistDto> dtoList = baseDiscountpackagelistService.fetchDetailsByDiscountSid(sid);
vo.setDiscountPackageList(dtoList);
return vo;
}
public ResultBean<String> saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto 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();
String dtoSid = dto.getSid();
List<AppDiscountpackagelistDto> appDiscountpackagelists = dto.getDiscountPackageList();
if (StringUtils.isBlank(dtoSid)) {
BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
BeanUtil.copyProperties(dto,baseDiscountpackageApplyDto);
baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
String sid = this.insertByDto(baseDiscountpackageApplyDto);
for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
baseDiscountpackagelist.setDiscountSid(sid);
baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist);
}
return rb.success().setMsg("添加成功").setData(sid);
}
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dtoSid);
if (baseDiscountpackageApply == null){
return rb.setMsg("该优惠包申请不存在");
}
baseDiscountpackagelistService.delByDiscountSid(dtoSid);
BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
BeanUtil.copyProperties(dto,baseDiscountpackageApplyDto);
baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
this.updateByDto(baseDiscountpackageApplyDto);
for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
baseDiscountpackagelist.setDiscountSid(dtoSid);
baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist);
}
return rb.success().setMsg("修改成功").setData(dtoSid);
}
public IPage<AppDiscountpackageVo> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
IPage<AppDiscountpackageQuery> page = PagerUtil.queryToPage(pq);
QueryWrapper<AppDiscountpackageVo> qw = new QueryWrapper<>();
AppDiscountpackageQuery params = pq.getParams();
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
qw.eq("createBySid",params.getUserSid());
qw.eq("createOrgSid", orgSid);
// qw.eq("state", params.getType());
qw.eq("isDelete", 0);
if (StringUtils.isNotBlank(params.getNames())) {
qw.and(wrapper -> wrapper.like("contractId", params.getNames()).or().like("customerName", params.getNames()));
}
if (StringUtils.isNotBlank(params.getDate())) {
qw.like("applyDate", params.getDate());
}
IPage<AppDiscountpackageVo> busOrderDiscountPageListVoIPage = baseMapper.getDiscountManageApplyList(page, qw);
return busOrderDiscountPageListVoIPage;
}
public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
ResultBean rb = ResultBean.fireFail();
AppDiscountpackageApplyDetailsVo appDiscountpackageApplyDetailsVo = new AppDiscountpackageApplyDetailsVo();
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(sid);
BeanUtil.copyProperties(baseDiscountpackageApply,appDiscountpackageApplyDetailsVo);
List<AppDiscountpackagelistDetailsVo> appDiscountpackagelistDetailsVos = baseDiscountpackagelistService.fetchByDiscountSid(sid);
appDiscountpackageApplyDetailsVo.setAppDiscountpackagelists(appDiscountpackagelistDetailsVos);
return rb.success().setData(appDiscountpackageApplyDetailsVo);
}
public ResultBean<String> saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto 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();
String dtoSid = dto.getSid();
List<AppDiscountpackagelistDto> appDiscountpackagelists = dto.getDiscountPackageList();
if (StringUtils.isBlank(dtoSid)) {
BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto);
baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
baseDiscountpackageApplyDto.setCreateBySid(dto.getUserSid());
String sid = this.insertByDto(baseDiscountpackageApplyDto);
for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
baseDiscountpackagelist.setDiscountSid(sid);
baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist);
}
return rb.success().setMsg("添加成功").setData(sid);
}
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dtoSid);
if (baseDiscountpackageApply == null) {
return rb.setMsg("该优惠包申请不存在");
}
baseDiscountpackagelistService.delByDiscountSid(dtoSid);
BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto);
baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
this.updateByDto(baseDiscountpackageApplyDto);
for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
baseDiscountpackagelist.setDiscountSid(dtoSid);
baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist);
}
return rb.success().setMsg("修改成功").setData(dtoSid);
}
public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, baseDiscountpackageApply);
if (r == 3) {
return rb.setMsg("该申请不存在");
}
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
//新增修改保存
ResultBean<String> resultBean = saveDiscountPackageApplyInfo(dto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值
Map<String, Object> variables = BeanUtil.beanToMap(dto);
//若有网关,则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
BaseDiscountpackageApply baseDiscountpackageApply1 = fetchBySid(businessSid);
//用户的部门全路径sid
bv.setOrgSidPath(baseDiscountpackageApply1.getOrgSidPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getUserSid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());
}
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
}
if (r == 2) {
// ToDo:驳回到发起人后再次提交
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
bv.setTaskId(baseDiscountpackageApply.getTaskId());
bv.setTaskDefKey(baseDiscountpackageApply.getNodeSid());
bv.setComment("重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
}
return rb;
}
public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
ResultBean rb = ResultBean.fireFail();
AppDiscountpackageApplyDetailsVo appDiscountpackageApplyDetailsVo = new AppDiscountpackageApplyDetailsVo();
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(sid);
BeanUtil.copyProperties(baseDiscountpackageApply, appDiscountpackageApplyDetailsVo);
List<AppDiscountpackagelistDetailsVo> appDiscountpackagelistDetailsVos = baseDiscountpackagelistService.fetchByDiscountSid(sid);
appDiscountpackageApplyDetailsVo.setAppDiscountpackagelists(appDiscountpackagelistDetailsVos);
return rb.success().setData(appDiscountpackageApplyDetailsVo);
}
/**
* 判断提交的流程是否被允许
*
* @param dto
* @return
*/
private synchronized int submitBusinessData(SubmitBaseDiscountpackageApplyDto dto, BaseDiscountpackageApply baseDiscountpackageApply) {
int r = 0;
if (StringUtils.isBlank(dto.getSid())) {
r = 1;
} else {
if (baseDiscountpackageApply != null) {
String businessTaskId = baseDiscountpackageApply.getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交
r = 1;
} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
//二次提交//只有数据一致的时候才能进行下一步
r = 2;
}
} else {
r = 3;
}
/**
* 优惠包提交申请
*
* @param dto
* @return
*/
public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, baseDiscountpackageApply);
if (r == 3) {
return rb.setMsg("该申请不存在");
}
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
//新增修改保存
ResultBean<String> resultBean = saveDiscountPackageApplyInfo(dto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值
Map<String, Object> variables = BeanUtil.beanToMap(dto);
Map<String, Object> appMap = new HashMap<>();
//若有网关,则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
appMap.put("businessSid", businessSid);
variables.put("appMap", appMap);
BaseDiscountpackageApply baseDiscountpackageApply1 = fetchBySid(businessSid);
//用户的部门全路径sid
bv.setOrgSidPath(baseDiscountpackageApply1.getOrgSidPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getUserSid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());
}
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
}
if (r == 2) {
// ToDo:驳回到发起人后再次提交
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
bv.setTaskId(baseDiscountpackageApply.getTaskId());
bv.setTaskDefKey(baseDiscountpackageApply.getNodeSid());
bv.setComment("重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
}
return rb;
}
}
return r;
}
/**
* 判断提交的流程是否被允许
*
* @param dto
* @return
*/
private synchronized int submitBusinessData(SubmitBaseDiscountpackageApplyDto dto, BaseDiscountpackageApply baseDiscountpackageApply) {
int r = 0;
if (StringUtils.isBlank(dto.getSid())) {
r = 1;
} else {
if (baseDiscountpackageApply != null) {
String businessTaskId = baseDiscountpackageApply.getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交
r = 1;
} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
//二次提交//只有数据一致的时候才能进行下一步
r = 2;
}
} else {
r = 3;
}
}
return r;
}
/**
* 更新流程相关的状态
*
* @param map
* @return
*/
private int updateFlowFiled(Map<String, Object> map) {
return baseMapper.updateFlowFiled(map);
}
/**
* 更新流程相关的状态
*
* @param map
* @return
*/
private int updateFlowFiled(Map<String, Object> map) {
return baseMapper.updateFlowFiled(map);
}
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
BaseDiscountpackageApply baseDiscountpackageApply = this.fetchBySid(businessSid);
if (bv.getTaskId().equals(baseDiscountpackageApply.getTaskId())) {
bv.setOrgSidPath(baseDiscountpackageApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
BaseDiscountpackageApply baseDiscountpackageApply = this.fetchBySid(businessSid);
if (bv.getTaskId().equals(baseDiscountpackageApply.getTaskId())) {
bv.setOrgSidPath(baseDiscountpackageApply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
//推送优惠包交接
BusDiscountpackageHandoverDto handoverDto = new BusDiscountpackageHandoverDto();
handoverDto.setBusSid(businessSid);
//获取合同编号
String contractId = baseDiscountpackageApply.getContractId();
//根据合同编号获取销售订单sid
CommonContract contract = commonContractService.selectByNo(contractId).getData();
if (null != contract) {
if (StringUtils.isNotBlank(contract.getBusSid())) {
//销售订单sid
String busSid = contract.getBusSid();
//根据销售订单sid查询车架号
List<String> vinNos = busSalesOrderVehicleFeign.selectList(busSid).getData();
StringBuffer sb = new StringBuffer();
if (null != vinNos && vinNos.size() > 0) {
for (String vinNo : vinNos) {
sb.append(vinNo).append(",");
}
sb.delete(sb.length() - 1, sb.length());
handoverDto.setVinNo(sb.toString());
}
}
}
handoverDto.setRecName(baseDiscountpackageApply.getApplyName());
handoverDto.setContractNo(contractId);
handoverDto.setCustomerName(baseDiscountpackageApply.getCustomerName());
handoverDto.setCreateBySid(baseDiscountpackageApply.getCreateBySid());
handoverDto.setCreateOrgSid(baseDiscountpackageApply.getCreateOrgSid());
handoverDto.setRecUserSid(baseDiscountpackageApply.getCreateBySid());
handoverDto.setUseOrgSid(baseDiscountpackageApply.getUseOrgSid());
handoverDto.setCreateOrgName(baseDiscountpackageApply.getCreateOrgName());
handoverDto.setUseOrgName(baseDiscountpackageApply.getUseOrgName());
SysUser sysUser = userFeign.selectBySid(baseDiscountpackageApply.getCreateBySid()).getData();
if (null != sysUser) {
if (StringUtils.isNotBlank(sysUser.getMobile())) {
handoverDto.setRecPhone(sysUser.getMobile());
}
}
handoverDto.setVehCount(baseDiscountpackageApply.getNumber());
handoverDto.setVehModel(baseDiscountpackageApply.getModel());
//根据优惠包申请sid获取优惠包列表
List<BaseDiscountpackagelistDto> dtos = baseDiscountpackagelistService.fetchDetailsByDiscountSid(businessSid);
List<BusDiscountpackageHandoverListDto> listDtos = new ArrayList<>();
if (null != dtos) {
for (BaseDiscountpackagelistDto dto : dtos) {
BusDiscountpackageHandoverListDto listDto = new BusDiscountpackageHandoverListDto();
BeanUtil.copyProperties(dto, listDto, "id", "sid");
listDto.setMainSid(handoverDto.getSid());
listDtos.add(listDto);
}
}
handoverDto.setBusDiscountpackageHandoverLists(listDtos);
busDiscountpackageHandoverFeign.save(handoverDto);
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BaseDiscountpackageApply baseDiscountpackageApply = this.fetchBySid(flowTaskVo.getBusinessSid());
String businessTaskid = baseDiscountpackageApply.getTaskId();
if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
BeanUtil.copyProperties(flowTaskVo, fl);
fl.setBusinessSid(flowTaskVo.getBusinessSid());
fl.setUserSid(flowTaskVo.getUserSid());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(fl);
if (!resultBean.getSuccess()) {
return resultBean;
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return resultBean;
} else {
return ResultBean.fireFail().setMsg("操作失败,提交的数据不一致!");
}
}
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BaseDiscountpackageApply baseDiscountpackageApply = this.fetchBySid(flowTaskVo.getBusinessSid());
String businessTaskid = baseDiscountpackageApply.getTaskId();
if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
BeanUtil.copyProperties(flowTaskVo, fl);
fl.setBusinessSid(flowTaskVo.getBusinessSid());
fl.setUserSid(flowTaskVo.getUserSid());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(fl);
if (!resultBean.getSuccess()) {
return resultBean;
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return resultBean;
} else {
return ResultBean.fireFail().setMsg("操作失败,提交的数据不一致!");
}
}
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
ResultBean rb = ResultBean.fireFail();
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(flowTaskVo.getBusinessSid());
if (baseDiscountpackageApply == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = baseDiscountpackageApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(flowTaskVo.getTaskId())) {
BeanUtil.copyProperties(flowTaskVo, fl);
fl.setBusinessSid(flowTaskVo.getBusinessSid());
fl.setUserSid(flowTaskVo.getUserSid());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(fl);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
//更新业务中的流程相关的参数
updateFlowFiled(map);
return rb.success();
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
ResultBean rb = ResultBean.fireFail();
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(flowTaskVo.getBusinessSid());
if (baseDiscountpackageApply == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = baseDiscountpackageApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(flowTaskVo.getTaskId())) {
BeanUtil.copyProperties(flowTaskVo, fl);
fl.setBusinessSid(flowTaskVo.getBusinessSid());
fl.setUserSid(flowTaskVo.getUserSid());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(fl);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
//更新业务中的流程相关的参数
updateFlowFiled(map);
return rb.success();
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
ResultBean rb = ResultBean.fireFail();
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
if (StringUtils.isBlank(flowTaskVo.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
if (StringUtils.isBlank(flowTaskVo.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(flowTaskVo.getBusinessSid());
String businessTaskId = baseDiscountpackageApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(flowTaskVo.getTaskId())) {
BeanUtil.copyProperties(flowTaskVo, fl);
fl.setBusinessSid(flowTaskVo.getBusinessSid());
fl.setUserSid(flowTaskVo.getUserSid());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(fl);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
ResultBean rb = ResultBean.fireFail();
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
if (StringUtils.isBlank(flowTaskVo.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
if (StringUtils.isBlank(flowTaskVo.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(flowTaskVo.getBusinessSid());
String businessTaskId = baseDiscountpackageApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(flowTaskVo.getTaskId())) {
BeanUtil.copyProperties(flowTaskVo, fl);
fl.setBusinessSid(flowTaskVo.getBusinessSid());
fl.setUserSid(flowTaskVo.getUserSid());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(fl);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean flowRecord(String procInsId) {
return flowTaskFeign.businessFlowRecord(procInsId);
}
public ResultBean flowRecord(String procInsId) {
return flowTaskFeign.businessFlowRecord(procInsId);
}
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
// List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
return rb.success().setData(voList);
}
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
// List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
return rb.success().setData(voList);
}
}

27
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.java

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDetailsVo;
import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -55,19 +56,21 @@ import java.util.List;
@Mapper
public interface BaseDiscountpackagelistMapper extends BaseMapper<BaseDiscountpackagelist> {
//@Update("update base_discountpackagelist set name=#{msg} where id=#{id}")
//IPage<BaseDiscountpackagelistVo> voPage(IPage<BaseDiscountpackagelist> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDiscountpackagelist> qw);
IPage<BaseDiscountpackagelistVo> selectPageVo(IPage<BaseDiscountpackagelist> page, @Param(Constants.WRAPPER) Wrapper<BaseDiscountpackagelist> qw);
List<BaseDiscountpackagelistVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseDiscountpackagelist> qw);
@Select("select * from base_discountpackagelist")
List<BaseDiscountpackagelistVo> selectListVo();
//@Update("update base_discountpackagelist set name=#{msg} where id=#{id}")
//IPage<BaseDiscountpackagelistVo> voPage(IPage<BaseDiscountpackagelist> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDiscountpackagelist> qw);
@Delete("delete from base_discountpackagelist where discountSid = #{dtoSid}")
IPage<BaseDiscountpackagelistVo> selectPageVo(IPage<BaseDiscountpackagelist> page, @Param(Constants.WRAPPER) Wrapper<BaseDiscountpackagelist> qw);
List<BaseDiscountpackagelistVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseDiscountpackagelist> qw);
@Select("select * from base_discountpackagelist")
List<BaseDiscountpackagelistVo> selectListVo();
@Delete("delete from base_discountpackagelist where discountSid = #{dtoSid}")
void delByDiscountSid(String dtoSid);
@Select("select * from base_discountpackagelist from discountSid = #{sid}")
List<AppDiscountpackagelistDetailsVo> fetchByDiscountSid(String sid);
@Select("select * from base_discountpackagelist from discountSid = #{sid}")
List<AppDiscountpackagelistDetailsVo> fetchByDiscountSid(String sid);
List<BaseDiscountpackagelistDto> fetchDetailsByDiscountSid(@Param("discountSid") String discountSid);
}

27
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.xml

@ -1,13 +1,22 @@
<?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.basediscountpackagelist.BaseDiscountpackagelistMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo">
SELECT * FROM base_discountpackagelist <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo">
SELECT * FROM base_discountpackagelist <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo">
SELECT * FROM base_discountpackagelist
<where>${ew.sqlSegment}</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo">
SELECT * FROM base_discountpackagelist
<where>${ew.sqlSegment}</where>
</select>
<select id="fetchDetailsByDiscountSid"
resultType="com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto">
SELECT sid, price, `number`, packageExplain, totalPrice, discountName, discountSid
FROM base_discountpackagelist
WHERE discountSid = #{discountSid}
</select>
</mapper>

72
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistRest.java

@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelist;
import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistQuery;
import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo;
@ -59,42 +60,49 @@ import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistFei
@RequestMapping("v1/basediscountpackagelist")
public class BaseDiscountpackagelistRest implements BaseDiscountpackagelistFeign {
@Autowired
private BaseDiscountpackagelistService baseDiscountpackagelistService;
@Autowired
private BaseDiscountpackagelistService baseDiscountpackagelistService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseDiscountpackagelistVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackagelistQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseDiscountpackagelistVo> pv = baseDiscountpackagelistService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseDiscountpackagelistVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackagelistQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseDiscountpackagelistVo> pv = baseDiscountpackagelistService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseDiscountpackagelistDto dto){
ResultBean rb = ResultBean.fireFail();
baseDiscountpackagelistService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseDiscountpackagelistDto dto) {
ResultBean rb = ResultBean.fireFail();
baseDiscountpackagelistService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseDiscountpackagelistService.delBySids(sids);
return rb.success();
}
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
baseDiscountpackagelistService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BaseDiscountpackagelistDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BaseDiscountpackagelistDetailsVo vo = baseDiscountpackagelistService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
public ResultBean<BaseDiscountpackagelistDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
BaseDiscountpackagelistDetailsVo vo = baseDiscountpackagelistService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<BaseDiscountpackagelistDto>> fetchDetailsByDiscountSid(String discountSid) {
ResultBean rb = ResultBean.fireFail();
List<BaseDiscountpackagelistDto> dtos = baseDiscountpackagelistService.fetchDetailsByDiscountSid(discountSid);
return rb.success().setData(dtos);
}
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistService.java

@ -110,4 +110,8 @@ public class BaseDiscountpackagelistService extends MybatisBaseService<BaseDisco
public List<AppDiscountpackagelistDetailsVo> fetchByDiscountSid(String sid) {
return baseMapper.fetchByDiscountSid(sid);
}
public List<BaseDiscountpackagelistDto> fetchDetailsByDiscountSid(String discountSid) {
return baseMapper.fetchDetailsByDiscountSid(discountSid);
}
}

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

@ -99,4 +99,6 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
IPage<CommonContractVo> selectByStaffSid(IPage<CommonContract> page,@Param(Constants.WRAPPER) QueryWrapper<CommonContractVo> qw);
IPage<ContractPageVo> getApprovalContractList(IPage<ContractPageVo> page,@Param(Constants.WRAPPER) QueryWrapper<ContractPageVo> qw);
List<CommonContractPackageVo> selectByCreateUserSid(@Param("createBySid") String createBySid);
}

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

@ -238,4 +238,14 @@
</where>
order by createDate desc
</select>
<select id="selectByCreateUserSid"
resultType="com.yxt.anrui.base.api.commoncontract.CommonContractPackageVo">
SELECT contractNo as contractId,
modelName as model,
num as number,
busSid
FROM common_contract
WHERE createBySid = #{createBySid}
ORDER BY createTime DESC
</select>
</mapper>

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

@ -243,6 +243,16 @@ public class CommonContractRest implements CommonContractFeign {
return rb.success().setData(commonContractBuscenterVo);
}
/**
* 根据创建人查合同信息
* @param createBySid
* @return
*/
@Override
public ResultBean<CommonContractPackageVo> selectByCreateUserSid(String createBySid) {
return commonContractService.selectByCreateUserSid(createBySid);
}
@Override
public ResultBean updateCommonContractDeposit(String deposit, String sid) {
return commonContractService.updateCommonContractDeposit(deposit, sid);

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

@ -27,6 +27,7 @@ import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign;
import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
@ -2625,10 +2626,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ResultBean rb = ResultBean.fireFail();
CommonContractQKQuery params = query.getParams();
QueryWrapper<CommonContractVo> qw = new QueryWrapper<>();
ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(),params.getOrgPath());
if(!busList.getData().isEmpty()){
qw.in("busSid",busList.getData());
}
if (StringUtils.isNotBlank(params.getCustomerName())){
qw.like("partyB",params.getCustomerName());
}
@ -2680,4 +2677,28 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
IPage<ContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw);
return iPage;
}
/**
* 根据创建人查询合同信息
*
* @param createBySid
* @return
*/
public ResultBean<CommonContractPackageVo> selectByCreateUserSid(String createBySid) {
ResultBean rb = ResultBean.fireFail();
List<CommonContractPackageVo> contractPackageVos = baseMapper.selectByCreateUserSid(createBySid);
if (null != contractPackageVos) {
for (CommonContractPackageVo contractPackageVo : contractPackageVos) {
if (StringUtils.isNotBlank(contractPackageVo.getBusSid())) {
BusSalesOrderDetailsVo data = busSalesOrderFeign.fetchDetailsBySid(contractPackageVo.getBusSid()).getData();
if (null != data) {
if (StringUtils.isNotBlank(data.getCustomerName())) {
contractPackageVo.setCustomerName(data.getCustomerName());
}
}
}
}
}
return rb.success().setData(contractPackageVos);
}
}

114
anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue

@ -612,67 +612,69 @@ export default {
// this.registProvince = response.data.registAddressProvince
// this.registcity = response.data.registAddressCity
// this.registcount = response.data.registAddressCounty
const managementcount_codes = this.temp.managementAddressCode.split('')
this.managementProvinceCode = managementcount_codes[0] + managementcount_codes[1] + '0000'
getProvince().then((res) => {
if (res.code === '200') {
this.inputProvinceList02 = res.data
console.log('回显省02', this.inputProvinceList02)
let bb = ''
this.inputProvinceList02.forEach((e) => {
if (e.districtCode === this.managementProvinceCode) {
bb = {
name: e.name,
districtCode: e.districtCode,
sid: e.sid
if (this.temp.managementAddressCode !== '') {
const managementcount_codes = this.temp.managementAddressCode.split('')
this.managementProvinceCode = managementcount_codes[0] + managementcount_codes[1] + '0000'
getProvince().then((res) => {
if (res.code === '200') {
this.inputProvinceList02 = res.data
console.log('回显省02', this.inputProvinceList02)
let bb = ''
this.inputProvinceList02.forEach((e) => {
if (e.districtCode === this.managementProvinceCode) {
bb = {
name: e.name,
districtCode: e.districtCode,
sid: e.sid
}
}
})
this.managementProvince = bb.name
var sid = {
sid: bb.sid
}
})
this.managementProvince = bb.name
var sid = {
sid: bb.sid
}
getCity(sid).then((res) => {
if (res.code === '200') {
this.inputCityList02 = res.data
console.log('回显市02', this.inputCityList02)
this.managementcityCode = managementcount_codes[0] + managementcount_codes[1] + managementcount_codes[2] + managementcount_codes[3] + '00'
let cc = ''
this.inputCityList02.forEach((e) => {
if (e.districtCode === this.managementcityCode) {
cc = {
name: e.name,
districtCode: e.districtCode,
sid: e.sid
getCity(sid).then((res) => {
if (res.code === '200') {
this.inputCityList02 = res.data
console.log('回显市02', this.inputCityList02)
this.managementcityCode = managementcount_codes[0] + managementcount_codes[1] + managementcount_codes[2] + managementcount_codes[3] + '00'
let cc = ''
this.inputCityList02.forEach((e) => {
if (e.districtCode === this.managementcityCode) {
cc = {
name: e.name,
districtCode: e.districtCode,
sid: e.sid
}
}
})
this.managementcity = cc.name
var sid02 = {
sid: cc.sid
}
})
this.managementcity = cc.name
var sid02 = {
sid: cc.sid
}
getCounty(sid02).then((res) => {
if (res.code === '200') {
this.inputCountyList02 = res.data
console.log('回显市03', this.inputCountyList02)
this.managementcountCode = this.temp.managementAddressCode
let dd = ''
this.inputCountyList02.forEach((e) => {
if (e.districtCode === this.managementcountCode) {
dd = {
name: e.name,
districtCode: e.districtCode,
sid: e.sid
getCounty(sid02).then((res) => {
if (res.code === '200') {
this.inputCountyList02 = res.data
console.log('回显市03', this.inputCountyList02)
this.managementcountCode = this.temp.managementAddressCode
let dd = ''
this.inputCountyList02.forEach((e) => {
if (e.districtCode === this.managementcountCode) {
dd = {
name: e.name,
districtCode: e.districtCode,
sid: e.sid
}
}
}
})
this.managementcount = dd.name
}
})
}
})
}
})
})
this.managementcount = dd.name
}
})
}
})
}
})
}
this.getLevelList(sids)
}
})

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

@ -93,7 +93,6 @@ public interface BusAdvanceGinvoiceapplyFeign {
/*************************************************APP提前开票接口***************************************************/
@ApiOperation("手机端-获取提前开票列表")
@PostMapping("/getAdvanceInvoiceList")
@ResponseBody

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

@ -319,7 +319,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
return rb.success().setMsg("修改成功");
}
public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) {
public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) {
String orgSid = checkUserOrg(dto.getUserSid());
String businessSid = "";
if (StringUtils.isBlank(orgSid)) {

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

@ -58,6 +58,7 @@
if(bo.nodeState = '已办结', true, false) as showStopBtn,
bo.nodeState is null as showUpdateBtn,
bo.nodeState is null as showDeleteBtn,
bo.nodeState is not null as showRePublishBtn,
0 as showFinancialBtn,
bo.type,
bo.contractNo as contractId,

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

@ -1769,9 +1769,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
for (AppBusSalesOrderVo record : pagging.getRecords()) {
if (pq.getParams().getType().equals("2")) {
record.setShowRePublishBtn(true);
}
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
if (commonContractVoResultBean.getData() != null) {
record.setContractId(commonContractVoResultBean.getData().getContractNo());

28
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue

@ -7,6 +7,8 @@
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">确认
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -170,7 +172,8 @@ export default {
filePaths: [],
bitlingFilePaths: [],
certificatePaths: [],
vinNo: ''
vinNo: '',
tempSave: ''
},
rules: {}
}
@ -200,6 +203,7 @@ export default {
if (valid) {
this.getUrl()
this.submitdisabled = true
this.formobj.tempSave = true
saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -213,6 +217,25 @@ export default {
}
})
},
handleSubmit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
this.submitdisabled = true
this.formobj.tempSave = false
saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作陈工' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
getUrl() {
if (this.diploma_list.length > 0) {
const aa = []
@ -241,7 +264,8 @@ export default {
invoiceNo: '',
invoiceCode: '',
filePaths: [],
vinNo: ''
vinNo: '',
tempSave: ''
}
this.diploma_list = []
this.submitdisabled = false

13
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@ -41,14 +41,13 @@
<el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
<el-button type="primary" size="mini" v-show="!scope.row.recallAtn" @click="toEdit(scope.row)">办理</el-button>
<el-button type="danger" size="mini" v-show="scope.row.recallAtn" @click="toRevocation(scope.row)">撤回</el-button>
<el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState ==3 ? '已审核' : '' }}</span>
<span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState == 3 ? '已审核' : scope.row.auditState == 4 ? '已撤回' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="下载次数" align="center" width="90">
@ -151,8 +150,8 @@
<el-button size="small" :disabled="visibleDisabled" @click="dialogVisible = false">取消</el-button>
</span>
</el-dialog>
<acknowledgementReceiptAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<acknowledgementReceiptInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
<acknowledgementReceiptAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<acknowledgementReceiptInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
</div>
</template>
@ -386,12 +385,8 @@ export default {
this.visibleDisabled = false
})
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
handLook(row) {
this.viewState = 4
this.viewState = 3
this.$refs['divInfo'].showInfo(row)
},
resetState() {

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java

@ -70,5 +70,6 @@ public class FinVehicleInvoiceDetailsVo implements Vo {
private List<String> billingFilePaths;
@ApiModelProperty("合格证照片")
private List<String> certificatePaths;
@ApiModelProperty("临时保存")
private Boolean tempSave;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java

@ -115,5 +115,7 @@ public class FinVehicleInvoiceDto implements Dto {
private String billingSid;
@ApiModelProperty("开票申请附件")
private List<String> billingFilePaths;
@ApiModelProperty("临时保存")
private Boolean tempSave;
}

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

@ -1249,7 +1249,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
if(vvvv.getVIN().length()>=8){
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
@ -1378,7 +1381,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
if(vvvv.getVIN().length()>8){
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
@ -1507,7 +1513,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
if(vvvv.getVIN().length()>=8){
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
@ -2330,7 +2339,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
if(vvvv.getVIN().length()>=8){
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
@ -2462,7 +2474,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
if(vvvv.getVIN().length()>=8){
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
@ -2595,7 +2610,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
if(vvvv.getVIN().length()>=8){
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
@ -3097,7 +3115,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
ResultBean<String> customerResultBean = crmCustomerTempFeign.checkCustomerOrUpdate(customerQuery);
log.info("推送客户{}", customerResultBean);
return customerResultBean.getData();
return customerQuery.getCustomerNo();
}
//全款推送车款
@ -3136,9 +3154,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
if (vv.getVIN().length() < 8) {
freceivebillentry.setF_PAEZ_Base1(vv.getVIN());
} else {
if (vv.getVIN().length() >= 8) {
freceivebillentry.setF_PAEZ_Base1(vv.getVIN().substring(vv.getVIN().length() - 8));
}
//收款用途
@ -3222,9 +3238,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
if (vv.getVIN().length() < 8) {
freceivebillentry.setF_PAEZ_Base1(vv.getVIN());
} else {
if (vv.getVIN().length() >= 8) {
freceivebillentry.setF_PAEZ_Base1(vv.getVIN().substring(vv.getVIN().length() - 8));
}
//收款用途
@ -3308,9 +3322,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
if (vv.getVIN().length() < 8) {
freceivebillentry.setF_PAEZ_Base1(vv.getVIN());
} else {
if (vv.getVIN().length() >= 8) {
freceivebillentry.setF_PAEZ_Base1(vv.getVIN().substring(vv.getVIN().length() - 8));
}
//收款用途
@ -3787,7 +3799,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
if(vvvv.getVIN().length()>=8){
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
@ -3921,7 +3936,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
if(vvvv.getVIN().length()>=8){
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@ -272,10 +272,14 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
sb.delete(sb.length() - 1, sb.length());
dto.setFilePath(sb.toString());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getFilePath())) {
dto.setBillingStateKey("002");
dto.setBillingState("已开票");
dto.setInvoiceDate((new Date()));
if (null != dto.getTempSave()) {
if (!dto.getTempSave()) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getFilePath())) {
dto.setBillingStateKey("002");
dto.setBillingState("已开票");
dto.setInvoiceDate((new Date()));
}
}
}
if (com.yxt.common.base.utils.StringUtils.isNotEmpty(dto.getVinNo())) {
String VIN = dto.getVinNo();

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java

@ -15,7 +15,7 @@ import javax.validation.Valid;
@Api(tags = "优惠包申请列表")
@FeignClient(
contextId = "terminal-Discountpackage",
contextId = "terminal-DiscountpackageApply",
name = "anrui-terminal",
path = "/autoservice/v1/discountPackageApply",
fallback = AppScmVehicleGressionFeignFallback.class)
@ -46,6 +46,7 @@ public interface AppDiscountpackageFegin {
@ResponseBody
public ResultBean complete(@Valid @RequestBody BaseDiscountpackageApplysCompleteDto dto);
@ApiOperation(value = "撤回流程")
@PutMapping(value = "/recallDiscountPackageApplyInfo")
@ResponseBody

Loading…
Cancel
Save