diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java index e0f30bf8f7..477bc1cff0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java @@ -40,4 +40,6 @@ public class BaseInterNalPurchaseCompleteDto implements Dto { private Map formVariables; private String orgPath; + + private String id; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java index 481f56c017..6ebf50372f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java @@ -23,10 +23,8 @@ import lombok.Data; @Data public class BaseModelConfigQuery implements Query { -/* @ApiModelProperty("车型sid(陕汽必须的字段)") - private String vehicleSid;*/ -/* @ApiModelProperty("车型配置代码(陕汽必须的字段)") - private String vehicleCode;*/ + @ApiModelProperty("所属归属") + private String orgSid; @ApiModelProperty("车身颜色key") private String carColorKey; @ApiModelProperty("缓速器key") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java index 78a7fb3a98..54fb25f55f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java @@ -1,9 +1,12 @@ package com.yxt.anrui.base.api.basevehicle; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author dimengzhe * @Date 2022/4/12 11:26 @@ -29,7 +32,9 @@ public class BaseChoiceVehicleVo implements Vo { @ApiModelProperty(value = "车型sid") private String carModelSid; @ApiModelProperty(value = "入库日期") - private String priceDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date priceDate; @ApiModelProperty(value = "销售日期") - private String salesDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date salesDate; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java index 6fd392becc..41fff876dd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java @@ -27,6 +27,8 @@ public class BaseVehicleModelQuery implements Query { private String configSid; @ApiModelProperty(value = "分公司sid") private String createOrgSId; + @ApiModelProperty("所属归属") + private String orgSid; @ApiModelProperty(value = "车型sid") private String modelSid; @ApiModelProperty(value = "品牌sid") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java index d599969554..b081c72237 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java @@ -114,7 +114,7 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign { BusinessVariables bv=new BusinessVariables(); BeanUtil.copyProperties(bvd,bv); bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId()); - return baseInternalPurchaseService.InitiatorToAnswer(bv); + return baseInternalPurchaseService.InitiatorToAnswer(bv,bvd.getId()); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 2b7969f959..4befc91db1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -580,7 +580,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); List candidateGroups = voList.get(0).getCandidateGroups(); UserRoleQuery userRoleQuery = new UserRoleQuery(); - userRoleQuery.setRoleSid(candidateGroups.get(0)); - userRoleQuery.setOrgSid(callInOrgSid); + if (StringUtils.isNotBlank(id)){ + if (id.equals("Activity_08r04ow")){ + String sellerOrgSid = baseInternalPurchase.getSellerOrgSid(); + userRoleQuery.setRoleSid(candidateGroups.get(0)); + userRoleQuery.setOrgSid(sellerOrgSid); + }else if (id.equals("Activity_02xqz9n")){ + String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid(); + userRoleQuery.setRoleSid(candidateGroups.get(0)); + userRoleQuery.setOrgSid(buyerOrgSid); + }else { + userRoleQuery.setRoleSid(candidateGroups.get(0)); + userRoleQuery.setOrgSid(callInOrgSid); + } + }else { + userRoleQuery.setRoleSid(candidateGroups.get(0)); + userRoleQuery.setOrgSid(callInOrgSid); + } List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); StringBuilder nextNodeUserSids = new StringBuilder(); if (sysUserVos.size() > 0) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 4e4ab3f865..8f648a94de 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinance; import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceDto; import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceVo; +import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; @@ -706,7 +707,16 @@ public class BaseManufacturerService extends MybatisBaseService map = new HashMap<>(); + map.put("sid",s); + map.put("manufacturerName",sysOrganizationVo.getName()); + maps.add(map); + } } return rb.success().setData(maps); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index 2a8eb18b0f..df0ea2c66e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java @@ -73,12 +73,9 @@ public class BaseModelConfigService extends MybatisBaseService qw = new QueryWrapper<>(); if (pagerQuery != null) { qw.eq("bmc.isDelete", "0"); - /*if (StringUtils.isNotBlank(pagerQuery.getVehicleCode())) {//整车编码 - qw.like("bmc.vehicleCode", pagerQuery.getVehicleCode()); + if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) { + qw.eq("bmc.createOrgSId", pagerQuery.getOrgSid()); } - if (StringUtils.isNotBlank(pagerQuery.getVehicleSid())) {//车型sid - qw.eq("bmc.vehicleSid", pagerQuery.getVehicleSid()); - }*/ if (StringUtils.isNotBlank(pagerQuery.getCarColorKey())) {//车身颜色 qw.like("bmc.carColorKey", pagerQuery.getCarColorKey()); } @@ -149,6 +146,7 @@ public class BaseModelConfigService extends MybatisBaseService { IPage baseDisCountPackageGetVeh(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); - IPage vehicleCollectionPageList(IPage page, QueryWrapper qw); + IPage vehicleCollectionPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file 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 3672cd2887..3ef2c5849a 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 @@ -1353,7 +1353,7 @@ bv.vinNo, bmc.carColor color, bv.locationName location, - bv.costPrice as priced, + bv.costPrice as guidedPrice, bv.priceDate, bv.salesDate FROM base_vehicle bv 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 ca07f12939..7c840d32e8 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 @@ -143,7 +143,7 @@ public class BaseVehicleService extends MybatisBaseService wrapper.eq("bv.vehicleState",VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState",VehicleState.StockEnum.DR_STOCK.getCode())); - if (StringUtils.isNotBlank(params.getVehicleState())){ - qw.eq("bv.vehicleState",params.getVehicleState()); + qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); + if (StringUtils.isNotBlank(params.getVehicleState())) { + qw.eq("bv.vehicleState", params.getVehicleState()); } - if (StringUtils.isNotBlank(params.getVehicleAlias())){ - qw.like("bv.modelName",params.getVehicleAlias()); + if (StringUtils.isNotBlank(params.getVehicleAlias())) { + qw.like("bv.modelName", params.getVehicleAlias()); } - if (StringUtils.isNotBlank(params.getConfigName())){ - qw.like("bv.configName",params.getConfigName()); + if (StringUtils.isNotBlank(params.getConfigName())) { + qw.like("bv.configName", params.getConfigName()); } - if (StringUtils.isNotBlank(params.getVinNo())){ - qw.like("bv.vinNo",params.getVinNo()); + if (StringUtils.isNotBlank(params.getVinNo())) { + qw.like("bv.vinNo", params.getVinNo()); } - if (StringUtils.isNotBlank(params.getCarColorKey())){ - qw.eq("bmc.carColorKey",params.getCarColorKey()); + if (StringUtils.isNotBlank(params.getCarColorKey())) { + qw.eq("bmc.carColorKey", params.getCarColorKey()); } - if (StringUtils.isNotBlank(params.getLocation())){ - qw.like("bv.locationName",params.getLocation()); + if (StringUtils.isNotBlank(params.getLocation())) { + qw.like("bv.locationName", params.getLocation()); } return baseMapper.vehicleCrmPageList(page, qw); } @@ -1516,16 +1516,16 @@ public class BaseVehicleService extends MybatisBaseService wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode())); } // 车架号 - if (StringUtils.isNotBlank(params.getVinNo())){ - qw.like("bv.vinNo",params.getVinNo()); + if (StringUtils.isNotBlank(params.getVinNo())) { + qw.like("bv.vinNo", params.getVinNo()); } // 颜色 - if (StringUtils.isNotBlank(params.getCarColorKey())){ - qw.eq("bmc.carColorKey",params.getCarColorKey()); + if (StringUtils.isNotBlank(params.getCarColorKey())) { + qw.eq("bmc.carColorKey", params.getCarColorKey()); } // 存放地点 - if (StringUtils.isNotBlank(params.getLocation())){ - qw.eq("bv.location",params.getLocation()); + if (StringUtils.isNotBlank(params.getLocation())) { + qw.eq("bv.location", params.getLocation()); } if (params.getVinNoList().size() > 0) { qw.notIn("bv.vinNo", params.getVinNoList()); @@ -1688,16 +1688,16 @@ public class BaseVehicleService extends MybatisBaseService wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode())); } // 车架号 - if (StringUtils.isNotBlank(params.getVinNo())){ - qw.like("bv.vinNo",params.getVinNo()); + if (StringUtils.isNotBlank(params.getVinNo())) { + qw.like("bv.vinNo", params.getVinNo()); } // 颜色 - if (StringUtils.isNotBlank(params.getCarColorKey())){ - qw.eq("bmc.carColorKey",params.getCarColorKey()); + if (StringUtils.isNotBlank(params.getCarColorKey())) { + qw.eq("bmc.carColorKey", params.getCarColorKey()); } // 存放地点 - if (StringUtils.isNotBlank(params.getLocation())){ - qw.eq("bv.location",params.getLocation()); + if (StringUtils.isNotBlank(params.getLocation())) { + qw.eq("bv.location", params.getLocation()); } if (params.getVinNoList().size() > 0) { qw.notIn("bv.vinNo", params.getVinNoList()); @@ -1748,16 +1748,16 @@ public class BaseVehicleService extends MybatisBaseService wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode())); } // 车架号 - if (StringUtils.isNotBlank(params.getVinNo())){ - qw.like("bv.vinNo",params.getVinNo()); + if (StringUtils.isNotBlank(params.getVinNo())) { + qw.like("bv.vinNo", params.getVinNo()); } // 颜色 - if (StringUtils.isNotBlank(params.getCarColorKey())){ - qw.eq("bmc.carColorKey",params.getCarColorKey()); + if (StringUtils.isNotBlank(params.getCarColorKey())) { + qw.eq("bmc.carColorKey", params.getCarColorKey()); } // 存放地点 - if (StringUtils.isNotBlank(params.getLocation())){ - qw.eq("bv.location",params.getLocation()); + if (StringUtils.isNotBlank(params.getLocation())) { + qw.eq("bv.location", params.getLocation()); } if (params.getVinNoList().size() > 0) { qw.notIn("bv.vinNo", params.getVinNoList()); @@ -1988,6 +1988,7 @@ public class BaseVehicleService extends MybatisBaseService> selectAppListOne(String modelSid, String configSid, String orgSid) { ResultBean> rb = ResultBean.fireFail(); List orderVoList = new ArrayList<>(); @@ -2295,6 +2296,7 @@ public class BaseVehicleService extends MybatisBaseService newRecords = new ArrayList<>(); for (BaseChoiceVehicleVo record : records) { ScmCollectionRebateVehDetailsVo scmCollectionRebateVehDetailsVo = scmCollectionRebateVehFeign.fetchByVehSid(record.getVinNo()); - if (scmCollectionRebateVehDetailsVo == null){ + if (scmCollectionRebateVehDetailsVo == null) { newRecords.add(record); } } @@ -3249,22 +3252,22 @@ public class BaseVehicleService extends MybatisBaseService wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode())); } // 车架号 - if (StringUtils.isNotBlank(params.getVinNo())){ - qw.like("bv.vinNo",params.getVinNo()); + if (StringUtils.isNotBlank(params.getVinNo())) { + qw.like("bv.vinNo", params.getVinNo()); } // 颜色 - if (StringUtils.isNotBlank(params.getCarColorKey())){ - qw.eq("bmc.carColorKey",params.getCarColorKey()); + if (StringUtils.isNotBlank(params.getCarColorKey())) { + qw.eq("bmc.carColorKey", params.getCarColorKey()); } // 存放地点 - if (StringUtils.isNotBlank(params.getLocation())){ - qw.eq("bv.location",params.getLocation()); + if (StringUtils.isNotBlank(params.getLocation())) { + qw.eq("bv.location", params.getLocation()); } if (params.getVinNoList().size() > 0) { qw.notIn("bv.vinNo", params.getVinNoList()); } qw.eq("bv.isDelete", 0); - qw.eq("bv.vehicleState",VehicleState.StockEnum.OUT_STOCK.getCode()); + qw.eq("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode()); } return baseMapper.vehicleCollectionPageList(page, qw); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index 4b437783c6..aa052a3a1c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java @@ -85,6 +85,9 @@ public class BaseVehicleModelService extends MybatisBaseService> checkApplyGetAlreadyUploadCollectionRebate(@RequestBody PagerQuery pq); - - } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java index 04c8d94dbd..c29f65be72 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java @@ -51,12 +51,12 @@ public class ScmCollectionRebateDistributionQuery implements Query { @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("预提开始标题") - private String withholdingStartApply; // 预提开始标题 - @ApiModelProperty("预提结束标题") - private String withholdingEndApply; // 预提结束标题 + @ApiModelProperty("预提标题") + private String withholdingApply; // 预提标题 @ApiModelProperty("创建开始日期") private String createStartTime; // 创建开始日期 @ApiModelProperty("创建结束日期") private String createEndTime; // 创建结束日期 + @ApiModelProperty("创建分公司sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java index 5f1ed0b0ed..35927e7494 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java @@ -53,21 +53,22 @@ public class ScmCollectionRebateWithDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("备注") - private String remarks; // 备注 - @ApiModelProperty("预提返利") - private String withRebate; // 预提返利 - @ApiModelProperty("台数") - private String num; // 台数 - @ApiModelProperty("回款返利sid") - private List collectionRebateSids; // 回款返利sid - @ApiModelProperty("回款返利sid") - private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("回款返利预提申请sid") + private String mainSid; // 回款返利预提申请sid @ApiModelProperty("回款方式key") private String collectionTypeKey; // 回款方式key @ApiModelProperty("回款方式value") private String collectionTypeValue; // 回款方式value - @ApiModelProperty("回款返利预提申请sid") - private String mainSid; // 回款返利预提申请sid - + @ApiModelProperty("回款金额") + private String collectionMoney; // 回款金额 + @ApiModelProperty("运费") + private String freight; // 运费 + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + @ApiModelProperty("回款返利sid") + private List collectionRebateSids; // 回款返利sid + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java index adfbd6d905..803fe787ac 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmcollectionrebatewith; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -75,4 +76,9 @@ public interface ScmCollectionRebateWithFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("回款返利预提查看详情") + @GetMapping("/collectionRebateWithDetails/{sid}") + @ResponseBody + public ResultBean> collectionRebateWithDetails(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java index 90cfde02f8..387e228b4c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmcollectionrebatewith; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -69,4 +70,9 @@ public class ScmCollectionRebateWithFeignFallback implements ScmCollectionRebate ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean> collectionRebateWithDetails(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java index 73a426f318..ae46681a61 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java @@ -31,6 +31,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -48,6 +50,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java index a2b828b8f5..9939cabd27 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java @@ -78,6 +78,7 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService listPageVo(PagerQuery pq) { ScmCollectionRebateDistributionQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + qw.eq("createOrgSid",query.getCreateOrgSid()); if (StringUtils.isNotBlank(query.getBrandSid())){ qw.eq("brandSid",query.getBrandSid()); } @@ -86,11 +87,9 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); - String withholdingStartApply = query.getWithholdingStartApply(); - String withholdingEndApply = query.getWithholdingEndApply(); - qw.apply(StringUtils.isNotBlank(withholdingStartApply), "date_format (withholdingApply,'%Y年%m月份') >= date_format('" + withholdingStartApply + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(withholdingEndApply), "date_format (withholdingApply,'%Y年%m月份') <= date_format('" + withholdingEndApply + "','%Y-%m-%d')" - ); + if (StringUtils.isNotBlank(query.getWithholdingApply())){ + qw.like("withholdingApply",query.getWithholdingApply()); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml index b6f49e1296..a3684c1a96 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml @@ -1,27 +1,37 @@ - - - - - + + + - + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java index 3ac1e5c31c..d8099dec4a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmcollectionrebatewith; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -97,4 +98,9 @@ public class ScmCollectionRebateWithRest implements ScmCollectionRebateWithFeign ScmCollectionRebateWithDetailsVo vo = scmCollectionRebateWithService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean> collectionRebateWithDetails(String sid) { + return scmCollectionRebateWithService.collectionRebateWithDetails(sid); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java index 9dfb98e5ce..5dfbcae299 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java @@ -28,6 +28,9 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatewith; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; +import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -41,8 +44,10 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDeta import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto; import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -60,6 +65,10 @@ import java.util.List; */ @Service public class ScmCollectionRebateWithService extends MybatisBaseService { + + @Autowired + private ScmCollectionRebateService scmCollectionRebateService; + private QueryWrapper createQueryWrapper(ScmCollectionRebateWithQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -123,4 +132,17 @@ public class ScmCollectionRebateWithService extends MybatisBaseService fetchCollectionReBateSidByMainSid(String businessSid) { return baseMapper.fetchCollectionReBateSidByMainSid(businessSid); } + + public ResultBean> collectionRebateWithDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + List scmCollectionRebateDetailsVos = new ArrayList<>(); + String[] sids = sid.split(","); + for (String s : sids) { + ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(s); + ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = new ScmCollectionRebateDetailsVo(); + BeanUtil.copyProperties(scmCollectionRebate,scmCollectionRebateDetailsVo); + scmCollectionRebateDetailsVos.add(scmCollectionRebateDetailsVo); + } + return rb.success().setData(scmCollectionRebateDetailsVos); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java index 1db10d6529..5cf7ac2f8f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java @@ -89,7 +89,7 @@ public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWith @Override @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids) { return scmCollectionRebateWithApplyService.delAll(sids); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java index 436cfb7fda..e173810f26 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java @@ -39,6 +39,9 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith; import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto; @@ -46,6 +49,8 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto; import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService; +import com.yxt.anrui.scm.biz.scmcollectionrebatedistribution.ScmCollectionRebateDistributionService; +import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService; import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -87,6 +92,10 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); - return voResultBean; } if (r == 2) { @@ -341,7 +346,19 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(collectionRebateSid); + if (scmCollectionRebateVehDetailsVos.isEmpty()){ + ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(collectionRebateSid); + ScmCollectionRebateDistribution scmCollectionRebateDistribution = new ScmCollectionRebateDistribution(); + String sid = scmCollectionRebateDistribution.getSid(); + BeanUtil.copyProperties(scmCollectionRebate,scmCollectionRebateDistribution); + scmCollectionRebateDistribution.setSid(sid); + scmCollectionRebateDistribution.setDistributionState("未分配"); + scmCollectionRebateDistribution.setWithholdingApply(scmCollectionRebateDistribution.getWithholdingApply()); + scmCollectionRebateDistributionService.save(scmCollectionRebateDistribution); + } } + } return rb.success().setData(resultBean.getData()); } else {