dimengzhe
3 weeks ago
20 changed files with 846 additions and 34 deletions
@ -0,0 +1,80 @@ |
|||||
|
package com.yxt.anrui.reportcenter.api.carsSoldProfit; |
||||
|
|
||||
|
import com.yxt.common.core.domain.BaseEntity; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.math.BigDecimal; |
||||
|
import java.util.Date; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/9 |
||||
|
**/ |
||||
|
@Data |
||||
|
public class CarsSoldProfit extends BaseEntity { |
||||
|
private static final long serialVersionUID = 3918454271608275795L; |
||||
|
|
||||
|
private String orgSidPath; |
||||
|
@ApiModelProperty("销售专员sid") |
||||
|
private String staffSid; |
||||
|
@ApiModelProperty("销售专员") |
||||
|
private String staffName; |
||||
|
@ApiModelProperty("客户sid") |
||||
|
private String customerSid; |
||||
|
@ApiModelProperty("客户名称") |
||||
|
private String customerName; |
||||
|
@ApiModelProperty("销售日期") |
||||
|
private Date saleDate; |
||||
|
@ApiModelProperty("分公司sid") |
||||
|
private String useOrgSid; |
||||
|
@ApiModelProperty("分公司名称") |
||||
|
private String useOrgName; |
||||
|
@ApiModelProperty("车型sid") |
||||
|
private String vehModelSid; |
||||
|
@ApiModelProperty("车型配置sid") |
||||
|
private String vehMConfigSid; |
||||
|
@ApiModelProperty("采购系统sid") |
||||
|
private String purchaseSystemSid; |
||||
|
@ApiModelProperty("采购系统名称") |
||||
|
private String purchaseSystemName; |
||||
|
@ApiModelProperty("车架号") |
||||
|
private String vinNo; |
||||
|
@ApiModelProperty("车辆sid") |
||||
|
private String vinSid; |
||||
|
@ApiModelProperty("存放地点sid") |
||||
|
private String locationSid; |
||||
|
@ApiModelProperty("存放地点") |
||||
|
private String locationName; |
||||
|
@ApiModelProperty("采购类型") |
||||
|
private String type; |
||||
|
@ApiModelProperty("出库价") |
||||
|
private BigDecimal exStockPrice; |
||||
|
@ApiModelProperty("预计毛利") |
||||
|
private BigDecimal expectedMaori; |
||||
|
@ApiModelProperty("返利调整") |
||||
|
private BigDecimal rebatesAdjust; |
||||
|
@ApiModelProperty("调整后毛利") |
||||
|
private BigDecimal adjustedMaori; |
||||
|
@ApiModelProperty("厂家结算价") |
||||
|
private BigDecimal makersSettlementPrice; |
||||
|
@ApiModelProperty("返利合计") |
||||
|
private BigDecimal rebatesTotal; |
||||
|
@ApiModelProperty("车辆成本") |
||||
|
private BigDecimal carCost; |
||||
|
@ApiModelProperty("金融服务费") |
||||
|
private BigDecimal financeServiceCharge; |
||||
|
@ApiModelProperty("中介返利费") |
||||
|
private BigDecimal mediatorRebatePrice; |
||||
|
@ApiModelProperty("调车费") |
||||
|
private BigDecimal moveCarPrice; |
||||
|
@ApiModelProperty("排产订单编号") |
||||
|
private String schedulingId; |
||||
|
@ApiModelProperty("变速箱") |
||||
|
private String gearbox; |
||||
|
@ApiModelProperty("数据日期") |
||||
|
private Date createDate; |
||||
|
@ApiModelProperty("更新日期") |
||||
|
private Date updateDate; |
||||
|
} |
||||
@ -0,0 +1,78 @@ |
|||||
|
package com.yxt.anrui.reportcenter.api.carsSoldProfit; |
||||
|
|
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.math.BigDecimal; |
||||
|
import java.util.Date; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/9 |
||||
|
**/ |
||||
|
@Data |
||||
|
public class CarsSoldProfitDto { |
||||
|
|
||||
|
private String orgSidPath; |
||||
|
@ApiModelProperty("销售专员sid") |
||||
|
private String staffSid; |
||||
|
@ApiModelProperty("销售专员") |
||||
|
private String staffName; |
||||
|
@ApiModelProperty("客户sid") |
||||
|
private String customerSid; |
||||
|
@ApiModelProperty("客户名称") |
||||
|
private String customerName; |
||||
|
@ApiModelProperty("销售日期") |
||||
|
private String saleDate; |
||||
|
@ApiModelProperty("分公司sid") |
||||
|
private String useOrgSid; |
||||
|
@ApiModelProperty("分公司名称") |
||||
|
private String useOrgName; |
||||
|
@ApiModelProperty("车型sid") |
||||
|
private String vehModelSid; |
||||
|
@ApiModelProperty("车型配置sid") |
||||
|
private String vehMConfigSid; |
||||
|
@ApiModelProperty("采购系统sid") |
||||
|
private String purchaseSystemSid; |
||||
|
@ApiModelProperty("采购系统名称") |
||||
|
private String purchaseSystemName; |
||||
|
@ApiModelProperty("车架号") |
||||
|
private String vinNo; |
||||
|
@ApiModelProperty("车辆sid") |
||||
|
private String vinSid; |
||||
|
@ApiModelProperty("存放地点sid") |
||||
|
private String locationSid; |
||||
|
@ApiModelProperty("存放地点") |
||||
|
private String locationName; |
||||
|
@ApiModelProperty("采购类型") |
||||
|
private String type; |
||||
|
@ApiModelProperty("出库价") |
||||
|
private String exStockPrice; |
||||
|
@ApiModelProperty("预计毛利") |
||||
|
private String expectedMaori; |
||||
|
@ApiModelProperty("返利调整") |
||||
|
private String rebatesAdjust; |
||||
|
@ApiModelProperty("调整后毛利") |
||||
|
private String adjustedMaori; |
||||
|
@ApiModelProperty("厂家结算价") |
||||
|
private String makersSettlementPrice; |
||||
|
@ApiModelProperty("返利合计") |
||||
|
private String rebatesTotal; |
||||
|
@ApiModelProperty("车辆成本") |
||||
|
private String carCost; |
||||
|
@ApiModelProperty("金融服务费") |
||||
|
private String financeServiceCharge; |
||||
|
@ApiModelProperty("中介返利费") |
||||
|
private String mediatorRebatePrice; |
||||
|
@ApiModelProperty("调车费") |
||||
|
private String moveCarPrice; |
||||
|
@ApiModelProperty("排产订单编号") |
||||
|
private String schedulingId; |
||||
|
@ApiModelProperty("变速箱") |
||||
|
private String gearbox; |
||||
|
@ApiModelProperty("数据日期") |
||||
|
private String createDate; |
||||
|
@ApiModelProperty("更新日期") |
||||
|
private String updateDate; |
||||
|
} |
||||
@ -0,0 +1,31 @@ |
|||||
|
package com.yxt.anrui.reportcenter.api.carsSoldProfit; |
||||
|
|
||||
|
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback; |
||||
|
import com.yxt.common.core.query.PagerQuery; |
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import com.yxt.common.core.vo.PagerVo; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
import org.springframework.web.bind.annotation.ResponseBody; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/9 |
||||
|
**/ |
||||
|
@FeignClient( |
||||
|
contextId = "anrui-reportcenter-CarsSoldProfit", |
||||
|
name = "anrui-reportcenter", |
||||
|
path = "v1/carsSoldProfit", |
||||
|
fallback = CarsSoldProfitFeignFallback.class) |
||||
|
public interface CarsSoldProfitFeign { |
||||
|
|
||||
|
@PostMapping("saveOrUpdate") |
||||
|
@ResponseBody |
||||
|
ResultBean saveOrUpdate(@RequestBody CarsSoldProfitDto dto); |
||||
|
|
||||
|
@PostMapping("list") |
||||
|
@ResponseBody |
||||
|
ResultBean<PagerVo<CarsSoldProfitVo>> list(@RequestBody PagerQuery<CarsSoldProfitQuery> pagerQuery); |
||||
|
} |
||||
@ -0,0 +1,12 @@ |
|||||
|
package com.yxt.anrui.reportcenter.api.carsSoldProfit; |
||||
|
|
||||
|
import org.springframework.stereotype.Component; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/9 |
||||
|
**/ |
||||
|
@Component |
||||
|
public class CarsSoldProfitFeignFallback { |
||||
|
} |
||||
@ -0,0 +1,25 @@ |
|||||
|
package com.yxt.anrui.reportcenter.api.carsSoldProfit; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/9 |
||||
|
**/ |
||||
|
@Data |
||||
|
public class CarsSoldProfitQuery implements Query { |
||||
|
private static final long serialVersionUID = -2577600843922228724L; |
||||
|
@ApiModelProperty("菜单sid") |
||||
|
private String menuSid; |
||||
|
@ApiModelProperty("机构组织全路径") |
||||
|
private String orgSidPath; |
||||
|
@ApiModelProperty("搜索分公司、车架号、车型、排产订单、销售专员") |
||||
|
private String names; |
||||
|
|
||||
|
private String date; |
||||
|
|
||||
|
private String userSid; |
||||
|
} |
||||
@ -0,0 +1,71 @@ |
|||||
|
package com.yxt.anrui.reportcenter.api.carsSoldProfit; |
||||
|
|
||||
|
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/9 |
||||
|
**/ |
||||
|
@Data |
||||
|
public class CarsSoldProfitVo { |
||||
|
|
||||
|
@ApiModelProperty("销售专员") |
||||
|
@JsonProperty("seller") |
||||
|
private String staffName; |
||||
|
@ApiModelProperty("客户名称") |
||||
|
@JsonProperty("customer") |
||||
|
private String customerName; |
||||
|
@ApiModelProperty("销售日期") |
||||
|
@JsonProperty("saleTime") |
||||
|
private String saleDate; |
||||
|
@ApiModelProperty("分公司") |
||||
|
@JsonProperty("branch") |
||||
|
private String useOrgName; |
||||
|
@ApiModelProperty("事业部") |
||||
|
private String division; |
||||
|
@ApiModelProperty("车型") |
||||
|
private String model; |
||||
|
|
||||
|
@ApiModelProperty("采购系统") |
||||
|
@JsonProperty("buySystem") |
||||
|
private String purchaseSystemName; |
||||
|
@ApiModelProperty("车架号") |
||||
|
@JsonProperty("vin") |
||||
|
private String vinNo; |
||||
|
|
||||
|
@ApiModelProperty("出库价") |
||||
|
private String exStockPrice; |
||||
|
@ApiModelProperty("预计毛利") |
||||
|
private String expectedMaori; |
||||
|
@ApiModelProperty("返利调整") |
||||
|
private String rebatesAdjust; |
||||
|
@ApiModelProperty("调整后毛利") |
||||
|
private String adjustedMaori; |
||||
|
@ApiModelProperty("厂家结算价") |
||||
|
private String makersSettlementPrice; |
||||
|
@ApiModelProperty("返利合计") |
||||
|
private String rebatesTotal; |
||||
|
@ApiModelProperty("车辆成本") |
||||
|
private String carCost; |
||||
|
@ApiModelProperty("金融服务费") |
||||
|
private String financeServiceCharge; |
||||
|
@ApiModelProperty("中介返利费") |
||||
|
private String mediatorRebatePrice; |
||||
|
@ApiModelProperty("调车费") |
||||
|
private String moveCarPrice; |
||||
|
|
||||
|
@ApiModelProperty("变速箱") |
||||
|
private String gearbox; |
||||
|
@ApiModelProperty("排产订单编号") |
||||
|
private String schedulingId; |
||||
|
|
||||
|
@ApiModelProperty("数据日期") |
||||
|
private String dataTime; |
||||
|
@ApiModelProperty("更新日期") |
||||
|
private String updateTime; |
||||
|
|
||||
|
private String sid; |
||||
|
} |
||||
@ -0,0 +1,22 @@ |
|||||
|
package com.yxt.anrui.reportcenter.biz.carsSoldProfit; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
|
import com.baomidou.mybatisplus.core.toolkit.Constants; |
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfit; |
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
import org.apache.ibatis.annotations.Param; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/9 |
||||
|
**/ |
||||
|
@Mapper |
||||
|
public interface CarsSoldProfitMapper extends BaseMapper<CarsSoldProfit> { |
||||
|
CarsSoldProfit selectByVinSid(String vinSid); |
||||
|
|
||||
|
IPage<CarsSoldProfitVo> listPage(IPage<CarsSoldProfit> page, @Param(Constants.WRAPPER)QueryWrapper<CarsSoldProfit> qw); |
||||
|
} |
||||
@ -0,0 +1,16 @@ |
|||||
|
<?xml version="1.0" encoding="UTF-8" ?> |
||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
|
<mapper namespace="com.yxt.anrui.reportcenter.biz.carsSoldProfit.CarsSoldProfitMapper"> |
||||
|
<select id="selectByVinSid" resultType="com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfit"> |
||||
|
select * |
||||
|
from cars_sole_profit |
||||
|
where vinSid = #{vinSid} |
||||
|
</select> |
||||
|
|
||||
|
<select id="listPage" resultType="com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo"> |
||||
|
select * from cars_sole_profit |
||||
|
<where> |
||||
|
${ew.sqlSegment} |
||||
|
</where> |
||||
|
</select> |
||||
|
</mapper> |
||||
@ -0,0 +1,40 @@ |
|||||
|
package com.yxt.anrui.reportcenter.biz.carsSoldProfit; |
||||
|
|
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto; |
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitFeign; |
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitQuery; |
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo; |
||||
|
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; |
||||
|
import com.yxt.common.core.query.PagerQuery; |
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import com.yxt.common.core.vo.PagerVo; |
||||
|
import io.swagger.annotations.Api; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.RestController; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/9 |
||||
|
**/ |
||||
|
@Api(tags = "车辆利润报表") |
||||
|
@RestController |
||||
|
@RequestMapping("v1/carsSoldProfit") |
||||
|
public class CarsSoldProfitRest implements CarsSoldProfitFeign { |
||||
|
|
||||
|
@Autowired |
||||
|
private CarsSoldProfitService carsSoldProfitService; |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean saveOrUpdate(CarsSoldProfitDto dto) { |
||||
|
return carsSoldProfitService.saveProfit(dto); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean<PagerVo<CarsSoldProfitVo>> list(PagerQuery<CarsSoldProfitQuery> pagerQuery) { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
PagerVo<CarsSoldProfitVo> pv = carsSoldProfitService.listPage(pagerQuery); |
||||
|
return rb.success().setData(pv); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,138 @@ |
|||||
|
package com.yxt.anrui.reportcenter.biz.carsSoldProfit; |
||||
|
|
||||
|
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.portal.api.sysuser.PrivilegeQuery; |
||||
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfit; |
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto; |
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitQuery; |
||||
|
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo; |
||||
|
import com.yxt.common.base.service.MybatisBaseService; |
||||
|
import com.yxt.common.base.utils.PagerUtil; |
||||
|
import com.yxt.common.base.utils.StringUtils; |
||||
|
import com.yxt.common.core.query.PagerQuery; |
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import com.yxt.common.core.vo.PagerVo; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
|
||||
|
import java.math.BigDecimal; |
||||
|
import java.util.Collections; |
||||
|
import java.util.Date; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/9 |
||||
|
**/ |
||||
|
@Service |
||||
|
public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapper, CarsSoldProfit> { |
||||
|
|
||||
|
@Autowired |
||||
|
private SysUserFeign sysUserFeign; |
||||
|
|
||||
|
public ResultBean saveProfit(CarsSoldProfitDto dto) { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
CarsSoldProfit carsSoldProfit = baseMapper.selectByVinSid(dto.getVinSid()); |
||||
|
if (carsSoldProfit != null) { |
||||
|
//预计毛利
|
||||
|
if (StringUtils.isNotBlank(dto.getExpectedMaori())) { |
||||
|
carsSoldProfit.setExpectedMaori(new BigDecimal(dto.getExpectedMaori())); |
||||
|
} |
||||
|
//返利调整
|
||||
|
if (StringUtils.isNotBlank(dto.getRebatesAdjust())) { |
||||
|
carsSoldProfit.setRebatesAdjust(new BigDecimal(dto.getRebatesAdjust())); |
||||
|
} |
||||
|
//调整后毛利
|
||||
|
if (StringUtils.isNotBlank(dto.getAdjustedMaori())) { |
||||
|
carsSoldProfit.setAdjustedMaori(new BigDecimal(dto.getAdjustedMaori())); |
||||
|
} |
||||
|
//
|
||||
|
carsSoldProfit.setUpdateDate(new Date()); |
||||
|
baseMapper.updateById(carsSoldProfit); |
||||
|
|
||||
|
|
||||
|
} else { |
||||
|
carsSoldProfit = new CarsSoldProfit(); |
||||
|
BeanUtil.copyProperties(dto, carsSoldProfit); |
||||
|
baseMapper.insert(carsSoldProfit); |
||||
|
} |
||||
|
return rb.success(); |
||||
|
} |
||||
|
|
||||
|
public PagerVo<CarsSoldProfitVo> listPage(PagerQuery<CarsSoldProfitQuery> pagerQuery) { |
||||
|
CarsSoldProfitQuery query = pagerQuery.getParams(); |
||||
|
QueryWrapper<CarsSoldProfit> qw = new QueryWrapper<>(); |
||||
|
if (query != null) { |
||||
|
if (StringUtils.isNotBlank(query.getMenuSid())) { |
||||
|
//=======================
|
||||
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
||||
|
privilegeQuery.setOrgPath(query.getOrgSidPath()); |
||||
|
privilegeQuery.setMenuSid(query.getMenuSid()); |
||||
|
privilegeQuery.setUserSid(query.getUserSid()); |
||||
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
||||
|
if (org.apache.commons.lang3.StringUtils.isNotBlank(defaultIdReltBean.getData())) { |
||||
|
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
||||
|
String orgSidPath = query.getOrgSidPath(); |
||||
|
orgSidPath = orgSidPath + "/"; |
||||
|
int i1 = orgSidPath.indexOf("/"); |
||||
|
int i2 = orgSidPath.indexOf("/", i1 + 1); |
||||
|
int i3 = orgSidPath.indexOf("/", i2 + 1); |
||||
|
int i4 = orgSidPath.indexOf("/", i3 + 1); |
||||
|
String orgLevelKey = defaultIdReltBean.getData(); |
||||
|
if ("1".equals(orgLevelKey)) { |
||||
|
orgSidPath = orgSidPath.substring(0, i1); |
||||
|
qw.like("bd.orgSidPath", orgSidPath); |
||||
|
} else if ("2".equals(orgLevelKey)) { |
||||
|
orgSidPath = orgSidPath.substring(0, i2); |
||||
|
qw.like("bd.orgSidPath", orgSidPath); |
||||
|
} else if ("3".equals(orgLevelKey)) { |
||||
|
orgSidPath = orgSidPath.substring(0, i3); |
||||
|
qw.like("bd.orgSidPath", orgSidPath); |
||||
|
} else if ("4".equals(orgLevelKey)) { |
||||
|
orgSidPath = orgSidPath.substring(0, i4); |
||||
|
qw.like("bd.orgSidPath", orgSidPath); |
||||
|
} else { |
||||
|
PagerVo<CarsSoldProfitVo> p = new PagerVo<>(); |
||||
|
return p; |
||||
|
} |
||||
|
} else { |
||||
|
PagerVo<CarsSoldProfitVo> p = new PagerVo<>(); |
||||
|
return p; |
||||
|
} |
||||
|
} |
||||
|
String date = query.getDate(); |
||||
|
if (StringUtils.isNotBlank(date)) { |
||||
|
String[] s = date.split("至"); |
||||
|
String startDate = s[0]; |
||||
|
if (StringUtils.isNotBlank(startDate)) { |
||||
|
qw.ge("saleDate", startDate); |
||||
|
} |
||||
|
String endDate = s[1]; |
||||
|
if (StringUtils.isNotBlank(endDate)) { |
||||
|
qw.le("saleDate", endDate); |
||||
|
} |
||||
|
} |
||||
|
String names = query.getNames(); |
||||
|
// 多字段模糊查询
|
||||
|
if (StringUtils.isNotBlank(names)) { |
||||
|
qw.and(wrapper -> wrapper.like("useOrgName", names) |
||||
|
.or().like("vinNo", names) |
||||
|
.or().like("model", names) |
||||
|
.or().like("schedulingId", names) |
||||
|
.or().like("staffName", names)); |
||||
|
|
||||
|
|
||||
|
} |
||||
|
} |
||||
|
IPage<CarsSoldProfit> page = PagerUtil.queryToPage(pagerQuery); |
||||
|
IPage<CarsSoldProfitVo> pagging = baseMapper.listPage(page, qw); |
||||
|
List<CarsSoldProfitVo> recordList = pagging.getRecords(); |
||||
|
recordList.removeAll(Collections.singleton(null)); |
||||
|
PagerVo<CarsSoldProfitVo> p = PagerUtil.pageToVo(pagging, null); |
||||
|
return p; |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,14 @@ |
|||||
|
package com.yxt.anrui.riskcenter.api.loansecondarysalescustomer; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: dimengzhe |
||||
|
* @date: 2025/5/13 |
||||
|
**/ |
||||
|
@Data |
||||
|
public class FileQuery { |
||||
|
|
||||
|
private String url; |
||||
|
} |
||||
@ -0,0 +1,50 @@ |
|||||
|
DROP TABLE IF EXISTS `car_sold_profit`; |
||||
|
CREATE TABLE `car_sold_profit` |
||||
|
( |
||||
|
`id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', |
||||
|
`sid` varchar(64) NOT NULL COMMENT 'sid', |
||||
|
`lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', |
||||
|
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', |
||||
|
`modifyTime` timestamp NULL DEFAULT NULL COMMENT '修改时间', |
||||
|
`isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', |
||||
|
`state` int(32) DEFAULT '1' COMMENT '状态', |
||||
|
`isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', |
||||
|
`remarks` varchar(255) DEFAULT NULL COMMENT '备注', |
||||
|
`createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', |
||||
|
`updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', |
||||
|
`orgSidPath` varchar(500) DEFAULT NULL COMMENT '组织机构', |
||||
|
`staffSid` varchar(64) DEFAULT NULL COMMENT '销售专员sid', |
||||
|
`staffName` varchar(64) DEFAULT NULL COMMENT '销售专员名称', |
||||
|
`customerSid` varchar(500) DEFAULT NULL COMMENT '客户sid', |
||||
|
`customerName` varchar(500) DEFAULT NULL COMMENT '客户名称', |
||||
|
`saleDate` varchar(64) DEFAULT NULL COMMENT '销售日期', |
||||
|
`useOrgSid` varchar(64) DEFAULT NULL COMMENT '分公司sid', |
||||
|
`useOrgName` varchar(64) DEFAULT NULL COMMENT '分公司名称', |
||||
|
`vehModelSid` varchar(64) DEFAULT NULL COMMENT '车型sid', |
||||
|
`vehModel` varchar(64) DEFAULT NULL COMMENT '车型', |
||||
|
`vehMConfigSid` varchar(64) DEFAULT NULL COMMENT '车型配置sid', |
||||
|
`purchaseSystemSid` varchar(64) DEFAULT NULL COMMENT '采购系统sid', |
||||
|
`purchaseSystemName` varchar(64) DEFAULT NULL COMMENT '采购系统名称', |
||||
|
`vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', |
||||
|
`vinSid` varchar(200) DEFAULT NULL COMMENT '车辆sid', |
||||
|
`locationSid` varchar(200) DEFAULT NULL COMMENT '存放地点sid', |
||||
|
`locationName` varchar(200) DEFAULT NULL COMMENT '存放地点', |
||||
|
`type` varchar(200) DEFAULT NULL COMMENT '类型', |
||||
|
`exStockPrice` decimal(10, 2) DEFAULT NULL COMMENT '出库价', |
||||
|
`expectedMaori` decimal(10, 2) DEFAULT NULL COMMENT '预计毛利', |
||||
|
`rebatesAdjust` decimal(10, 2) DEFAULT NULL COMMENT '返利调整', |
||||
|
`adjustedMaori` decimal(10, 2) DEFAULT NULL COMMENT '调整后毛利', |
||||
|
`makersSettlementPrice` decimal(10, 2) DEFAULT NULL COMMENT '厂家结算价', |
||||
|
`rebatesTotal` decimal(10, 2) DEFAULT NULL COMMENT '返利合计', |
||||
|
`carCost` decimal(10, 2) DEFAULT NULL COMMENT '车辆成本', |
||||
|
`financeServiceCharge` decimal(10, 2) DEFAULT NULL COMMENT '金融服务费', |
||||
|
`mediatorRebatePrice` decimal(10, 2) DEFAULT NULL COMMENT '中介返利费', |
||||
|
`moveCarPrice` decimal(10, 2) DEFAULT NULL COMMENT '调车费', |
||||
|
`schedulingId` varchar(500) DEFAULT NULL COMMENT '排产订单编号', |
||||
|
`gearbox` varchar(500) DEFAULT NULL COMMENT '变速箱', |
||||
|
`createDate` date DEFAULT NULL COMMENT '数据日期', |
||||
|
`updateDate` date DEFAULT NULL COMMENT '更新日期', |
||||
|
PRIMARY KEY (`id`), |
||||
|
KEY `id` (`id`) |
||||
|
) ENGINE = INNODB |
||||
|
DEFAULT CHARSET = utf8 COMMENT ='车辆销售利润报表'; |
||||
Loading…
Reference in new issue