排产车型修复

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java

@@ -53,11 +53,6 @@ public class BaseVehmodelConfigQuerys implements Query {
     private static final long serialVersionUID = 4709259975908909806L;
     @ApiModelProperty(value = "分公司sid")
     private String useOrgSid;
-//    @ApiModelProperty(value = "车型配置和常用配置")
-//    private String[] sidList;
-    private List<BaseVehomodelQuery> sidList;
-    @ApiModelProperty(value = "车辆类型")
-    private String vehicleStateValue;
     @ApiModelProperty(value = "车型别名")
     private String vehicleAlias;
     @ApiModelProperty(value = "常用配置名称")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@@ -131,7 +131,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
 
     List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid, @Param("createOrgSId") String createOrgSId);
 
-    IPage<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage<BaseVehmodelConfig> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVos> qw,@Param("vehicleStateValue") String vehicleStateValue);
+    IPage<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage<BaseVehmodelConfig> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVos> qw);
 
     BaseVehmodelConfig selectSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -306,10 +306,6 @@
             LEFT JOIN base_model_config bmc
                       ON bvc.`configurationItemsSid` = bmc.`sid`
             left join base_vehicle_brand bb on bb.sid = bvm.carBrand
-        <if test="vehicleStateValue != null and vehicleStateValue != ''">
-            LEFT JOIN base_vehicle bv
-                      ON bvc.`modelSid` = bv.`modelSid`
-        </if>
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -572,7 +572,6 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         qw.like("bb.useOrg", query.getUseOrgSid());
         List<BaseVehomodelQuery> sidList = query.getSidList();
         sidList.removeAll(Collections.singleton(null));
-//        String[] sidList = query.getSidList();
         if (!sidList.isEmpty()) {
             List<String> siList = new ArrayList<>();
             for (BaseVehomodelQuery q : sidList){
@@ -585,12 +584,6 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
                 qw.notIn("bvc.sid", siList);
             }
         }
-       /* if (StringUtils.isNotBlank(query.getVehicleStateValue())) {
-            qw.eq("bv.vehicleStateValue", query.getVehicleStateValue());
-        }*/
-       /* if(StringUtils.isNotBlank(query.getUseOrgSid())){
-            qw.eq("bv.useOrgSid", query.getUseOrgSid());
-        }*/
         if (StringUtils.isNotBlank(query.getVehicleAlias())) {
             qw.like("bvm.vehicleAlias", query.getVehicleAlias());
         }
@@ -599,7 +592,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         }
         qw.eq("bvm.isDelete",0);
         IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);
-        IPage<BaseVehmodelConfigVos> pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw, query.getVehicleStateValue());
+        IPage<BaseVehmodelConfigVos> pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw);
         PagerVo<BaseVehmodelConfigVos> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }