更改

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

@@ -40,6 +40,8 @@ import java.util.List;
 @ApiModel(value = "专项返利分配选择车辆 视图数据对象", description = "专项返利分配选择车辆 视图数据对象")
 public class BaseCollRebateDisGetVehVo implements Query {
 
+    @ApiModelProperty(value = "采购系统sid")
+    private String purchaseSystemSid;
     @ApiModelProperty(value = "车型名称和编码")
     private String modelName;
     @ApiModelProperty(value = "车架号")

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

@@ -3723,6 +3723,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         BaseCollRebateDisGetVehVo params = pagerQuery.getParams();
         if (params != null) {
             qw.eq("bv.useOrgSid", params.getCreateOrgSid());
+            //采购系统
+            if (StringUtils.isNotBlank(params.getPurchaseSystemSid())) {
+                qw.eq("bv.purchaseSystemSid", params.getPurchaseSystemSid());
+            }
             //车型
             if (StringUtils.isNotBlank(params.getModelName())) {
                 qw.like("bv.modelName", params.getModelName());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java

@@ -140,6 +140,7 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService<S
                 apply(StringUtils.isNotBlank(subitDateEnd), "date_format (sd.subitDate,'%Y-%m-%d') <= date_format('" + subitDateEnd + "','%Y-%m-%d')"
                 );
         qw.groupBy("sd.sid");
+        qw.orderByDesc("sd.createTime");
         IPage<ScmCollectionRebateDistribution> page = PagerUtil.queryToPage(pq);
         IPage<ScmCollectionRebateDistributionVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ScmCollectionRebateDistributionVo> p = PagerUtil.pageToVo(pagging, null);
@@ -192,6 +193,20 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService<S
             }
             return rb.success().setMsg("修改成功");
         } else if ("1".equals(state)) {
+            String sid = this.insertByDto(dto);
+            if (scmCollectionRebateVehs != null) {
+                for (ScmCollectionRebateDistributionVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) {
+                    scmCollectionRebateVehDto.setMainSid(sid);
+                    scmCollectionRebateDistributionVehService.insertByDto(scmCollectionRebateVehDto);
+                }
+            }
+            for (ScmCollectionRebateDistributionFile url : urls) {
+                String filePath = url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+                ScmFile scmFile = new ScmFile();
+                scmFile.setFilePath(filePath);
+                scmFile.setLinkSid(sid);
+                scmFileService.save(scmFile);
+            }
             baseMapper.updateStateAndSubmitDate(dtoSid, state);
             return rb.success().setMsg("提交成功");
         } else if ("2".equals(state)) {