Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@@ -235,4 +235,10 @@ public interface BaseManufacturerFeign {
     @GetMapping("/selectByInternalPurchaseSid/{buyerOrgSid}/{sellerOrgName}")
     @ResponseBody
     ResultBean<String> selectByInternalPurchaseSid(@PathVariable("buyerOrgSid")String buyerOrgSid,@PathVariable("sellerOrgName") String sellerOrgName);
+
+    @ApiOperation("查询分公司下的供应商信息和主机厂信息")
+    @GetMapping("/getDetailsList")
+    @ResponseBody
+    ResultBean<List<ManufacturerVo>> getDetailsList(@RequestParam("orgSid")String orgSid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@@ -145,4 +145,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
     public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
+        return null;
+    }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java

@@ -37,4 +37,6 @@ public class BusVehicleApplyQuery implements Query {
 
     @ApiModelProperty("采购原因")
     private String schedulingTypeKey;
+
+    private String applicationCode;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -149,4 +149,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
     List<BaseManufacturerVo> getGysByOrgSid(String orgSid);
 
     List<BaseManufacturerVo> getGysTypeByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType);
+
+    List<ManufacturerVo> getDetailsList(String orgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -339,4 +339,15 @@
         WHERE createOrg = #{orgSid}
         AND supplierType = #{supplierType}
     </select>
+
+    <select id="getDetailsList" resultType="com.yxt.anrui.base.api.basemanufacturer.ManufacturerVo">
+        SELECT bm.manufacturerName name,bm.manufacturerCode payCode,bm.sid
+        FROM base_manufacturer bm
+        where bm.createOrg = #{orgSid} and bm.isDelete = 0
+        union all
+        SELECT bm.manufacturerName name,bm.manufacturerCode payCode,bm.sid
+        FROM base_manufacturer bm
+        left join base_vehicle_brand bb on bb.manufacturerSid = bm.sid
+        where bm.supplierType = '0001' and bm.isDelete = 0 and bb.useOrg like concat('%',#{orgSid},'%')
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@@ -5,7 +5,6 @@ import com.yxt.anrui.base.api.basemanufacturer.*;
 import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
 import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -20,8 +19,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -236,4 +237,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
     public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
         return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid,sellerOrgName);
     }
+
+    @Override
+    public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
+        return baseManufacturerService.getDetailsList(orgSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -734,4 +734,13 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         List<BaseManufacturerVo> baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid,supplierType);
         return rb.success().setData(baseManufacturerVos);
     }
+
+    public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
+        ResultBean<List<ManufacturerVo>> rb = ResultBean.fireFail();
+        List<ManufacturerVo> voList = baseMapper.getDetailsList(orgSid);
+        if(voList.size() == 0){
+            voList = new ArrayList<>();
+        }
+        return rb.success().setData(voList);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -152,6 +152,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (StringUtils.isNotBlank(query.getSchedulingTypeKey())) {
                 qw.eq("bva.schedulingTypeKey", query.getSchedulingTypeKey());
             }
+            if(StringUtils.isNotBlank(query.getApplicationCode())){
+                qw.like("bva.applicationCode", query.getApplicationCode());
+            }
 
             //查询分公司sid
 //            if (StringUtils.isNotBlank(query.getUserSid())) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml

@@ -58,7 +58,7 @@
         where bd.vehicleSid = #{modelSid}
           and bd.configSid = #{configSid} and length(bo.orderNo)>0
           and length (bo.platformNo)
-            > 0
+            > 0 and bo.platformNo != bo.lockingNum
     </select>
 
     <select id="getVehicleApply" resultType="com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo">