From a07570cf6130256977cb1c5aae63df2274e9819e Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 2 Sep 2022 14:38:03 +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

---
 .../BaseOutsourcingApplicationDto.java                 |  2 --
 .../api/basevehiclebrand/BaseVehicleBrandFeign.java    |  6 ++++--
 .../BaseOutsourcingApplicationService.java             | 10 ++++++++++
 .../biz/sysorganization/SysOrganizationService.java    |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
index f9b08a9d3d..52b8e5e28e 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
@@ -92,10 +92,8 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	@NotBlank(message = "常用配置不能为空")
     private String configName; // 常用配置名称
 	@ApiModelProperty("采购价格")
-	@NotBlank(message = "采购价格不能为空")
     private BigDecimal purchasePrice; // 采购价格
 	@ApiModelProperty("销售指导价")
-	@NotBlank(message = "销售指导价不能为空")
     private BigDecimal guidedPrice; // 销售指导价
 	@ApiModelProperty("厂家合同价")
     private BigDecimal manufactorSettlementPrice; // 厂家合同价
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java
index 300c2c5ab9..facf47c2e8 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java
@@ -95,7 +95,7 @@ public interface BaseVehicleBrandFeign {
      */
     @GetMapping("/selectByOrgSid")
     @ApiOperation(value = "根据使用组织查询品牌下拉框")
-    public ResultBean<List<BaseVehicleBrandSelectVo>> selectByOrgSid(BaseVehicleBrandSelectQuery baseVehicleBrandSelectQuery);
+    public ResultBean<List<BaseVehicleBrandSelectVo>> selectByOrgSid(@RequestBody BaseVehicleBrandSelectQuery baseVehicleBrandSelectQuery);
 
     @ApiOperation("根据厂商sid查询品牌列表")
     @GetMapping("/namesDownBySid")
@@ -113,5 +113,7 @@ public interface BaseVehicleBrandFeign {
     @GetMapping("/selectAppListByUserSid/{userSid}")
     ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(@PathVariable("userSid") String userSid);
 
-    BaseVehicleBrand fetchBySid(String sid);
+    @ApiOperation("根据品牌sid获取品牌信息")
+    @GetMapping("/fetchBySid/{sid}")
+    BaseVehicleBrand fetchBySid(@RequestParam("sid") String sid);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
index f8ffbbfe64..8fc998c1c3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@@ -88,6 +88,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -195,6 +196,14 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         CommonAppendix contract = dto.getContract();
         String sid1 = entity.getSid();
         String sid = dto.getSid();
+        BigDecimal guidedPrice = dto.getGuidedPrice();
+        BigDecimal purchasePrice = dto.getPurchasePrice();
+        if (guidedPrice == null){
+            return rb.setMsg("销售指导价不能为空");
+        }
+        if (purchasePrice == null){
+            return rb.setMsg("采购价格不能为空");
+        }
         if (StringUtils.isBlank(sid)) {//新增
             String billNo = getApplyCode(dto.getUserSid());
             dto.setApplicationCode(billNo);
@@ -420,6 +429,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 
     private synchronized ResultBean submitBusinessData(SubmitBaseOutSourcingApplicationDto dto,
                                                        String businessSid, String orgSidPath) {
+        saveOrUpdateDto(dto);
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
         BaseOutsourcingApplicationDto booad = baseMapper.getBySid(businessSid);
         String businessTaskid = booad.getTaskId();
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
index 468111ff5b..5586c21cfb 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
@@ -306,7 +306,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         baseVehicleBrandSelectQuery.setOrgSid(orgSid);
         List<BaseVehicleBrandSelectVo> data = baseVehicleBrandFeign.selectByOrgSid(baseVehicleBrandSelectQuery).getData();
         if (data.size() < 1) {
-            return rb.setMsg("该分公司未别品牌方授权");
+            return rb.setMsg("该分公司未被品牌方授权");
         }
         List<String> orgSids = new ArrayList<>();
         List<SysOrgVo> list = new ArrayList<>();