From dff64ac24ae2ab26d16a51bc5cb92dfd4a44fe13 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 10 Jan 2023 18:03:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemanufacturer/BaseManufacturerFeign.java | 6 ++++++ .../BaseManufacturerFeignFallback.java | 5 +++++ .../api/busvehicleapply/BusVehicleApplyQuery.java | 2 ++ .../biz/basemanufacturer/BaseManufacturerMapper.java | 2 ++ .../biz/basemanufacturer/BaseManufacturerMapper.xml | 11 +++++++++++ .../biz/basemanufacturer/BaseManufacturerRest.java | 12 +++++++++--- .../basemanufacturer/BaseManufacturerService.java | 9 +++++++++ .../biz/busvehicleapply/BusVehicleApplyService.java | 3 +++ .../BusVehicleApplyDetailMapper.xml | 2 +- 9 files changed, 48 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java index 08347798ba..bbc58d39fe 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java +++ b/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 selectByInternalPurchaseSid(@PathVariable("buyerOrgSid")String buyerOrgSid,@PathVariable("sellerOrgName") String sellerOrgName); + + @ApiOperation("查询分公司下的供应商信息和主机厂信息") + @GetMapping("/getDetailsList") + @ResponseBody + ResultBean> getDetailsList(@RequestParam("orgSid")String orgSid); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java index 3cd43bfee9..86efdaceae 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java +++ b/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 selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) { return null; } + + @Override + public ResultBean> getDetailsList(String orgSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java index 2affb82760..c2d029a3a8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java +++ b/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; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java index 336434f485..300f1d50f0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java +++ b/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 { List getGysByOrgSid(String orgSid); List getGysTypeByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType); + + List getDetailsList(String orgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index ad7babfcdb..b2548c3985 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/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} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index ba5f285313..d345674a64 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/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(安瑞基础信息模块)
@@ -236,4 +237,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { public ResultBean selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) { return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid,sellerOrgName); } + + @Override + public ResultBean> getDetailsList(String orgSid) { + return baseManufacturerService.getDetailsList(orgSid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index c3ce6b3cbb..5c986cb24d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/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 baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid,supplierType); return rb.success().setData(baseManufacturerVos); } + + public ResultBean> getDetailsList(String orgSid) { + ResultBean> rb = ResultBean.fireFail(); + List voList = baseMapper.getDetailsList(orgSid); + if(voList.size() == 0){ + voList = new ArrayList<>(); + } + return rb.success().setData(voList); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 5a1a63a8ec..d5bfee2989 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -152,6 +152,9 @@ public class BusVehicleApplyService extends MybatisBaseService0 and length (bo.platformNo) - > 0 + > 0 and bo.platformNo != bo.lockingNum