diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java index 82345599a0..f64e258244 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java @@ -54,6 +54,8 @@ public class ScmVehRebateDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; // 创建日期 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java index 33010a6be5..8f0e06810b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java @@ -51,30 +51,24 @@ import java.util.List; @ApiModel(value = "单车返利表 数据传输对象", description = "单车返利表 数据传输对象") public class ScmVehRebateDto implements Dto { + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("返利类型key") - private String rebateTypeKey; // 返利类型key + private String rebateTypeKey; @ApiModelProperty("返利类型value") - private String rebateTypeValue; // 返利类型value + private String rebateTypeValue; @ApiModelProperty("返利名称") - private String rebateName; // 返利名称 + private String rebateName; @ApiModelProperty("计算标准") - private String calculationStandard; // 计算标准 + private String calculationStandard; @ApiModelProperty("所属年月") - private String palceGenDate; // 所属年月 + private String palceGenDate; @ApiModelProperty("计算方式key") - private String calculationModeKey; // 计算方式key + private String calculationModeKey; @ApiModelProperty("计算方式Value") - private String calculationModeValue; // 计算方式Value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") - private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 + private String calculationModeValue; @ApiModelProperty("组织全路径") private String orgPath; @ApiModelProperty("单车返利车辆信息") - private List scmVehRebateVehs; // 单车返利车辆信息 + private List scmVehRebateVehs; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java index 1e4a133d15..bf9805e3f8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java @@ -52,25 +52,23 @@ import java.util.List; public class ScmVehRebateQuery implements Query { @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid + private String brandSid; @ApiModelProperty("车型名称") - private String vehModelName; // 车型名称 + private String vehModelName; @ApiModelProperty("车架号") - private String vinNo; // 车架号 + private String vinNo; @ApiModelProperty("创建开始日期") - private String createStartTime; // 创建开始日期 + private String createStartTime; @ApiModelProperty("创建结束日期") - private String createEndTime; // 创建结束日期 + private String createEndTime; @ApiModelProperty("返利类型key") - private String rebateTypeKey; // 返利类型key + private String rebateTypeKey; @ApiModelProperty("返利名称") - private String rebateName; // 返利名称 + private String rebateName; @ApiModelProperty("状态") - private String state; // 状态 - @ApiModelProperty("是否调整") - private String isAdjustment; // 是否调整 + private String state; @ApiModelProperty("单车返利sid") - private List sidList; // 单车返利sid + private List sidList; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java index 0f21795847..74cdb8ff4d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java @@ -54,9 +54,6 @@ import java.util.List; @Mapper public interface ScmVehRebateMapper extends BaseMapper { - //@Update("update scm_veh_rebate set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 35a56c5857..157a383893 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -30,6 +30,9 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo; @@ -65,13 +68,10 @@ public class ScmVehRebateService extends MybatisBaseService createQueryWrapper(ScmVehRebateQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; public PagerVo listPageVo(PagerQuery pq) { ScmVehRebateQuery query = pq.getParams(); @@ -403,16 +403,16 @@ public class ScmVehRebateService extends MybatisBaseService