From 91307e64999ddbb0aaf70f7947aa13ab97174611 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 25 Aug 2022 14:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=88=86=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E9=97=B4=E8=B0=83=E8=BD=A6-=E5=8D=B3=E5=86=85?= =?UTF-8?q?=E8=B4=AD=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E5=8F=8A=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCompanyShuntingListVo.java | 3 + .../AppCompanyShuntingVo.java | 3 +- .../BaseInternalPurchaseMapper.java | 3 + .../BaseInternalPurchaseMapper.xml | 13 ++ .../BaseInternalPurchaseRest.java | 2 +- .../BaseInternalPurchaseService.java | 20 +-- .../BaseInternalPurchaseVehicleMapper.java | 3 + .../BaseInternalPurchaseVehicleMapper.xml | 17 +++ .../BaseInternalPurchaseVehicleService.java | 16 +-- .../companyShunting/CompanyShuntingDto.java | 43 ++++++ .../companyShunting/CompanyShuntingFeign.java | 47 +++++- .../companyShunting/CompanyShuntingList.java | 56 ++++++++ .../companyShunting/CompanyShuntingQuery.java | 14 ++ .../CompanyShuntingTaskQuery.java | 45 ++++++ .../companyShunting/CompanyShuntingVo.java | 17 +++ .../companyShunting/CompanyShuntingRest.java | 67 +++++++++ .../CompanyShuntingService.java | 134 ++++++++++++++++++ 17 files changed, 478 insertions(+), 25 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingList.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingListVo.java index 27fdca9be2..8f627a9a33 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingListVo.java @@ -41,4 +41,7 @@ public class AppCompanyShuntingListVo implements Vo { @ApiModelProperty("备注") private String remarks; + + @ApiModelProperty("sid") + private String sid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingVo.java index 5fab0a0d4d..80df4fcc5f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingVo.java @@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -31,5 +32,5 @@ public class AppCompanyShuntingVo implements Vo { @ApiModelProperty("调车类型") private String shuntingTypeValue; - private List records; + private List records = new ArrayList<>(); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.java index 7e4b9f4957..ff007e26ac 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -69,4 +70,6 @@ public interface BaseInternalPurchaseMapper extends BaseMapper + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java index 578f2f3961..42649af2ca 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java @@ -149,6 +149,6 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign { @Override public ResultBean getCompanyShunting(String sid) { - return null; + return baseInternalPurchaseService.getCompanyShunting(sid); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 60559e6fa9..ca871e08f9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -36,16 +36,11 @@ import com.yxt.anrui.base.api.baseinternalpurchase.flow.SubmitBaseInterNalPurcha import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDto; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo; -import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice; -import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto; import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; @@ -68,20 +63,17 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.UserQuery; -import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto; import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto; import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign; -import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsDto; import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign; -import com.yxt.common.base.utils.ConstantUtils; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.ConstantUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -715,4 +707,12 @@ public class BaseInternalPurchaseService extends MybatisBaseService getCompanyShunting(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppCompanyShuntingVo vo = baseMapper.getCompanyShunting(sid); + List records = baseInternalPurchaseVehicleService.getListBySid(sid); + vo.setRecords(records); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.java index 3da01b8cb9..891db41477 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingListVo; import org.apache.ibatis.annotations.*; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo; @@ -78,4 +79,6 @@ public interface BaseInternalPurchaseVehicleMapper extends BaseMapper getListBySid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.xml index 20411947c9..05067713da 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.xml @@ -10,4 +10,21 @@ + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java index 9fe805f41d..57403d02c3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java @@ -28,19 +28,13 @@ package com.yxt.anrui.base.biz.baseinternalpurchasevehicle; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.commons.lang3.StringUtils; +import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingListVo; +import com.yxt.anrui.base.api.baseinternalpurchasevehicle.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; -import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleQuery; -import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo; -import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; -import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDto; -import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign; - +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -131,4 +125,8 @@ public class BaseInternalPurchaseVehicleService extends MybatisBaseService getListBySid(String sid) { + return baseMapper.getListBySid(sid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingDto.java new file mode 100644 index 0000000000..9f3768edd5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingDto.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.terminal.api.supplychain.companyShunting; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/8/25 11:43 + * @Description + */ +@Data +public class CompanyShuntingDto implements Dto { + private static final long serialVersionUID = -1526555701754422925L; + + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "用户全路径sid") + @NotBlank(message = "参数错误：orgSidPath") + private String orgSidPath; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：instanceId") + private String instanceId; + @ApiModelProperty(value = "意见") + @NotBlank(message = "参数错误：comment") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + private List json; + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingFeign.java index cee51a6082..7da5faf0f2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingFeign.java @@ -4,9 +4,8 @@ import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; /** * @Author dimengzhe @@ -24,5 +23,45 @@ public interface CompanyShuntingFeign { @ApiOperation("分公司调车详情") @GetMapping("/getCompanyShunting/{sid}") @ResponseBody - ResultBean getCompanyShunting(@PathVariable("sid") String sid); + ResultBean getCompanyShunting(@PathVariable("sid") String sid); + + @ApiOperation("办理") + @PutMapping("/agreeCompanyShuntingInfo") + @ResponseBody + ResultBean agreeCompanyShuntingInfo(@RequestBody CompanyShuntingDto dto); + + @ApiOperation("应对方第二个环节办理:添加销售指导价") + @PutMapping("/upDateAgreeCompanyShuntingInfo") + @ResponseBody + ResultBean upDateAgreeCompanyShuntingInfo(@RequestBody CompanyShuntingDto dto); + + @ApiOperation("申请方最后一个环节办理") + @PutMapping("/initiatorToAnswerInfo") + @ResponseBody + ResultBean initiatorToAnswerInfo(@RequestBody CompanyShuntingDto dto); + + @ApiOperation("应对方最后一个环节办理") + @PutMapping("/companyToDivisionOperateInfo") + @ResponseBody + ResultBean companyToDivisionOperateInfo(@RequestBody CompanyShuntingDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCompanyShuntingInfo") + @ResponseBody + ResultBean rejectCompanyShuntingInfo(@RequestBody CompanyShuntingTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCompanyShuntingInfo") + @ResponseBody + ResultBean recallCompanyShuntingInfo(@RequestBody CompanyShuntingTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCompanyShuntingInfo") + @ResponseBody + ResultBean stopCompanyShuntingInfo(@RequestBody CompanyShuntingTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap CompanyShuntingQuery query); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingList.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingList.java new file mode 100644 index 0000000000..9fee30d949 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingList.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.terminal.api.supplychain.companyShunting; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/8/25 11:29 + * @Description + */ +@Data +public class CompanyShuntingList implements Vo { + private static final long serialVersionUID = 7979018402791508819L; + + @ApiModelProperty("sid") + private String sid; + + @ApiModelProperty("车型sid") + private String modelSid; + + @ApiModelProperty("配置sid") + private String configSid; + + @ApiModelProperty("车型名称") + @JsonProperty("modelName") + private String vehicleAlias; + + @ApiModelProperty("车架号") + @JsonProperty("vin") + private String vinNo; + + @ApiModelProperty("销售指导价") + @JsonProperty("guidancePrice") + private String guidedPrice; + + @ApiModelProperty("库存地点") + @JsonProperty("address") + private String inventoryLocationName; + + @ApiModelProperty("内销价格") + @JsonProperty("domesticPrice") + private String witPinMoney; + + @ApiModelProperty("运费") + @JsonProperty("fare") + private String freight; + + @ApiModelProperty("运费承担方") + @JsonProperty("freightPayer") + private String freightUndertakerName; + + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingQuery.java new file mode 100644 index 0000000000..29f6b5aaca --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingQuery.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.terminal.api.supplychain.companyShunting; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/8/25 11:48 + * @Description + */ +@Data +public class CompanyShuntingQuery implements Query { + private static final long serialVersionUID = 5168595226107955454L; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingTaskQuery.java new file mode 100644 index 0000000000..4feb49fb5b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingTaskQuery.java @@ -0,0 +1,45 @@ +package com.yxt.anrui.terminal.api.supplychain.companyShunting; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/8/25 11:47 + * @Description + */ +@Data +public class CompanyShuntingTaskQuery implements Query { + private static final long serialVersionUID = -8199630188033418050L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + private String instanceId; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingVo.java index f162924459..212228bb0d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingVo.java @@ -1,8 +1,12 @@ package com.yxt.anrui.terminal.api.supplychain.companyShunting; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/8/24 9:12 @@ -13,9 +17,22 @@ public class CompanyShuntingVo implements Vo { private static final long serialVersionUID = -2353840810082116878L; private String sid; + private String userSid; + private String taskId; + private String procInsId; + @ApiModelProperty("调入分公司名称") + private String buyerOrgName; + @ApiModelProperty("调出分公司名称") + private String sellerOrgName; + @ApiModelProperty("调车类型key") + private String shuntingTypeKey; + @ApiModelProperty("调车类型") + private String shuntingTypeValue; + + private List records = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingRest.java new file mode 100644 index 0000000000..310fb886b1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingRest.java @@ -0,0 +1,67 @@ +package com.yxt.anrui.terminal.biz.supplychain.companyShunting; + +import com.yxt.anrui.terminal.api.supplychain.companyShunting.*; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author dimengzhe + * @Date 2022/8/25 11:31 + * @Description + */ +@Api(tags = "分公司间调车") +@Controller +@RequestMapping("/supplychain/v1/companyShunting") +public class CompanyShuntingRest implements CompanyShuntingFeign { + + @Autowired + private CompanyShuntingService companyShuntingService; + + @Override + public ResultBean getCompanyShunting(String sid) { + return companyShuntingService.getCompanyShunting(sid); + } + + @Override + public ResultBean agreeCompanyShuntingInfo(CompanyShuntingDto dto) { + return companyShuntingService.agreeCompanyShuntingInfo(dto); + } + + @Override + public ResultBean upDateAgreeCompanyShuntingInfo(CompanyShuntingDto dto) { + return companyShuntingService.upDateAgreeCompanyShuntingInfo(dto); + } + + @Override + public ResultBean initiatorToAnswerInfo(CompanyShuntingDto dto) { + return companyShuntingService.initiatorToAnswerInfo(dto); + } + + @Override + public ResultBean companyToDivisionOperateInfo(CompanyShuntingDto dto) { + return companyShuntingService.companyToDivisionOperateInfo(dto); + } + + @Override + public ResultBean rejectCompanyShuntingInfo(CompanyShuntingTaskQuery query) { + return companyShuntingService.rejectCompanyShuntingInfo(query); + } + + @Override + public ResultBean recallCompanyShuntingInfo(CompanyShuntingTaskQuery query) { + return companyShuntingService.recallCompanyShuntingInfo(query); + } + + @Override + public ResultBean stopCompanyShuntingInfo(CompanyShuntingTaskQuery query) { + return companyShuntingService.stopCompanyShuntingInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(CompanyShuntingQuery query) { + return companyShuntingService.getFlowOperateTitle(query); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java new file mode 100644 index 0000000000..75393b4020 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java @@ -0,0 +1,134 @@ +package com.yxt.anrui.terminal.biz.supplychain.companyShunting; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingVo; +import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign; +import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto; +import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.*; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author dimengzhe + * @Date 2022/8/25 11:32 + * @Description + */ +@Service +public class CompanyShuntingService { + + @Autowired + private BaseInternalPurchaseFeign baseInternalPurchaseFeign; + + public ResultBean getCompanyShunting(String sid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = baseInternalPurchaseFeign.getCompanyShunting(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + CompanyShuntingVo companyShuntingVo = new CompanyShuntingVo(); + AppCompanyShuntingVo vo = resultBean.getData(); + BeanUtil.copyProperties(vo, companyShuntingVo); + return rb.success().setData(companyShuntingVo); + } + + public ResultBean agreeCompanyShuntingInfo(CompanyShuntingDto dto) { + ResultBean rb = ResultBean.fireFail(); + BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); + BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); + ResultBean resultBean = baseInternalPurchaseFeign.complete(baseInterNalPurchaseCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean upDateAgreeCompanyShuntingInfo(CompanyShuntingDto dto) { + ResultBean rb = ResultBean.fireFail(); + List list = dto.getJson(); + if (list.isEmpty()) { + return rb.setMsg("车辆list不能为空"); + } + List> dataList = list.stream().map(companyShuting -> { + Map map = new HashMap<>(); + map.put("sid", companyShuting.getSid()); + map.put("guidedPrice", companyShuting.getGuidedPrice()); + return map; + }).collect(Collectors.toList()); + Map map = new HashMap<>(); + BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); + BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); + map.put("baseInternalPurchaseVehicles", dataList); + baseInterNalPurchaseCompleteDto.setFormVariables(map); + ResultBean resultBean = baseInternalPurchaseFeign.complete(baseInterNalPurchaseCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean initiatorToAnswerInfo(CompanyShuntingDto dto) { + ResultBean rb = ResultBean.fireFail(); + BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); + BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); + ResultBean resultBean = baseInternalPurchaseFeign.InitiatorToAnswer(baseInterNalPurchaseCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean companyToDivisionOperateInfo(CompanyShuntingDto dto) { + ResultBean rb = ResultBean.fireFail(); + BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); + BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); + ResultBean resultBean = baseInternalPurchaseFeign.companyToDivisionOperate(baseInterNalPurchaseCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean rejectCompanyShuntingInfo(CompanyShuntingTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BaseInterNalPurchaseTaskQuery baseInterNalPurchaseTaskQuery = new BaseInterNalPurchaseTaskQuery(); + BeanUtil.copyProperties(query, baseInterNalPurchaseTaskQuery); + ResultBean resultBean = baseInternalPurchaseFeign.taskReject(baseInterNalPurchaseTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean recallCompanyShuntingInfo(CompanyShuntingTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BaseInterNalPurchaseTaskQuery baseInterNalPurchaseTaskQuery = new BaseInterNalPurchaseTaskQuery(); + BeanUtil.copyProperties(query, baseInterNalPurchaseTaskQuery); + ResultBean resultBean = baseInternalPurchaseFeign.revokeProcess(baseInterNalPurchaseTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean stopCompanyShuntingInfo(CompanyShuntingTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BaseInterNalPurchaseTaskQuery baseInterNalPurchaseTaskQuery = new BaseInterNalPurchaseTaskQuery(); + BeanUtil.copyProperties(query, baseInterNalPurchaseTaskQuery); + ResultBean resultBean = baseInternalPurchaseFeign.breakProcess(baseInterNalPurchaseTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean getFlowOperateTitle(CompanyShuntingQuery query) { + return null; + } +}