Merge remote-tracking branch 'origin/master'

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

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -78,6 +77,8 @@ public class BaseVehicle extends BaseEntity {
 
     @ApiModelProperty(value = "指导价")
     private Integer salePrice;
+    @ApiModelProperty(value = "厂家结算价")
+    private Integer settlePrice;
 
     @ApiModelProperty("创建组织(陕汽必须的字段)")
     private String createOrgSid;

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

@@ -78,8 +78,10 @@ public class BaseVehicleDto implements Dto {
     private String location;
     @ApiModelProperty("存放地点名称（陕汽必须的字段）")
     private String locationName;
-    @ApiModelProperty(value = "厂家结算价")
+    @ApiModelProperty(value = "入库价")
     private Integer costPrice;
+    @ApiModelProperty(value = "厂家结算价")
+    private Integer settlePrice;
     @ApiModelProperty(value = "厂家合同价")
     private Integer contractPrice;
     @ApiModelProperty(value = "成交价")

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

@@ -120,6 +120,15 @@ public interface BaseVehicleFeign {
     @PostMapping("/update/{sid}")
     public ResultBean update(@RequestBody BaseVehicleDto dto, @PathVariable("sid") String sid);
 
+    /**
+     * 修改厂家结算价
+     *
+     * @return
+     */
+    @ApiOperation("修改厂家结算价")
+    @PostMapping("/updateSettlePrice")
+    public ResultBean updateSettlePrice(@RequestParam("sid") String sid, @RequestParam("settlePrice") String settlePrice);
+
     /**
      * 详情及修改回显
      *

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

@@ -72,6 +72,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/update无法访问");
     }
 
+    @Override
+    public ResultBean updateSettlePrice(String sid, String settlePrice) {
+        return null;
+    }
+
     @Override
     public ResultBean<BaseVehicleSelectVo> details(String sid) {
         return null;

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

@@ -54,8 +54,11 @@ public class BaseVehicleVo implements Vo {
     private String locationName;
     @ApiModelProperty(value = "厂家订单编号")
     private String orderingNo;
-    @ApiModelProperty(value = "厂家结算价")
+    @ApiModelProperty(value = "入库价")
     private Integer costPrice;
+    @ApiModelProperty(value = "厂家结算价")
+    private Integer settlePrice;
+
     @ApiModelProperty(value = "运费")
     private Integer freight;
     @ApiModelProperty(value = "厂家合同价")

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

@@ -44,6 +44,7 @@
         bv.locationName,
         bv.orderingNo,
         bv.costPrice,
+        bv.settlePrice,
         bv.freight,
         bv.contractPrice,
         bv.priceDate,

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

@@ -685,6 +685,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setMsg("修改成功");
     }
 
+    @Override
+    public ResultBean updateSettlePrice(String sid, String settlePrice) {
+        return baseVehicleService.updateSettlePrice(sid,settlePrice);
+    }
+
     @Override
     public ResultBean<BaseVehicleSelectVo> details(String sid) {
         ResultBean rb = ResultBean.fireFail();

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

@@ -86,6 +86,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -3416,6 +3418,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                     .or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode())
                     .or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode())
                     .or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode())
+                    .or().eq("bv.vehicleState", VehicleState.StockEnum.RETURN_STOCK.getCode())
             );
         }
         return qw;
@@ -4437,4 +4440,30 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         baseMapper.updateVehicleYmd(vehiSid, settlementStatus, settlementStatusValue);
         return rb.success();
     }
+
+    public ResultBean updateSettlePrice(String sid, String settlePrice) {
+    ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(settlePrice)) {
+            return rb.setMsg("厂家结算价不能为空！");
+        }
+        if (!isNumeric(settlePrice)) {
+            return rb.setMsg("请填写整数");
+        }
+        BaseVehicle baseVehicle = fetchBySid(sid);
+        Integer i = Integer.valueOf(settlePrice);
+        baseVehicle.setSettlePrice(i);
+        baseMapper.updateById(baseVehicle);
+        return rb.success();
+    }
+
+
+    public boolean isNumeric(String str) {
+        Pattern pattern = Pattern.compile("[0-9]*");
+        System.out.println(str);
+        Matcher isNum = pattern.matcher(str);
+        if (!isNum.matches()) {
+            return false;
+        }
+        return true;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -1445,6 +1445,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             scmVehRebateVehDto.setEstimateRebate(factoryDiscount);
             scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
             scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
+            scmVehRebateVehDto.setWithholdingDate(DateUtil.format(new Date(), "yyyy-MM"));
             scmVehRebateVehDtos.add(scmVehRebateVehDto);
             scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
             scmVehRebateFeign.save(scmVehRebateDto);

anrui-gateway/src/main/resources/logback-spring.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<property name="log.base" value="logs/anrui_gateway" />
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 ：
+			|%blue(%thread)  线程 如 ：DiscoveryClient-CacheRefreshExecutor-0-->
+			<!--<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>-->
+			<pattern>%yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n)
+			</pattern>
+			<!--<charset>UTF-8</charset> -->
+		</encoder>
+	</appender>
+
+	<!-- 彩色日志 -->
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+	<appender name="FILEOUT"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.base}.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.base}.%d{yyyyMMdd}.%i.log.zip
+			</fileNamePattern>
+			<!-- 当文件大小超过10MB时触发滚动 -->
+			<timeBasedFileNamingAndTriggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>1MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+		<encoder>
+			<!--<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>-->
+			<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}
+				-%msg%n</Pattern>
+			<!--<charset>UTF-8</charset> -->
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="FILEOUT" />
+	</root>
+
+</configuration>

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java

@@ -58,7 +58,7 @@ import java.util.List;
 public interface ScmSpecialRebateWithFeign {
 
     @ApiOperation("专项返利预提查看详情")
-    @GetMapping("/specialRebateWithDetails/{sid}")
+    @PostMapping("/specialRebateWithDetails")
     @ResponseBody
-    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(@PathVariable("sid") String sid);
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(@RequestBody String[] sids);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java

@@ -26,31 +26,15 @@
 package com.yxt.anrui.scm.api.scmspecialrebatewith;
 
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
-
 import java.util.List;
 
-/**
- * Project: anrui-scm(专项返利) <br/>
- * File: ScmSpecialRebateWithFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeignFallback <br/>
- * Description: 专项返利预提表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-09-09 09:14:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class ScmSpecialRebateWithFeignFallback implements ScmSpecialRebateWithFeign {
 
 	@Override
-	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
+	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String[] sids) {
 		return null;
 	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java

@@ -81,7 +81,7 @@ public interface ScmVehRebateWithFeign {
     public ResultBean<ScmVehRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
     @ApiOperation("单车返利预提查看详情")
-    @GetMapping("/vehRebateWithDetails/{sid}")
+    @PostMapping("/vehRebateWithDetails")
     @ResponseBody
-    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(@PathVariable("sid") String sid);
+    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(@RequestBody String[] sids);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java

@@ -25,28 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehrebatewith;
 
-import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
-
 import java.util.List;
 
-/**
- * Project: anrui-scm(单车返利预提申请) <br/>
- * File: ScmVehRebateWithFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithFeignFallback <br/>
- * Description: 单车返利预提表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-25 09:04:38 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class ScmVehRebateWithFeignFallback implements ScmVehRebateWithFeign {
 
@@ -73,7 +58,7 @@ public class ScmVehRebateWithFeignFallback implements ScmVehRebateWithFeign {
 	}
 
 	@Override
-	public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String sid) {
+	public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String[] sids) {
 		return null;
 	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -757,6 +757,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             // baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
             //厂家结算价
             baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString()));
+            baseVehicleDto.setSettlePrice(Integer.parseInt(booad.getCostPrice().toString()));
 
             baseVehicleDto.setPriceDate(booad.getPriceDate());
             baseVehicleDto.setDepartureDate(booad.getDepartureDate());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -368,6 +368,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             return rb.setMsg("返利信息已存在");
         }
         dto.setStayDetermineMoneyNew(dto.getStayDetermineMoney());
+        if (StringUtils.isBlank(dto.getSecondaryUploadDate())){
+            dto.setSecondaryUploadDate("");
+        }
         this.updateBySid(dto, dtoSid);
         return rb.success();
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java

@@ -70,16 +70,15 @@ public class ScmSpecialRebateWithRest implements ScmSpecialRebateWithFeign {
 	HttpServletResponse response;
 
 	@Override
-	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
+	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String[] sids) {
-		return scmSpecialRebateWithService.specialRebateWithDetails(sid);
+		return scmSpecialRebateWithService.specialRebateWithDetails(sids);
 	}
 
 	@ApiOperation("导出")
 	@PostMapping("/excelList")
 	public void excelList(@RequestParam("sid") String sid) {
 		List<String> strings = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(sid);
-		String specialSid = String.join(",", strings);
+		List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithService.specialRebateWithDetails(strings.toArray(new String[0])).getData();
-		List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithService.specialRebateWithDetails(specialSid).getData();
 		List<SpectalRebateWithExcelVo> excelVos = new ArrayList<>();
 		Integer i = 1;
 		for (ScmSpecialRebateDetailsVo datum : data) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java

@@ -80,10 +80,9 @@ public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRe
         return baseMapper.fetchSpecialReBateSidByMainSid(businessSid);
     }
 
-    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
-        String[] sids = sid.split(",");
         for (String s : sids) {
             ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(s);
             ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -549,6 +549,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setInsideCode(baseVehicle.getInsideCode());
                     if (StringUtils.isNotBlank(vehicleDetailsVo.getWitPinMoney())) {
                         baseVehicleDto.setCostPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
+                        baseVehicleDto.setSettlePrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                         baseVehicleDto.setSalePrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                         baseVehicleDto.setContractPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.scm.biz.scmvehrebate;
 
 import com.yxt.anrui.scm.api.scmvehrebate.*;
 import com.yxt.common.base.utils.ExportExcelUtils;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -335,6 +336,9 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
     public ResultBean update(ScmVehRebateVehDto dto) {
         ResultBean rb = ResultBean.fireFail();
         dto.setStayDetermineMoneyNew(dto.getStayDetermineMoney());
+        if (StringUtils.isBlank(dto.getSecondaryUploadDate())){
+            dto.setSecondaryUploadDate("");
+        }
         scmVehRebateService.updateBySid(dto, dto.getSid());
         return rb.success().setMsg("修改成功");
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -833,7 +833,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                                 if (rebate.getIsAdjustment().equals("是")) {
                                     if (StringUtils.isNotBlank(rebate.getAdjustmentMoney())) {
                                         BigDecimal adMoney = new BigDecimal(rebate.getAdjustmentMoney());
-                                        if (adMoney.compareTo(BigDecimal.ZERO) >= 0) {
+                                        if (adMoney.compareTo(BigDecimal.ZERO) != 0) {
                                             CostAdjustmentsBill.CostAdjustmentsBillDetailDto dto = new CostAdjustmentsBill.CostAdjustmentsBillDetailDto();
                                             dto.setCompanyCode(useOrgCode);
                                             dto.setMaterialID(vinCode);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml

@@ -25,7 +25,7 @@
                svc.brandName,
                svc.rebateTypeKey,
                svc.rebateTypeValue,
-               SUM(svc.estimateRebate)                                                                  withRebate,
+               SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebate,
                COUNT(*)                                                                                 num,
                GROUP_CONCAT(svc.vehRebateSid)                                                           vehRebateSid,
                SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
@@ -49,7 +49,7 @@
                svc.brandName,
                svc.palceGenDate,
                svc.withholdingDate,
-               SUM(svc.estimateRebate)                                                                  withRebate,
+               SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebate,
                COUNT(*)                                                                                 num,
                GROUP_CONCAT(svc.vehRebateSid)                                                           vehRebateSid,
                SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
@@ -80,7 +80,7 @@
                svc.brandName,
                CONCAT(svc.purchaseSystemName, svc.brandName, '本月上传返利核对及调整金额合计')                         title,
                COUNT(*)                                                                                 numTotal,
-               SUM(svc.estimateRebate)                                                                  withRebateTotal,
+               SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebateTotal,
                SUM(svc.expectTreatCost + svc.expectSuppCost)                                            withholdCostTotal,
                SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
                       svc.uploadMoney +
@@ -103,7 +103,7 @@
                CONCAT(svc.purchaseSystemName, svc.brandName, svc.rebateTypeValue, '明细')                 title,
                svc.rebateTypeValue,
                COUNT(*)                                                                                 num,
-               SUM(svc.estimateRebate)                                                                  withRebate,
+               SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebate,
                SUM(svc.expectTreatCost + svc.expectSuppCost)                                            withholdCost,
                SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
                       svc.uploadMoney + svc.secondaryUploadMoney))                                      uploadMoney,
@@ -127,7 +127,7 @@
                CONCAT(svc.purchaseSystemName, svc.brandName, svc.withholdingDate, '预提明细')               title,
                svc.withholdingDate,
                COUNT(*)                                                                                 num,
-               SUM(svc.estimateRebate)                                                                  withRebate,
+               SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebate,
                SUM(svc.expectTreatCost + svc.expectSuppCost)                                            withholdCost,
                SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
                       svc.uploadMoney + svc.secondaryUploadMoney))                                      uploadMoney,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java

@@ -105,16 +105,15 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign {
     }
 
     @Override
-    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String sid) {
+    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String[] sids) {
-        return scmVehRebateWithService.vehRebateWithDetails(sid);
+        return scmVehRebateWithService.vehRebateWithDetails(sids);
     }
 
     @ApiOperation("导出")
     @PostMapping("/excelList")
     public void excelList(@RequestParam("sid") String sid) {
         List<String> strings = scmVehRebateWithService.fetchVehReBateSidByMainSid(sid);
-        String vehRebateSid = String.join(",", strings);
+        List<ScmVehRebateDetailsVo> data = scmVehRebateWithService.vehRebateWithDetails(strings.toArray(new String[0])).getData();
-        List<ScmVehRebateDetailsVo> data = scmVehRebateWithService.vehRebateWithDetails(vehRebateSid).getData();
         List<ExcelVo> excelVos = new ArrayList<>();
         Integer i = 1;
         for (ScmVehRebateDetailsVo datum : data) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java

@@ -140,10 +140,9 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
         return baseMapper.fetchByMainSid(sid);
     }
 
-    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String sid) {
+    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         List<ScmVehRebateDetailsVo> scmVehRebateDetailsVos = new ArrayList<>();
-        String[] sids = sid.split(",");
         for (String s : sids) {
             ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(s);
             ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java

@@ -77,7 +77,8 @@ public class AppSpecialRebateWithApplyService {
     public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppSpecialRebateDetailsVo> appSpecialRebateDetailsVos = new ArrayList<>();
-        List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithFeign.specialRebateWithDetails(sid).getData();
+        String[] sids = sid.split(",");
+        List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithFeign.specialRebateWithDetails(sids).getData();
         for (ScmSpecialRebateDetailsVo datum : data) {
             AppSpecialRebateDetailsVo appSpecialRebateDetailsVo = new AppSpecialRebateDetailsVo();
             BeanUtil.copyProperties(datum,appSpecialRebateDetailsVo);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java

@@ -79,7 +79,8 @@ public class AppVehRebateWithApplyService {
     public ResultBean<List<AppVehRebateDetailsVo>> specialRebateWithDetails(String sid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppVehRebateDetailsVo> appVehRebateDetailsVos = new ArrayList<>();
-        List<ScmVehRebateDetailsVo> data = scmVehRebateWithFeign.vehRebateWithDetails(sid).getData();
+        String[] sids = sid.split(",");
+        List<ScmVehRebateDetailsVo> data = scmVehRebateWithFeign.vehRebateWithDetails(sids).getData();
         for (ScmVehRebateDetailsVo datum : data) {
             AppVehRebateDetailsVo appVehRebateDetailsVo = new AppVehRebateDetailsVo();
             BeanUtil.copyProperties(datum,appVehRebateDetailsVo);

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDetailVo.java

@@ -58,4 +58,6 @@ public class AdFeesReimbursableApplyDetailVo extends OaFormCommonVo {
 
     private List<AdFeesReimbursableListDetailsVo> list = new ArrayList<>();
 
+    private Boolean isTravelCharge = false;// 费用类别是否包含差旅费
+    private Boolean isBanquetExpense = false;// 费用类别是否包含商务宴请费用
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDto.java

@@ -105,4 +105,6 @@ public class AdFeesReimbursableApplyDto extends OaFormDto {
 
     private List<AdFeesReimbursableDetailsDto> list = new ArrayList<>();
 
+    private Boolean isTravelCharge = false;// 费用类别是否包含差旅费
+    private Boolean isBanquetExpense = false;// 费用类别是否包含商务宴请费用
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyService.java

@@ -109,6 +109,12 @@ public class AdFeesReimbursableApplyService extends MybatisBaseService<AdFeesRei
         applyVo.setIsBeyondQuotaObj(obj3);
         List<AdFeesReimbursableDetailsVo> list = adFeesReimbursableDetailsService.getUpdateInit(sid);
         list.removeAll(Collections.singleton(null));
+        if (StringUtils.isNotBlank(apply.getIsSpecialSeatKey())) {
+            applyVo.setIsTravelCharge(true);
+        }
+        if (StringUtils.isNotBlank(apply.getIsExpensiveKey())) {
+            applyVo.setIsBanquetExpense(true);
+        }
         if (!list.isEmpty()) {
             list.stream().forEach(details -> {
                 FormCommon objv1 = FormCommon.of(details.getBelongsDeptSid(), details.getBelongsDept());
@@ -131,6 +137,16 @@ public class AdFeesReimbursableApplyService extends MybatisBaseService<AdFeesRei
     public ResultBean<String> saveOrUpdateDto(AdFeesReimbursableApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        if (!dto.getIsTravelCharge()) {
+            dto.setIsSpecialSeatKey(null);
+            dto.setIsSpecialSeatValue(null);
+            dto.setDepartureTime(null);
+            dto.setReturnTime(null);
+        }
+        if (!dto.getIsBanquetExpense()) {
+            dto.setIsExpensiveKey(null);
+            dto.setIsExpensiveValue(null);
+        }
         if (StringUtils.isBlank(sid)) {
             // 新建操作
             AdFeesReimbursableApply entity = new AdFeesReimbursableApply();
@@ -185,6 +201,12 @@ public class AdFeesReimbursableApplyService extends MybatisBaseService<AdFeesRei
         if (applyDetailVo == null) {
             return rb.setMsg("该申请不存在");
         }
+        if (StringUtils.isNotBlank(applyDetailVo.getIsSpecialSeatValue())) {
+            applyDetailVo.setIsTravelCharge(true);
+        }
+        if (StringUtils.isNotBlank(applyDetailVo.getIsExpensiveValue())) {
+            applyDetailVo.setIsBanquetExpense(true);
+        }
         List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
         List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
         applyDetailVo.setFiles(files);

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyVo.java

@@ -95,4 +95,7 @@ public class AdFeesReimbursableApplyVo {
     @ApiModelProperty("流程实例id")
     private String procInsId;
 
+
+    private Boolean isTravelCharge = false;// 费用类别是否包含差旅费
+    private Boolean isBanquetExpense = false;// 费用类别是否包含商务宴请费用
 }