Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java

@@ -78,6 +78,8 @@ public class ScmSpecialrebatedistributeVo implements Vo {
     private String uploadMoney;
     @ApiModelProperty("分配总金额")
     private String distributionMoneyTotal;
+    @ApiModelProperty("专项返利sid")
+    private String specialSid;
     @ApiModelProperty("分配数量")
     private String disNum;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailDetailsVo.java

@@ -59,6 +59,8 @@ public class ScmSpecialrebatedistributedetailDetailsVo implements Vo {
     private String mainSid; // 分配申请sid
 	@ApiModelProperty("专项返利sid")
     private String specialRebateSid; // 专项返利sid
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
     @ApiModelProperty("所属年月")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java

@@ -181,6 +181,15 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
         qw.groupBy("sp.sid");
         IPage<ScmSpecialrebatedistribute> page = PagerUtil.queryToPage(pq);
         IPage<ScmSpecialrebatedistributeVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmSpecialrebatedistributeVo record : pagging.getRecords()) {
+            String[] specialSids = record.getSpecialSid().split(",");
+            int disVehCount = 0;
+            for (String specialSid : specialSids) {
+                int i = scmSpecialrebateVehsService.getDisVehCount(specialSid);
+                disVehCount = disVehCount + i;
+            }
+            record.setDisNum(String.valueOf(disVehCount));
+        }
         PagerVo<ScmSpecialrebatedistributeVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }