From d3bd0a78aaaaa9664e4643cf107bb7c7cf124d6e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 14 May 2022 17:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E8=81=94=E8=B0=83=E3=80=82=20=E5=A4=96=E9=87=87?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=81=E7=A8=8B=E6=96=B0=E5=A2=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9Edata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basedistributor/BaseDistributorDto.java | 5 ++++- .../BaseOutsourcingApplication.java | 3 +++ .../BaseOutsourcingApplicationDto.java | 3 +++ .../BaseOutsourcingApplicationFeign.java | 4 ++-- .../BaseOutsourcingApplicationFeignFallback.java | 2 +- .../BaseDistributorLegalMapper.java | 2 +- .../BaseDistributorLegalRest.java | 15 ++++++++++----- .../BaseDistributorLegalService.java | 2 +- .../BaseDistributorPersonService.java | 1 + .../BaseDistributorStaffMapper.java | 2 +- .../BaseOutsourcingApplicationRest.java | 4 ++-- .../BaseOutsourcingApplicationService.java | 14 +++++++++----- .../base/biz/basevehicle/BaseVehicleService.java | 8 ++++---- .../api/sysformlink/SysFormLinkTypeEnum.java | 1 + 14 files changed, 43 insertions(+), 23 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java index 7bb889adb6..ff35ccccb5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorDto.java @@ -39,8 +39,11 @@ public class BaseDistributorDto implements Dto { @ApiModelProperty("经销商类型Value值") private String distributorTypeValue; - @ApiModelProperty("经销商等级（陕汽必须字段）") + @ApiModelProperty("经销商等级key（陕汽必须字段）") private String distributorLevel; + + @ApiModelProperty("经销商等级value（陕汽必须字段）") + private String distributorLevelValue; @ApiModelProperty("证书号码（法人为统一社会信用代码/个人为身份证号）（陕汽必须字段）") private String numCode; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java index 2b0c8b3086..1c978f31a7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java @@ -97,4 +97,7 @@ public class BaseOutsourcingApplication extends BaseEntity { @ApiModelProperty(value = "节点状态") private String nodeState; + + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java index 630570b327..a6b3b6eed8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java @@ -104,6 +104,9 @@ public class BaseOutsourcingApplicationDto implements Dto { @ApiModelProperty(value = "节点状态") private String nodeState; + + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid @ApiModelProperty("外采车辆列表") private List baseOutsourcingApplicationVehicleDtos; // 外采车辆列表 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java index 51f3cc1153..591422fc2d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java @@ -80,11 +80,11 @@ public interface BaseOutsourcingApplicationFeign { @ApiOperation("政策外采车辆选择列表") @GetMapping("/fetchVehicle") - public ResultBean fetchVehicle(@RequestParam("vehicleSid") String vehicleSid); + public ResultBean fetchVehicle(@RequestParam("vehicleSid") String vehicleSid,@RequestParam("modelSid") String modelSid); /*************************流程审批**************************/ - @ApiOperation("提交盖章申请审批流程") + @ApiOperation("提交外采申请审批流程") @PostMapping("/submitBaseOutSourcingApplication") public ResultBean submitBaseOutSourcingApplication(@RequestBody @Valid SubmitBaseOutSourcingApplicationDto dto); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java index 0b64b431b6..7137bf3072 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java @@ -73,7 +73,7 @@ public class BaseOutsourcingApplicationFeignFallback implements BaseOutsourcingA } @Override - public ResultBean fetchVehicle(String vehicleSid) { + public ResultBean fetchVehicle(String vehicleSid,String modelSid) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.java index 17dcaeae34..58b8c5ac7c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegal; import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.Map; @@ -41,5 +42,4 @@ public interface BaseDistributorLegalMapper extends BaseMapper baseDistributorAppendixVos = baseDistributorAppendixService.selByLinkSid(sid); List baseDistributorBankVos = baseDistributorBankService.selByDistributorSid(sid); - List baseDistributorStaffVos = baseDistributorStaffService.selbyDistributorSid(sid); + List baseDistributorStaffVos = baseDistributorStaffService.selbyDistributorSid(baseDistributorLegalVo.getSid()); baseDistributorLegalVo.setBaseDistributorAppendixs(baseDistributorAppendixVos); baseDistributorLegalVo.setBaseDistributorBanks(baseDistributorBankVos); baseDistributorLegalVo.setList(baseDistributorStaffVos); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java index 068252a9ae..cd3e0ea0e7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java @@ -163,6 +163,7 @@ public class BaseDistributorPersonService extends MybatisBaseService selectBySid(String sid); - @Select("select * from base_distributor_staff where distributorSid = #{sid}") + @Select("select * from base_distributor_staff where distributorSid = #{sid} AND isDelete = 0") List selbyDistributorSid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java index 607025fa6a..1bbe2cae30 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java @@ -94,8 +94,8 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio } @Override - public ResultBean fetchVehicle(String vehicleSid) { - return baseVehicleService.fetchVehicle(vehicleSid); + public ResultBean fetchVehicle(String vehicleSid,String modelSid) { + return baseVehicleService.fetchVehicle(vehicleSid,modelSid); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index f4a606e1ee..38095be086 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -115,6 +115,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService map = (Map) resultBean1.getData(); //更新业务表中的流程状态 Map paramMap = new HashMap<>(); paramMap.put("sid", businessSid); - paramMap.put("procDefId", ProcDefEnum.SEALAPPLY.getProDefId()); + paramMap.put("procDefId", ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId()); paramMap.put("nodeState", map.get("nodeState")); paramMap.put("procInsId", map.get("procInsId")); paramMap.put("taskDefKey", map.get("taskDefKey")); @@ -461,4 +464,5 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService fetchVehicle(String vehicleSid) { + public ResultBean fetchVehicle(String vehicleSid,String modelSid) { ResultBean rb = ResultBean.fireFail(); - QueryWrapper qw = vehicleActualWrapper1(vehicleSid); + QueryWrapper qw = vehicleActualWrapper1(vehicleSid,modelSid); BaseVehicleVo baseVehicleVo = baseMapper.fetchVehicle(qw); return rb.success().setData(baseVehicleVo); } - private QueryWrapper vehicleActualWrapper1(String vehicleSid) { + private QueryWrapper vehicleActualWrapper1(String vehicleSid,String modelSid) { QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(vehicleSid)){ @@ -1191,7 +1191,7 @@ public class BaseVehicleService extends MybatisBaseService