diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 62a7495f89..6861271257 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -215,7 +215,7 @@ public interface BaseVehicleFeign { */ @ApiOperation("虚拟订单选择车辆根据车辆sid查询信息") @GetMapping("/getBusDepositVehByVehSid/{vehicleSid}") - public ResultBean getBusDepositVehByVehSid(@PathVariable("vehicleSid") String vehicleSid); + public ResultBean getBusDepositVehByVehSid(@PathVariable("vehicleSid") String vehicleSid); @ApiOperation("是否允许买断") @GetMapping("/isBuyoutAllowed/{vehicleSid}") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 8c669ecbe0..1422be350f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -117,7 +117,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean getBusDepositVehByVehSid(String vehicleSid) { + public ResultBean getBusDepositVehByVehSid(String vehicleSid) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BusDepositVehListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BusDepositVinListVo.java similarity index 84% rename from anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BusDepositVehListVo.java rename to anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BusDepositVinListVo.java index bd8ae1a585..0841d83d39 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BusDepositVehListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BusDepositVinListVo.java @@ -13,7 +13,7 @@ import lombok.Data; */ @ApiModel("销售虚拟订单预定车辆列表") @Data -public class BusDepositVehListVo implements Vo { +public class BusDepositVinListVo implements Vo { @ApiModelProperty("品牌") private String brandName; @@ -29,4 +29,7 @@ public class BusDepositVehListVo implements Vo { @ApiModelProperty("销售指导价(万元)") private String guidedPrice; + + @ApiModelProperty("锁定状态") + private String lockedState; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 98e6b246b2..61801564a6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -9,7 +9,6 @@ import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; -import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; @@ -198,7 +197,7 @@ public interface BaseVehicleMapper extends BaseMapper { */ ExiCarConfigDetailVo selectExiCarConfig(@Param("modelSid") String modelSid, @Param("configSid") String configSid); - BusDepositVehListVo getBusDepositVehByVehSid(@Param("sid") String sid); + BusDepositVinListVo getBusDepositVehByVehSid(@Param("sid") String sid); /** * 获取车架号 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index e6b661827c..1c17aee60f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -563,10 +563,11 @@ WHERE bvc.sid = #{vehModelConfigSid} LIMIT 1 - SELECT bv.sid, bv.vehicleStateValue, + bv.lockedState, bvm.brandName, diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index d29808fdcc..961d94d6ac 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -679,7 +679,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { } @Override - public ResultBean getBusDepositVehByVehSid(String vehicleSid) { + public ResultBean getBusDepositVehByVehSid(String vehicleSid) { return baseVehicleService.getBusDepositVehByVehSid(vehicleSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 5f7177c47d..86f9ede120 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -989,8 +989,8 @@ public class BaseVehicleService extends MybatisBaseService getBusDepositVehByVehSid(String vehicleSid) { - return new ResultBean().success().setData(baseMapper.getBusDepositVehByVehSid(vehicleSid)); + public ResultBean getBusDepositVehByVehSid(String vehicleSid) { + return new ResultBean().success().setData(baseMapper.getBusDepositVehByVehSid(vehicleSid)); } /** diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index ab311250a2..bb5444b92b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1111,7 +1111,7 @@ public class CommonContractService extends MybatisBaseService idCard = new ArrayList<>(); List idCardImages = Arrays.asList(split3); for (String idCardImage : idCardImages) { diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java index f0437d25d6..baa80bc0ba 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AdCarListVo.java @@ -7,6 +7,9 @@ import lombok.Data; @Data public class AdCarListVo implements Vo { private static final long serialVersionUID = -1495695891564098295L; + + @ApiModelProperty("车辆sid") + private String carSid; @ApiModelProperty("车架号") private String vin; @ApiModelProperty("成交价") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java index d151a3d6b5..984cfb0c43 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppAdvanceArrearsInfoQuery.java @@ -10,4 +10,7 @@ public class AppAdvanceArrearsInfoQuery implements Query { @ApiModelProperty("申请sid") private String contractSid; + + @ApiModelProperty("用户sid") + private String userSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java index 9333911845..d94f32de9c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java @@ -34,12 +34,20 @@ public class AppArrearsCarryInfoVo implements Vo { @ApiModelProperty("欠款提车原因") private String reason; @ApiModelProperty("选择车辆列表") - private List carList = new ArrayList<>(); + private List carList = new ArrayList<>(); @ApiModelProperty("所有车辆列表") private List vinList = new ArrayList<>(); @ApiModelProperty("流程实列id") private String procInsId; - @ApiModelProperty("用户sid") + @ApiModelProperty("任务id") private String taskId; + @ApiModelProperty("流程实例id") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("节点状态") + private String nodeState; + @ApiModelProperty("节点id") + private String nodeId; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java index 1501f1c07b..ce2e78e573 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java @@ -1,11 +1,19 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; + @Data public class GetNodeQuery implements Query { private static final long serialVersionUID = -6541874437751241596L; + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误:taskDefKey") + private String taskDefKey; +// @ApiModelProperty(value = "分支字段及业务字段") +// private Map formVariables; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java new file mode 100644 index 0000000000..6093b3aabf --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverprepare; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepare.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表", description = "交车准备-申请表") +@TableName("bus_handover_prepare") +public class BusHandoverPrepare extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("联系电话") + private String mobile; // 联系电话 + @ApiModelProperty("品牌") + private String brandName; // 品牌 + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value") + private String payType; // 付款方式value + @ApiModelProperty("交车准备状态key") + private String handoverPrepareStateKey; // 交车准备状态key + @ApiModelProperty("交车准备状态value") + private String handoverPrepareState; // 交车准备状态value + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java new file mode 100644 index 0000000000..23961f0477 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare; + +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class BusHandoverPrepareAddDto implements Dto { + private static final long serialVersionUID = -5503119838818185683L; + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("联系电话") + private String mobile; // 联系电话 + @ApiModelProperty("品牌") + private String brandName; // 品牌 + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value") + private String payType; // 付款方式value + @ApiModelProperty("交车准备状态key") + private String handoverPrepareStateKey; // 交车准备状态key + @ApiModelProperty("交车准备状态value") + private String handoverPrepareState; // 交车准备状态value + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("车辆信息") + private List appBusHandoverPrepareVehicleDtos; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareDetailsVo.java new file mode 100644 index 0000000000..84d442bf02 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareDetailsVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverprepare; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVo.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareVo
+ * Description: 交车准备-申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表 视图数据详情", description = "交车准备-申请表 视图数据详情") +public class BusHandoverPrepareDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("联系电话") + private String mobile; // 联系电话 + @ApiModelProperty("品牌") + private String brandName; // 品牌 + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value") + private String payType; // 付款方式value + @ApiModelProperty("交车准备状态key") + private String handoverPrepareStateKey; // 交车准备状态key + @ApiModelProperty("交车准备状态value") + private String handoverPrepareState; // 交车准备状态value + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareDto.java new file mode 100644 index 0000000000..abcb71b645 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareDto.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverprepare; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareDto.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareDto
+ * Description: 交车准备-申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表 数据传输对象", description = "交车准备-申请表 数据传输对象") +public class BusHandoverPrepareDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("联系电话") + private String mobile; // 联系电话 + @ApiModelProperty("品牌") + private String brandName; // 品牌 + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value") + private String payType; // 付款方式value + @ApiModelProperty("交车准备状态key") + private String handoverPrepareStateKey; // 交车准备状态key + @ApiModelProperty("交车准备状态value") + private String handoverPrepareState; // 交车准备状态value + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java new file mode 100644 index 0000000000..c281c8eb81 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java @@ -0,0 +1,144 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverprepare; + +import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareFeign.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "交车准备-申请表") +@FeignClient( + contextId = "anrui-buscenter-handover-BusHandoverPrepare", + name = "anrui-buscenter", + path = "v1/bushandoverprepare", + fallback = BusHandoverPrepareFeignFallback.class) +public interface BusHandoverPrepareFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody BusHandoverPrepareDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("出库申请推送交车准备数据") + @PostMapping("/addHandoverPrepare") + @ResponseBody + public ResultBean addHandoverPrepare(@RequestBody BusHandoverPrepareAddDto dto); + + + //***********************************App********************************** + + + @ApiOperation("手机端-获取交车准备申请列表") + @PostMapping("/getDeliveryPlanList") + @ResponseBody + ResultBean> getDeliveryPlanList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("手机端-初始化交车准备申请") + @PostMapping("/getDeliveryPlanInfo") + @ResponseBody + ResultBean getDeliveryPlanInfo(@SpringQueryMap AppBusHandoverPrepareInfoQuery query); + + @ApiOperation("修改交车准备 各资料状态修改") + @PutMapping("/saveState") + @ResponseBody + ResultBean saveState(@RequestBody AppStateDateDto dto); + + @ApiOperation("获取交车准备 发票信息") + @GetMapping("/getInvoiceInfo") + @ResponseBody + ResultBean getInvoiceInfo(@SpringQueryMap AppInvoicingInfoQuery query); + + @ApiOperation("获取交车准备 合格证信息") + @GetMapping("/getCertificateInfo") + @ResponseBody + ResultBean getCertificateInfo(@SpringQueryMap AppCertificateInfoQuery query); + + @ApiOperation("获取交车准备 保单信息") + @GetMapping("/getPolicyInfo") + @ResponseBody + ResultBean getPolicyInfo(@SpringQueryMap AppPolicyInfoQuery query); + + @ApiOperation("修改交车准备 保单信息") + @PutMapping("/savePolicyInfo") + @ResponseBody + ResultBean savePolicyInfo(@RequestBody AppPolicyDto dto); + + @ApiOperation("获取交车准备 其他资料信息") + @GetMapping("/getOtherDataInfo") + @ResponseBody + ResultBean getOtherDataInfo(@SpringQueryMap AppOtherDataInfoQuery query); + + @ApiOperation("修改交车准备 其他资料信息") + @PutMapping("/saveOtherDataInfo") + @ResponseBody + ResultBean saveOtherDataInfo(@RequestBody AppOtherDataDto dto); + + @ApiOperation("保存交车准备信息") + @PostMapping("/saveDeliveryPlanInfo") + @ResponseBody + ResultBean saveDeliveryPlanInfo(@RequestBody AppHandoverPrepareDto dto); + + @ApiOperation("交车准备详情") + @GetMapping("/getDeliveryPlanInfoDetail") + @ResponseBody + ResultBean getDeliveryPlanInfoDetail(@SpringQueryMap AppBusHandoverPrepareInfoQuery query); + + +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java new file mode 100644 index 0000000000..f8c87e1751 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java @@ -0,0 +1,131 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverprepare; + +import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeignFallback
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口bus_handover/bushandoverprepare/listPage无法访问"); + } + + @Override + public ResultBean save(BusHandoverPrepareDto dto){ + return ResultBean.fireFail().setMsg("接口bus_handover/bushandoverprepare/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口bus_handover/bushandoverprepare/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口bus_handover/bushandoverprepare/fetchDetailsBySid无法访问"); + } + + @Override + public ResultBean addHandoverPrepare(BusHandoverPrepareAddDto dto) { + return null; + } + + @Override + public ResultBean> getDeliveryPlanList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean getDeliveryPlanInfo(AppBusHandoverPrepareInfoQuery query) { + return null; + } + + @Override + public ResultBean saveState(AppStateDateDto dto) { + return null; + } + + @Override + public ResultBean getInvoiceInfo(AppInvoicingInfoQuery query) { + return null; + } + + @Override + public ResultBean getCertificateInfo(AppCertificateInfoQuery query) { + return null; + } + + @Override + public ResultBean getPolicyInfo(AppPolicyInfoQuery query) { + return null; + } + + @Override + public ResultBean savePolicyInfo(AppPolicyDto dto) { + return null; + } + + @Override + public ResultBean getOtherDataInfo(AppOtherDataInfoQuery query) { + return null; + } + + @Override + public ResultBean saveOtherDataInfo(AppOtherDataDto dto) { + return null; + } + + @Override + public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) { + return null; + } + + @Override + public ResultBean getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) { + return null; + } +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareQuery.java new file mode 100644 index 0000000000..538310b077 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareQuery.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverprepare; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareQuery.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareQuery
+ * Description: 交车准备-申请表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表 查询条件", description = "交车准备-申请表 查询条件") +public class BusHandoverPrepareQuery implements Query { + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("联系电话") + private String mobile; // 联系电话 + @ApiModelProperty("品牌") + private String brandName; // 品牌 + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value") + private String payType; // 付款方式value + @ApiModelProperty("交车准备状态key") + private String handoverPrepareStateKey; // 交车准备状态key + @ApiModelProperty("交车准备状态value") + private String handoverPrepareState; // 交车准备状态value + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareVo.java new file mode 100644 index 0000000000..0e2eb3e8a9 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverprepare; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVo.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareVo
+ * Description: 交车准备-申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表 视图数据对象", description = "交车准备-申请表 视图数据对象") +public class BusHandoverPrepareVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("联系电话") + private String mobile; // 联系电话 + @ApiModelProperty("品牌") + private String brandName; // 品牌 + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value") + private String payType; // 付款方式value + @ApiModelProperty("交车准备状态key") + private String handoverPrepareStateKey; // 交车准备状态key + @ApiModelProperty("交车准备状态value") + private String handoverPrepareState; // 交车准备状态value + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoQuery.java new file mode 100644 index 0000000000..5e34c2f8c1 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBusHandoverPrepareInfoQuery implements Query { + private static final long serialVersionUID = -8642412443149902560L; + + @ApiModelProperty("sid") + private String sid; + + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoVo.java new file mode 100644 index 0000000000..b23d706f16 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoVo.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppBusHandoverPrepareInfoVo implements Vo { + private static final long serialVersionUID = -4080169340603665916L; + + private String sid; // sid + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("联系电话") + private String mobile; // 联系电话 + @ApiModelProperty("品牌") + private String brandName; // 品牌 + @ApiModelProperty("车辆数量") + private String num; // 车辆数量 + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value") + private String payType; // 付款方式value + @ApiModelProperty("交车准备状态key") + private String handoverPrepareStateKey; // 交车准备状态key + @ApiModelProperty("交车准备状态value") + private String handoverPrepareState; // 交车准备状态value + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("用户sid") + private String userSid; // 用户sid + + @ApiModelProperty("车辆列表") + private List carDataList; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java new file mode 100644 index 0000000000..89edca4d57 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java @@ -0,0 +1,4 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +public class AppCertificateInfoQuery { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java new file mode 100644 index 0000000000..90956375c8 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java @@ -0,0 +1,4 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +public class AppCertificateInfoVo { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPrepareDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPrepareDto.java new file mode 100644 index 0000000000..92e7187dcb --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPrepareDto.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +@Data +public class AppHandoverPrepareDto implements Dto { + private static final long serialVersionUID = -3500405140044756010L; + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageQuery.java new file mode 100644 index 0000000000..4fcc27c385 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppHandoverPreparePageQuery implements Query { + private static final long serialVersionUID = 9181406369906863485L; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("") + private String name; + + @ApiModelProperty("") + private String type; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageVo.java new file mode 100644 index 0000000000..7aea592f4d --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageVo.java @@ -0,0 +1,45 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppHandoverPreparePageVo implements Vo { + private static final long serialVersionUID = -7176749864266340577L; + + @ApiModelProperty("sid") + private String sid; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("联系电话") + private String mobile; + + @ApiModelProperty("合同编号") + private String contractNo; + + @ApiModelProperty("合同sid") + private String contractSid; + + @ApiModelProperty("车型") + private String model; + + @ApiModelProperty("付款方式") + private String payType; + + @ApiModelProperty("数量") + private String num; + + @ApiModelProperty("交车准备状态") + private String handoverPrepareState; + + @ApiModelProperty("交车准备状态key") + private String handoverPrepareStateKey; + + @ApiModelProperty("是否显示办理") + private Boolean isShowUpData; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java new file mode 100644 index 0000000000..e40d7df0ad --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppInvoicingInfoQuery implements Query { + private static final long serialVersionUID = 235552231378193054L; + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("车辆sid") + private String carSid; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java new file mode 100644 index 0000000000..493959cc6b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppInvoicingInfoVo implements Vo { + private static final long serialVersionUID = 8827030575604891015L; + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("车辆sid") + private String carSid; + @ApiModelProperty("发票代码") + private String invoice; + @ApiModelProperty("开票日期") + private String date; + @ApiModelProperty("开票附件") + private List invoiceImages; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java new file mode 100644 index 0000000000..3aad85029c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java @@ -0,0 +1,4 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +public class AppOtherDataDto { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java new file mode 100644 index 0000000000..a35b23785a --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java @@ -0,0 +1,4 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +public class AppOtherDataInfoQuery { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java new file mode 100644 index 0000000000..6ae6610c9d --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java @@ -0,0 +1,4 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +public class AppOtherDataInfoVo { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java new file mode 100644 index 0000000000..332988f22e --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +@Data +public class AppPolicyDto implements Dto { + private static final long serialVersionUID = 214089296630394804L; + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java new file mode 100644 index 0000000000..f2b9cc95fb --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java @@ -0,0 +1,4 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +public class AppPolicyInfoQuery { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java new file mode 100644 index 0000000000..fccbcc364b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java @@ -0,0 +1,4 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +public class AppPolicyInfoVo { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppStateDateDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppStateDateDto.java new file mode 100644 index 0000000000..7750cbfe60 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppStateDateDto.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppStateDateDto implements Dto { + private static final long serialVersionUID = -3523087314399529059L; + + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("状态") + private String key; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java new file mode 100644 index 0000000000..2fd45aab5e --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBusHandoverPrepareVehicleDto implements Dto { + private static final long serialVersionUID = -8913800891100928726L; + + @ApiModelProperty("交车申请表sid") + private String mainSid; // 交车申请表sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("开票状态") + private int invoicingState; // 开票状态 + @ApiModelProperty("合格证状态") + private int certificateState; // 合格证状态 + @ApiModelProperty("保单状态") + private int policyState; // 保单状态 + @ApiModelProperty("随车资料状态") + private int onBoardDataState; // 随车资料状态 + @ApiModelProperty("其他资料状态") + private int otherDataState; // 其他资料状态 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java new file mode 100644 index 0000000000..0d9487d6fb --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBusHandoverPrepareVehicleInfoVo implements Vo { + private static final long serialVersionUID = 1415137296013613928L; + + @ApiModelProperty("交车申请表sid") + private String mainSid; // 交车申请表sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("开票状态") + private int invoicingState; // 开票状态 + @ApiModelProperty("合格证状态") + private int certificateState; // 合格证状态 + @ApiModelProperty("保单状态") + private int policyState; // 保单状态 + @ApiModelProperty("随车资料状态") + private int onBoardDataState; // 随车资料状态 + @ApiModelProperty("其他资料状态") + private int otherDataState; // 其他资料状态 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicle.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicle.java new file mode 100644 index 0000000000..7ac60c3c7e --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicle.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicle.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表", description = "交车准备-申请表") +@TableName("bus_handover_prepare_vehicle") +public class BusHandoverPrepareVehicle extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("交车申请表sid") + private String mainSid; // 交车申请表sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("开票状态") + private int invoicingState; // 开票状态 + @ApiModelProperty("合格证状态") + private int certificateState; // 合格证状态 + @ApiModelProperty("保单状态") + private int policyState; // 保单状态 + @ApiModelProperty("随车资料状态") + private int onBoardDataState; // 随车资料状态 + @ApiModelProperty("其他资料状态") + private int otherDataState; // 其他资料状态 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleDetailsVo.java new file mode 100644 index 0000000000..cf327bd648 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleDetailsVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicleVo.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo
+ * Description: 交车准备-申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表 视图数据详情", description = "交车准备-申请表 视图数据详情") +public class BusHandoverPrepareVehicleDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("交车申请表sid") + private String mainSid; // 交车申请表sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("开票状态") + private int invoicingState; // 开票状态 + @ApiModelProperty("合格证状态") + private int certificateState; // 合格证状态 + @ApiModelProperty("保单状态") + private int policyState; // 保单状态 + @ApiModelProperty("随车资料状态") + private int onBoardDataState; // 随车资料状态 + @ApiModelProperty("其他资料状态") + private int otherDataState; // 其他资料状态 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleDto.java new file mode 100644 index 0000000000..bff0f2aa06 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleDto.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicleDto.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDto
+ * Description: 交车准备-申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表 数据传输对象", description = "交车准备-申请表 数据传输对象") +public class BusHandoverPrepareVehicleDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("交车申请表sid") + private String mainSid; // 交车申请表sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("开票状态") + private int invoicingState; // 开票状态 + @ApiModelProperty("合格证状态") + private int certificateState; // 合格证状态 + @ApiModelProperty("保单状态") + private int policyState; // 保单状态 + @ApiModelProperty("随车资料状态") + private int onBoardDataState; // 随车资料状态 + @ApiModelProperty("其他资料状态") + private int otherDataState; // 其他资料状态 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeign.java new file mode 100644 index 0000000000..530c12764f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicleFeign.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleFeign
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "交车准备-申请表") +@FeignClient( + contextId = "anrui-buscenter-handover-BusHandoverPrepareVehicle", + name = "anrui-buscenter", + path = "v1/bushandoverpreparevehicle", + fallback = BusHandoverPrepareVehicleFeignFallback.class) +public interface BusHandoverPrepareVehicleFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody BusHandoverPrepareVehicleDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeignFallback.java new file mode 100644 index 0000000000..f5560f5f66 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicleFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleFeignFallback
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BusHandoverPrepareVehicleFeignFallback implements BusHandoverPrepareVehicleFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口bus_handover/bushandoverpreparevehicle/listPage无法访问"); + } + + @Override + public ResultBean save(BusHandoverPrepareVehicleDto dto){ + return ResultBean.fireFail().setMsg("接口bus_handover/bushandoverpreparevehicle/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口bus_handover/bushandoverpreparevehicle/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口bus_handover/bushandoverpreparevehicle/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleQuery.java new file mode 100644 index 0000000000..1423c794f8 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleQuery.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicleQuery.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleQuery
+ * Description: 交车准备-申请表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表 查询条件", description = "交车准备-申请表 查询条件") +public class BusHandoverPrepareVehicleQuery implements Query { + + @ApiModelProperty("交车申请表sid") + private String mainSid; // 交车申请表sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("开票状态") + private int invoicingState; // 开票状态 + @ApiModelProperty("合格证状态") + private int certificateState; // 合格证状态 + @ApiModelProperty("保单状态") + private int policyState; // 保单状态 + @ApiModelProperty("随车资料状态") + private int onBoardDataState; // 随车资料状态 + @ApiModelProperty("其他资料状态") + private int otherDataState; // 其他资料状态 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleVo.java new file mode 100644 index 0000000000..f77f8b29ee --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicleVo.java
+ * Class: com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo
+ * Description: 交车准备-申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "交车准备-申请表 视图数据对象", description = "交车准备-申请表 视图数据对象") +public class BusHandoverPrepareVehicleVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("交车申请表sid") + private String mainSid; // 交车申请表sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("开票状态") + private int invoicingState; // 开票状态 + @ApiModelProperty("合格证状态") + private int certificateState; // 合格证状态 + @ApiModelProperty("保单状态") + private int policyState; // 保单状态 + @ApiModelProperty("随车资料状态") + private int onBoardDataState; // 随车资料状态 + @ApiModelProperty("其他资料状态") + private int otherDataState; // 其他资料状态 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index 1c765856d5..240d244971 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -717,9 +717,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService recipientSidList = new ArrayList<>(); - // 风控中心总经理角色用户 + // 风控中心风控内勤 UserRoleQuery userRoleQuery = new UserRoleQuery(); - userRoleQuery.setRoleSid("537bea8f-75e8-430c-9a5f-3140bda41f39"); + userRoleQuery.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4"); List list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); for (SysUserVo userVo : list1) { recipientSidList.add(userVo.getSid()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index a5d139b94c..08cc6721a8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -453,6 +453,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService initArrearsApply(AppAdvanceArrearsInfoQuery query) { ResultBean rb = ResultBean.fireFail(); String contractSid = query.getContractSid(); + String userSid = query.getUserSid(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); List carList = new ArrayList<>(); List vinList = new ArrayList<>(); AppArrearsCarryInfoVo vo = new AppArrearsCarryInfoVo(); @@ -468,6 +470,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService { int updateFlowFiled(Map map); - int selByUserSid(@Param("createBySid") String createBySid); + List selByUserSid(@Param("createBySid") String createBySid); List selectListByState(@Param("date") String tomorrow,@Param("nodeState") String nodeState, @Param("key") String key); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml index b8464e0dad..41b728c2af 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml @@ -66,10 +66,17 @@ FROM bus_deposit_vehicle bdv WHERE bdv.billSid = #{virtualOrderSid} - + SELECT + bdv.sid + FROM + bus_deposit_vehicle bdv + LEFT JOIN bus_main_deposit bmd ON bmd.sid = bdv.billSid + WHERE + bdv.createBySid = #{createBySid} + AND bmd.nodeState = '已办结' + GROUP BY + bdv.vinNo diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java index c78df6834e..ec02de2491 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java @@ -290,9 +290,9 @@ public class BusDepositVehicleService extends MybatisBaseService list = baseMapper.selByUserSid(createBySid); // Integer count = strings.stream().mapToInt(Integer::valueOf).sum(); - vo.setExplain("目前该销售人员已预订" + count + "台车辆"); + vo.setExplain("目前该销售人员已预订" + list.size() + "台车辆"); } return new ResultBean().success().setData(vo); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareMapper.java new file mode 100644 index 0000000000..bc52ea2925 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareMapper.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bushandoverprepare; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.buscenter.api.bushandoverprepare.app.AppHandoverPreparePageQuery; +import com.yxt.anrui.buscenter.api.bushandoverprepare.app.AppHandoverPreparePageVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare; +import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareVo; + +import java.util.List; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareMapper.java
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareMapper
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BusHandoverPrepareMapper extends BaseMapper { + + //@Update("update bus_handover_prepare set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_handover_prepare") + List selectListVo(); + + IPage getDeliveryPlanList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareMapper.xml new file mode 100644 index 0000000000..df8ed2a704 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java new file mode 100644 index 0000000000..710fb9b734 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java @@ -0,0 +1,161 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bushandoverprepare; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bushandoverprepare.*; +import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareRest
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "交车准备-申请表") +@RestController("com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareRest") +@RequestMapping("v1/bushandoverprepare") +public class BusHandoverPrepareRest implements BusHandoverPrepareFeign { + + @Autowired + private BusHandoverPrepareService busHandoverPrepareService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busHandoverPrepareService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BusHandoverPrepareDto dto) { + ResultBean rb = ResultBean.fireFail(); + busHandoverPrepareService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + busHandoverPrepareService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + BusHandoverPrepareDetailsVo vo = busHandoverPrepareService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean addHandoverPrepare(BusHandoverPrepareAddDto dto) { + ResultBean rb = ResultBean.fireFail(); + busHandoverPrepareService.addHandoverPrepare(dto); + return rb.success(); + } + + @Override + public ResultBean> getDeliveryPlanList(PagerQuery pagerQuery) { + PagerVo page = new PagerVo<>(); + IPage iPage = busHandoverPrepareService.getDeliveryPlanList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } + + @Override + public ResultBean getDeliveryPlanInfo(AppBusHandoverPrepareInfoQuery query) { + return busHandoverPrepareService.getDeliveryPlanInfo(query); + } + + @Override + public ResultBean saveState(AppStateDateDto dto) { + return busHandoverPrepareService.saveState(dto); + } + + @Override + public ResultBean getInvoiceInfo(AppInvoicingInfoQuery query) { + return busHandoverPrepareService.getInvoiceInfo(query); + } + + @Override + public ResultBean getCertificateInfo(AppCertificateInfoQuery query) { + return null; + } + + @Override + public ResultBean getPolicyInfo(AppPolicyInfoQuery query) { + return null; + } + + @Override + public ResultBean savePolicyInfo(AppPolicyDto dto) { + return null; + } + + @Override + public ResultBean getOtherDataInfo(AppOtherDataInfoQuery query) { + return null; + } + + @Override + public ResultBean saveOtherDataInfo(AppOtherDataDto dto) { + return null; + } + + @Override + public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) { + return null; + } + + @Override + public ResultBean getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) { + return null; + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java new file mode 100644 index 0000000000..327ce68d25 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java @@ -0,0 +1,177 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bushandoverprepare; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bushandoverprepare.*; +import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle; +import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.common.core.result.ResultBean; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareService.java
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareService
+ * Description: 交车准备-申请表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BusHandoverPrepareService extends MybatisBaseService { + @Autowired + private BusHandoverPrepareVehicleService busHandoverPrepareVehicleService; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + private QueryWrapper createQueryWrapper(BusHandoverPrepareQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusHandoverPrepareQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(BusHandoverPrepareDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(BusHandoverPrepareDto dto) { + BusHandoverPrepare entity = new BusHandoverPrepare(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BusHandoverPrepareDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + BusHandoverPrepare entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BusHandoverPrepareDetailsVo fetchDetailsVoBySid(String sid) { + BusHandoverPrepare entity = fetchBySid(sid); + BusHandoverPrepareDetailsVo vo = new BusHandoverPrepareDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void addHandoverPrepare(BusHandoverPrepareAddDto dto) { + BusHandoverPrepare busHandoverPrepare = new BusHandoverPrepare(); + BeanUtil.copyProperties(dto, busHandoverPrepare); + List handoverPrepareVehicleDtos = dto.getAppBusHandoverPrepareVehicleDtos(); + if (handoverPrepareVehicleDtos.size() > 0) { + for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) { + BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle(); + BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle); + busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid()); + busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle); + } + } + save(busHandoverPrepare); + } + + public IPage getDeliveryPlanList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + AppHandoverPreparePageQuery params = pagerQuery.getParams(); + String userSid = params.getUserSid(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(params.getType())) { + qw.eq("handoverPrepareStateKey", params.getType()); + } + if (StringUtils.isNotBlank(useOrgSid)) { + qw.eq("useOrgSid", useOrgSid); + } + IPage iPage = baseMapper.getDeliveryPlanList(page, qw, params.getName()); + for (AppHandoverPreparePageVo record : iPage.getRecords()) { + if ("1".equals(record.getHandoverPrepareStateKey())) { + record.setIsShowUpData(true); + } else if ("2".equals(record.getHandoverPrepareStateKey())) { + record.setIsShowUpData(false); + } + } + return iPage; + } + + public ResultBean getDeliveryPlanInfo(AppBusHandoverPrepareInfoQuery query) { + ResultBean rb = ResultBean.fireFail(); + String sid = query.getSid(); + AppBusHandoverPrepareInfoVo appBusHandoverPrepareInfoVo = new AppBusHandoverPrepareInfoVo(); + BusHandoverPrepare busHandoverPrepare = fetchBySid(sid); + BeanUtil.copyProperties(busHandoverPrepare, appBusHandoverPrepareInfoVo); + List list = busHandoverPrepareVehicleService.selByMainSid(sid); + appBusHandoverPrepareInfoVo.setCarDataList(list); + appBusHandoverPrepareInfoVo.setUserSid(query.getUserSid()); + return rb.setData(appBusHandoverPrepareInfoVo); + } + + public ResultBean saveState(AppStateDateDto dto) { + ResultBean rb = ResultBean.fireFail(); + busHandoverPrepareVehicleService.saveState(dto); + return rb.success(); + } + + public ResultBean getInvoiceInfo(AppInvoicingInfoQuery query) { + return null; + } +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java new file mode 100644 index 0000000000..35b55791f6 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java @@ -0,0 +1,87 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +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.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo; +import com.yxt.common.core.result.ResultBean; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicleMapper.java
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleMapper
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BusHandoverPrepareVehicleMapper extends BaseMapper { + + //@Update("update bus_handover_prepare_vehicle set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_handover_prepare_vehicle") + List selectListVo(); + + @Select("select * from bus_handover_prepare_vehicle where mainSid = #{sid} ") + List selByMainSid(@Param("sid") String sid); + + + @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where mainSid = #{sid} and vinNo = #{vin}") + void saveInvoiceState(@Param("sid") String sid, @Param("vin") String vin); + + @Update("update bus_handover_prepare_vehicle set certificateState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + void saveCertificateState(@Param("sid") String sid, @Param("vin") String vin); + + @Update("update bus_handover_prepare_vehicle set policyState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + void savePolicyState(@Param("sid") String sid, @Param("vin") String vin); + + @Update("update bus_handover_prepare_vehicle set onBoardDataState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + void saveOnBoardState(@Param("sid") String sid, @Param("vin") String vin); + + @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + void saveOtherDataState(@Param("sid") String sid, @Param("vin") String vin); +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml new file mode 100644 index 0000000000..6f4b5a9aa6 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleRest.java new file mode 100644 index 0000000000..045741486c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleQuery; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDetailsVo; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDto; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleFeign; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicleFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleRest
+ * Description: 交车准备-申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "交车准备-申请表") +@RestController("com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleRest") +@RequestMapping("v1/bushandoverpreparevehicle") +public class BusHandoverPrepareVehicleRest implements BusHandoverPrepareVehicleFeign { + + @Autowired + private BusHandoverPrepareVehicleService busHandoverPrepareVehicleService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busHandoverPrepareVehicleService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BusHandoverPrepareVehicleDto dto){ + ResultBean rb = ResultBean.fireFail(); + busHandoverPrepareVehicleService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + busHandoverPrepareVehicleService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + BusHandoverPrepareVehicleDetailsVo vo = busHandoverPrepareVehicleService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java new file mode 100644 index 0000000000..147d368cbc --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java @@ -0,0 +1,133 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bushandoverprepare.app.AppStateDateDto; +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.*; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: bus_handover(交车准备)
+ * File: BusHandoverPrepareVehicleService.java
+ * Class: com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService
+ * Description: 交车准备-申请表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 15:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BusHandoverPrepareVehicleService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(BusHandoverPrepareVehicleQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusHandoverPrepareVehicleQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(BusHandoverPrepareVehicleDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(BusHandoverPrepareVehicleDto dto) { + BusHandoverPrepareVehicle entity = new BusHandoverPrepareVehicle(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BusHandoverPrepareVehicleDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + BusHandoverPrepareVehicle entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BusHandoverPrepareVehicleDetailsVo fetchDetailsVoBySid(String sid) { + BusHandoverPrepareVehicle entity = fetchBySid(sid); + BusHandoverPrepareVehicleDetailsVo vo = new BusHandoverPrepareVehicleDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List selByMainSid(String sid) { + List list = baseMapper.selByMainSid(sid); + return list; + } + + public void saveState(AppStateDateDto dto) { + String sid = dto.getSid(); + String key = dto.getKey(); + String vin = dto.getVin(); + if ("01".equals(key)) { + baseMapper.saveInvoiceState(sid, vin); + } + if ("02".equals(key)) { + baseMapper.saveCertificateState(sid, vin); + } + if ("03".equals(key)) { + baseMapper.savePolicyState(sid, vin); + } + if ("04".equals(key)) { + baseMapper.saveOnBoardState(sid, vin); + } + if ("05".equals(key)) { + baseMapper.saveOtherDataState(sid, vin); + } + + } +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index f35615e425..d78d6c520a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BusDepositVinListVo; import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; @@ -1880,6 +1881,16 @@ public class BusMainDepositService extends MybatisBaseService carList = dto.getCarList(); + for (AppBusDepositVehicleCarListDto carListDto : carList) { + String carSid = carListDto.getCarSid(); + BusDepositVinListVo busDepositVinListVo = baseVehicleFeign.getBusDepositVehByVehSid(carSid).getData(); + if (!busDepositVinListVo.getLockedState().equals(VehicleState.LockEnum.UN_LOCK.getCode())) { + return rb.setMsg("您所选车辆已被预定或锁定!"); + } + } + } //新增修改保存 ResultBean resultBean = reserveCarInfo(dto); if (!resultBean.getSuccess()) { @@ -1998,7 +2009,7 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } else { //更新修改时间 - baseMapper.updateModify(new Date(),bv.getBusinessSid()); + baseMapper.updateModify(new Date(), bv.getBusinessSid()); //如果类型为订金,推送款项确认 if (DictCommonEnum.DepositBillType.JYDD_DJ.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { BusDeposit busDeposit = busDepositService.selectByBillSid(bv.getBusinessSid()); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppCollectionConfirmationStateVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppCollectionConfirmationStateVo.java new file mode 100644 index 0000000000..3c08ad2234 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppCollectionConfirmationStateVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppCollectionConfirmationStateVo implements Vo { + private static final long serialVersionUID = -1351560055250587524L; + + @ApiModelProperty("合同编号") + private String contractNo; + + @ApiModelProperty("车架号") + private String vinNo; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java index d79537a832..eabe9e0a1c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java @@ -13,6 +13,9 @@ import java.util.List; @Data public class AppFinCollectionConfirmationDto implements Dto { + @ApiModelProperty("机构sid") + private String orgPath; + @ApiModelProperty("款项确认sid") private String sid; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationOrgPathQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationOrgPathQuery.java new file mode 100644 index 0000000000..37d16cd49e --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationOrgPathQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppFinCollectionConfirmationOrgPathQuery implements Query { + private static final long serialVersionUID = -1124576139838723852L; + + @ApiModelProperty("申请sid") + private String collectionBillSid; + + @ApiModelProperty("机构sid") + private String orgPath; + + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java index 8a3982bf12..75a6be5663 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java @@ -13,4 +13,7 @@ public class AppFinCollectionConfirmationQuery implements Query { @ApiModelProperty("付款方名称") private String name; + @ApiModelProperty("机构sid") + private String orgPath; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java index eedb37204d..f18e2c9dfa 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java @@ -21,5 +21,8 @@ public class AppFinSelectedReceivablesPaymentDetailsQuery implements Query { @ApiModelProperty("分公司sid") private String useOrgSid; + @ApiModelProperty("机构sid") + private String orgPath; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java index 21d75ae14c..a1d722836d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java @@ -37,4 +37,7 @@ public class AppFinSelectedReceivablesPaymentDetailsVo implements Vo { @ApiModelProperty("认款状态") private String state; + @ApiModelProperty("sid") + private String sid; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 4b08cf21b3..60f96a11aa 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -33,6 +33,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -93,20 +94,20 @@ public interface FinCollectionConfirmationFeign { public ResultBean addCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto); @ApiOperation("手机端—初始化收款确认申请") - @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}") - public ResultBean initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid); + @GetMapping("/initCollectionConfirm") + public ResultBean initCollectionConfirm(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery query); @ApiOperation("手机端—款项确认申请详情") - @GetMapping("/getCollectionConfirmDetail/{collectionBillSid}") - public ResultBean getCollectionConfirmDetail(@PathVariable("collectionBillSid") String collectionBillSid); + @GetMapping("/getCollectionConfirmDetail") + public ResultBean getCollectionConfirmDetail(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery query); @ApiOperation("手机端—提交款项确认申请") @PostMapping("/submitCollectionConfirm") public ResultBean submitCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto); @ApiOperation("手机端—删除收款确认单") - @DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}") - public ResultBean deleteCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid); + @DeleteMapping("/deleteCollectionConfirm") + public ResultBean deleteCollectionConfirm(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery query); @ApiOperation("手机端—查询可使用款项明细列表") @PostMapping("/getPaymentDetailsList") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 30cf1a2261..83c18f7e01 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -93,12 +93,12 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf } @Override - public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + public ResultBean initCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) { return null; } @Override - public ResultBean getCollectionConfirmDetail(String collectionBillSid) { + public ResultBean getCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery query) { return null; } @@ -108,7 +108,7 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf } @Override - public ResultBean deleteCollectionConfirm(String collectionBillSid) { + public ResultBean deleteCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) { return null; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java index 0800f7bdee..d068842de0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java @@ -36,4 +36,7 @@ public class AppFinUncollectedReceivablesDetailedVo implements Vo { @ApiModelProperty("认款状态") private String state; + @ApiModelProperty("sid") + private String sid; + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index 23c703eeb9..cca6fc1bf4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -97,4 +97,7 @@ public interface FinCollectionConfirmationMapper extends BaseMapper billNoList(); + + + List selectByState(); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 07302fc32c..ea62d4fa48 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -65,6 +65,7 @@ collectionBankNum AS collectionNum, collectionTypeValue AS collectionType, collectionMoney AS paymentMoney, + paymentState AS collectionBillState, paymentVoucherUrl, remarks FROM fin_collection_confirmation @@ -72,6 +73,17 @@ + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index f3d32811d3..a3ba1a66c9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -130,29 +130,28 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF /** * 手机端—初始化收款确认申请 * - * @param collectionBillSid - * @param userSid + * @param query * @return */ @Override - public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + public ResultBean initCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isBlank(userSid)) { + if (StringUtils.isBlank(query.getUserSid())) { return rb.setMsg("用户sid不能为空"); } - AppFinCollectionConfirmationInitVo data = finCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid).getData(); + AppFinCollectionConfirmationInitVo data = finCollectionConfirmationService.initCollectionConfirm(query).getData(); return rb.success().setData(data); } /** * 手机端—款项确认申请详情 * - * @param collectionBillSid + * @param query * @return */ @Override - public ResultBean getCollectionConfirmDetail(String collectionBillSid) { - return finCollectionConfirmationService.getCollectionConfirmDetail(collectionBillSid); + public ResultBean getCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery query) { + return finCollectionConfirmationService.getCollectionConfirmDetail(query); } /** @@ -169,12 +168,12 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF /** * 手机端—删除收款确认单 * - * @param collectionBillSid + * @param query * @return */ @Override - public ResultBean deleteCollectionConfirm(String collectionBillSid) { - return finCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid); + public ResultBean deleteCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) { + return finCollectionConfirmationService.deleteCollectionConfirm(query); } /** diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 0b1f0467f8..36986514c0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -340,6 +340,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService getCollectionConfirmList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); + String orgPath = pagerQuery.getParams().getOrgPath(); + String orgSid = ""; + if (StringUtils.isNotBlank(pagerQuery.getParams().getOrgPath())) { + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + orgSid = sysStaffOrgFeign.getPathSidByUserSid(orgPath).getData(); + } + pagerQuery.getParams().setOrgPath(orgSid); QueryWrapper qw = appBuildQueryWrapper(pagerQuery.getParams()); IPage collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw); for (AppFinCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) { @@ -351,12 +359,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService appBuildQueryWrapper(AppFinCollectionConfirmationQuery pagerQuery) { QueryWrapper qw = new QueryWrapper<>(); if (pagerQuery != null) { - if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//付款方名称 + if (StringUtils.isNotBlank(pagerQuery.getName())) {//付款方名称 qw.like("payerName", pagerQuery.getName()); } + if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) { + qw.eq("useOrgSid", pagerQuery.getOrgPath()); + } } - qw.eq("pushMessage",0); + qw.eq("pushMessgae", 0); return qw; } @@ -403,12 +419,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService payFiles = dto.getPayFiles(); String payFilePath = ""; for (String payFile : payFiles) { @@ -446,13 +466,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService initCollectionConfirm(String collectionBillSid, String userSid) { + public ResultBean initCollectionConfirm(AppFinCollectionConfirmationOrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); + String orgPath = query.getOrgPath(); + String collectionBillSid = query.getCollectionBillSid(); + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); + } AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid); List list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid); vo.setContractList(list); @@ -463,18 +489,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService getCollectionConfirmDetail(String collectionBillSid) { + public ResultBean getCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); + String collectionBillSid = query.getCollectionBillSid(); AppFinCollectionConfirmationDetailedVo vo = baseMapper.getCollectionConfirmDetail(collectionBillSid); List list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid); vo.setContractList(list); @@ -619,14 +646,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService getPaymentDetailsList(PagerQuery pagerQuery) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid(); - if (StringUtils.isNotBlank(useOrgSid)) { - pagerQuery.getParams().setUseOrgSid(useOrgSid); - } + String orgPath = pagerQuery.getParams().getOrgPath(); + String userSid = pagerQuery.getParams().getUserSid(); + String useOrgSid = ""; IPage page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams()); + if (StringUtils.isNotBlank(orgPath)) { + useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + if (StringUtils.isNotBlank(useOrgSid)) { + qw.eq("useOrgSid", useOrgSid); + } + qw.ne("currentReceivableMoney", 0); + List vos = baseMapper.selectByState(); + for (AppCollectionConfirmationStateVo vo : vos) { + vo.getContractNo(); + vo.getVinNo(); + } IPage collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw); List records = collectionConfirmList.getRecords(); for (AppFinUncollectedReceivablesDetailedVo record : records) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 4d9020cf7e..d6f9d8e66b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -23,6 +23,7 @@