From c41e89f8999aaeea7440a7cffb306727e2c8a813 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 4 Apr 2023 17:51:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basetrailer/BaseTrailerFeign.java | 9 ++- .../basetrailer/BaseTrailerFeignFallback.java | 7 +++ .../anrui/base/api/basetrailer/TrailerVo.java | 61 +++++++++++++++++++ .../biz/basetrailer/BaseTrailerMapper.java | 2 + .../biz/basetrailer/BaseTrailerMapper.xml | 51 ++++++++++++---- .../base/biz/basetrailer/BaseTrailerRest.java | 7 +++ .../biz/basetrailer/BaseTrailerService.java | 8 +++ .../busdeliveredapply/BusDeliveredApply.java | 17 ++++++ .../app/order/AppBusSalesOrderVo.java | 3 + .../bussalesorder/BusSalesOrderService.java | 22 ++++++- .../anrui/flowable/api/flow/FlowSelectVo.java | 17 ++++++ .../flowable/api/flow/FlowableFallback.java | 5 ++ .../flowable/api/flow/FlowableFeign.java | 5 ++ .../flowable/biz/flow/FlowableMapper.java | 3 + .../flowable/biz/flow/FlowableMapper.xml | 9 +++ .../anrui/flowable/biz/flow/FlowableRest.java | 5 ++ .../flowable/biz/flow/FlowableService.java | 9 +++ doc/databases/bus-center_tables.sql | 26 ++++++++ 18 files changed, 249 insertions(+), 17 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TrailerVo.java create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowSelectVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java index bdb2c5c153..5720c6e56b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java @@ -25,12 +25,11 @@ *********************************************************/ package com.yxt.anrui.base.api.basetrailer; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto; -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.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -116,4 +115,8 @@ public interface BaseTrailerFeign { @ApiOperation("挂车出库") @PostMapping("/trailerOut/{sid}") ResultBean trailerOut(@PathVariable("sid") String sid); + + @ApiOperation("查询主车的挂车信息") + @GetMapping("/trailerList") + ResultBean> trailerList(@RequestParam("vinSid") String vinSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java index 57c24986df..5eb6b35520 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java @@ -30,6 +30,8 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.util.List; + /** * Project: anrui-base(基础信息)
* File: BaseTrailerFeignFallback.java
@@ -81,4 +83,9 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign { public ResultBean trailerOut(String sid) { return null; } + + @Override + public ResultBean> trailerList(String vinSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TrailerVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TrailerVo.java new file mode 100644 index 0000000000..1b99dc06bd --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TrailerVo.java @@ -0,0 +1,61 @@ +package com.yxt.anrui.base.api.basetrailer; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/4 15:53 + * @Description + */ +@Data +public class TrailerVo implements Vo { + private static final long serialVersionUID = 5418099081343029730L; + + @ApiModelProperty("挂车车架号") + private String trailerVinNo; + + //成交价 + private String dealPrice; + //车辆品牌 + private String brandName; + //车辆型号 + private String carModelName; + //生产厂商名称 + private String manufacturerName; + //挂车类型 + private String trailerTypeValue; + //外观尺寸：长、宽、高、总高 + private String appearanceSizeLong; + private String appearanceSizeWide; + private String appearanceSizeHigh; + private String appearanceSizeTotalHigh; + //内部尺寸：长、宽、高 + private String insideSizeLong; + private String insideSizeWide; + private String insideSizeHigh; + //鞍座离地尺寸 + private String saddleLeaveLandHigh; + //大梁尺寸：高度、宽度、立板 + private String girderSizeHigh; + private String girderSizeWide; + private String girderSizeStandPlate; + //牵引销 + private String towPin; + //板簧 + private String plateSpring; + //车桥 + private String axle; + //轮胎及钢圈 + private String tyreAndSteelCircle; + //底板 + private String floorSize; + //门扇要求 + private String doorFanRequirement; + //箱体颜色 + private String boxColor; + //更多配置 + private String moreConfig; + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java index 6b2508d28e..0ad32285b2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java @@ -88,4 +88,6 @@ public interface BaseTrailerMapper extends BaseMapper { String selectNum(String billNo); int selectNumGCRK(String bill); + + List trailerList(String vinSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml index 7cd0db1fd6..945e97dd74 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml @@ -4,13 +4,11 @@ + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java index 68dd36e3b4..ad0ce6e7a7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java @@ -36,6 +36,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: anrui-base(基础信息)
* File: BaseTrailerFeignFallback.java
@@ -109,4 +111,9 @@ public class BaseTrailerRest implements BaseTrailerFeign { public ResultBean trailerOut(String sid) { return baseTrailerService.trailerOut(sid); } + + @Override + public ResultBean> trailerList(String vinSid) { + return baseTrailerService.trailerList(vinSid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 2b357f3222..65d2e26383 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -94,6 +94,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -670,4 +671,11 @@ public class BaseTrailerService extends MybatisBaseService> trailerList(String vinSid) { + ResultBean> rb = ResultBean.fireFail(); + List voList = baseMapper.trailerList(vinSid); + voList.removeAll(Collections.singleton(null)); + return rb.success().setData(voList); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java index f39ef7570c..3fa847a8e7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java @@ -91,4 +91,21 @@ public class BusDeliveredApply extends BaseEntity { @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty("发起部门sid") + private String applyDeptSid; + @ApiModelProperty("发起部门") + private String applyDept; + @ApiModelProperty("销售专员用户sid") + private String staffUserSid; + @ApiModelProperty("销售专员名称") + private String staffName; + @ApiModelProperty("销售部门sid") + private String staffDeptSid; + @ApiModelProperty("销售部门名称") + private String staffDeptName; + @ApiModelProperty("贷款人") + private String loanName; + @ApiModelProperty("贷款人手机号") + private String loanMobile; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index 04b9bcbea1..a99487547a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -160,4 +160,7 @@ public class AppBusSalesOrderVo implements Vo { private String procDefId; @ApiModelProperty("流程实例id") private String procInstId; + + @ApiModelProperty("审批结束时间") + private String endTime; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 13eb60ec77..fe7d76271d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -122,6 +122,7 @@ import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto; +import com.yxt.anrui.flowable.api.flow.FlowSelectVo; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -149,12 +150,15 @@ import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.*; import com.yxt.common.base.utils.Base64; +import com.yxt.common.base.utils.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.*; +import com.yxt.messagecenter.api.message.Message; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import com.yxt.messagecenter.api.messagelist.MessageList; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; @@ -164,7 +168,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.math.BigInteger; import java.net.HttpURLConnection; @@ -4887,6 +4894,15 @@ public class BusSalesOrderService extends MybatisBaseService flowSelectVoResultBean = flowableFeign.selectFlows(record.getProcDefId(),record.getProcInstId()); + if(flowSelectVoResultBean.getData() != null){ + FlowSelectVo flowSelectVo = flowSelectVoResultBean.getData(); + if(StringUtils.isNotBlank(flowSelectVo.getEndTime())){ + record.setEndTime(flowSelectVo.getEndTime()); + } + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowSelectVo.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowSelectVo.java new file mode 100644 index 0000000000..a0e19ead9c --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowSelectVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.flowable.api.flow; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/4 14:18 + * @Description + */ +@Data +public class FlowSelectVo implements Vo { + private static final long serialVersionUID = 4565010214322673924L; + + private String endTime; + +} diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java index 659ce9824b..a87c254107 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java @@ -96,5 +96,10 @@ public class FlowableFallback implements FlowableFeign { return null; } + @Override + public ResultBean selectFlows(String proDefId, String proInsId) { + return null; + } + } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java index f14d22bada..c7059f789e 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java @@ -141,4 +141,9 @@ public interface FlowableFeign { @PostMapping(value = "/shareFlowable") @ResponseBody ResultBean shareFlowable(@RequestBody FlowableShareQuery flowableShareQuery); + + @ApiOperation(value = "根据流程id和实例id查询流程结束时间") + @GetMapping(value = "/selectFlows") + @ResponseBody + ResultBean selectFlows(@RequestParam("proDefId")String proDefId,@RequestParam("proInsId")String proInsId); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.java index 1a3162dc3e..2b77bbebc3 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.java @@ -3,6 +3,7 @@ package com.yxt.anrui.flowable.biz.flow; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.flowable.api.flow.FlowListVo; import com.yxt.anrui.flowable.api.flow.FlowProcinst; +import com.yxt.anrui.flowable.api.flow.FlowSelectVo; import com.yxt.anrui.flowable.api.flow.Flowable; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,6 @@ public interface FlowableMapper extends BaseMapper { * @return 查询所有流程名称及key */ List selectFlowList(); + + FlowSelectVo selectFlows(@Param("proDefId") String proDefId, @Param("proInsId") String proInsId); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.xml index 5e80d0ee71..6d107f5749 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.xml @@ -23,6 +23,15 @@ (select SUBSTRING_INDEX(GROUP_CONCAT(ID_ order by VERSION_ desc),',',1) AS id from act_re_procdef GROUP BY KEY_) AS t2 ON t2.id = t1.ID_ + +