Browse Source

封装流程提交时的接口,修改业务表增加业务关联的流程相关字段

master
djz236 3 years ago
parent
commit
660361460c
  1. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java
  2. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositDto.java
  3. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java
  4. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusDepositVo.java
  5. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java
  6. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java
  7. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java
  8. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java
  9. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml
  10. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java

@ -90,4 +90,10 @@ public class BusDeposit extends BaseEntity {
@ApiModelProperty("付款凭证") @ApiModelProperty("付款凭证")
private String paymentProof; private String paymentProof;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("环节定义的sid")
private String nodeSid;
@ApiModelProperty("流程实例的sid")
private String procInstSid;
} }

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositDto.java

@ -104,4 +104,11 @@ public class BusDepositDto implements Dto {
@ApiModelProperty("订车车辆信息List") @ApiModelProperty("订车车辆信息List")
private List<BusDepositVehicleDto> busDepositVehicleDto; private List<BusDepositVehicleDto> busDepositVehicleDto;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("环节定义的sid")
private String nodeSid;
@ApiModelProperty("流程实例的sid")
private String procInstSid;
} }

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java

@ -38,4 +38,5 @@ public interface BusDepositFeign {
@GetMapping("/getDepositInfoDetails/{virtualOrderSid}") @GetMapping("/getDepositInfoDetails/{virtualOrderSid}")
public ResultBean<AppBusDepositBuscenterDetailVo> getDepositInfoDetails(@PathVariable("virtualOrderSid") String virtualOrderSid); public ResultBean<AppBusDepositBuscenterDetailVo> getDepositInfoDetails(@PathVariable("virtualOrderSid") String virtualOrderSid);
} }

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusDepositVo.java

@ -53,4 +53,10 @@ public class BusDepositVo extends BusMainDepositVo{
@ApiModelProperty("客户列表") @ApiModelProperty("客户列表")
private List<BusDepositCustomerVo> customerList = new ArrayList<>(); private List<BusDepositCustomerVo> customerList = new ArrayList<>();
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("环节定义的sid")
private String nodeSid;
@ApiModelProperty("流程实例的sid")
private String procInstSid;
} }

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java

@ -77,4 +77,11 @@ public class BusMainDeposit extends BaseEntity {
@ApiModelProperty("单据类型") @ApiModelProperty("单据类型")
private String depositBillType; private String depositBillType;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("环节定义的sid")
private String nodeSid;
@ApiModelProperty("流程实例的sid")
private String procInstSid;
} }

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java

@ -69,15 +69,15 @@ public interface BusMainDepositFeign {
@ApiOperation("保存虚拟订单(订金)") @ApiOperation("保存虚拟订单(订金)")
@PostMapping("/saveDeposit") @PostMapping("/saveDeposit")
public ResultBean saveDeposit(@Valid @RequestBody BusDepositDto dto); public ResultBean saveOrUpdateDeposit(@Valid @RequestBody BusDepositDto dto);
@ApiOperation("保存虚拟订单(预定车辆)") @ApiOperation("保存虚拟订单(预定车辆)")
@PostMapping("/saveDepositVehicle") @PostMapping("/saveDepositVehicle")
public ResultBean saveDepositVehicle(@Valid @RequestBody BusMainDepositVehicleDto dto); public ResultBean saveDepositVehicle(@Valid @RequestBody BusMainDepositVehicleDto dto);
@ApiOperation("修改虚拟订单(订金)信息") /* @ApiOperation("修改虚拟订单(订金)信息")
@PostMapping("/updateDeposit/{sid}") @PostMapping("/updateDeposit/{sid}")
public ResultBean updateDeposit(@Valid @RequestBody BusDepositDto dto, @PathVariable("sid") String sid); public ResultBean updateDeposit(@Valid @RequestBody BusDepositDto dto, @PathVariable("sid") String sid);*/
@ApiOperation("修改虚拟订单(预定车辆)信息") @ApiOperation("修改虚拟订单(预定车辆)信息")
@PostMapping("/updateDepositVehicle/{sid}") @PostMapping("/updateDepositVehicle/{sid}")

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java

@ -62,7 +62,7 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign {
} }
@Override @Override
public ResultBean saveDeposit(BusDepositDto dto){ public ResultBean saveOrUpdateDeposit(BusDepositDto dto){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDeposit无法访问"); return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDeposit无法访问");
} }
@ -71,10 +71,10 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign {
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDepositVehicle无法访问"); return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDepositVehicle无法访问");
} }
@Override /*@Override
public ResultBean updateDeposit(BusDepositDto dto, String sid){ public ResultBean updateDeposit(BusDepositDto dto, String sid){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/updateDeposit无法访问"); return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/updateDeposit无法访问");
} }*/
@Override @Override
public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) { public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) {

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java

@ -41,4 +41,5 @@ public interface BusDepositMapper extends BaseMapper<BusDeposit> {
@Delete("delete from bus_deposit where billSid=#{billSid}") @Delete("delete from bus_deposit where billSid=#{billSid}")
int delByBillSid(String billSid); int delByBillSid(String billSid);
} }

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@ -43,4 +43,5 @@
AND staffSid = #{staffSid} AND staffSid = #{staffSid}
</select> </select>
</mapper> </mapper>

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@ -5,6 +5,7 @@ import com.yxt.anrui.buscenter.api.busdeposit.*;
import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService; import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService; import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.buscenter.biz.flow.FlowableService;
import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer;
import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
@ -153,4 +154,6 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
} }
} }
Loading…
Cancel
Save