Merge remote-tracking branch 'origin/master'

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

@@ -30,7 +30,11 @@ public interface AppBaseVehicleFeign {
 
     @ApiOperation("手机端现车详细配置(新)")
     @GetMapping("/appCarParams")
-    public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("userSid") String userSid);
+    public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(
+            @RequestParam("modelSid") String modelSid,
+            @RequestParam("configSid") String configSid,
+            @RequestParam("userSid") String userSid,
+            @RequestParam(value = "useOrgSid",required = false)String useOrgSid);
 
 
 }

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

@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
 public class AppBaseVehicleFeignFallback implements AppBaseVehicleFeign {
 
     @Override
-    public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid,String userSid) {
+    public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid,String userSid,String useOrgSid) {
         return null;
     }
 }

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

@@ -56,4 +56,6 @@ public class BusVehicleApplyVo implements Vo {
     private String orgDeptSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
 }

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

@@ -36,8 +36,8 @@ public class AppBaseVehicleRest implements AppBaseVehicleFeign {
      * @return
      */
     @Override
-    public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid) {
-        AppCurrentCarDetailConfigVo vo = baseVehicleService.getAppCurrentCarDetailConfigVo(modelSid, configSid, userSid);
+    public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid,String useOrgSid) {
+        AppCurrentCarDetailConfigVo vo = baseVehicleService.getAppCurrentCarDetailConfigVo(modelSid, configSid, userSid,useOrgSid);
         return new ResultBean<AppCurrentCarDetailConfigVo>().success().setData(vo);
     }
 

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

@@ -837,8 +837,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param configSid
      * @return
      */
-    public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid) {
-        String useOrg = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+    public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid,String useOrgSid) {
+        String useOrg = "";
+        if(StringUtils.isNotBlank(useOrgSid)){
+            useOrg = useOrgSid;
+        }else{
+            useOrg = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
         AppCurrentCarDetailConfigVo configDetailVo = baseMapper.getAppModelConfig(modelSid, configSid, useOrg);
         if (configDetailVo != null) {
             String date = configDetailVo.getDate();

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

@@ -18,7 +18,8 @@
                         bva.applyType,
                         bva.applyTypeKey,
                         bva.id,
-                        bva.orgDeptSid
+                        bva.orgDeptSid,
+                        bva.createOrgSid useOrgSid
         FROM bus_vehicle_apply bva
                  LEFT JOIN bus_vehicle_apply_detail bvad
                            ON bva.sid = bvad.`applySid`

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeign.java

@@ -33,6 +33,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderPriceFeign.java <br/>
@@ -64,5 +66,5 @@ public interface BusSalesOrderPriceFeign {
 
     @ApiOperation(value = "移动端-保存价格信息")
     @PostMapping(value = "/save")
-    ResultBean savePriceInfo(@RequestBody AppBusSalesOrderPriceDto dto);
+    ResultBean savePriceInfo(@Valid @RequestBody AppBusSalesOrderPriceDto dto);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/app/AppBusSalesOrderPriceDto.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Author dimengzhe
  * @Date 2022/6/6 11:55
@@ -14,8 +16,10 @@ public class AppBusSalesOrderPriceDto implements Dto {
     private static final long serialVersionUID = 401229647162329928L;
 
     @ApiModelProperty(value = "预计提车地点")
+    @NotBlank(message = "预计提车地点不能为空")
     private String plannedPickUpLocation;
     @ApiModelProperty(value = "预计提车地点key")
+    @NotBlank(message = "预计提车地点不能为空")
     private String plannedPickUpLocationKey;
     @ApiModelProperty(value = "主车单台成交价格")
     private String transactionPrice;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -854,7 +854,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         busDeposit.setPaymentDate(dto.getPayDate());
         busDeposit.setVehicleNum(dto.getCarNumber());
         busDeposit.setDraweeMobile(dto.getMobile());
-        if("03".equals(dto.getPayTypeKey())){
+        if("03".equals(dto.getPayTypeKey()) || "05".equals(dto.getPayTypeKey())){
             busDeposit.setProBankAccKey(dto.getCollectionNumberKey());
             busDeposit.setProBankAccValue(dto.getCollectionNumber());
             busDeposit.setProBankValue(dto.getCollectionBank());

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerOrgPathQuery.java

@@ -18,4 +18,7 @@ public class FinManufacturerOrgPathQuery implements Query {
     @ApiModelProperty(value = "查询条件")
     private String name;
 
+    @ApiModelProperty(value = "账户类型key",required = false)
+    private String collectionTypeKey;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -858,6 +858,29 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
         finCollectionConfirmation.setStaffDeptSid(createDeptSid);
         finCollectionConfirmation.setStaffDeptName(deptName);
+        if("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())){
+            //收款银行账号
+            finCollectionConfirmation.setCollectionBankNum(dto.getCollectionBankNum());
+            finCollectionConfirmation.setCollectionBankNumKey(dto.getCollectionBankNumKey());
+            //收款银行名称
+            finCollectionConfirmation.setReceivingName(dto.getReceivingName());
+            finCollectionConfirmation.setCollectionBank(dto.getCollectionBank());
+            //付款账号后4位
+            finCollectionConfirmation.setPayAccount(dto.getPayAccount());
+            //付款银行
+            finCollectionConfirmation.setPayBank(dto.getPayBank());
+        }else{
+            //收款银行账号
+            finCollectionConfirmation.setCollectionBankNum("");
+            finCollectionConfirmation.setCollectionBankNumKey("");
+            //收款银行名称
+            finCollectionConfirmation.setReceivingName("");
+            finCollectionConfirmation.setCollectionBank("");
+            //付款账号后4位
+            finCollectionConfirmation.setPayAccount("");
+            //付款银行
+            finCollectionConfirmation.setPayBank("");
+        }
         //添加单据编号
         String billNo = getApplyCode(finCollectionConfirmation.getUseOrgSid());
         finCollectionConfirmation.setBillNo(billNo);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java

@@ -66,7 +66,7 @@ public interface FinManufacturerBankMapper extends BaseMapper<FinManufacturerBan
 
     List<FinManufacturerVo> selectAccountByUseOrgSid(String useOrgSid);
 
-    List<FinManufacturerVo> selAccountByOrgSid(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
+    List<FinManufacturerVo> selAccountByOrgSid(@Param("useOrgSid") String useOrgSid,@Param("name") String name,@Param(Constants.WRAPPER) QueryWrapper<FinManufacturerBank> qw);
 
     IPage<FinManufacturerVo> selAppAccountByOrgSid(IPage<FinManufacturerVo> page,@Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw,@Param("name") String name);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml

@@ -55,7 +55,7 @@
         select sid as accountSid, bankAccount, accountName, depositBank, depositBankKey
         from fin_manufacturer_bank
         <where>
-            useOrgSid = #{useOrgSid}
+            ${ew.sqlSegment}
             <if test="name != null and name != ''">
                 and concat(IFNULL(bankAccount
                 , '')

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@@ -212,12 +212,26 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
         String userSid = query.getUserSid();
         String orgPath = query.getOrgPath();
         String useOrgSid = "";
+        QueryWrapper<FinManufacturerBank> qw = new QueryWrapper<>();
         if (StringUtils.isBlank(orgPath)) {
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         } else {
             useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
-        List<FinManufacturerVo> list = baseMapper.selAccountByOrgSid(useOrgSid,query.getName());
+        qw.eq("useOrgSid",useOrgSid);
+        if(StringUtils.isNotBlank(query.getCollectionTypeKey())){
+            String key = "";
+            //个人账户
+            if("03".equals(query.getCollectionTypeKey())){
+                key = "01";
+                qw.eq("dueBankKey",key);
+            }
+            if("05".equals(query.getCollectionTypeKey())){
+                key = "02";
+                qw.eq("dueBankKey",key);
+            }
+        }
+        List<FinManufacturerVo> list = baseMapper.selAccountByOrgSid(useOrgSid,query.getName(),qw);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
@@ -234,6 +248,18 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
             orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getParams().getUserSid()).getData();
         }
         qw.eq("useOrgSid", orgSid);
+        if(StringUtils.isNotBlank(query.getParams().getCollectionTypeKey())){
+            String key = "";
+            //个人账户
+            if("03".equals(query.getParams().getCollectionTypeKey())){
+                key = "01";
+                qw.eq("dueBankKey",key);
+            }
+            if("05".equals(query.getParams().getCollectionTypeKey())){
+                key = "02";
+                qw.eq("dueBankKey",key);
+            }
+        }
         IPage<FinManufacturerVo> iPage = baseMapper.selAppAccountByOrgSid(page, qw, name);
         return iPage;
     }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -10,6 +10,7 @@
         FROM sys_staffinfo staff
                  LEFT JOIN sys_user user
                            ON staff.sid = user.staffSid
+            where staff.personTypeKey != '01'
         ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
     </select>
 
@@ -24,7 +25,7 @@
         FROM sys_staffinfo staff
                  LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
                  LEFT JOIN sys_user user ON staff.sid = user.staffSid
-        WHERE 1 = 1
+        WHERE 1 = 1 and staff.personTypeKey != '01'
         <if test="mobileStr != null and mobileStr != ''">
             AND staff.mobile LIKE concat('%', #{mobileStr}, '%')
         </if>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerOrgPathQuery.java

@@ -16,4 +16,7 @@ public class AppManufacturerOrgPathQuery implements Query {
 
     @ApiModelProperty(value = "查询条件")
     private String name;
+
+    @ApiModelProperty("收款方式")
+    private String collectionTypeKey;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java

@@ -65,5 +65,7 @@ public class VehicleApplyVo implements Vo {
 /*    @ApiModelProperty("是否存在分享按钮")
     private boolean haveShare;*/
 
+    private String useOrgSid;
+
 
 }