修改

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<List<TrailerVo>> trailerList(@RequestParam("vinSid") String vinSid);
 }

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(基础信息) <br/>
  * File: BaseTrailerFeignFallback.java <br/>
@@ -81,4 +83,9 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign {
 	public ResultBean trailerOut(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<TrailerVo>> trailerList(String vinSid) {
+		return null;
+	}
 }

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;
+
+}

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<BaseTrailer> {
     String selectNum(String billNo);
 
     int selectNumGCRK(String bill);
+
+    List<TrailerVo> trailerList(String vinSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml

@@ -4,13 +4,11 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basetrailer.BaseTrailerVo">
-        SELECT
+        SELECT bt.*,
-        bt.*,
+               btm.*
-        btm.*
+        FROM base_trailer bt
-        FROM
+                 LEFT JOIN base_trailer_model btm
-        base_trailer bt
+                           ON bt.`trailerModelSid` = btm.`sid`
-        LEFT JOIN base_trailer_model btm
-        ON bt.`trailerModelSid` = btm.`sid`
         <where>
             ${ew.sqlSegment}
         </where>
@@ -52,16 +50,16 @@
         bt.guidePrice,
         <!--价格有效期-->
         DATE_FORMAT(bt.priceValidity, '%Y-%m-%d') as priceValidity
-                FROM base_trailer bt
+        FROM base_trailer bt
-                        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="selectNum" resultType="java.lang.String">
-        select RIGHT (billNo, 4)
+        select RIGHT(billNo, 4)
         from base_vehicle_out_apply
         where billNo LIKE concat(#{billNo}, '%')
         order by billNo desc
-                limit 1
+        limit 1
     </select>
 
     <select id="selectNumGCRK" resultType="int">
@@ -69,4 +67,35 @@
         from base_trailer
         where billNo LIKE concat(#{bill}, '%')
     </select>
+
+    <select id="trailerList" resultType="com.yxt.anrui.base.api.basetrailer.TrailerVo">
+        select bt.vinNo trailerVinNo,
+               bt.dealPrice,
+               btm.brandName,
+               btm.carModelName,
+               btm.manufacturerName,
+               btm.trailerTypeValue,
+               btm.appearanceSizeHigh,
+               btm.appearanceSizeWide,
+               btm.appearanceSizeHigh,
+               btm.appearanceSizeTotalHigh,
+               btm.insideSizeLong,
+               btm.insideSizeWide,
+               btm.insideSizeHigh,
+               btm.saddleLeaveLandHigh,
+               btm.girderSizeHigh,
+               btm.girderSizeWide,
+               btm.girderSizeStandPlate,
+               btm.towPin,
+               btm.plateSpring,
+               btm.axle,
+               btm.tyreAndSteelCircle,
+               btm.floorSize,
+               btm.doorFanRequirement,
+               btm.boxColor,
+               btm.moreConfig
+        from base_trailer bt
+                 left join base_trailer_model btm on btm.sid = bt.trailerModelSid
+        where bt.vehSid = #{vinSid}
+    </select>
 </mapper>

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(基础信息) <br/>
  * File: BaseTrailerFeignFallback.java <br/>
@@ -109,4 +111,9 @@ public class BaseTrailerRest implements BaseTrailerFeign {
 	public ResultBean trailerOut(String sid) {
 		return baseTrailerService.trailerOut(sid);
 	}
+
+	@Override
+	public ResultBean<List<TrailerVo>> trailerList(String vinSid) {
+		return baseTrailerService.trailerList(vinSid);
+	}
 }

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<BaseTrailerMapper, Ba
             return null;
         }
     }
+
+    public ResultBean<List<TrailerVo>> trailerList(String vinSid) {
+        ResultBean<List<TrailerVo>> rb = ResultBean.fireFail();
+        List<TrailerVo> voList = baseMapper.trailerList(vinSid);
+        voList.removeAll(Collections.singleton(null));
+        return rb.success().setData(voList);
+    }
 }

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;
+
 }

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;
 }

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<BusSalesOrderMapper
             } else {
                 record.setPrintOrderBtn(false);
             }
+            //根据流程定义id以及实例id查询结束时间
+            ResultBean<FlowSelectVo> 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<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

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;
+
+}

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<FlowSelectVo> selectFlows(String proDefId, String proInsId) {
+        return null;
+    }
+
 
 }

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<FlowSelectVo> selectFlows(@RequestParam("proDefId")String proDefId,@RequestParam("proInsId")String proInsId);
 }

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<Flowable> {
      * @return 查询所有流程名称及key
      */
     List<FlowListVo> selectFlowList();
+
+    FlowSelectVo selectFlows(@Param("proDefId") String proDefId, @Param("proInsId") String proInsId);
 }

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_
     </select>
+
+    <select id="selectFlows" resultType="com.yxt.anrui.flowable.api.flow.FlowSelectVo">
+        SELECT
+            DATE_FORMAT(ahpi.END_TIME_,'%Y-%m-%d %H:%m:%s') endTime,
+            ahpi.PROC_DEF_ID_,
+            ahpi.PROC_INST_ID_
+        FROM ACT_HI_PROCINST ahpi
+        where ahpi.PROC_DEF_ID_ = #{proDefId} and ahpi.PROC_INST_ID_ = #{proInsId}
+    </select>
     <!--
         <insert id="insetFlowableTask">
             insert into `act_ru_task` (`REV`, `EXECUTION_ID`, `PROC_INST_ID`, `PROC_DEF_ID`,

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -699,4 +699,9 @@ public class FlowableRest implements FlowableFeign {
         }
         return rb.success();
     }
+
+    @Override
+    public ResultBean<FlowSelectVo> selectFlows(String proDefId, String proInsId) {
+        return flowableService.selectFlows(proDefId,proInsId);
+    }
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java

@@ -285,4 +285,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         List<FlowListVo> list = baseMapper.selectFlowList();
         return rb.success().setData(list);
     }
+
+    public ResultBean<FlowSelectVo> selectFlows(String proDefId, String proInsId) {
+        ResultBean<FlowSelectVo> rb = ResultBean.fireFail();
+        FlowSelectVo flowSelectVo = baseMapper.selectFlows(proDefId,proInsId);
+        if(flowSelectVo == null){
+            return rb;
+        }
+        return rb.success().setData(flowSelectVo);
+    }
 }

doc/databases/bus-center_tables.sql

@@ -245,6 +245,32 @@ CREATE TABLE `bus_delivered_apply_details`
     KEY `id` (`id`)
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='出库车辆关联表';
+-- 出库车辆选择优惠
+DROP TABLE IF EXISTS `bus_delivered_details_discount`;
+CREATE TABLE `bus_delivered_details_discount`
+(
+    `id`              int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`             varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`     int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`        int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`           int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`        int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`         varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`     varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`     varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `detailsSid`      VARCHAR(64)          DEFAULT NULL COMMENT '出库车辆表sid',
+    `name`            varchar(64)          DEFAULT NULL COMMENT '优惠包名称',
+    `price`           varchar(64)          DEFAULT NULL COMMENT '价值',
+    `discountExplain` VARCHAR(64)          DEFAULT NULL COMMENT '优惠包项目说明',
+    `num`             VARCHAR(64)          DEFAULT NULL COMMENT '数量',
+    `surplusNum`      VARCHAR(64)          DEFAULT NULL COMMENT '剩余数量',
+    `useMessageSid`   VARCHAR(64)          DEFAULT NULL COMMENT '本次赠送数量',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='出库车辆关联表';
 
 -- 使用人信息
 DROP TABLE IF EXISTS `bus_delivered_use_message`;