pc端未售买断完善调式

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java

@@ -45,5 +45,8 @@ public class BaseVehicleReturnQuery implements Query {
     @ApiModelProperty(value = "已选择的车辆的车架号")
     private List<String> vinNoList = new ArrayList<>();
 
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeign.java

@@ -34,6 +34,11 @@ public interface BaseVehicleActualSalesFeign {
     @ResponseBody
     ResultBean saveOrUpdate(@RequestBody BaseVehicleActualSalesDto baseVehicleActualSalesDto);
 
+    @ApiOperation("删除")
+    @DeleteMapping("/delete")
+    @ResponseBody
+    ResultBean delete(@RequestBody String[] sidsList);
+
     @ApiOperation("提交")
     @PostMapping("/submitVehicleSales")
     @ResponseBody

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeignFallback.java

@@ -26,6 +26,11 @@ public class BaseVehicleActualSalesFeignFallback implements BaseVehicleActualSal
         return null;
     }
 
+    @Override
+    public ResultBean delete(String[] sidsList) {
+        return null;
+    }
+
     @Override
     public ResultBean submitVehicleSales(BaseVehicleActualSalesDto baseVehicleActualSalesDto) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesQuery.java

@@ -20,4 +20,7 @@ public class BaseVehicleActualSalesQuery implements Query {
     private String nodeState;
     @ApiModelProperty(value = "车架号")
     private String vinNo;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -649,7 +649,7 @@
         <!--颜色-->
         bmc.carColor color,
         <!--存放地点-->
-        bv.location,
+        bv.locationName location,
         <!--销售指导价-->
         bv.guidedPrice,
         bmc.configName,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -799,8 +799,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getEngineType())) {
             qw.eq("bvm.engineTypeValue", pagerQuery.getEngineType());
         }
-        if(StringUtils.isNotBlank(pagerQuery.getSpecifications())){
-            qw.like("bvm.specifications",pagerQuery.getSpecifications());
+        if (StringUtils.isNotBlank(pagerQuery.getSpecifications())) {
+            qw.like("bvm.specifications", pagerQuery.getSpecifications());
         }
         return qw;
     }
@@ -963,11 +963,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             }
             //功能
             if (StringUtils.isNotBlank(params.getVehicleType())) {
-                qw.like("bvm.vehicleType", params.getVehicleType());
+                qw.eq("bvm.vehicleType", params.getVehicleType());
             }
             //系列
             if (StringUtils.isNotBlank(params.getProductLine())) {
-                qw.like("bvm.productLine", params.getProductLine());
+                qw.eq("bvm.productLine", params.getProductLine());
             }
             //变速箱
             if (StringUtils.isNotBlank(params.getGearboxType())) {
@@ -995,7 +995,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             }
             //车型
             if (StringUtils.isNotBlank(params.getVehicleAlias())) {
-                qw.eq("bvm.vehicleAlias", params.getVehicleAlias());
+                qw.like("bvm.vehicleAlias", params.getVehicleAlias());
             }
             //快捷检索车型
             if (StringUtils.isNotBlank(params.getModelName())) {
@@ -1005,8 +1005,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 qw.notIn("bv.vinNo", params.getVinNoList());
             }
             //锁定状态
-            qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
-            qw.eq("bv.vehicleStateValue", "库存");
+            qw.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode());
+//            qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
+            qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
         }
         return qw;
     }
@@ -1103,17 +1104,22 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private QueryWrapper<BaseVehicle> vehicleActualWrapper(BaseVehicleReturnQuery params) {
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (params != null) {
+            if (StringUtils.isNotBlank(params.getUserSid())) {
+                String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+                qw.eq("bv.useOrg", orgSid);
+
+            }
             //品牌
             if (StringUtils.isNotBlank(params.getBrandSid())) {
                 qw.eq("bvm.carBrand", params.getBrandSid());
             }
             //功能
             if (StringUtils.isNotBlank(params.getVehicleType())) {
-                qw.like("bvm.vehicleType", params.getVehicleType());
+                qw.eq("bvm.vehicleType", params.getVehicleType());
             }
             //系列
             if (StringUtils.isNotBlank(params.getProductLine())) {
-                qw.like("bvm.productLine", params.getProductLine());
+                qw.eq("bvm.productLine", params.getProductLine());
             }
             //变速箱
             if (StringUtils.isNotBlank(params.getGearboxType())) {
@@ -1141,7 +1147,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             }
             //车型
             if (StringUtils.isNotBlank(params.getVehicleAlias())) {
-                qw.eq("bvm.vehicleAlias", params.getVehicleAlias());
+                qw.like("bvm.vehicleAlias", params.getVehicleAlias());
             }
             //快捷检索车型
             if (StringUtils.isNotBlank(params.getModelName())) {
@@ -1151,9 +1157,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 qw.notIn("bv.vinNo", params.getVinNoList());
             }
             //结算状态：0没买断
-            qw.eq("bv.settlementStatus", "0");
+            qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
             //车辆状态：现车
-            qw.eq("bv.vehicleStateValue", "库存");
+            qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
         }
         return qw;
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.java

@@ -34,4 +34,12 @@ public interface BaseVehicleActualDetailsMapper extends BaseMapper<BaseVehicleAc
      * @return
      */
     List<String> selectVinNoList(String sid);
+
+    /**
+     * 根据业务sid删除未售买断的车辆
+     *
+     * @param s
+     * @return
+     */
+    int deleteByActualSid(String s);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml

@@ -24,4 +24,10 @@
         from base_vehicle_actual_details
         where vehicleActualSid = #{sid}
     </select>
+
+    <delete id="deleteByActualSid">
+        delete
+        from base_vehicle_actual_details
+        where vehicleActualSid = #{s}
+    </delete>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java

@@ -9,6 +9,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -73,4 +74,11 @@ public class BaseVehicleActualDetailsService extends MybatisBaseService<BaseVehi
         List<String> vinNoList = baseMapper.selectVinNoList(sid);
         return rb.success().setData(vinNoList);
     }
+
+    public void deleteByActualSid(String[] sidsList) {
+        List<String> stringList = Arrays.asList(sidsList);
+        for (int i = 0; i < stringList.size(); i++) {
+            baseMapper.deleteByActualSid(stringList.get(i));
+        }
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.java

@@ -10,6 +10,8 @@ import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/4/8 17:43
@@ -45,4 +47,6 @@ public interface BaseVehicleActualSalesMapper extends BaseMapper<BaseVehicleActu
      */
     void modifyFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String proDefId, @Param("nodeState") String nodeState,
                          @Param("procInstSid") String procInsId, @Param("nodeSid") String taskDefKey,@Param("taskId") String taskId);
+
+    int selectBySid(String list);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml

@@ -2,12 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxt.anrui.base.biz.basevehicleactualsales.BaseVehicleActualSalesMapper">
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesVo">
-        select sv.sid,
-               sv.applicationName,
-               DATE_FORMAT(sv.createTime, '%Y-%m-%d')                                                  as createTime,
-               sv.reason,
-               (select count(*) from base_vehicle_actual_details sa where sa.vehicleActualSid = sv.sid) as num
+        select distinct sv.sid,
+                        sv.applicationName,
+                        DATE_FORMAT(sv.createTime, '%Y-%m-%d')                                                   as createTime,
+                        sv.reason,
+                        (select count(*) from base_vehicle_actual_details sa where sa.vehicleActualSid = sv.sid) as num
         from base_vehicle_actual_sales sv
+                 left join base_vehicle_actual_details bd on bd.vehicleActualSid = sv.sid
             ${ew.customSqlSegment}
     </select>
 
@@ -25,4 +26,11 @@
             nodeSid=#{nodeSid}
         where sid = #{businessSid}
     </update>
+
+    <select id="selectBySid" resultType="int">
+        select count(*)
+        from base_vehicle_actual_sales
+        where length(nodeState)>0
+          and find_in_set(sid, #{list})
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesRest.java

@@ -34,6 +34,11 @@ public class BaseVehicleActualSalesRest implements BaseVehicleActualSalesFeign {
         return baseVehicleActualSalesService.saveOrUpdateVehicleSales(scmVehicleActualSalesDto);
     }
 
+    @Override
+    public ResultBean delete(String[] sidsList) {
+        return baseVehicleActualSalesService.delete(sidsList);
+    }
+
     @Override
     public ResultBean submitVehicleSales(BaseVehicleActualSalesDto baseVehicleActualSalesDto) {
         return baseVehicleActualSalesService.submitVehicleSales(baseVehicleActualSalesDto);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -73,16 +73,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         PagerVo<BaseVehicleActualSalesVo> pv1 = PagerUtil.pageToVo(page, pv);
         List<BaseVehicleActualSalesVo> voList = pv1.getRecords();
         if (voList.size() > 0) {
-           /* for (int i = 0; i < voList.size(); i++) {
-                ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(voList.get(i).getSid());
-                if (resultBean.getSuccess() && resultBean.getData() != null) {
-                    SysFormStateVo formState = resultBean.getData();
-                    voList.get(i).setNodeState(formState.getNodeState());
-                    voList.get(i).setFlowState(formState.getFlowState());
-                } else {
-                    voList.get(i).setFlowState(0);
-                }
-            }*/
             for (BaseVehicleActualSalesVo vo : voList) {
                 if (StringUtils.isNotBlank(vo.getNodeState())) {
                     vo.setNodeState(vo.getNodeState());
@@ -116,9 +106,24 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         QueryWrapper<BaseVehicleActualSales> qw = new QueryWrapper<>();
         if (params != null) {
             //申请日期
+            qw.apply(StringUtils.isNotBlank(params.getApplyStartDate()), "date_format (sv.createTime,'%Y-%m-%d') >= date_format('" + params.getApplyStartDate() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(params.getApplyEndDate()), "date_format (sv.createTime,'%Y-%m-%d') <= date_format('" + params.getApplyEndDate() + "','%Y-%m-%d')"
+                    );
             //状态
+            if (StringUtils.isNotBlank(params.getNodeState())) {
+                if("待提交".contains(params.getNodeState())){
+                    qw.isNull("sv.nodeState");
+                }else{
+                    qw.like("sv.nodeState", params.getNodeState());
+                }
+
+            }
             //车架号
+            if (StringUtils.isNotBlank(params.getVinNo())) {
+                qw.like("bd.vinNo", params.getVinNo());
+            }
         }
+        qw.eq("sv.createBySid", params.getUserSid());
         return qw;
     }
 
@@ -136,6 +141,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             //新增
             BaseVehicleActualSales baseVehicleActualSales = new BaseVehicleActualSales();
             BeanUtils.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales, "sid");
+            baseVehicleActualSales.setCreateBySid(scmVehicleActualSalesDto.getUserSid());
             boolean isSave = save(baseVehicleActualSales);
             if (!isSave) {
                 return rb.setMsg("保存失败");
@@ -465,4 +471,16 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         sysFormLinkFeign.updateFiled(map);
         return new ResultBean().success();
     }
+
+    public ResultBean delete(String[] sidsList) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehicleActualDetailsService.deleteByActualSid(sidsList);
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sidsList,","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
+        delBySids(sidsList);
+        return rb.success().setMsg("删除成功");
+    }
 }