Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleListQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.base.api.basemiddleman;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/29 14:18
+ * @Description
+ */
+@Data
+public class BaseMiddleListQuery implements Query {
+    private static final long serialVersionUID = 235157485806433620L;
+    @ApiModelProperty("销售专员sid")
+    private String staffSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleListVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.base.api.basemiddleman;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/29 14:15
+ * @Description
+ */
+@Data
+public class BaseMiddleListVo implements Vo {
+    private static final long serialVersionUID = 2848609419353517091L;
+    @ApiModelProperty("中介人")
+    private String middleName;
+    @ApiModelProperty("中介人sid")
+    private String middleSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java

@@ -31,9 +31,11 @@ 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.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * Project: anrui-base(基础) <br/>
@@ -85,4 +87,9 @@ public interface BaseMiddlemanFeign {
     @PostMapping("/getMiddleList")
     @ResponseBody
     ResultBean<PagerVo<BaseMiddleVo>> getMiddleList(@Valid @RequestBody PagerQuery<BaseMiddleQuery> query);
+
+    @ApiOperation("车辆出库中介人员")
+    @PostMapping("/selectMiddleList")
+    @ResponseBody
+    ResultBean<List<BaseMiddleListVo>> selectMiddleList(@SpringQueryMap BaseMiddleListQuery query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeignFallback.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: BaseMiddlemanFeignFallback.java <br/>
@@ -77,4 +79,9 @@ public class BaseMiddlemanFeignFallback implements BaseMiddlemanFeign {
 	public ResultBean<PagerVo<BaseMiddleVo>> getMiddleList(PagerQuery<BaseMiddleQuery> query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<BaseMiddleListVo>> selectMiddleList(BaseMiddleListQuery query) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @Author dimengzhe
  * @Date 2022/9/23 11:42
@@ -28,10 +30,12 @@ public class BaseVehicleOut extends BaseEntity {
     private String staffSid;
     @ApiModelProperty("销售专员")
     private String staffName;
+    @ApiModelProperty("销售日期")
+    private String saleDate;
     @ApiModelProperty("合同编号")
     private String concatNo;
     @ApiModelProperty("成交价")
-    private String price;
+    private BigDecimal price;
     @ApiModelProperty("是否为终端客户")
     private String isTerminal;
     @ApiModelProperty("客户名称")
@@ -40,18 +44,32 @@ public class BaseVehicleOut extends BaseEntity {
     private String mobile;
     @ApiModelProperty("赠品说明")
     private String giftsDescription;
-    @ApiModelProperty("二次经销商")
-    private String distributorName;
-    @ApiModelProperty("返利金额")
-    private String rebateAmount;
-    @ApiModelProperty("实际购车人名称")
-    private String actualCustomer;
-    @ApiModelProperty("实际购车人电话")
-    private String actualMobile;
-    @ApiModelProperty("实际购车人sid")
-    private String actualSid;
-    @ApiModelProperty("二次经销商sid")
-    private String distributorSid;
+    /*   @ApiModelProperty("二次经销商")
+       private String distributorName;
+       @ApiModelProperty("返利金额")
+       private String rebateAmount;
+       @ApiModelProperty("实际购车人名称")
+       private String actualCustomer;
+       @ApiModelProperty("实际购车人电话")
+       private String actualMobile;
+       @ApiModelProperty("实际购车人sid")
+       private String actualSid;
+       @ApiModelProperty("二次经销商sid")
+       private String distributorSid;*/
     @ApiModelProperty("客户sid")
     private String customerSid;
+    @ApiModelProperty("销售折让")
+    private BigDecimal salesAllowance;
+    @ApiModelProperty("中介人1")
+    private String middleOne;
+    @ApiModelProperty("中介人1sid")
+    private String middleOneSid;
+    @ApiModelProperty("返利金额1")
+    private BigDecimal rebateMoneyOne;
+    @ApiModelProperty("中介人2")
+    private String middleTwo;
+    @ApiModelProperty("中介人2sid")
+    private String middleTwoSid;
+    @ApiModelProperty("返利金额2")
+    private BigDecimal rebateMoneyTwo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java

@@ -4,8 +4,6 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Author dimengzhe
  * @Date 2022/9/23 13:36
@@ -33,7 +31,7 @@ public class BaseVehicleOutDto implements Dto {
     private String concatNo;
     @ApiModelProperty("成交价")
     private String price;
-    @ApiModelProperty("是否为终端客户")
+    @ApiModelProperty("是否为终端客户:1是0不是")
     private String isTerminal;
     @ApiModelProperty("客户名称")
     private String customerName;
@@ -44,25 +42,21 @@ public class BaseVehicleOutDto implements Dto {
     @ApiModelProperty("赠品说明")
     private String giftsDescription;
 
-    @ApiModelProperty("返利金额")
-    private String rebateAmount;
-
-   /* @ApiModelProperty("实际购车人名称")
-    private String actualCustomer;
-    @ApiModelProperty("实际购车人电话")
-    private String actualMobile;
-    @ApiModelProperty("实际购车人sid")
-    private String actualSid;*/
-       /* @ApiModelProperty("二次经销商")
-     private String distributorName;
-     @ApiModelProperty("二次经销商sid")
-     private String distributorSid;*/
-        private List<BaseVehicleOutQuery> queryList;
-
-    //销售折让
-    //中介人1
-    //返利金额1
-    //中介人2
-    //返利金额2
-    //备注
+    @ApiModelProperty("销售折让")
+    private String salesAllowance;
+    @ApiModelProperty("中介人1")
+    private String middleOne;
+    @ApiModelProperty("中介人1sid")
+    private String middleOneSid;
+    @ApiModelProperty("返利金额1")
+    private String rebateMoneyOne;
+    @ApiModelProperty("中介人2")
+    private String middleTwo;
+    @ApiModelProperty("中介人2sid")
+    private String middleTwoSid;
+    @ApiModelProperty("返利金额2")
+    private String rebateMoneyTwo;
+    @ApiModelProperty("备注")
+    private String remarks;
+    private String saleDate;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -1,6 +1,8 @@
 package com.yxt.anrui.base.api.basevehicleout;
 
+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.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +25,11 @@ public interface BaseVehicleOutFeign {
     @PostMapping("/vehicleOut")
     @ResponseBody
     public ResultBean vehicleOut(@RequestBody BaseVehicleOutDto dto);
+
+    @ApiOperation("车辆出库分页列表")
+    @PostMapping("/pagerList")
+    @ResponseBody
+    ResultBean<PagerVo<BaseVehicleOutVo>> pagerList(@RequestBody PagerQuery<BaseVehicleOutQuery> query);
 }
 
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutQuery.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.api.basevehicleout;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,7 +12,21 @@ import lombok.Data;
 @Data
 public class BaseVehicleOutQuery implements Query {
     private static final long serialVersionUID = -5581600140473125908L;
-
-    private String vinSid;
+    @ApiModelProperty("车架号")
     private String vinNo;
+
+    @ApiModelProperty("销售类型key")
+    private String typeKey;
+
+    @ApiModelProperty("销售日期开始时间")
+    private String saleDateStart;
+    @ApiModelProperty("销售日期结束时间")
+    private String saleDateEnd;
+
+//    @ApiModelProperty("客户类型")
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("合同编号")
+    private String concatNo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java

@@ -0,0 +1,73 @@
+package com.yxt.anrui.base.api.basevehicleout;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/29 12:00
+ * @Description
+ */
+@Data
+public class BaseVehicleOutVo implements Vo {
+    private static final long serialVersionUID = -1711615769602118459L;
+
+    @ApiModelProperty("车架号")
+    private String vinSid;
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("配置")
+    private String modelConfig;
+
+    @ApiModelProperty("销售类型")
+    private String type;
+
+    @ApiModelProperty("销售日期")
+    private String saleDate;
+
+    @ApiModelProperty("成交价")
+    private String price;
+
+    @ApiModelProperty("销售部门")
+    private String orgName;
+
+    @ApiModelProperty("销售专员")
+    private String staffName;
+
+    @ApiModelProperty("合同编号")
+    private String concatNo;
+
+    @ApiModelProperty("是否为终端客户")
+    private String isTerminal;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("手机号码")
+    private String mobile;
+
+    @ApiModelProperty("赠品说明")
+    private String giftsDescription;
+
+    @ApiModelProperty("销售折让")
+    private String salesAllowance;
+
+    @ApiModelProperty("中介人1")
+    private String middleOne;
+
+
+    @ApiModelProperty("返利金额1")
+    private String rebateMoneyOne;
+
+    @ApiModelProperty("中介人2")
+    private String middleTwo;
+
+
+    @ApiModelProperty("返利金额2")
+    private String rebateMoneyTwo;
+
+
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.java

@@ -30,13 +30,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.basemiddleman.BaseMiddleVo;
-import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
+import com.yxt.anrui.base.api.basemiddleman.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
-import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanVo;
 
 import java.util.List;
 
@@ -75,4 +72,6 @@ public interface BaseMiddlemanMapper extends BaseMapper<BaseMiddleman> {
      * @return
      */
     IPage<BaseMiddleVo> getMiddleList(IPage<BaseMiddleman> page, @Param(Constants.WRAPPER) QueryWrapper<BaseMiddleman> qw, @Param("name") String name);
+
+    List<BaseMiddleListVo> selectMiddleList(String staffSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml

@@ -67,4 +67,10 @@
             </if>
         </where>
     </select>
+
+    <select id="selectMiddleList" resultType="com.yxt.anrui.base.api.basemiddleman.BaseMiddleListVo">
+        select name as middleName, sid as middleSid
+        from base_middleman
+        where createBySid = #{staffSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanRest.java

@@ -36,6 +36,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(基础) <br/>
  * File: BaseMiddlemanFeignFallback.java <br/>
@@ -107,4 +109,9 @@ public class BaseMiddlemanRest implements BaseMiddlemanFeign {
         PagerVo<BaseMiddleVo> pv = baseMiddlemanService.getMiddleList(query);
         return rb.success().setData(pv);
     }
+
+    @Override
+    public ResultBean<List<BaseMiddleListVo>> selectMiddleList(BaseMiddleListQuery query) {
+        return baseMiddlemanService.selectMiddleList(query);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@@ -41,6 +41,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(基础) <br/>
  * File: BaseMiddlemanService.java <br/>
@@ -121,4 +123,11 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
         PagerVo<BaseMiddleVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean<List<BaseMiddleListVo>> selectMiddleList(BaseMiddleListQuery query) {
+        ResultBean<List<BaseMiddleListVo>> rb = ResultBean.fireFail();
+        String staffSid = query.getStaffSid();
+        List<BaseMiddleListVo> list = baseMapper.selectMiddleList(staffSid);
+        return rb.success().setData(list);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java

@@ -1,7 +1,11 @@
 package com.yxt.anrui.base.biz.basevehicleout;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,4 +20,9 @@ import java.util.List;
 public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
 
     List<String> selectCountBySid(@Param("list") List<String> stringList);
+
+    int selectCountByVinSid(String vinSid);
+
+
+    IPage<BaseVehicleOutVo> selectPageVo(IPage<BaseVehicleOut> page, @Param(Constants.WRAPPER)QueryWrapper<BaseVehicleOut> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@@ -13,4 +13,39 @@
             #{sid}
         </foreach>
     </select>
+
+    <select id="selectCountByVinSid" resultType="int">
+        select count(*)
+        from base_vehicle
+        where (vehicleStateValue &lt;&gt; '库存'
+            or vehicleStateValue &lt;&gt; '调入')
+          and isProblemVeh &lt;&gt; '0'
+          and sid = #{vinSid}
+    </select>
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo">
+        SELECT bvo.vinNo,
+               bvo.vinSid,
+               bvo.type,
+               bvo.saleDate,
+               bvo.price,
+               bvo.orgName,
+               bvo.staffName,
+               bvo.concatNo,
+               case bvo.isTerminal
+                   when 1 then '是'
+                   when 0 then '否' end as isTerminal,
+               bvo.customerName,
+               bvo.mobile,
+               bvo.giftsDescription,
+               bvo.salesAllowance,
+               bvo.middleOne,
+               bvo.middleTwo,
+               bvo.rebateMoneyOne,
+               bvo.rebateMoneyTwo
+        from base_vehicle_out bvo
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@@ -2,7 +2,11 @@ package com.yxt.anrui.base.biz.basevehicleout;
 
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -25,4 +29,11 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     public ResultBean vehicleOut(BaseVehicleOutDto dto) {
         return baseVehicleOutService.vehicleOut(dto);
     }
+
+    @Override
+    public ResultBean<PagerVo<BaseVehicleOutVo>> pagerList(PagerQuery<BaseVehicleOutQuery> query) {
+        ResultBean<PagerVo<BaseVehicleOutVo>> rb = ResultBean.fireFail();
+        PagerVo<BaseVehicleOutVo> pv = baseVehicleOutService.pagerList(query);
+        return rb.success().setData(pv);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1,20 +1,26 @@
 package com.yxt.anrui.base.biz.basevehicleout;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 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 org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @Author dimengzhe
@@ -29,31 +35,68 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
 
     public ResultBean vehicleOut(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        List<BaseVehicleOutQuery> list = dto.getQueryList();
-        List<String> stringList = list.stream().map(BaseVehicleOutQuery -> BaseVehicleOutQuery.getVinSid()).collect(Collectors.toList());
+       /* List<BaseVehicleOutQuery> list = dto.getQueryList();
+        List<String > stringList = list.stream().map(BaseVehicleOutQuery -> BaseVehicleOutQuery.getVinSid()).collect(Collectors.toList());
         //根据sid查询出库的车辆是否符合出库条件（库存状态为库存或调入、且问题状态为无问题的、且为相同合同内的，车辆才能出库、可以批量选择）、当选择的车辆不满足条件时，点击出库按钮时
         //应给出提示“xx车辆不满足出库条件”、则不能出库
-        List<String> count = baseMapper.selectCountBySid(stringList);
+       /* List<String> count = baseMapper.selectCountBySid(stringList);
         if (count.size() > 0) {
             String vinNo = String.join(",", count);
             return rb.setMsg(vinNo + "车辆不满足出库条件");
+        }*/
+        //查询出库的车辆是否满足出库条件
+        int count = baseMapper.selectCountByVinSid(dto.getVinSid());
+        if (count > 0) {
+            return rb.setMsg(dto.getVinNo() + "车辆不满足出库条件");
         }
-        for (BaseVehicleOutQuery baseVehicleOutQuery : list) {
-            BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
-            BeanUtil.copyProperties(dto, baseVehicleOut, "sid");
-            baseVehicleOut.setVinNo(baseVehicleOutQuery.getVinNo());
-            baseVehicleOut.setVinSid(baseVehicleOutQuery.getVinSid());
-            baseMapper.insert(baseVehicleOut);
-            //更新车辆台账的出库状态等值，库存状态修改为出库，销售日期修改为当天，成交价，备注
-            String remarks = baseVehicleOut.getConcatNo() + baseVehicleOut.getType();
-            BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleOutQuery.getVinSid());
-            baseVehicle.setRemarks(remarks);
-            baseVehicle.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
-            baseVehicle.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
-            baseVehicle.setSalesDate(new Date());
-            baseVehicle.setSalePrice(Integer.valueOf(dto.getPrice()));
-            baseVehicleService.updateById(baseVehicle);
-        }
+        BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
+        BeanUtil.copyProperties(dto, baseVehicleOut, "sid");
+        baseVehicleOut.setPrice(new BigDecimal(dto.getPrice()));
+        baseVehicleOut.setSalesAllowance(new BigDecimal(dto.getSalesAllowance()));
+        baseVehicleOut.setRebateMoneyOne(new BigDecimal(dto.getRebateMoneyOne()));
+        baseVehicleOut.setRebateMoneyTwo(new BigDecimal(dto.getRebateMoneyTwo()));
+        baseMapper.insert(baseVehicleOut);
+        //更新车辆台账的出库状态等值，库存状态修改为出库，销售日期修改为当天，成交价，备注
+        String remarks = baseVehicleOut.getConcatNo() + baseVehicleOut.getType();
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(dto.getVinSid());
+        baseVehicle.setRemarks(remarks);
+        baseVehicle.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
+        baseVehicle.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
+        baseVehicle.setSalesDate(new Date());
+        baseVehicle.setSalePrice(Integer.valueOf(dto.getPrice()));
+        baseVehicleService.updateById(baseVehicle);
+        ////ToDo:推送财务出库单
         return rb.success();
     }
+
+    public PagerVo<BaseVehicleOutVo> pagerList(PagerQuery<BaseVehicleOutQuery> query) {
+        IPage<BaseVehicleOut> page = PagerUtil.queryToPage(query);
+        BaseVehicleOutQuery params = query.getParams();
+        QueryWrapper<BaseVehicleOut> qw = new QueryWrapper<>();
+        if (params != null) {
+            //车架号
+            if (StringUtils.isNotBlank(params.getVinNo())) {
+                qw.like("bvo.vinNo", params.getVinNo());
+            }
+            //销售类型
+            if (StringUtils.isNotBlank(params.getTypeKey())) {
+                qw.eq("bvo.typeKey", params.getTypeKey());
+            }
+            //销售日期开始-销售日期结束
+            qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvo.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvo.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')"
+                    );
+            //合同编号
+            if (StringUtils.isNotBlank(params.getConcatNo())) {
+                qw.like("bvo.concatNo", params.getConcatNo());
+            }
+            //客户名称
+            if (StringUtils.isNotBlank(params.getCustomerName())) {
+                qw.like("bvo.customerName", params.getCustomerName());
+            }
+        }
+        IPage<BaseVehicleOutVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseVehicleOutVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeVo.java

@@ -25,5 +25,8 @@ public class DictTypeVo implements Vo {
     @ApiModelProperty(value = "说明")
     private String remarks;
 
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
+
 
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java

@@ -69,7 +69,7 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
     public QueryWrapper<SysMappingVo> queryWrapper(SysMappingQuery query) {
         QueryWrapper<SysMappingVo> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getMap_sourceKey())) {
-            qw.eq("sm.map_sourceKey", query.getMap_sourceKey());
+            qw.like("sm.map_sourceKey", query.getMap_sourceKey());
         }
         if (StringUtils.isNotBlank(query.getMap_sourceValue())) {
             qw.like("sm.map_sourceValue", query.getMap_sourceValue());
@@ -81,22 +81,22 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
             qw.like("sm.map_item", query.getMap_item());
         }
         if (StringUtils.isNotBlank(query.getMap_itemKey())) {
-            qw.eq("sm.map_itemKey", query.getMap_itemKey());
+            qw.like("sm.map_itemKey", query.getMap_itemKey());
         }
         if (StringUtils.isNotBlank(query.getMap_itemValue())) {
             qw.like("sm.map_itemValue", query.getMap_itemValue());
         }
         if (StringUtils.isNotBlank(query.getDictTypeCode())) {
-            qw.eq("dc.dictKey", query.getDictTypeCode());
+            qw.like("dt.dictTypeCode", query.getDictTypeCode());
         }
         if (StringUtils.isNotBlank(query.getDictTypeName())) {
-            qw.like("dc.dictValue", query.getDictTypeName());
+            qw.like("dt.dictTypeName", query.getDictTypeName());
         }
         if (StringUtils.isNotBlank(query.getDictKey())) {
-            qw.eq("dt.dictTypeCode", query.getDictKey());
+            qw.like("dc.dictKey", query.getDictKey());
         }
         if (StringUtils.isNotBlank(query.getDictValue())) {
-            qw.like("dt.dictTypeName", query.getDictValue());
+            qw.like("dc.dictValue", query.getDictValue());
         }
         return qw;
     }
@@ -137,7 +137,7 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
     public void saveMappingList(List<SysMappingDto> dto) {
         for (SysMappingDto sysMappingDto : dto) {
             SysMapping entity = new SysMapping();
-            BeanUtil.copyProperties(sysMappingDto, entity, "sid");
+            BeanUtil.copyProperties(sysMappingDto, entity);
             entity.setCreateBySid(sysMappingDto.getUserSid());
             save(entity);
         }