修改

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@@ -1157,6 +1157,12 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
         dataMap.put("hj", busValcustFilingDetailsVo.getTotalMoney());
         dataMap.put("yssxf", busValcustFilingDetailsVo.getYsMoney());
         dataMap.put("sssxf", busValcustFilingDetailsVo.getSsMoney());
+        if (StringUtils.isBlank(busValcustFilingDetailsVo.getYsMoney())){
+            busValcustFilingDetailsVo.setYsMoney("0");
+        }
+        if (StringUtils.isBlank(busValcustFilingDetailsVo.getSsMoney())){
+            busValcustFilingDetailsVo.setSsMoney("0");
+        }
         dataMap.put("ce", new BigDecimal(busValcustFilingDetailsVo.getYsMoney()).subtract(new BigDecimal(busValcustFilingDetailsVo.getSsMoney())));
         dataMap.put("yssxfhj", new BigDecimal(busValcustFilingDetailsVo.getYsMoney()).multiply(new BigDecimal(busValcustFilingDetailsVo.getNum())));
         dataMap.put("sssxfhj", new BigDecimal(busValcustFilingDetailsVo.getSsMoney()).multiply(new BigDecimal(busValcustFilingDetailsVo.getNum())));

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmspecialrebate;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
@@ -36,19 +35,6 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
-/**
- * Project: anrui-scm(专项返利管理) <br/>
- * File: ScmSpecialRebateVo.java <br/>
- * Class: com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo <br/>
- * Description: 专项返利表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-09-08 16:11:43 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "专项返利表 视图数据详情", description = "专项返利表 视图数据详情")
 public class ScmSpecialRebateDetailsVo implements Vo {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java

@@ -36,19 +36,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-scm(专项返利) <br/>
- * File: ScmSpecialrebateCheckapplydetailFeign.java <br/>
- * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign <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
- */
 @Api(tags = "专项返利核对申请表_返利列表")
 @FeignClient(
         contextId = "anrui-scm-ScmSpecialrebateCheckapplydetail",
@@ -65,10 +52,10 @@ public interface ScmSpecialrebateCheckapplydetailFeign {
     @ApiOperation("专项返利核对查看分组详情")
     @GetMapping("/specialRebateGroupDetails")
     @ResponseBody
-    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(@RequestParam("applySid") String applySid,@RequestParam("specialRebateSids") String specialRebateSids);
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(@RequestParam("applySid") String applySid, @RequestParam("specialRebateSids") String specialRebateSids);
 
     @ApiOperation("app查询明细")
     @GetMapping("/appMx/{sid}")
     @ResponseBody
-    ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(@PathVariable("sid") String sid);
+    ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(@PathVariable("sid") String sid, @RequestParam("applySid") String applySid);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java

@@ -28,7 +28,6 @@ package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Component;
-
 import java.util.List;
 
 @Component
@@ -45,7 +44,7 @@ public class ScmSpecialrebateCheckapplydetailFeignFallback implements ScmSpecial
 	}
 
 	@Override
-	public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
+	public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid, String applySid) {
 		return null;
 	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java

@@ -59,7 +59,7 @@ public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper<ScmSp
 
     List<AppSpecialrebateCheckapplydetailDetailssVo> fetchByMainSidDate(@Param("sid") String sid, @Param("purchaseSystemName") String purchaseSystemName, @Param("brandName") String brandName);
 
-    ScmSpecialRebateDetailsVo appMx(String s);
+    ScmSpecialRebateDetailsVo appMx(@Param("applySid") String applySid, @Param("specialRebateSid") String specialRebateSid);
 
     ScmSpecialRebateDetailsVo specialRebateGroupDetails(@Param("applySid") String applySid, @Param("specialRebateSid") String specialRebateSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml

@@ -151,7 +151,8 @@
         FROM scm_specialrebate_checkapplydetail sd
                  LEFT JOIN scm_specialrebate_checkapply sc
                            ON sd.mainSid = sc.sid
-        WHERE sd.specialRebateSid = #{s}
+        WHERE sd.mainSid = #{applySid}
+          AND sd.specialRebateSid = #{specialRebateSid}
     </select>
 
     <select id="specialRebateGroupDetails"

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java

@@ -32,41 +32,29 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign;
 
-/**
- * Project: anrui-scm(专项返利) <br/>
- * File: ScmSpecialrebateCheckapplydetailFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailRest <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
- */
 @Api(tags = "专项返利核对申请表_返利列表")
 @RestController
 @RequestMapping("v1/scmspecialrebatecheckapplydetail")
 public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateCheckapplydetailFeign {
 
-	@Autowired
+    @Autowired
-	private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
+    private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
 
-	@Override
+    @Override
-	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
-		return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid);
+        return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String applySid,String specialRebateSids) {
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String applySid, String specialRebateSids) {
-		return scmSpecialrebateCheckapplydetailService.specialRebateGroupDetails(applySid,specialRebateSids);
+        return scmSpecialrebateCheckapplydetailService.specialRebateGroupDetails(applySid, specialRebateSids);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid, String applySid) {
-		return scmSpecialrebateCheckapplydetailService.appMx(sid);
+        return scmSpecialrebateCheckapplydetailService.appMx(sid, applySid);
-	}
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java

@@ -99,19 +99,19 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
     }
 
     public List<AppSpecialrebateCheckapplydetailDetailssVo> fetchByMainSidType(String sid, String purchaseSystemName, String brandName) {
-        return baseMapper.fetchByMainSidType(sid,purchaseSystemName,brandName);
+        return baseMapper.fetchByMainSidType(sid, purchaseSystemName, brandName);
     }
 
     public List<AppSpecialrebateCheckapplydetailDetailssVo> fetchByMainSidDate(String sid, String purchaseSystemName, String brandName) {
-        return baseMapper.fetchByMainSidDate(sid,purchaseSystemName,brandName);
+        return baseMapper.fetchByMainSidDate(sid, purchaseSystemName, brandName);
     }
 
-    public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid, String applySid) {
         ResultBean rb = ResultBean.fireFail();
         List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
         String[] sids = sid.split(",");
         for (String s : sids) {
-            ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.appMx(s);
+            ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.appMx(applySid, s);
             scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
             scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString());
             scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
@@ -119,12 +119,12 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
         return rb.success().setData(scmSpecialRebateDetailsVos);
     }
 
-    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String applySid,String specialRebateSids) {
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String applySid, String specialRebateSids) {
         ResultBean rb = ResultBean.fireFail();
         List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
         String[] sids = specialRebateSids.split(",");
         for (String s : sids) {
-            ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.specialRebateGroupDetails(applySid,s);
+            ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.specialRebateGroupDetails(applySid, s);
             scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
             scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString());
             scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyFeign.java

@@ -31,7 +31,7 @@ public interface AppSpecialrebateCheckapplyFeign {
 
     @ApiOperation("明细")
     @GetMapping("/specialRebateCheckDetails/{sid}")
-    public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(@PathVariable("sid") String sid);
+    public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(@PathVariable("sid") String sid, @RequestParam("applySid") String applySid);
 
     @ApiOperation("明细-详情")
     @GetMapping("/scmspecialrebateDetail/{sid}")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyRest.java

@@ -52,8 +52,8 @@ public class AppSpecialrebateCheckapplyRest implements AppSpecialrebateCheckappl
     }
 
     @Override
-    public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
+    public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid, String applySid) {
-        return appSpecialrebateCheckapplyService.specialRebateCheckDetails(sid);
+        return appSpecialrebateCheckapplyService.specialRebateCheckDetails(sid, applySid);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyService.java

@@ -75,17 +75,17 @@ public class AppSpecialrebateCheckapplyService {
         ResultBean rb = ResultBean.fireFail();
         AppSpecialrebateCheckapplyDetailsVo appSpecialrebateCheckapplyDetailsVo = new AppSpecialrebateCheckapplyDetailsVo();
         com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplyDetailsVo data = scmSpecialrebateCheckapplyFeign.appDetail(sid).getData();
-        BeanUtil.copyProperties(data,appSpecialrebateCheckapplyDetailsVo);
+        BeanUtil.copyProperties(data, appSpecialrebateCheckapplyDetailsVo);
         return rb.success().setData(appSpecialrebateCheckapplyDetailsVo);
     }
 
-    public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
+    public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid, String applySid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppSpecialRebateDetailsVo> appSpecialRebateDetailsVos = new ArrayList<>();
-        List<ScmSpecialRebateDetailsVo> data = scmSpecialrebateCheckapplydetailFeign.appMx(sid).getData();
+        List<ScmSpecialRebateDetailsVo> data = scmSpecialrebateCheckapplydetailFeign.appMx(sid, applySid).getData();
         for (ScmSpecialRebateDetailsVo datum : data) {
             AppSpecialRebateDetailsVo appSpecialRebateDetailsVo = new AppSpecialRebateDetailsVo();
-            BeanUtil.copyProperties(datum,appSpecialRebateDetailsVo);
+            BeanUtil.copyProperties(datum, appSpecialRebateDetailsVo);
             appSpecialRebateDetailsVo.setSid(appSpecialRebateDetailsVo.getSpecialRebateSid());
             appSpecialRebateDetailsVos.add(appSpecialRebateDetailsVo);
         }
@@ -96,7 +96,7 @@ public class AppSpecialrebateCheckapplyService {
         ResultBean rb = ResultBean.fireFail();
         AppSpecialRebateDetailsVo appSpecialRebateDetailsVo = new AppSpecialRebateDetailsVo();
         ScmSpecialRebateDetailsVo data = scmSpecialRebateFeign.fetchDetailsBySid(sid).getData();
-        BeanUtil.copyProperties(data,appSpecialRebateDetailsVo);
+        BeanUtil.copyProperties(data, appSpecialRebateDetailsVo);
         return rb.success().setData(appSpecialRebateDetailsVo);
     }