From 157514191690f9e6f9bd77d558907f8c1093ad1a Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Tue, 6 Dec 2022 19:21:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/VehicleStateTempOrLast.java | 4 +- .../biz/basevehicle/BaseVehicleService.java | 8 +- .../busdelivered/AddRetrievalApplyDto.java | 9 +- .../AppBusDeliveredPageQuery.java | 3 + .../busdelivered/AppDeliveredDetailsVo.java | 6 + .../api/busdelivered/BusDelivered.java | 5 +- .../AppDeliveredApplyInfoVo.java | 10 +- .../AppDeliveredApplyPageQuery.java | 3 + .../AppSubmitDeliveredApplyDto.java | 17 ++ .../busdeliveredapply/BusDeliveredApply.java | 4 + .../BusDeliveredApplyFeign.java | 5 + .../BusDeliveredApplyFeignFallback.java | 5 + .../BusDeliveredUseMessage.java | 6 + .../BusArrearsCarryVehicleApplyService.java | 9 +- .../biz/busdelivered/BusDeliveredMapper.java | 4 +- .../biz/busdelivered/BusDeliveredMapper.xml | 17 +- .../biz/busdelivered/BusDeliveredService.java | 46 ++++- .../BusDeliveredApplyMapper.java | 2 +- .../BusDeliveredApplyMapper.xml | 9 + .../BusDeliveredApplyRest.java | 5 + .../BusDeliveredApplyService.java | 163 ++++++++++++++++-- .../BusDeliveredApplyDetailsService.java | 25 +++ .../AppBillApplicationIInfoVo.java | 3 +- .../fin/api/kingdee/appaybill/ApPayBill.java | 2 +- .../FinBillApplicationService.java | 49 +++++- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../invoiced/BillApplicationIInfoVo.java | 3 + .../retrieval/AppBusDeliveredApplyFeign.java | 39 +++++ .../AppBusDeliveredApplyFeignFallback.java | 34 ++++ .../api/autoservice/retrieval/CarListDto.java | 19 ++ .../retrieval/DeliveredApplyDetailsVo.java | 6 + .../retrieval/DeliveredApplyDto.java | 5 +- .../retrieval/DeliveredApplyInfoVo.java | 8 + .../retrieval/DeliveredApplyPageQuery.java | 3 + .../retrieval/DeliveredDetailsVo.java | 6 + .../retrieval/DeliveredPageQuery.java | 3 + .../api/autoservice/retrieval/UseInfoDto.java | 29 ++++ .../flowable/CompleteRetrievalDto.java | 33 ++++ .../retrieval/flowable/RetrievalQuery.java | 21 +++ .../flowable/RetrievalTaskQuery.java | 44 +++++ .../flowable/SubmitRetrievalDto.java | 33 ++++ .../retrieval/AppBusDeliveredApplyRest.java | 34 ++++ .../AppBusDeliveredApplyService.java | 118 ++++++++++++- doc/databases/bus_handover_tables.sql | 96 +++++++++++ 44 files changed, 904 insertions(+), 51 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/UseInfoDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/CompleteRetrievalDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/RetrievalQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/RetrievalTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java create mode 100644 doc/databases/bus_handover_tables.sql diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java index d6ff878a6b..47cd34d691 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java @@ -21,7 +21,9 @@ public class VehicleStateTempOrLast { FIN_PAYMENT("0005", "款项确认"), - NORMAL_INVOICING("0006", "正常开票"); + NORMAL_INVOICING("0006", "正常开票"), + + ISSUE_APPLY("0007", "出库申请"); /** * code值 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 fb833836d7..47d4b545ff 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 @@ -1082,7 +1082,7 @@ public class BaseVehicleService extends MybatisBaseService wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK)); + qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK)).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK); } if (StringUtils.isNotBlank(params.getLockedState())) { //锁定状态 // qw.and(wrapper -> wrapper.ne("bv.lockedStateValue", "预定").and(wrapper1 -> wrapper1.ne("bv.lockedStateValue", "锁定"))); @@ -2014,7 +2014,7 @@ public class BaseVehicleService extends MybatisBaseService> selectAppListOne(String modelSid, String configSid, String orgSid,List list) { + public ResultBean> selectAppListOne(String modelSid, String configSid, String orgSid, List list) { ResultBean> rb = ResultBean.fireFail(); List orderVoList = new ArrayList<>(); - orderVoList = baseMapper.selectAppListOne(modelSid, configSid, orgSid, VehicleState.LockEnum.LOCK.getCode(),list); + orderVoList = baseMapper.selectAppListOne(modelSid, configSid, orgSid, VehicleState.LockEnum.LOCK.getCode(), list); if (orderVoList.isEmpty()) { return rb.setData(orderVoList); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AddRetrievalApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AddRetrievalApplyDto.java index fafbb66b51..132850160f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AddRetrievalApplyDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AddRetrievalApplyDto.java @@ -14,8 +14,12 @@ public class AddRetrievalApplyDto implements Dto { private String name; @ApiModelProperty("车架号") private String vinNo; + @ApiModelProperty(value = "车型Sid") + private String modelSid; @ApiModelProperty(value = "车型别名") private String modelName; + @ApiModelProperty(value = "配置Sid") + private String configSid; @ApiModelProperty(value = "联系电话") private String mobile; @ApiModelProperty(value = "证件号码") @@ -34,5 +38,8 @@ public class AddRetrievalApplyDto implements Dto { @ApiModelProperty("款项状态key") private String subscriptionKey; - + @ApiModelProperty(value = "使用组织sid") + private String useOrgSid; + @ApiModelProperty(value = "使用组织名称") + private String useOrgName; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageQuery.java index 9204635b39..a38c169903 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageQuery.java @@ -11,6 +11,9 @@ public class AppBusDeliveredPageQuery implements Query { @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("机构sid") + private String orgPath; + @ApiModelProperty("客户名称") private String name; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java index 325e198a72..e28114354e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java @@ -17,6 +17,12 @@ public class AppDeliveredDetailsVo implements Vo { @ApiModelProperty("车型") private String model; + @ApiModelProperty("车型Sid") + private String modelSid; + + @ApiModelProperty("配置Sid") + private String configSid; + @ApiModelProperty("手机号") private String mobile; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java index 00d223bb4b..e878c1a1c4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java @@ -75,5 +75,8 @@ public class BusDelivered extends BaseEntity { private String address; @ApiModelProperty(value = "成交价") private String price; - + @ApiModelProperty(value = "使用组织sid") + private String useOrgSid; + @ApiModelProperty(value = "使用组织名称") + private String useOrgName; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java index 2c9bb8534e..91351d1e7f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java @@ -14,9 +14,17 @@ import java.util.List; public class AppDeliveredApplyInfoVo implements Vo { private static final long serialVersionUID = 1516492882330414001L; + private String sid; + @ApiModelProperty("合同id") private String contractNo; + @ApiModelProperty("车型Sid") + private String modelSid; + + @ApiModelProperty("配置Sid") + private String configSid; + @ApiModelProperty("车型") private String modelName; @@ -34,7 +42,7 @@ public class AppDeliveredApplyInfoVo implements Vo { private String terminalValue; @ApiModelProperty("是否为终端客户") - private String isTerminal; + private int isTerminal; @ApiModelProperty("备注") private String remarks; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java index 07e5954a99..d6d6811b42 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java @@ -12,6 +12,9 @@ public class AppDeliveredApplyPageQuery implements Query { @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("机构sid") + private String orgPath; + @ApiModelProperty("用户名称") private String name; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java new file mode 100644 index 0000000000..62a549db7e --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppSubmitDeliveredApplyDto extends AppDeliveredApplyDto { + private static final long serialVersionUID = -1742176484192196029L; + + @ApiModelProperty("意见") + private String comment; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java index bc720bd9e5..f39ef7570c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java @@ -60,6 +60,10 @@ public class BusDeliveredApply extends BaseEntity { private Date applyDate; // 申请日期 @ApiModelProperty("客户名称") private String name; // 客户名称 + @ApiModelProperty("车型Sid") + private String modelSid; + @ApiModelProperty("配置Sid") + private String configSid; @ApiModelProperty("车型别名") private String modelName; // 车型别名 @ApiModelProperty("是否是终端:1是，0不是") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index 4bfc51575e..66b7944f60 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -148,6 +148,11 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean submitDeliveredApply(@Valid @RequestBody SubmitDeliveredApplyDto dto); + @ApiOperation("App-提交车库移库审批流程") + @PostMapping("/submitAppDeliveredApply") + @ResponseBody + public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto); + @ApiOperation(value = "办理（同意）") @PostMapping("/complete") @ResponseBody diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index 4a1f02cfe2..ae270f63ba 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -105,6 +105,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean submitAppDeliveredApply(AppSubmitDeliveredApplyDto dto) { + return null; + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessage.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessage.java index 2624326612..7fe9797b6c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessage.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessage.java @@ -60,6 +60,12 @@ public class BusDeliveredUseMessage extends BaseEntity { private String mobile; // 联系电话 @ApiModelProperty("证件号码") private String idNo; // 证件号码 + @ApiModelProperty("县") + private String county; + @ApiModelProperty("市") + private String city; + @ApiModelProperty("省") + private String province; @ApiModelProperty("联系地址") private String address; // 联系地址 @ApiModelProperty(value = "出库申请sid") 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 0c05472768..b330bd3683 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 @@ -838,6 +838,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService { * @param qw * @return */ - IPage getRetrievalNotList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage getRetrievalNotList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); /** * 查询车架号 @@ -87,7 +87,7 @@ public interface BusDeliveredMapper extends BaseMapper { * @param contractNo * @return */ - List selVinListVo(String contractNo); + List selVinListVo(@Param("contractNo") String contractNo, @Param(Constants.WRAPPER) QueryWrapper qw); AppCarListVo getDeliveredPice(@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/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index 2799854741..46f9b0c34a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -35,19 +35,26 @@ resultType="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo"> SELECT * FROM bus_delivered bd - WHERE - bd.`state` = 1 - group by bd.contractNo ${ew.sqlSegment} + + and concat(IFNULL(bd.contractNo + , '') + , ifnull(bd.`name` + , '')) LIKE concat('%' + , #{name} + , '%') + + group by bd.contractNo diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index 65f14dbe8f..06800d46a1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -168,6 +168,11 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { return busDeliveredApplyService.submitDeliveredApply(dto); } + @Override + public ResultBean submitAppDeliveredApply(AppSubmitDeliveredApplyDto dto) { + return busDeliveredApplyService.submitAppDeliveredApply(dto); + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { BusinessVariables bv = new BusinessVariables(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 305a157ffb..707a8e3974 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -30,6 +30,10 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.commoncontract.CommonContract; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.buscenter.api.busdeliveredapply.*; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListDto; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; @@ -106,6 +110,10 @@ public class BusDeliveredApplyService extends MybatisBaseService getRetrievalApplyList(PagerQuery pagerQuery) { QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) { - qw.eq("name", pagerQuery.getParams().getName()); + String orgPath = pagerQuery.getParams().getOrgPath(); + String orgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + orgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); } + qw.eq("orgSid", orgSid); IPage page = PagerUtil.queryToPage(pagerQuery); - IPage iPage = baseMapper.getRetrievalApplyList(page, qw); + IPage iPage = baseMapper.getRetrievalApplyList(page, qw, pagerQuery.getParams().getName()); return iPage; } @@ -723,33 +736,46 @@ public class BusDeliveredApplyService extends MybatisBaseService carList = appDeliveredApplyDto.getCarList(); - if (carList.size() > 0) { - busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid()); - } //根据申请人sid查询分公司sid ResultBean stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(appDeliveredApplyDto.getUserSid()); if (stringResultBean.getSuccess()) { busDeliveredApply.setOrgSid(stringResultBean.getData()); } + if (carList.size() > 0) { + String vin = carList.get(0).getVin(); + baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vin, stringResultBean.getData()).getData(); + busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid()); + } busDeliveredApply.setApplySid(sysUserVo.getSid()); busDeliveredApply.setApplyName(sysUserVo.getName()); + busDeliveredApply.setModelSid(baseVehicle.getModelSid()); + busDeliveredApply.setConfigSid(baseVehicle.getModelConfigSid()); save(busDeliveredApply); } else { BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid); if (busDeliveredApply == null) { return rb.setMsg("该申请不存在"); } + BeanUtil.copyProperties(appDeliveredApplyDto, busDeliveredApply, "sid"); //删除 busDeliveredApplyDetailsService.deleteByApplySid(dtoSid); busDeliveredUseMessageService.deleteByApplySid(dtoSid); List carList = appDeliveredApplyDto.getCarList(); + //根据申请人sid查询分公司sid + ResultBean stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(appDeliveredApplyDto.getUserSid()); if (carList.size() > 0) { + String vin = carList.get(0).getVin(); + baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vin, stringResultBean.getData()).getData(); + busDeliveredApply.setModelSid(baseVehicle.getModelSid()); + busDeliveredApply.setConfigSid(baseVehicle.getModelConfigSid()); busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid()); } + updateById(busDeliveredApply); } return rb.success().setData(dtoSid); } @@ -760,24 +786,30 @@ public class BusDeliveredApplyService extends MybatisBaseService voList = busDeliveredApplyDetailsService.appDetailsList(sid); voList.removeAll(Collections.singleton(null)); if (!voList.isEmpty()) { for (AppCarListVo v : voList) { - CrmCustomerTempVo data = crmCustomerTempFeign.selByMobile(vo.getMobile()).getData(); - AppUseInfoVo appUseInfoVo = new AppUseInfoVo(); - appUseInfoVo.setMobile(data.getMobile()); - appUseInfoVo.setCustomer(data.getName()); - appUseInfoVo.setAddress(data.getAddress()); - appUseInfoVo.setIdNumber(data.getIDNumber()); + String contractNo = vo.getContractNo(); + CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData(); +// String customerSid = commonContract.getCustomerSid(); +// CrmCustomerTempVo data = crmCustomerTempFeign.fetchSid(customerSid).getData(); + AppUseInfoVo appUseInfoVo = null; +// if (data != null) { +// appUseInfoVo = new AppUseInfoVo(); +// appUseInfoVo.setMobile(data.getMobile()); +// appUseInfoVo.setCustomer(data.getName()); +// appUseInfoVo.setAddress(data.getAddress()); +// appUseInfoVo.setIdNumber(data.getIDNumber()); +// } v.setUseInfo(appUseInfoVo); } } vo.setCarList(voList); - } else if (vo.getIsTerminal().equals("0")) { + } else if (vo.getIsTerminal() == 0) { //根据出库申请单的sid查询需要出库的车辆信息 List voList = busDeliveredApplyDetailsService.appDetailsList(sid); for (int i = 0; i < voList.size(); i++) { @@ -787,13 +819,116 @@ public class BusDeliveredApplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid()); + int r = submitAppBusinessData(dto, busDeliveredApply); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + //新增修改保存 + ResultBean resultBean = saveRetrievalApplyInfo(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + String sid = resultBean.getData(); + //更改状态 + List stringList = busDeliveredApplyDetailsService.selectVinByApplySid(sid); + for (int i = 0; i < stringList.size(); i++) { + String vinNo = stringList.get(i); + busDeliveredService.updateState(vinNo, 0); + } + baseMapper.updateStateBySid(2, sid, DateUtil.date()); + String businessSid = resultBean.getData(); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值 + Map variables = BeanUtil.beanToMap(dto); + //若有网关，则赋值网关中判断的字段。 + variables.put("businessSid", businessSid); + //用户的部门全路径sid + bv.setOrgSidPath(orgSidPath); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(dto.getUserSid()); + bv.setFormVariables(variables); + //流程定义id + bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId()); + if (r == 1) { + ResultBean voResultBean = flowableFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + bv.setTaskId(busDeliveredApply.getTaskId()); + bv.setTaskDefKey(busDeliveredApply.getNodeId()); + bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } + + /** + * 判断提交的流程是否被允许 + * + * @param dto + * @return + */ + private synchronized int submitAppBusinessData(AppSubmitDeliveredApplyDto dto, BusDeliveredApply busDeliveredApply) { + int r = 0; + if (StringUtils.isBlank(dto.getSid())) { + r = 1; + } else { + if (busDeliveredApply != null) { + String businessTaskId = busDeliveredApply.getTaskId(); + if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { + //新提交 + r = 1; + } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { + //二次提交//只有数据一致的时候才能进行下一步 + r = 2; + } + } else { + r = 3; + } + + } + return r; + } + // public ResultBean getRetrievalDetail(String contractSid) { // ResultBean rb = ResultBean.fireFail(); // AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java index 83ad8a678f..50e5adf254 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java @@ -28,6 +28,12 @@ package com.yxt.anrui.buscenter.biz.busdeliveredapplydetails; 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.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListDto; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.anrui.buscenter.api.busdeliveredusemessage.AppUseInfoDto; @@ -61,6 +67,10 @@ import java.util.List; public class BusDeliveredApplyDetailsService extends MybatisBaseService { @Autowired private BusDeliveredUseMessageService busDeliveredUseMessageService; + @Autowired + private BaseVehicleFeign baseVehicleFeign; + @Autowired + private BaseVehicleTempstateFeign baseVehicleTempstateFeign; private QueryWrapper createQueryWrapper(BusDeliveredApplyDetailsQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -132,6 +142,9 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService FPAYBILLENTRYs=new ArrayList<>(); + List FPAYBILLENTRYs=new ArrayList<>();FRECTUNIT FPAYBILLENTRY fpaybillentry=new FPAYBILLENTRY(); fpaybillentry.setFSETTLETYPEID("02"); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index e80c535cd7..dba879f28c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -27,19 +27,23 @@ package com.yxt.anrui.fin.biz.finbillapplication; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AdCarListDto; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign; import com.yxt.anrui.fin.api.finbillapplication.*; import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery; @@ -703,6 +707,12 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -741,6 +751,14 @@ public class FinBillApplicationService extends MybatisBaseService variables = new HashMap<>(); bv.setFormVariables(variables); bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId()); + //查询业务信息 + FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); + //判断是否是高低开，若是，则isTrue网关参数为true=============添加 + String contractNo = finBillApplication.getContractNo(); + BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); + if (data != null) { + variables.put("isTrue", data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())); + } ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinBillNodeVo.class)).collect(Collectors.toList()); @@ -755,6 +773,14 @@ public class FinBillApplicationService extends MybatisBaseService variables = new HashMap<>(); bv.setFormVariables(variables); bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId()); + //查询业务信息 + FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); + //判断是否是高低开，若是，则isTrue网关参数为true=============添加 + String contractNo = finBillApplication.getContractNo(); + BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); + if (data != null) { + variables.put("isTrue", data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())); + } ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinBillNodeVo.class)).collect(Collectors.toList()); @@ -783,6 +809,12 @@ public class FinBillApplicationService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断是否是高低开，若是，则isTrue网关参数为true=============添加 + String contractNo = finBillApplication.getContractNo(); + BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); + if (data != null) { + variables.put("isTrue", data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())); + } flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { @@ -982,7 +1014,7 @@ public class FinBillApplicationService extends MybatisBaseService iPage = baseMapper.getInvoicedApplyList(page, qw,name); + IPage iPage = baseMapper.getInvoicedApplyList(page, qw, name); List records = iPage.getRecords(); for (AppBillApplicationPageVo record : records) { String createBySid = record.getCreateBySid(); @@ -1026,6 +1058,15 @@ public class FinBillApplicationService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 0e17f2591f..286b348c4f 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -49,7 +49,7 @@ public enum ProcDefEnum { FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试 ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22 BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试 - FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:1:862516"),//测试（新）2022、11、22 + FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:2:937504"),//测试（新）2022、11、22 BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java index 5c63a9ead0..4cf453160d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java @@ -73,4 +73,7 @@ public class BillApplicationIInfoVo implements Vo { @JsonProperty("contractSid") private String contractSid; + @ApiModelProperty("是否能填写开票价") + private Boolean canEdit; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java index ba28074423..1f71b58607 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java @@ -27,12 +27,21 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsQuery; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.SubmitRetrievalDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -115,4 +124,34 @@ public interface AppBusDeliveredApplyFeign { @DeleteMapping("/deleteRetrievalInfo") @ResponseBody public ResultBean deleteRetrievalInfo(@RequestParam("sid") String sid); + + @ApiOperation("提交流程") + @PostMapping("/submitRetrievalInfo") + @ResponseBody + ResultBean submitRetrievalInfo(@RequestBody SubmitRetrievalDto dto); + + @ApiOperation("办理") + @PutMapping("/agreeAdvanceInvoiceInfo") + @ResponseBody + ResultBean agreeRetrievalInfo(@RequestBody CompleteRetrievalDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectRetrievalInfo") + @ResponseBody + ResultBean rejectRetrievalInfo(@RequestBody RetrievalTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallRetrievalInfo") + @ResponseBody + ResultBean recallRetrievalInfo(@RequestBody RetrievalTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopRetrievalInfo") + @ResponseBody + ResultBean stopRetrievalInfo(@RequestBody RetrievalTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap RetrievalQuery query); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java index 6f62e857ce..707078f4b4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java @@ -27,6 +27,10 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsQuery; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.SubmitRetrievalDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -90,4 +94,34 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe public ResultBean deleteRetrievalInfo(String sid) { return null; } + + @Override + public ResultBean submitRetrievalInfo(SubmitRetrievalDto dto) { + return null; + } + + @Override + public ResultBean agreeRetrievalInfo(CompleteRetrievalDto dto) { + return null; + } + + @Override + public ResultBean rejectRetrievalInfo(RetrievalTaskQuery query) { + return null; + } + + @Override + public ResultBean recallRetrievalInfo(RetrievalTaskQuery query) { + return null; + } + + @Override + public ResultBean stopRetrievalInfo(RetrievalTaskQuery query) { + return null; + } + + @Override + public ResultBean getFlowOperateTitle(RetrievalQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListDto.java new file mode 100644 index 0000000000..e64530f180 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListDto.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CarListDto implements Dto { + private static final long serialVersionUID = 7232265575331329751L; + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("成交价") + private String price; + @ApiModelProperty("录入人信息") + private UseInfoDto useInfo; + @ApiModelProperty("车辆备注") + private String carRemarks; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java index 9db915cd7a..0f43f20bc7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java @@ -23,6 +23,12 @@ public class DeliveredApplyDetailsVo implements Vo { @JsonProperty("model") private String modelName; + @ApiModelProperty("车型Sid") + private String modelSid; + + @ApiModelProperty("配置Sid") + private String configSid; + @ApiModelProperty("申请日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonProperty("date") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java index c2cf3308a8..3ec04f9b2e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java @@ -13,6 +13,9 @@ public class DeliveredApplyDto implements Dto { private static final long serialVersionUID = 1435828778500563915L; + @ApiModelProperty("记录sid") + private String sid; + @ApiModelProperty("合同id") @JsonProperty("contractId") private String contractNo; @@ -44,7 +47,7 @@ public class DeliveredApplyDto implements Dto { private String remarks; @ApiModelProperty("车辆集合") - private List carList; + private List carList; @ApiModelProperty("用户sid") @JsonProperty("userSid") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyInfoVo.java index ec510a42bd..fb53285d88 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyInfoVo.java @@ -14,10 +14,18 @@ import java.util.List; public class DeliveredApplyInfoVo implements Vo { private static final long serialVersionUID = 3238349626312645201L; + private String sid; + @ApiModelProperty("合同id") @JsonProperty("contractId") private String contractNo; + @ApiModelProperty("车型Sid") + private String modelSid; + + @ApiModelProperty("配置Sid") + private String configSid; + @ApiModelProperty("车型") @JsonProperty("model") private String modelName; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java index 19b6c937d8..4b7a813600 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyPageQuery.java @@ -11,6 +11,9 @@ public class DeliveredApplyPageQuery implements Query { @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("机构sid") + private String orgPath; + @ApiModelProperty("用户名称") private String name; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java index f6d05009ab..f4e90698a3 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java @@ -18,6 +18,12 @@ public class DeliveredDetailsVo implements Vo { @ApiModelProperty("车型") private String model; + @ApiModelProperty("车型Sid") + private String modelSid; + + @ApiModelProperty("配置Sid") + private String configSid; + @ApiModelProperty("手机号") private String mobile; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java index ea66db1d4c..b1c0784962 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java @@ -11,6 +11,9 @@ public class DeliveredPageQuery implements Query { @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("机构sid") + private String orgPath; + @ApiModelProperty("客户名称") private String name; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/UseInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/UseInfoDto.java new file mode 100644 index 0000000000..5fb0f71014 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/UseInfoDto.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class UseInfoDto implements Dto { + private static final long serialVersionUID = -2622215767931928713L; + + @ApiModelProperty("使用人名称") + private String customer; + @ApiModelProperty("证件号码") + private String idNumber; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("详细地址") + private String address; + @ApiModelProperty("定位") + private String location; + @ApiModelProperty("县") + private String county; + @ApiModelProperty("市") + private String city; + @ApiModelProperty("省") + private String province; + @ApiModelProperty("区域代码") + private String code; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/CompleteRetrievalDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/CompleteRetrievalDto.java new file mode 100644 index 0000000000..ae7ad7c6c5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/CompleteRetrievalDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class CompleteRetrievalDto implements Dto { + private static final long serialVersionUID = -1634177638238174363L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/RetrievalQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/RetrievalQuery.java new file mode 100644 index 0000000000..2ff95a022a --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/RetrievalQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class RetrievalQuery implements Query { + private static final long serialVersionUID = -5879668616710833830L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/RetrievalTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/RetrievalTaskQuery.java new file mode 100644 index 0000000000..dc0ba723c8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/RetrievalTaskQuery.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class RetrievalTaskQuery implements Query { + private static final long serialVersionUID = -6061453269533691015L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java new file mode 100644 index 0000000000..0f9ec209a1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.autoservice.retrieval.DeliveredApplyDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class SubmitRetrievalDto extends DeliveredApplyDto { + private static final long serialVersionUID = -471108222247151552L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java index 3f12e7696f..e9e09f7c1f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java @@ -28,6 +28,10 @@ package com.yxt.anrui.terminal.biz.autoservice.retrieval; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsQuery; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; import com.yxt.anrui.terminal.api.autoservice.retrieval.*; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.SubmitRetrievalDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -99,4 +103,34 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign { public ResultBean deleteRetrievalInfo(String sid) { return appBusDeliveredApplyService.deleteRetrievalInfo(sid); } + + @Override + public ResultBean submitRetrievalInfo(SubmitRetrievalDto dto) { + return appBusDeliveredApplyService.submitRetrievalInfo(dto); + } + + @Override + public ResultBean agreeRetrievalInfo(CompleteRetrievalDto dto) { + return appBusDeliveredApplyService.agreeRetrievalInfo(dto); + } + + @Override + public ResultBean rejectRetrievalInfo(RetrievalTaskQuery query) { + return appBusDeliveredApplyService.rejectRetrievalInfo(query); + } + + @Override + public ResultBean recallRetrievalInfo(RetrievalTaskQuery query) { + return appBusDeliveredApplyService.recallRetrievalInfo(query); + } + + @Override + public ResultBean stopRetrievalInfo(RetrievalTaskQuery query) { + return appBusDeliveredApplyService.stopRetrievalInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(RetrievalQuery query) { + return appBusDeliveredApplyService.getFlowOperateTitle(query); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index 4b11ece930..d1027d10eb 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -30,12 +30,15 @@ import com.yxt.anrui.buscenter.api.busdelivered.*; import com.yxt.anrui.buscenter.api.busdeliveredapply.*; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign; -import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageQuery; -import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.terminal.api.autoservice.retrieval.*; -import com.yxt.anrui.terminal.api.supplychain.inspection.StayPatrolinspectionPageVo; -import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionInfoVo; -import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionPageVo; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery; +import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.SubmitRetrievalDto; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -44,6 +47,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; @@ -72,6 +76,12 @@ public class AppBusDeliveredApplyService { @Autowired BusDeliveredApplyDetailsFeign busDeliveredApplyDetailsFeign; + @Autowired + private SysUserFeign sysUserFeign; + + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + public ResultBean> getRetrievalNotList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); @@ -108,6 +118,7 @@ public class AppBusDeliveredApplyService { } AppDeliveredApplyInfoVo appDeliveredApplyInfoVo = resultBean.getData(); BeanUtil.copyProperties(appDeliveredApplyInfoVo, vo); + vo.setSid(sid); return rb.success().setData(vo); } @@ -143,4 +154,101 @@ public class AppBusDeliveredApplyService { ResultBean resultBean = busDeliveredApplyFeign.delBySids(sids); return resultBean; } + + public ResultBean submitRetrievalInfo(SubmitRetrievalDto dto) { + ResultBean rb = ResultBean.fireFail(); + AppSubmitDeliveredApplyDto submitDeliveredApplyDto = new AppSubmitDeliveredApplyDto(); + BeanUtil.copyProperties(dto, submitDeliveredApplyDto); + ResultBean resultBean = busDeliveredApplyFeign.submitAppDeliveredApply(submitDeliveredApplyDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean agreeRetrievalInfo(CompleteRetrievalDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + BusDeliveredApplyCompleteDto deliveredApplyCompleteDto = new BusDeliveredApplyCompleteDto(); + BeanUtil.copyProperties(dto, deliveredApplyCompleteDto); + deliveredApplyCompleteDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = busDeliveredApplyFeign.complete(deliveredApplyCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectRetrievalInfo(RetrievalTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BusDeliveredApplyTaskQuery taskQuery = new BusDeliveredApplyTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = busDeliveredApplyFeign.taskReject(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallRetrievalInfo(RetrievalTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BusDeliveredApplyTaskQuery taskQuery = new BusDeliveredApplyTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = busDeliveredApplyFeign.revokeProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopRetrievalInfo(RetrievalTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BusDeliveredApplyTaskQuery taskQuery = new BusDeliveredApplyTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = busDeliveredApplyFeign.breakProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(RetrievalQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + GetNodeQuery getNodeQuery = new GetNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = busDeliveredApplyFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = busDeliveredApplyFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } } \ No newline at end of file diff --git a/doc/databases/bus_handover_tables.sql b/doc/databases/bus_handover_tables.sql new file mode 100644 index 0000000000..6d93c182c0 --- /dev/null +++ b/doc/databases/bus_handover_tables.sql @@ -0,0 +1,96 @@ +-- 交车准备-申请表 +DROP TABLE IF EXISTS `bus_handover_prepare`; +CREATE TABLE `bus_handover_prepare` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `contractNo` varchar(64) DEFAULT NULL COMMENT '合同编号', + `customerName` varchar(64) DEFAULT NULL COMMENT '客户名称', + `mobile` varchar(64) DEFAULT NULL COMMENT '联系电话', + `brandName` varchar(64) DEFAULT NULL COMMENT '品牌', + `num` varchar(64) DEFAULT NULL COMMENT '车辆数量', + `model` varchar(64) DEFAULT NULL COMMENT '车型', + `payTypeKey` varchar(64) DEFAULT NULL COMMENT '付款方式key', + `payType` varchar(64) DEFAULT NULL COMMENT '付款方式value', + `handoverPrepareStateKey` varchar(64) DEFAULT NULL COMMENT '交车准备状态key', + `handoverPrepareState` varchar(64) DEFAULT NULL COMMENT '交车准备状态value', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid', + `createOrgName` varchar(64) DEFAULT NULL COMMENT '创建组织名称', + `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '使用组织名称', + PRIMARY KEY (`id`) USING BTREE, + KEY `id` (`id`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8 + ROW_FORMAT = DYNAMIC COMMENT ='交车准备-申请表'; + +-- 交车准备-申请车辆表 +DROP TABLE IF EXISTS `bus_handover_prepare_vehicle`; +CREATE TABLE `bus_handover_prepare_vehicle` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `mainSid` varchar(64) DEFAULT NULL COMMENT '交车申请表sid', + `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', + `invoicingState` varchar(64) DEFAULT NULL COMMENT '开票状态', + `certificateState` varchar(64) DEFAULT NULL COMMENT '合格证状态', + `policyState` varchar(64) DEFAULT NULL COMMENT '保单状态', + `onBoardDataState` varchar(64) DEFAULT NULL COMMENT '随车资料状态', + `otherDataState` varchar(64) DEFAULT NULL COMMENT '其他资料状态', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid', + `createOrgName` varchar(64) DEFAULT NULL COMMENT '创建组织名称', + `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '使用组织名称', + + PRIMARY KEY (`id`) USING BTREE, + KEY `id` (`id`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8 + ROW_FORMAT = DYNAMIC COMMENT ='交车准备-申请表'; + +-- 交车准备-附件表 +DROP TABLE IF EXISTS `bus_handover_file`; +CREATE TABLE `bus_handover_file` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `fileName` VARCHAR(64) DEFAULT NULL COMMENT '文件名', + `fileType` VARCHAR(64) DEFAULT NULL COMMENT '文件类型', + `name` VARCHAR(64) DEFAULT NULL COMMENT '上传人', + `linkSid` VARCHAR(64) DEFAULT NULL COMMENT '交车单sid', + `attachType` VARCHAR(64) DEFAULT NULL COMMENT '附件类型', + `fileSize` int DEFAULT NULL COMMENT '文件大小', + `filePath` VARCHAR(255) DEFAULT NULL COMMENT '文件的路径', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='交车单-交车照片'; + +