Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java

@@ -66,7 +66,7 @@ public interface ScmVehrebateCheckapplydetailFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehrebateCheckapplydetailDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody

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

@@ -46,7 +46,6 @@ public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper<ScmSp
 
     List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
 
-    @Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
     List<ScmSpecialrebateCheckapplydetailVo> selByMainSid(String sid);
 
     List<ScmSpecialRebateDetailsVo> fetchBySpecialRebateSid(String mainSid);

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

@@ -56,4 +56,9 @@
                            ON sd.mainSid = sc.sid
         WHERE sd.mainSid = #{mainSid}
     </select>
+
+    <select id="selByMainSid"
+            resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
+        select *,expectItureCost + expectTreatCost + expectSuppCost as withholdCost from scm_specialrebate_checkapplydetail where mainSid = #{sid}
+    </select>
 </mapper>