diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java index 3cc3666574..4d2ea99bec 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java +++ b/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; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index 3aa995fb35..824ee25c65 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/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 = "成交价") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 0df7e716c3..4e4edbe390 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/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); + /** * 详情及修改回显 * diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index ebfe53a2eb..b671ec0691 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/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 details(String sid) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index 3bd9c61c2e..422a42e5a2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/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 = "厂家合同价") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 6994a39462..65510e0f02 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/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, diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 3f1398bf8c..a4fac146fb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/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 details(String sid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index cbd13f36b2..5f13d5a8a2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/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(安瑞基础信息模块)
@@ -3416,6 +3418,7 @@ public class BaseVehicleService extends MybatisBaseService + + + + + + + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + + + + + + + + + + + + + + ${log.base}.log + + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java index f84dea8976..fbbf34574f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java +++ b/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> specialRebateWithDetails(@PathVariable("sid") String sid); + public ResultBean> specialRebateWithDetails(@RequestBody String[] sids); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java index 11d672a958..85f3a8c6f4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java +++ b/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(专项返利)
- * File: ScmSpecialRebateWithFeignFallback.java
- * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeignFallback
- * Description: 专项返利预提表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-09 09:14:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Component public class ScmSpecialRebateWithFeignFallback implements ScmSpecialRebateWithFeign { @Override - public ResultBean> specialRebateWithDetails(String sid) { + public ResultBean> specialRebateWithDetails(String[] sids) { return null; } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java index 6431b091c3..3c21b6a278 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java +++ b/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 fetchDetailsBySid(@PathVariable("sid") String sid); @ApiOperation("单车返利预提查看详情") - @GetMapping("/vehRebateWithDetails/{sid}") + @PostMapping("/vehRebateWithDetails") @ResponseBody - public ResultBean> vehRebateWithDetails(@PathVariable("sid") String sid); + public ResultBean> vehRebateWithDetails(@RequestBody String[] sids); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java index f08d5a4ba1..1ba501e34c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java +++ b/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(单车返利预提申请)
- * File: ScmVehRebateWithFeignFallback.java
- * Class: com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithFeignFallback
- * Description: 单车返利预提表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-25 09:04:38
- * - * @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> vehRebateWithDetails(String sid) { + public ResultBean> vehRebateWithDetails(String[] sids) { return null; } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 84604fda31..ac64a7fa7c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/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> specialRebateWithDetails(String sid) { - return scmSpecialRebateWithService.specialRebateWithDetails(sid); + public ResultBean> specialRebateWithDetails(String[] sids) { + return scmSpecialRebateWithService.specialRebateWithDetails(sids); } @ApiOperation("导出") @PostMapping("/excelList") public void excelList(@RequestParam("sid") String sid) { List strings = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(sid); - String specialSid = String.join(",", strings); - List data = scmSpecialRebateWithService.specialRebateWithDetails(specialSid).getData(); + List data = scmSpecialRebateWithService.specialRebateWithDetails(strings.toArray(new String[0])).getData(); List excelVos = new ArrayList<>(); Integer i = 1; for (ScmSpecialRebateDetailsVo datum : data) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java index 62b835e0b1..ae760b8b71 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java +++ b/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> specialRebateWithDetails(String sid) { + public ResultBean> specialRebateWithDetails(String[] sids) { ResultBean rb = ResultBean.fireFail(); List scmSpecialRebateDetailsVos = new ArrayList<>(); - String[] sids = sid.split(","); for (String s : sids) { ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(s); ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index 0004fb3074..6ffd3ee03d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/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= 0) { + if (adMoney.compareTo(BigDecimal.ZERO) != 0) { CostAdjustmentsBill.CostAdjustmentsBillDetailDto dto = new CostAdjustmentsBill.CostAdjustmentsBillDetailDto(); dto.setCompanyCode(useOrgCode); dto.setMaterialID(vinCode); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml index 7cebc07ce1..b274517a7c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml +++ b/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, diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java index 49e240cf01..9f37df06b4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java +++ b/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> vehRebateWithDetails(String sid) { - return scmVehRebateWithService.vehRebateWithDetails(sid); + public ResultBean> vehRebateWithDetails(String[] sids) { + return scmVehRebateWithService.vehRebateWithDetails(sids); } @ApiOperation("导出") @PostMapping("/excelList") public void excelList(@RequestParam("sid") String sid) { List strings = scmVehRebateWithService.fetchVehReBateSidByMainSid(sid); - String vehRebateSid = String.join(",", strings); - List data = scmVehRebateWithService.vehRebateWithDetails(vehRebateSid).getData(); + List data = scmVehRebateWithService.vehRebateWithDetails(strings.toArray(new String[0])).getData(); List excelVos = new ArrayList<>(); Integer i = 1; for (ScmVehRebateDetailsVo datum : data) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java index 61e9da0e2b..e3fea34994 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java +++ b/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> vehRebateWithDetails(String sid) { + public ResultBean> vehRebateWithDetails(String[] sids) { ResultBean rb = ResultBean.fireFail(); List scmVehRebateDetailsVos = new ArrayList<>(); - String[] sids = sid.split(","); for (String s : sids) { ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(s); ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java index 19af05c61c..b32c8e2a7d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java +++ b/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> specialRebateWithDetails(String sid) { ResultBean rb = ResultBean.fireFail(); List appSpecialRebateDetailsVos = new ArrayList<>(); - List data = scmSpecialRebateWithFeign.specialRebateWithDetails(sid).getData(); + String[] sids = sid.split(","); + List data = scmSpecialRebateWithFeign.specialRebateWithDetails(sids).getData(); for (ScmSpecialRebateDetailsVo datum : data) { AppSpecialRebateDetailsVo appSpecialRebateDetailsVo = new AppSpecialRebateDetailsVo(); BeanUtil.copyProperties(datum,appSpecialRebateDetailsVo); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java index dff73d6951..35bc2d71ce 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java +++ b/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> specialRebateWithDetails(String sid) { ResultBean rb = ResultBean.fireFail(); List appVehRebateDetailsVos = new ArrayList<>(); - List data = scmVehRebateWithFeign.vehRebateWithDetails(sid).getData(); + String[] sids = sid.split(","); + List data = scmVehRebateWithFeign.vehRebateWithDetails(sids).getData(); for (ScmVehRebateDetailsVo datum : data) { AppVehRebateDetailsVo appVehRebateDetailsVo = new AppVehRebateDetailsVo(); BeanUtil.copyProperties(datum,appVehRebateDetailsVo); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDetailVo.java index 63cd5f8698..91dc6482e8 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDetailVo.java @@ -58,4 +58,6 @@ public class AdFeesReimbursableApplyDetailVo extends OaFormCommonVo { private List list = new ArrayList<>(); + private Boolean isTravelCharge = false;// 费用类别是否包含差旅费 + private Boolean isBanquetExpense = false;// 费用类别是否包含商务宴请费用 } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDto.java index 01bbfc38fc..30eed85960 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDto.java @@ -105,4 +105,6 @@ public class AdFeesReimbursableApplyDto extends OaFormDto { private List list = new ArrayList<>(); + private Boolean isTravelCharge = false;// 费用类别是否包含差旅费 + private Boolean isBanquetExpense = false;// 费用类别是否包含商务宴请费用 } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyService.java index 0960d39d3c..f39e7f580d 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyService.java @@ -109,6 +109,12 @@ public class AdFeesReimbursableApplyService extends MybatisBaseService 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 saveOrUpdateDto(AdFeesReimbursableApplyDto dto) { ResultBean 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 files = oaAppendixService.selectByLinkSid(sid, "图片"); List appes = oaAppendixService.selectByLinkSid(sid, "文件"); applyDetailVo.setFiles(files); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyVo.java index 0968b819c6..fd9c4338de 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyVo.java +++ b/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;// 费用类别是否包含商务宴请费用 }