From b5013c515191a38902c6d4711444eafff0311ddf Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 13 May 2022 11:38:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=E3=80=82=20=E5=A4=96?= =?UTF-8?q?=E9=87=87=E7=AE=A1=E7=90=86=E6=B5=81=E7=A8=8B=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=97=E8=A1=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAffiliatCompanyDetailsVo.java | 3 + .../BaseDistributorLegalDto.java | 9 + .../BaseDistributorLegalVo.java | 109 +++++++++ .../BaseDistributorPersonDto.java | 11 + .../BaseDistributorPersonVo.java | 80 ++++++ .../BaseOutsourcingApplication.java | 9 + .../BaseOutsourcingApplicationDto.java | 11 + .../BaseOutsourcingApplicationFeign.java | 43 ++++ ...seOutsourcingApplicationFeignFallback.java | 38 +++ .../BaseOutsourcingApplicationQuery.java | 4 +- .../SubmitBaseOutSourcingApplicationDto.java | 28 +++ .../anrui/base/api/flow/AppFlowRecordVo.java | 43 ++++ .../anrui/base/api/flow/AppFlowTaskQuery.java | 28 +++ .../anrui/base/api/flow/FlowCommentDto.java | 40 +++ .../com/yxt/anrui/base/api/flow/FlowTask.java | 98 ++++++++ .../anrui/base/api/flow/FlowTaskQuery.java | 23 ++ .../yxt/anrui/base/api/flow/FlowTaskVo.java | 51 ++++ .../com/yxt/anrui/base/api/flow/Flowable.java | 7 - .../anrui/base/api/flow/FlowableFallback.java | 43 ++++ .../anrui/base/api/flow/FlowableFeign.java | 76 ++++++ .../yxt/anrui/base/api/flow/TaskQuery.java | 90 +++++++ .../basedistributor/BaseDistributorRest.java | 12 +- .../BaseDistributorAppendixMapper.java | 10 +- .../BaseDistributorAppendixService.java | 8 + .../BaseDistributorBankMapper.java | 11 +- .../BaseDistributorBankService.java | 8 + .../BaseDistributorLegalMapper.java | 3 +- .../BaseDistributorLegalMapper.xml | 2 +- .../BaseDistributorLegalRest.java | 73 +++++- .../BaseDistributorLegalService.java | 3 +- .../BaseDistributorPersonMapper.java | 3 +- .../BaseDistributorPersonMapper.xml | 2 +- .../BaseDistributorPersonRest.java | 63 +---- .../BaseDistributorPersonService.java | 148 +++++++++++- .../BaseOutsourcingApplicationMapper.java | 3 + .../BaseOutsourcingApplicationMapper.xml | 12 + .../BaseOutsourcingApplicationRest.java | 41 ++++ .../BaseOutsourcingApplicationService.java | 227 +++++++++++++++++- .../biz/basevehicle/BaseVehicleMapper.java | 4 +- .../biz/basevehicle/BaseVehicleMapper.xml | 5 + .../biz/basevehicle/BaseVehicleService.java | 41 ++-- .../anrui/flowable/api/utils/ProcDefEnum.java | 1 + .../api/sysstafforg/SysStaffOrgFeign.java | 5 + .../sysstafforg/SysStaffOrgFeignFallback.java | 5 + .../anrui/portal/api/sysuser/SysUserVo.java | 4 + .../biz/sysstafforg/SysStaffOrgMapper.java | 3 + .../biz/sysstafforg/SysStaffOrgRest.java | 10 +- .../biz/sysstafforg/SysStaffOrgService.java | 6 + .../portal/biz/sysuser/SysUserService.java | 7 + 49 files changed, 1449 insertions(+), 115 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/SubmitBaseOutSourcingApplicationDto.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowRecordVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowTaskQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowCommentDto.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTask.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFallback.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFeign.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/TaskQuery.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyDetailsVo.java index 90d85df246..bb3a03052d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyDetailsVo.java @@ -16,6 +16,9 @@ import java.util.List; @Data public class BaseAffiliatCompanyDetailsVo implements Vo { private static final long serialVersionUID = 1294843919462746225L; + + @ApiModelProperty("sid") + private String sid; @ApiModelProperty("单位名称") private String orgName; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java index 2537092188..7b2e996eff 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java @@ -2,6 +2,8 @@ package com.yxt.anrui.base.api.basedistributorlegal; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto; +import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankDto; import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff; import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto; import com.yxt.common.core.dto.Dto; @@ -33,6 +35,9 @@ public class BaseDistributorLegalDto implements Dto { private static final long serialVersionUID = 7039517493269003427L; //以下是基础表字段 + @ApiModelProperty(value = "userSid", required = true) + @NotBlank(message = "userSid不能为空") + private String userSid; @ApiModelProperty(value = "经销商名称", required = true) @NotBlank(message = "经销商名称不能为空") @@ -140,4 +145,8 @@ public class BaseDistributorLegalDto implements Dto { @ApiModelProperty("人员list") private List list; + @ApiModelProperty(value = "备案资料") + private List baseDistributorAppendixs; + @ApiModelProperty(value = "备案账号") + private List baseDistributorBanks; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java new file mode 100644 index 0000000000..7eadee852f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java @@ -0,0 +1,109 @@ +package com.yxt.anrui.base.api.basedistributorlegal; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo; +import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo; +import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; + +@Data +public class BaseDistributorLegalVo implements Vo { + + @ApiModelProperty(value = "经销商名称") + private String distributorName; + + @ApiModelProperty(value = "经销商类型key值") + private String distributorType; + + @ApiModelProperty(value = "经销商类型value值") + private String distributorTypeValue; + + @ApiModelProperty(value = "经销商等级key值") + private String distributorLevel; + + @ApiModelProperty(value = "经销商等级value值") + private String distributorLevelValue; + + @ApiModelProperty(value = "证书号码") + private String numCode; + + @ApiModelProperty(value = "联系电话") + private String businessMobile; + + @ApiModelProperty(value = "通讯地址邮编") + private String zipCode; + + @ApiModelProperty(value = "使用组织") + private String useOrg; + @ApiModelProperty(value = "使用组织Name") + private String useOrgName; + + @ApiModelProperty(value = "经销商分类key值") + private String distributorClassification; + + @ApiModelProperty(value = "经销商分类value值") + private String distributorClassificationValue; + + //以下是法人表字段 + + @ApiModelProperty(value = "企业性质") + private String enterpriseNature; + + @ApiModelProperty(value = "注册资本") + private String registeredCapital; + + @ApiModelProperty(value = "注册资本单位（万元/美元）") + private String registeredCapitalOrg; + + @ApiModelProperty(value = "成立日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @NotNull(message = "成立日期不能为空") + private Date setUpTime; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "营业期限开始时间") + @NotNull(message = "营业期限开始时间不能为空") + private Date businessTermStartTime; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "营业期限结束时间") + @NotNull(message = "营业期限结束时间不能为空") + private Date businessTermEndTime; + + @ApiModelProperty(value = "登记机关") + private String registAuthority; + + @ApiModelProperty(value = "核准日期") + private String approvalDate; + + @ApiModelProperty(value = "登记状态") + private String registState; + + @ApiModelProperty(value = "是否担保回购 是:1 否:2") + private String guaranteeOrNot; + + @ApiModelProperty(value = "业务联系人") + private String businessContact; + + @ApiModelProperty(value = "企业负责人") + private String enterpriseContact; + + @ApiModelProperty(value = "联系方式") + private String enterpriseMobile; + + @ApiModelProperty(value = "备注") + private String remarks; + + @ApiModelProperty("人员list") + private List list; + @ApiModelProperty(value = "备案资料") + private List baseDistributorAppendixs; + @ApiModelProperty(value = "备案账号") + private List baseDistributorBanks; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonDto.java index 8d9e13c1fa..d3cbec2daa 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonDto.java @@ -1,12 +1,15 @@ package com.yxt.anrui.base.api.basedistributorperson; +import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto; +import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.List; /** * Project: anrui-base(安瑞基础信息模块)
@@ -26,6 +29,9 @@ import javax.validation.constraints.NotBlank; public class BaseDistributorPersonDto implements Dto { private static final long serialVersionUID = -5720096918135139457L; + @ApiModelProperty(value = "userSid", required = true) + @NotBlank(message = "userSid不能为空") + private String userSid; //以下为基础表的字段 @ApiModelProperty(value = "姓名", required = true) @NotBlank(message = "姓名不能为空") @@ -97,4 +103,9 @@ public class BaseDistributorPersonDto implements Dto { @ApiModelProperty(value = "备注", required = true) private String remarks; + + @ApiModelProperty(value = "备案资料") + private List baseDistributorAppendixs; + @ApiModelProperty(value = "备案账号") + private List baseDistributorBanks; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java new file mode 100644 index 0000000000..3033f1e734 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java @@ -0,0 +1,80 @@ +package com.yxt.anrui.base.api.basedistributorperson; + +import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo; +import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class BaseDistributorPersonVo implements Vo { + + @ApiModelProperty("经销商sid（陕汽必须字段）") + private String distributorSid; + + //以下为基础表的字段 + @ApiModelProperty(value = "姓名") + private String distributorName; + + @ApiModelProperty(value = "经销商类型key值") + private String distributorType; + + @ApiModelProperty(value = "经销商类型value值") + private String distributorTypeValue; + + @ApiModelProperty(value = "身份证号") + private String numCode; + + @ApiModelProperty(value = "联系电话") + private String businessMobile; + + @ApiModelProperty(value = "通讯地址") + private String address; + + @ApiModelProperty(value = "通讯地址邮编") + private String zipCode; + + @ApiModelProperty("经销商等级key值") + private String distributorLevel; + @ApiModelProperty("经销商等级value值") + private String distributorLevelValue; + + @ApiModelProperty(value = "经销商分类") + private String distributorClassification; + + @ApiModelProperty(value = "经销商分类value") + private String distributorClassificationValue; + + //以下为个人表的字段 + @ApiModelProperty(value = "项目类型") + private String projectType; + @ApiModelProperty(value = "项目类型Value值") + private String projectTypeValue; + + @ApiModelProperty(value = "区域-省") + private String province; + + @ApiModelProperty(value = "区域-市") + private String city; + + @ApiModelProperty(value = "区域-县区") + private String county; + + @ApiModelProperty(value = "省市县Code值") + private String addressCode; + + @ApiModelProperty(value = "经销商品牌") + private String distributorBrand; + + @ApiModelProperty(value = "所属厂商") + private String belongsToVendor; + + @ApiModelProperty(value = "备注") + private String remarks; + @ApiModelProperty(value = "备案资料") + private List baseDistributorAppendixs; + @ApiModelProperty(value = "备案账号") + private List baseDistributorBanks; +} 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 878aec321e..2b0c8b3086 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 @@ -88,4 +88,13 @@ public class BaseOutsourcingApplication extends BaseEntity { private BigDecimal totalExpenseAmount; // 费用金额合计 @ApiModelProperty("部门sid") private String orgSid; // 部门sid + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程实例的sid") + private String procInstSid; + + @ApiModelProperty(value = "节点状态") + private String nodeState; } 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 64cf84f937..630570b327 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 @@ -57,6 +57,8 @@ public class BaseOutsourcingApplicationDto implements Dto { private String sid; // 申请编号 @ApiModelProperty("用户sid") private String userSid; // 用户sid + @ApiModelProperty("业务员sid") + private String staffSid; // 业务员sid @ApiModelProperty("申请编号") private String applicationCode; // 申请编号 @ApiModelProperty("申请人姓名") @@ -93,6 +95,15 @@ public class BaseOutsourcingApplicationDto implements Dto { private String totalExpenseAmount; // 费用金额合计 @ApiModelProperty("部门sid") private String orgSid; // 部门sid + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程实例的sid") + private String procInstSid; + + @ApiModelProperty(value = "节点状态") + private String nodeState; @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 3cbbd780c5..51f3cc1153 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 @@ -25,15 +25,21 @@ *********************************************************/ package com.yxt.anrui.base.api.baseoutsourcingapplication; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; +import com.yxt.anrui.base.api.flow.FlowTaskVo; 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 io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; +import java.util.Map; /** * Project: anrui-base(外采管理)
@@ -71,4 +77,41 @@ public interface BaseOutsourcingApplicationFeign { @ApiOperation("编辑回显和详情") @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); + + @ApiOperation("政策外采车辆选择列表") + @GetMapping("/fetchVehicle") + public ResultBean fetchVehicle(@RequestParam("vehicleSid") String vehicleSid); + + /*************************流程审批**************************/ + + @ApiOperation("提交盖章申请审批流程") + @PostMapping("/submitBaseOutSourcingApplication") + public ResultBean submitBaseOutSourcingApplication(@RequestBody @Valid SubmitBaseOutSourcingApplicationDto dto); + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@ApiParam(value = "变量集合,json对象") @RequestBody Map variables); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess/{userSid}/{businessSid}") + public ResultBean revokeProcess( + @ApiParam(value = "用户sid") @PathVariable(value = "userSid")String userSid, + @ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid, + @ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo) ; + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject/{businessSid}") + public ResultBean taskReject(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid, + @ApiParam(value = "工作流任务相关--请求参数")@RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess/{businessSid}") + public ResultBean breakProcess(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid, + @RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "流程历史流转记录" ) + @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") + public ResultBean flowRecord( @ApiParam(value = "流程实例id")@PathVariable(value = "procInsId")String procInsId, + @ApiParam(value = "目前没用")@PathVariable(value = "deployId")String deployId); + } \ No newline at end of file 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 754b91c0a4..0b64b431b6 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 @@ -25,12 +25,15 @@ *********************************************************/ package com.yxt.anrui.base.api.baseoutsourcingapplication; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; +import com.yxt.anrui.base.api.flow.FlowTaskVo; 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; +import java.util.Map; /** * Project: anrui-base(外采管理)
@@ -69,4 +72,39 @@ public class BaseOutsourcingApplicationFeignFallback implements BaseOutsourcingA return null; } + @Override + public ResultBean fetchVehicle(String vehicleSid) { + return null; + } + + @Override + public ResultBean submitBaseOutSourcingApplication(SubmitBaseOutSourcingApplicationDto dto) { + return null; + } + + @Override + public ResultBean complete(Map variables) { + return null; + } + + @Override + public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean taskReject(String businessSid, FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean flowRecord(String procInsId, String deployId) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java index f21ef7b617..961802e4ee 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java @@ -53,6 +53,6 @@ public class BaseOutsourcingApplicationQuery implements Query { private String applicationStartDate; // 申请日期开始日期 @ApiModelProperty("申请日期结束日期") private String applicationEndDate; // 申请日期结束日期 - @ApiModelProperty("车型sid") - private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/SubmitBaseOutSourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/SubmitBaseOutSourcingApplicationDto.java new file mode 100644 index 0000000000..c06b0c50cc --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/SubmitBaseOutSourcingApplicationDto.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.base.api.baseoutsourcingapplication; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuguohui + * @version 1.0 + * @description + * @date 2022/04/13 + */ +@ApiModel("提交") +@Data +public class SubmitBaseOutSourcingApplicationDto extends BaseOutsourcingApplicationDto{ + + @ApiModelProperty("业务sid") + private String businessSid; + + @ApiModelProperty("意见") + private String comment; + + @ApiModelProperty("流程实例id") + private String instanceId; + + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowRecordVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowRecordVo.java new file mode 100644 index 0000000000..afee4c7cb8 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowRecordVo.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.base.api.flow; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/12/27 + */ +@Data +@ApiModel("手机端审批流程") +public class AppFlowRecordVo implements Vo { + + @ApiModelProperty(value = "任务名称") + private String taskName; + + @ApiModelProperty(value = "任务执行人名称") + private String assigneeName; + + @ApiModelProperty("任务执行人头像") + private String assigneeHeadImage; + + @ApiModelProperty("任务创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + + @ApiModelProperty("任务完成时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String finishTime; + + @ApiModelProperty("任务耗时") + private String duration; + + @ApiModelProperty("意见类别 1正常（同意）意见 2退回意见 3 驳回意见 4 委派意见 5 转办意见 6 终止流程 7 撤回流程") + private String type; + + @ApiModelProperty("意见内容") + private String comment; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowTaskQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowTaskQuery.java new file mode 100644 index 0000000000..d4c3503b9e --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/AppFlowTaskQuery.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.base.api.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description + * @Author liuguohui + * @Date 2021/12/27 + */ +@Data +@ApiModel("手机端查询待办订单任务详情") +public class AppFlowTaskQuery implements Query { + + @ApiModelProperty(value = "订单sid", required = true) + @NotBlank(message = "订单sid不能为空") + private String orderSid; + + @ApiModelProperty(value = "流程实例ID") + private String procInsId; + + @ApiModelProperty(value = "流程部署编号") + private String deployId; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowCommentDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowCommentDto.java new file mode 100644 index 0000000000..4c9e90e211 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowCommentDto.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.base.api.flow; + +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author XuanXuan + * @date 2021/3/28 15:50 + */ +@Data +@Builder +/*@NoArgsConstructor +@AllArgsConstructor*/ +public class FlowCommentDto implements Serializable { + public FlowCommentDto() { + } + + public FlowCommentDto(String type, String comment) { + this.type = type; + this.comment = comment; + } + + /** + * + */ + private static final long serialVersionUID = 1929734226858491967L; + + /** + * 意见类别 1正常（同意）意见 2退回意见 3 驳回意见 4 委派意见 5 转办意见 6 终止流程 7 撤回流程 + */ + private String type; + + /** + * 意见内容 + */ + private String comment; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTask.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTask.java new file mode 100644 index 0000000000..2d51f87b31 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTask.java @@ -0,0 +1,98 @@ +package com.yxt.anrui.base.api.flow; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + *

工作流任务

+ * + * @author XuanXuan + * @date 2021-04-03 + */ +@ApiModel("工作流任务相关-返回参数") +@Data +public class FlowTask extends BaseEntity implements Serializable { + + @ApiModelProperty("任务编号") + private String taskId; + + @ApiModelProperty("任务名称") + private String taskName; + + @ApiModelProperty("任务Key") + private String taskDefKey; + + @ApiModelProperty("任务执行人Id") + private Long assigneeId; + + @ApiModelProperty("部门名称") + private String deptName; + + @ApiModelProperty("流程发起人部门名称") + private String startDeptName; + + @ApiModelProperty("任务执行人名称") + private String assigneeName; + + @ApiModelProperty("任务执行人头像") + private String assigneeHeadImage; + + @ApiModelProperty("流程发起人Id") + private String startUserId; + + @ApiModelProperty("流程发起人名称") + private String startUserName; + + @ApiModelProperty("流程类型") + private String category; + + @ApiModelProperty("流程变量信息") + private Object procVars; + + @ApiModelProperty("局部变量信息") + private Object taskLocalVars; + + @ApiModelProperty("流程部署编号") + private String deployId; + + @ApiModelProperty("流程ID") + private String procDefId; + + @ApiModelProperty("流程key") + private String procDefKey; + + @ApiModelProperty("流程定义名称") + private String procDefName; + + @ApiModelProperty("流程定义内置使用版本") + private int procDefVersion; + + @ApiModelProperty("流程实例ID") + private String procInsId; + + @ApiModelProperty("历史流程实例ID") + private String hisProcInsId; + + @ApiModelProperty("任务耗时") + private String duration; + + @ApiModelProperty("任务意见") + private FlowCommentDto comment = new FlowCommentDto(); + + @ApiModelProperty("候选执行人") + private String candidate; + + @ApiModelProperty("任务创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ApiModelProperty("任务完成时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date finishTime; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskQuery.java new file mode 100644 index 0000000000..fb93e6d146 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.base.api.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author hanweijia + * @date 2021/11/06 13:53 + * @description + */ +@Data +public class FlowTaskQuery implements Query { + private static final long serialVersionUID = -7395299971899690002L; + @ApiModelProperty(value = "用户sid", required = true) + private String userSid; + @ApiModelProperty(value = "zd", required = true) + private String zd; + @ApiModelProperty(value = "days", required = true) + private String days; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskVo.java new file mode 100644 index 0000000000..ed5d2ce033 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowTaskVo.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.base.api.flow; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + *

流程任务

+ * + * @author XuanXuan + * @date 2021-04-03 + */ +@ApiModel("工作流任务相关--请求参数") +@Data +public class FlowTaskVo { + + @ApiModelProperty("任务Id") + private String taskId; + + @ApiModelProperty("用户Id") + private String userId; + @ApiModelProperty("用户Sid") + private String userSid; + + @ApiModelProperty("任务意见") + private String comment; + + @ApiModelProperty("流程实例Id") + private String instanceId; + + @ApiModelProperty("节点") + private String targetKey; + + @ApiModelProperty("流程变量信息") + private Map values=new HashMap<>(); + + @ApiModelProperty("审批人") + private String assignee; + + @ApiModelProperty("候选人") + private List candidateUsers=new ArrayList<>(); + + @ApiModelProperty("审批组") + private List candidateGroups=new ArrayList<>(); + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/Flowable.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/Flowable.java index c388707573..88f734d6f3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/Flowable.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/Flowable.java @@ -3,13 +3,6 @@ package com.yxt.anrui.base.api.flow; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; -/** - * @author liuguohui - * @version 1.0 - * @description - * @date 2022/03/03 - */ @Data public class Flowable extends BaseEntity { - } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFallback.java new file mode 100644 index 0000000000..f34ca7c268 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFallback.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.base.api.flow; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component +public class FlowableFallback implements FlowableFeign{ + @Override + public ResultBean businessStart(String procDefId, String userSid, Map variables) { + return null; + } + + @Override + public ResultBean processPagerList(Integer pageNum, Integer pageSize) { + return null; + } + + @Override + public ResultBean myprocess( String userSid, PagerQuery taskQueryPagerQuery) { + return null; + } + + @Override + public ResultBean getAppFlowRecordList(AppFlowTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/bussolutiondetail/getOrderTaskDetaile无法访问"); + } + + @Override + public ResultBean stopProcess(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean deleteProcess(String procInsId) { + return null; + } + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFeign.java new file mode 100644 index 0000000000..4a75e63989 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/FlowableFeign.java @@ -0,0 +1,76 @@ +package com.yxt.anrui.base.api.flow; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +@Api(tags = "Flowable") +@FeignClient( + contextId = "anrui-buscenter-flow-Flowable", + name = "anrui-buscenter", + path = "v1/flow", + fallback = FlowableFallback.class) +public interface FlowableFeign { + /** + * 业务系统发起流程申请 + * @param procDefId 流程定义id + * @param userSid 用户sid + * @param variables form参数 + * @return + */ + @PostMapping("/businessStart/{procDefId}/{userSid}") + public ResultBean businessStart(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, + @ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, + @ApiParam(value = "变量集合,json对象") @RequestBody Map variables); + + /** + * 流程定义列表 一般业务中不需要查询该列表 + * @param pageNum 页数 + * @param pageSize 容量 + * @return + */ + @PostMapping("/processPagerList/{userSid}") + public ResultBean processPagerList(@ApiParam(value = "当前页码", required = true) @RequestParam("pageNum") Integer pageNum, + @ApiParam(value = "每页条数", required = true) @RequestParam("pageSize") Integer pageSize); + + /** + * 我的流程 我发起的流程 + * @param userSid 用户sid + * @param taskQueryPagerQuery 查询参数 + * @return + */ + @PostMapping("/myprocess/{userSid}") + public ResultBean myprocess(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, + @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery taskQueryPagerQuery); + + @ApiOperation("手机端查询审批订单流程记录") + @PostMapping("/getAppFlowRecordList") + public ResultBean> getAppFlowRecordList(@RequestBody AppFlowTaskQuery query); + + /** + * 取消申请 + * @param flowTaskVo + * @return + */ + @ApiOperation(value = "取消申请") + @PostMapping(value = "/task/stopProcess") + @ResponseBody + ResultBean stopProcess(@ApiParam(value = "工作流任务相关--请求参数")@RequestBody FlowTaskVo flowTaskVo); + /** + * 删除流程实例 + * @param procInsId 流程实例id + * @return + */ + @ApiOperation(value = "删除流程实例") + @DeleteMapping(value = "/task/deleteProcess/{procInsId}") + @ResponseBody + ResultBean deleteProcess(@ApiParam(value = "流程实例id")@PathVariable(value = "procInsId")String procInsId); +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/TaskQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/TaskQuery.java new file mode 100644 index 0000000000..af10b0a911 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/flow/TaskQuery.java @@ -0,0 +1,90 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.flow; + +import com.yxt.common.core.query.Query; + +/** + * Project: anrui-parent
+ * File: TaskQuery.java
+ * Class: com.yxt.anrui.portal.biz.flow.TaskQuery
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021/10/27 下午3:36
+ * + * @author popo + * @version 1.0 + * @since 1.0 + */ +public class TaskQuery implements Query { + + private String userSid; + private String days; + private String zd1; + private String processDefinitionId; + private String startTime; + + public String getZd1() { + return zd1; + } + + public void setZd1(String zd1) { + this.zd1 = zd1; + } + + public String getProcessDefinitionId() { + return processDefinitionId; + } + + public void setProcessDefinitionId(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; + } + + public String getUserSid() { + return userSid; + } + + public void setUserSid(String userSid) { + this.userSid = userSid; + } + + public String getDays() { + return days; + } + + public void setDays(String days) { + this.days = days; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index b4cc6b9865..098a8c377c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java @@ -2,6 +2,8 @@ package com.yxt.anrui.base.biz.basedistributor; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basedistributor.*; +import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo; +import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo; import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerExportVo; import com.yxt.anrui.base.biz.basedistributorlegal.BaseDistributorLegalService; @@ -118,7 +120,7 @@ public class BaseDistributorRest implements BaseDistributorFeign { */ @Override public ResultBean> details(String sid) { - Map map = new HashMap<>(); + BaseDistributorPersonVo baseDistributorPersonVo = new BaseDistributorPersonVo(); ResultBean rb = ResultBean.fireFail(); // BaseDistributor baseDistributor = baseDistributorService.fetchBySid(sid); BaseDistributorVo baseDistributorVo = baseDistributorService.selBySid(sid); @@ -126,13 +128,13 @@ public class BaseDistributorRest implements BaseDistributorFeign { return rb.fail().setMsg("该经销商不存在"); } else { if (personType.equals(baseDistributorVo.getDistributorClassification())) {//个人 - map = baseDistributorPersonService.details(sid); + baseDistributorPersonVo = baseDistributorPersonService.details(sid); } else if (legalType.equals(baseDistributorVo.getDistributorClassification())) {//法人 - map = baseDistributorLegalService.details(sid); - map.put("useOrg",baseDistributorVo.getUseOrg()); + BaseDistributorLegalVo details = baseDistributorLegalService.details(sid); + //map.put("useOrg",baseDistributorVo.getUseOrg()); } } - return rb.success().setData(map); + return rb.success().setData(baseDistributorPersonVo); } /** diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java index 65ebb352fe..e8340385e2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix; import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.*; import java.util.List; @@ -35,4 +33,10 @@ public interface BaseDistributorAppendixMapper extends BaseMapper selByLinkSid(String sid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java index 5afd3d7d83..3271a5eebc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java @@ -207,4 +207,12 @@ public class BaseDistributorAppendixService extends MybatisBaseService selByLinkSid(String sid) { + return baseMapper.selByLinkSid(sid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorbank/BaseDistributorBankMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorbank/BaseDistributorBankMapper.java index fb863f97c0..5c0dee88fb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorbank/BaseDistributorBankMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorbank/BaseDistributorBankMapper.java @@ -7,12 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.baseaffiliatcompany.BaseAffiliatCompanyQuery; import com.yxt.anrui.base.api.baseaffiliatcompany.BaseAffiliatCompanyVo; import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankQuery; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.*; import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBank; import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo; -import org.apache.ibatis.annotations.Update; import java.util.List; @@ -42,4 +39,10 @@ public interface BaseDistributorBankMapper extends BaseMapper 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/basedistributorbank/BaseDistributorBankService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorbank/BaseDistributorBankService.java index 7265008a8f..3f9213d691 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorbank/BaseDistributorBankService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorbank/BaseDistributorBankService.java @@ -73,4 +73,12 @@ public class BaseDistributorBankService extends MybatisBaseService selByDistributorSid(String sid) { + return baseMapper.selByDistributorSid(sid); + } } \ No newline at end of file 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 3951ba8576..17dcaeae34 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 @@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basedistributorlegal; 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.Update; @@ -39,6 +40,6 @@ public interface BaseDistributorLegalMapper extends BaseMapper details(String sid); + BaseDistributorLegalVo details(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.xml index d4ab8a1639..d43135109b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalMapper.xml @@ -3,7 +3,7 @@ - SELECT bl.sid, bl.enterpriseContact, bl.enterpriseNature, diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java index af551a7f07..87c0fbd831 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java @@ -1,7 +1,12 @@ package com.yxt.anrui.base.biz.basedistributorlegal; +import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.basedistributor.BaseDistributor; import com.yxt.anrui.base.api.basedistributor.BaseDistributorDto; +import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix; +import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto; +import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBank; +import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankDto; import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegal; import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalDto; import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalFeign; @@ -9,7 +14,10 @@ import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalOneDto; import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff; import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto; import com.yxt.anrui.base.biz.basedistributor.BaseDistributorService; +import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService; +import com.yxt.anrui.base.biz.basedistributorbank.BaseDistributorBankService; import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +52,12 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign { BaseDistributorService baseDistributorService; @Autowired private BaseDistributorStaffService baseDistributorStaffService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private BaseDistributorAppendixService baseDistributorAppendixService; + @Autowired + private BaseDistributorBankService baseDistributorBankService; /** * 新增法人基础信息 @@ -55,6 +69,10 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign { public ResultBean save(BaseDistributorLegalDto dto) { ResultBean rb = ResultBean.fireFail(); String numCode = dto.getNumCode(); + String jxsSid = ""; + BaseDistributorLegal bdbl = new BaseDistributorLegal(); + List baseDistributorAppendixs = dto.getBaseDistributorAppendixs(); + List baseDistributorBanks = dto.getBaseDistributorBanks(); int count = baseDistributorService.selectNumCode(numCode); if (count > 0) { return rb.fail().setMsg("保存失败，统一社会信用代码已存在"); @@ -72,7 +90,6 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign { if (stringResultBean.getSuccess()) { String sid = stringResultBean.getData();//经销商sid //存储法人表信息 - BaseDistributorLegal bdbl = new BaseDistributorLegal(); bdbl.setDistributorSid(sid); bdbl.setEnterpriseNature(dto.getEnterpriseNature()); bdbl.setRegisteredCapital(dto.getRegisteredCapital()); @@ -92,6 +109,7 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign { if (!isSave) { return rb.setMsg("经销商法人信息保存失败"); } + jxsSid = stringResultBean.getData(); //再新增 if (dto.getList().size() > 0) { for (int i = 0; i < dto.getList().size(); i++) { @@ -105,8 +123,36 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign { } else { return rb.setMsg(stringResultBean.getMsg()); } + for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) { + BaseDistributorAppendix entity = new BaseDistributorAppendix(); + BeanUtil.copyProperties(baseDistributorAppendix, entity); + entity.setCreateBySid(dto.getUserSid()); + entity.setCreateTime(new Date()); + String filePath = baseDistributorAppendix.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + entity.setFilePath(filePath); + entity.setLinkSid(jxsSid); + boolean save = baseDistributorAppendixService.save(entity); + if (save) { + return rb.success().setMsg("保存成功"); + } else { + return rb.setMsg("保存失败"); + } + } + for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) { + BaseDistributorBank entity = new BaseDistributorBank(); + BeanUtil.copyProperties(baseDistributorBank, entity); + entity.setDistributorSid(jxsSid); + boolean save = baseDistributorBankService.save(entity); + if (save) { + return rb.success().setMsg("保存成功"); + } else { + return rb.setMsg("保存失败"); + } + } return rb.success().setData(stringResultBean.getData()).setMsg("保存成功"); - } /** @@ -119,6 +165,8 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign { @Override public ResultBean update(BaseDistributorLegalDto dto, String sid) { ResultBean rb = ResultBean.fireFail(); + List baseDistributorAppendixs = dto.getBaseDistributorAppendixs(); + List baseDistributorBanks = dto.getBaseDistributorBanks(); //根据法人信息sid查询经销商法人信息 BaseDistributorLegal baseDistributorLegal = baseDistributorLegalService.fetchBySid(sid); if (baseDistributorLegal == null) { @@ -169,6 +217,27 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign { if (count1 == 0 || count == 0) { return rb.setMsg("修改失败"); } + baseDistributorAppendixService.delByLinkSid(sid); + for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) { + BaseDistributorAppendix entity = new BaseDistributorAppendix(); + BeanUtil.copyProperties(baseDistributorAppendix, entity); + entity.setCreateBySid(dto.getUserSid()); + entity.setCreateTime(new Date()); + String filePath = baseDistributorAppendix.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + entity.setFilePath(filePath); + entity.setLinkSid(sid); + baseDistributorAppendixService.save(entity); + } + baseDistributorBankService.delByDistributorSid(sid); + for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) { + BaseDistributorBank entity = new BaseDistributorBank(); + BeanUtil.copyProperties(baseDistributorBank, entity); + entity.setDistributorSid(sid); + baseDistributorBankService.save(entity); + } return rb.success().setMsg("修改成功"); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalService.java index 3333677224..657d4d246c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.biz.basedistributorlegal; import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegal; +import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,7 +44,7 @@ public class BaseDistributorLegalService extends MybatisBaseService details(String sid) { + public BaseDistributorLegalVo details(String sid) { return baseMapper.details(sid); } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.java index ad6254a3dc..a765675965 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.java @@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basedistributorperson; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPerson; +import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Update; @@ -38,6 +39,6 @@ public interface BaseDistributorPersonMapper extends BaseMapper details(String sid); + BaseDistributorPersonVo details(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.xml index 362241ed14..8858980ebb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonMapper.xml @@ -8,7 +8,7 @@ - SELECT bp.sid, bp.distributorSid, bp.projectType, diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonRest.java index eae4e49015..608bb42217 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonRest.java @@ -44,39 +44,7 @@ public class BaseDistributorPersonRest implements BaseDistributorPersonFeign { */ @Override public ResultBean save(BaseDistributorPersonDto dto) { - ResultBean rb = ResultBean.fireFail(); - String numCode = dto.getNumCode(); - int count = baseDistributorService.selectNumCode(numCode); - if (count > 0) { - return rb.fail().setMsg("保存失败，统一社会信用代码已存在"); - } - if (dto.getNumCode().length() != 18 && dto.getNumCode().length() != 9){ - return ResultBean.fireFail().setMsg("统一信用社会代码应为9位或18位"); - } - //创建基础信息的对象,和数据库对应的实体类 - ResultBean stringResultBean = baseDistributorService.saveGrDto(dto); - if (stringResultBean.getSuccess()) { - String sid = stringResultBean.getData(); - //存储个人表信息 - BaseDistributorPerson bp = new BaseDistributorPerson(); - bp.setDistributorSid(sid);//经销商sid - bp.setProjectType(dto.getProjectType());//项目类型 - bp.setProjectTypeValue(dto.getProjectTypeValue());//项目类型Value - bp.setDistributorBrand(dto.getDistributorBrand());//经销商品牌 - bp.setBelongsToVendor(dto.getBelongsToVendor());//所属厂商 - bp.setProvince(dto.getProvince());//省 - bp.setCity(dto.getCity());//市 - bp.setCounty(dto.getCounty());//县 - bp.setAddressCode(dto.getAddressCode());//省市县code值 - bp.setRemarks(dto.getRemarks()); - boolean isSave = baseDistributorPersonService.save(bp); - if (!isSave) { - return rb.setMsg("经销商个人信息保存失败"); - } - } else { - return rb.setMsg(stringResultBean.getMsg()); - } - return rb.success().setData(stringResultBean.getData()).setMsg("保存成功"); + return baseDistributorPersonService.saveAll(dto); } /** @@ -88,33 +56,6 @@ public class BaseDistributorPersonRest implements BaseDistributorPersonFeign { */ @Override public ResultBean update(BaseDistributorPersonDto dto, String sid) { - ResultBean rb = ResultBean.fireFail(); - //根据个人信息sid查询经销商个人信息 - BaseDistributorPerson baseDistributorPerson = baseDistributorPersonService.fetchBySid(sid); - if (baseDistributorPerson == null) { - return rb.setMsg("该经销商个人不存在"); - } - //修改经销商个人信息 - BaseDistributorPersonOneDto baseDistributorPersonOneDto = new BaseDistributorPersonOneDto(); - baseDistributorPersonOneDto.setBelongsToVendor(dto.getBelongsToVendor()); - baseDistributorPersonOneDto.setCity(dto.getCity()); - baseDistributorPersonOneDto.setCounty(dto.getCounty()); - baseDistributorPersonOneDto.setDistributorBrand(dto.getDistributorBrand()); - baseDistributorPersonOneDto.setProjectType(dto.getProjectType()); - baseDistributorPersonOneDto.setProvince(dto.getProvince()); - baseDistributorPersonOneDto.setRemarks(dto.getRemarks()); - //修改经销商基础信息 - BaseDistributorDto baseDistributorDto = new BaseDistributorDto(); - baseDistributorDto.setNumCode(dto.getNumCode()); - baseDistributorDto.setDistributorName(dto.getDistributorName()); - baseDistributorDto.setAddress(dto.getAddress()); - baseDistributorDto.setDistributorType(dto.getDistributorType()); - baseDistributorDto.setBusinessMobile(dto.getBusinessMobile()); - int count1 = baseDistributorService.updateBySid(baseDistributorDto.toMap(), baseDistributorPerson.getDistributorSid()); - int count = baseDistributorPersonService.updateBySid(baseDistributorPersonOneDto.toMap(), sid); - if (count1 == 0 || count == 0) { - return rb.setMsg("修改失败"); - } - return rb.success().setMsg("修改成功"); + return baseDistributorPersonService.updateAll(dto,sid); } } 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 e9b5e3164e..6c3ab05702 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 @@ -1,12 +1,37 @@ package com.yxt.anrui.base.biz.basedistributorperson; +import cn.hutool.core.bean.BeanUtil; +import com.auth0.jwt.JWT; +import com.auth0.jwt.interfaces.DecodedJWT; +import com.yxt.anrui.base.api.basedistributor.BaseDistributor; +import com.yxt.anrui.base.api.basedistributor.BaseDistributorDto; +import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix; +import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto; +import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo; +import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBank; +import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankDto; +import com.yxt.anrui.base.api.basedistributorbank.BaseDistributorBankVo; import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPerson; +import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonDto; +import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonOneDto; +import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo; +import com.yxt.anrui.base.biz.basedistributor.BaseDistributorService; +import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService; +import com.yxt.anrui.base.biz.basedistributorbank.BaseDistributorBankService; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.JWTUtil; +import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import java.util.Map; +import static cn.hutool.json.XMLTokener.entity; + /** * Project: anrui-base(安瑞基础信息模块)
* File: BaseDistributorPersonService.java
@@ -25,6 +50,14 @@ public class BaseDistributorPersonService extends MybatisBaseService details(String sid) { - return baseMapper.details(sid); + public BaseDistributorPersonVo details(String sid) { + BaseDistributorPersonVo baseDistributorPersonVo = baseMapper.details(sid); + List baseDistributorAppendixVos = baseDistributorAppendixService.selByLinkSid(sid); + List baseDistributorBankVos = baseDistributorBankService.selByDistributorSid(sid); + baseDistributorPersonVo.setBaseDistributorAppendixs(baseDistributorAppendixVos); + baseDistributorPersonVo.setBaseDistributorBanks(baseDistributorBankVos); + return baseDistributorPersonVo; + } + + public ResultBean saveAll(BaseDistributorPersonDto dto) { + ResultBean rb = ResultBean.fireFail(); + String numCode = dto.getNumCode(); + List baseDistributorAppendixs = dto.getBaseDistributorAppendixs(); + List baseDistributorBanks = dto.getBaseDistributorBanks(); + BaseDistributorPerson bp = new BaseDistributorPerson(); + int count = baseDistributorService.selectNumCode(numCode); + if (count > 0) { + return rb.fail().setMsg("保存失败，身份证号码已存在"); + } + if (dto.getNumCode().length() != 18 && dto.getNumCode().length() != 9) { + return ResultBean.fireFail().setMsg("身份证号码应为18位"); + } + //创建基础信息的对象,和数据库对应的实体类 + ResultBean stringResultBean = baseDistributorService.saveGrDto(dto); + if (stringResultBean.getSuccess()) { + String sid = stringResultBean.getData(); + //存储个人表信息 + bp.setDistributorSid(sid);//经销商sid + bp.setProjectType(dto.getProjectType());//项目类型 + bp.setProjectTypeValue(dto.getProjectTypeValue());//项目类型Value + bp.setDistributorBrand(dto.getDistributorBrand());//经销商品牌 + bp.setBelongsToVendor(dto.getBelongsToVendor());//所属厂商 + bp.setProvince(dto.getProvince());//省 + bp.setCity(dto.getCity());//市 + bp.setCounty(dto.getCounty());//县 + bp.setAddressCode(dto.getAddressCode());//省市县code值 + bp.setRemarks(dto.getRemarks()); + save(bp); + } + String sid = bp.getSid(); + for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) { + BaseDistributorAppendix entity = new BaseDistributorAppendix(); + BeanUtil.copyProperties(baseDistributorAppendix, entity); + entity.setCreateBySid(dto.getUserSid()); + entity.setCreateTime(new Date()); + String filePath = baseDistributorAppendix.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + entity.setFilePath(filePath); + entity.setLinkSid(sid); + baseDistributorAppendixService.save(entity); + } + for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) { + BaseDistributorBank entity = new BaseDistributorBank(); + BeanUtil.copyProperties(baseDistributorBank, entity); + entity.setDistributorSid(sid); + baseDistributorBankService.save(entity); + } + return rb.success().setMsg("保存成功"); } + public ResultBean updateAll(BaseDistributorPersonDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + //根据个人信息sid查询经销商个人信息 + BaseDistributorPerson baseDistributorPerson = fetchBySid(sid); + if (baseDistributorPerson == null) { + return rb.setMsg("该经销商个人不存在"); + } + List baseDistributorAppendixs = dto.getBaseDistributorAppendixs(); + List baseDistributorBanks = dto.getBaseDistributorBanks(); + //修改经销商个人信息 + BaseDistributorPersonOneDto baseDistributorPersonOneDto = new BaseDistributorPersonOneDto(); + baseDistributorPersonOneDto.setBelongsToVendor(dto.getBelongsToVendor()); + baseDistributorPersonOneDto.setCity(dto.getCity()); + baseDistributorPersonOneDto.setCounty(dto.getCounty()); + baseDistributorPersonOneDto.setDistributorBrand(dto.getDistributorBrand()); + baseDistributorPersonOneDto.setProjectType(dto.getProjectType()); + baseDistributorPersonOneDto.setProvince(dto.getProvince()); + baseDistributorPersonOneDto.setRemarks(dto.getRemarks()); + //修改经销商基础信息 + BaseDistributorDto baseDistributorDto = new BaseDistributorDto(); + baseDistributorDto.setNumCode(dto.getNumCode()); + baseDistributorDto.setDistributorName(dto.getDistributorName()); + baseDistributorDto.setAddress(dto.getAddress()); + baseDistributorDto.setDistributorType(dto.getDistributorType()); + baseDistributorDto.setBusinessMobile(dto.getBusinessMobile()); + int count1 = baseDistributorService.updateBySid(baseDistributorDto.toMap(), baseDistributorPerson.getDistributorSid()); + int count = updateBySid(baseDistributorPersonOneDto.toMap(), sid); + if (count1 == 0 || count == 0) { + return rb.setMsg("修改失败"); + } + baseDistributorAppendixService.delByLinkSid(sid); + for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) { + BaseDistributorAppendix entity = new BaseDistributorAppendix(); + BeanUtil.copyProperties(baseDistributorAppendix, entity); + entity.setCreateBySid(dto.getUserSid()); + entity.setCreateTime(new Date()); + String filePath = baseDistributorAppendix.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + entity.setFilePath(filePath); + entity.setLinkSid(sid); + baseDistributorAppendixService.save(entity); + } + baseDistributorBankService.delByDistributorSid(sid); + for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) { + BaseDistributorBank entity = new BaseDistributorBank(); + BeanUtil.copyProperties(baseDistributorBank, entity); + entity.setDistributorSid(sid); + baseDistributorBankService.save(entity); + } + return rb.success().setMsg("修改成功"); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.java index bccc8f1770..ec1bc4961c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.java @@ -37,6 +37,7 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicat import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationVo; import java.util.List; +import java.util.Map; /** * Project: anrui-base(外采管理)
@@ -62,4 +63,6 @@ public interface BaseOutsourcingApplicationMapper extends BaseMapper map); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml index 3ce680bc35..67d46b1c34 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml @@ -19,4 +19,16 @@ AND orgSid = #{orgSid} AND applicationCode LIKE concat(#{billsType}, '%') + + + UPDATE base_outsourcing_application + SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstSid=#{procInsId} + + WHERE sid=#{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 76b34c0537..607025fa6a 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 @@ -26,6 +26,9 @@ package com.yxt.anrui.base.biz.baseoutsourcingapplication; import com.yxt.anrui.base.api.baseoutsourcingapplication.*; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; +import com.yxt.anrui.base.api.flow.FlowTaskVo; +import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -35,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * Project: anrui-base(外采管理)
@@ -56,6 +60,8 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio @Autowired private BaseOutsourcingApplicationService baseOutsourcingApplicationService; + @Autowired + private BaseVehicleService baseVehicleService; @Override @ApiOperation("根据条件分页查询数据的列表") @@ -86,4 +92,39 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio public ResultBean fetchBySid(@PathVariable("sid") String sid){ return baseOutsourcingApplicationService.fetchAllBySid(sid); } + + @Override + public ResultBean fetchVehicle(String vehicleSid) { + return baseVehicleService.fetchVehicle(vehicleSid); + } + + @Override + public ResultBean submitBaseOutSourcingApplication(SubmitBaseOutSourcingApplicationDto dto) { + return baseOutsourcingApplicationService.submitBaseOutSourcingApplication(dto); + } + + @Override + public ResultBean complete(Map variables) { + return baseOutsourcingApplicationService.complete(variables); + } + + @Override + public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) { + return baseOutsourcingApplicationService.revokeProcess(userSid, businessSid, flowTaskVo); + } + + @Override + public ResultBean taskReject(String businessSid, FlowTaskVo flowTaskVo) { + return baseOutsourcingApplicationService.taskReject(businessSid, flowTaskVo); + } + + @Override + public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) { + return baseOutsourcingApplicationService.breakProcess(businessSid, flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId, String deployId) { + return baseOutsourcingApplicationService.flowRecord(procInsId, deployId); + } } 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 98e2d520be..5ebc7ec84b 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 @@ -32,9 +32,18 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.*; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo; +import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyPageVo; +import com.yxt.anrui.base.biz.flow.FlowableService; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; +import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; +import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; +import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -89,6 +98,10 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService createQueryWrapper(BaseOutsourcingApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -99,8 +112,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService= date_format('" + applicationStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(applicationEndDate), "date_format (applicationDate,'%Y-%m-%d') <= date_format('" + applicationEndDate + "','%Y-%m-%d')" ); - if (StringUtils.isNotBlank(query.getModelSid())) { - qw.eq("modelSid", query.getModelSid()); + if (StringUtils.isNotBlank(query.getModelName())) { + qw.like("modelName", query.getModelName()); } return qw; } @@ -227,4 +240,212 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService variables = new HashMap<>(); + variables.put("businessSid", businessSid); + variables.put("orgSid", orgSid); //部门sid + if (StringUtils.isBlank(dto.getTaskId())) { // 新提交 + String proDefId = ProcDefEnum.SEALAPPLY.getProDefId(); + ResultBean resultBean1 = flowableService.businessStart(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId(), dto.getUserSid(), variables); + if (resultBean1.getSuccess() && resultBean1.getData() != null) { + Map map = (Map) resultBean1.getData(); + //更新业务表中的流程状态 + Map paramMap = new HashMap<>(); + paramMap.put("sid", businessSid); + paramMap.put("procDefId", ProcDefEnum.SEALAPPLY.getProDefId()); + paramMap.put("nodeState", map.get("nodeState")); + paramMap.put("procInsId", map.get("procInsId")); + paramMap.put("taskDefKey", map.get("taskDefKey")); + updateFlowFiled(paramMap); + } + return resultBean1; + } else { // 驳回到发起人后再次提交 + variables.put("comment", StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + variables.put("instanceId", dto.getInstanceId()); + variables.put("taskId", dto.getTaskId()); + variables.put("userSid", dto.getUserSid()); + return complete(variables); + } + } + + /** + * 检查用户是否设置部门 + * + * @param staffSid + * @return 返回部门sid + */ + private String checkUserOrg(String staffSid) { + String orgSid = ""; + ResultBean resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid); + if (resultBean.getSuccess()) { + orgSid = resultBean.getData(); + } + return orgSid; + } + + /** + * 保存流程业务关联表 数据 + * + * @param map + */ + private void saveSysFormLink(Map map) { + String sid = map.get("sid"); + ResultBean resultBean = sysFormLinkFeign.selectByBusinessSid(sid); + if (!resultBean.getSuccess()) { // 新增 + SysFormLinkDto sysFormLinkDto = new SysFormLinkDto(); + sysFormLinkDto.setBusinessSid(map.get("sid")); + sysFormLinkDto.setProcInsId(map.get("procInsId")); + sysFormLinkDto.setTaskDefKey(map.get("taskDefKey")); + sysFormLinkDto.setNodeState(map.get("nodeState")); + sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ORDER_DEPOSIT_VEHICLE.getCode()); + sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode())); + sysFormLinkFeign.save(sysFormLinkDto); + } else { // 更新 + Map updateMap = new HashMap<>(); + updateMap.put("businessSid", sid); + updateMap.put("nodeState", map.get("nodeState")); + updateMap.put("taskDefKey", map.get("taskDefKey")); + updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode()); + sysFormLinkFeign.updateFiled(updateMap); + } + } + + /** + * 办理 + * @param variables + * @return + */ + public ResultBean complete(Map variables) { + BusinessVariables bv= BusinessVariables.builder().build(); + bv.setDetailUrl(""); + bv.setHandleUrl(""); + bv.setFormVariables(variables); + ResultBean resultBean = flowTaskFeign.businessComplete(bv); + if (!resultBean.getSuccess()) { + return resultBean; + } + String nodeState = ""; + String taskDefKey = ""; + Map paramMap = new HashMap<>(); + paramMap.put("sid", variables.get("businessSid").toString()); + if (resultBean.getData() != null) { + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId()); + if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) { + nodeState = listResultBean.getData().get(0).getName_(); + taskDefKey = listResultBean.getData().get(0).getTask_def_key_(); + } else { + nodeState = ProcessStateEnum.FINISHED.getStateName(); + taskDefKey = "Event_end"; + paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode()); + } + } + paramMap.put("nodeState", nodeState); + paramMap.put("taskDefKey", taskDefKey); + updateFlowFiled(paramMap); + return resultBean; + } + + /** + * 更新流程相关的状态 + * @param map + * @return + */ + private int updateFlowFiled(Map map) { + return baseMapper.updateFlowFiled(map); + } + + /** + * 撤回 + * @param userSid + * @param businessSid + * @param flowTaskVo + * @return + */ + public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl=new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(flowTaskVo,fl); + fl.setUserSid(userSid); + ResultBean> resultBean = flowTaskFeign.revokeProcess(fl); + if (!resultBean.getSuccess()) { + return resultBean; + } + String nodeState = resultBean.getData().get(0).getName_(); + String taskDefKey = resultBean.getData().get(0).getTask_def_key_(); + String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef(); + Map paramMap = new HashMap<>(); + paramMap.put("sid", businessSid); + if (incomingSourceRef.contains("start")) { + paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState()); + paramMap.put("taskDefKey", taskDefKey); + paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode()); + } else { + paramMap.put("nodeState",nodeState ); + paramMap.put("taskDefKey",taskDefKey ); + } + updateFlowFiled(paramMap); + return resultBean; + } + + /** + * 驳回 + * @param businessSid + * @param flowTaskVo + * @return + */ + public ResultBean taskReject(String businessSid, FlowTaskVo flowTaskVo) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl=new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(flowTaskVo,fl); + ResultBean> resultBean = flowTaskFeign.taskReject(fl); + if (!resultBean.getSuccess()) { + return resultBean; + } + String nodeState = resultBean.getData().get(0).getName_(); + String taskDefKey = resultBean.getData().get(0).getTask_def_key_(); + String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef(); + Map paramMap = new HashMap<>(); + paramMap.put("sid", businessSid); + paramMap.put("nodeState", nodeState); + paramMap.put("taskDefKey", taskDefKey); + if (incomingSourceRef.contains("start")) { + paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode()); + } + updateFlowFiled(paramMap); + return resultBean; + } + + /** + * 终止流程 + * @param businessSid + * @param flowTaskVo + * @return + */ + public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl=new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(flowTaskVo,fl); + ResultBean resultBean = flowTaskFeign.breakProcess(fl); + if (!resultBean.getSuccess()) { + return resultBean; + } + Map paramMap = new HashMap<>(); + paramMap.put("sid", businessSid); + paramMap.put("nodeState", String.valueOf(resultBean.getData())); + paramMap.put("taskDefKey", "Event_end"); + paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode()); + updateFlowFiled(paramMap); + return resultBean; + } + + /** + * 流程历史流转记录 + * @param procInsId + * @param deployId + * @return + */ + public ResultBean flowRecord(String procInsId, String deployId) { + return flowTaskFeign.businessFlowRecord(procInsId,deployId); + } } \ No newline at end of file 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 9738ee507b..af13125f0f 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 @@ -10,6 +10,7 @@ import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo; 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 org.apache.ibatis.annotations.Update; import java.util.List; @@ -237,7 +238,6 @@ public interface BaseVehicleMapper extends BaseMapper { * 手机端查询不本公司的现车，排产车 * * @param modelSid - * @param sid * @return */ List getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg); @@ -314,4 +314,6 @@ public interface BaseVehicleMapper extends BaseMapper { IPage vehicleActualPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage selectVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + BaseVehicleVo fetchVehicle(QueryWrapper qw); } \ No newline at end of file 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 943bc51c3d..b85771a1bd 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 @@ -660,4 +660,9 @@ order by isFictitious desc + + \ No newline at end of file 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 f3531596ae..49042197d0 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 @@ -17,6 +17,8 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuer import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +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.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsFeign; import com.yxt.common.base.config.component.FileUploadComponent; @@ -51,32 +53,17 @@ import java.util.Map; public class BaseVehicleService extends MybatisBaseService { @Autowired - private SysUserFeign sysUserFeign; - + private SysStaffOrgFeign sysStaffOrgFeign; @Autowired private SysOrganizationFeign sysOrganizationFeign; - @Autowired private BaseModelConfigService baseModelConfigService; - - @Autowired - private BaseModelSzconfigService baseModelSzconfigService; - - @Autowired - private BaseTrailerService baseTrailerService; - @Autowired private CommonAppendixService commonAppendixService; - @Autowired private BaseVehicleAppendixService baseVehicleAppendixService; - @Autowired private FileUploadComponent fileUploadComponent; - - @Autowired - private ScmVehicleReturnDetailsFeign scmVehicleReturnDetailsFeign; - @Autowired private PcBusMainDepositFeign pcBusMainDepositFeign; @@ -1187,4 +1174,26 @@ public class BaseVehicleService extends MybatisBaseService fetchVehicle(String vehicleSid) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = vehicleActualWrapper1(vehicleSid); + BaseVehicleVo baseVehicleVo = baseMapper.fetchVehicle(qw); + return rb.success().setData(baseVehicleVo); + } + + private QueryWrapper vehicleActualWrapper1(String vehicleSid) { + QueryWrapper qw = new QueryWrapper<>(); + + if (StringUtils.isNotBlank(vehicleSid)){ + String[] split = vehicleSid.split(","); + for (String s : split) { + qw.ne("sid",s); + } + } + + qw.eq("vehicleState",0005); + qw.eq("lockedState",03); + return qw; + } } \ No newline at end of file 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 7f1e4078e5..77cf0468cc 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 @@ -19,6 +19,7 @@ public enum ProcDefEnum { SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ), BASEVEHICLEACTUALSALES("未售买断", ""),//ToDo SALESORDER("销售订单审批流程", "process_p5ils2rn:3:252512"), + BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:1:232504"), ; ProcDefEnum(String proDefName, String proDefId) { diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java index 503ea1a06b..40f6196469 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -78,4 +78,9 @@ public interface SysStaffOrgFeign { @ResponseBody @ApiModelProperty("根据员工sid获取部门全路径") ResultBean selectSidPathByStaffSid(@RequestParam(value = "applySid") String applySid); + + @GetMapping("/selectAllByStaffSid") + @ResponseBody + @ApiModelProperty("根据员工sid获取主管部门信息") + ResultBean selectAllByStaffSid(@RequestParam(value = "staffSid") String staffSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java index 0c27554f41..f76f188607 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java @@ -84,4 +84,9 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { public ResultBean selectSidPathByStaffSid(String applySid) { return null; } + + @Override + public ResultBean selectAllByStaffSid(String staffSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java index bbe1c60c18..6978f5442c 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java @@ -67,6 +67,10 @@ public class SysUserVo implements Vo { private String userTypeKey; @ApiModelProperty("用户头像") private String headImage; + @ApiModelProperty("组织名称") + private String orgNamePath; + @ApiModelProperty("组织sid") + private String orgSidPath; @ApiModelProperty(value = "token") private String token; @ApiModelProperty(value = "角色sids") diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java index 5836cad469..722d9a89cd 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java @@ -74,4 +74,7 @@ public interface SysStaffOrgMapper extends BaseMapper { String getSysStaffOrgSidListByStaffSid(@Param("staffSid") String staffSid); String selectBySidPathByStaffSid(String applySid); + + @Select("select * from sys_staff_org where staffSid=#{staffSid} AND manageType != 2") + SysStaffOrg selectAllByStaffSid(String staffSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java index 40490fc7fe..c73734ed69 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.portal.biz.sysstafforg; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgQuery; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; +import com.yxt.anrui.portal.api.sysstafforg.*; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -118,4 +115,9 @@ public class SysStaffOrgRest implements SysStaffOrgFeign { public ResultBean selectSidPathByStaffSid(String applySid) { return sysStaffOrgService.selectSidPathByStaffSid(applySid); } + + @Override + public ResultBean selectAllByStaffSid(String staffSid) { + return sysStaffOrgService.selectAllByStaffSid(staffSid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index 6a7331f48e..ea18be4259 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -181,4 +181,10 @@ public class SysStaffOrgService extends MybatisBaseService selectAllByStaffSid(String staffSid) { + ResultBean rb = ResultBean.fireFail(); + SysStaffOrg sysStaffOrg = baseMapper.selectAllByStaffSid(staffSid); + return rb.success().setData(sysStaffOrg); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 9d09e0f6e9..f44f202211 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -9,6 +9,7 @@ import com.yxt.anrui.portal.api.sms.SmsFeign; import com.yxt.anrui.portal.api.sysrole.SysRoleQuery; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.*; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; @@ -261,6 +262,8 @@ public class SysUserService extends MybatisBaseService { userInfoOneVo.setUserName(user.getUserName()); userInfoOneVo.setIsAdmin(user.getIsAdmin()); + SysStaffOrg sysStaffOrg = sysStaffOrgService.selectAllByStaffSid(user.getStaffSid()).getData(); + userInfoOneVo.setRoleName(""); String dwjb = ""; // 系统管理员（没有对应的人员和单位） @@ -277,6 +280,8 @@ public class SysUserService extends MybatisBaseService { userInfoOneVo.setName(staffVo.getName()); userInfoOneVo.setMobile(staffVo.getMobile()); userInfoOneVo.setStaffSid(staffVo.getSid()); + userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath()); + userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath()); } // 尚无单位人员，没有单位和部门信息 if ("3".equals(user.getIsAdmin())) { @@ -291,6 +296,8 @@ public class SysUserService extends MybatisBaseService { userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName()); userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid()); userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName()); + userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath()); + userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath()); } } }