yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

报表修改

master
dimengzhe 1 year ago
parent
d9567741bd
commit
455d3aee3f
5 changed files with 72 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java
  2. 2
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java
  3. 1
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java
  4. 10
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
  5. 83
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

12
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java
View File

@ -14,18 +14,20 @@ public class DailyReportListVo {
private String date;
//存销比
@ApiModelProperty("存销比")
private String saleOfStockRatio;
//库存小计
@ApiModelProperty("库存小计")
private String stock_subtotal;
//排产小计
@ApiModelProperty("排产小计")
private String pcOrder_subtotal;
//本日销售订单
@ApiModelProperty("本日销售订单")
private String saleOrder_subtotal_day;
//本日销售
@ApiModelProperty("本日销售")
private String sale_subtotal_day;
//欠款出库金额
@ApiModelProperty("欠款出库金额")
private String arrears_carry_veh_amount;
//金融未放款金额
@ApiModelProperty("金融未放款金额")
private String loan_not_amount;
@ApiModelProperty("本日买断")
private String buyout_day;

2
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java
View File

@ -21,4 +21,6 @@ public class DailyReportQuery implements Query {
private String useOrgSid;
@ApiModelProperty("事业部报表时传：组织sid全路径")
private String orgPath;
@ApiModelProperty("日期:集团、事业部、分公司具体统计时传")
private String todayDate;
}

1
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java
View File

@ -19,6 +19,7 @@ public class DailyReportVo implements Vo {
private String createTime;
@ApiModelProperty("事业部sid")
private String busOrgSid;
private String orgPath;
@ApiModelProperty("事业部名称")
private String busOrgName;
@ApiModelProperty("品牌sid")

10
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
View File

@ -9,16 +9,18 @@
<where>
${ew.sqlSegment}
</where>
order by dr.useOrgSid desc, dr.brandSid desc, dr.vehModelSid desc, dr.vehMConfigSid desc
</select>
<select id="listPage3" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
select *
from daily_report
select dr.*
from daily_report dr
left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid
<where>
${ew.sqlSegment}
</where>
group by busOrgSid, brandSid, vehModelSid, vehMConfigSid
group by dr.busOrgSid, dr.brandSid, dr.vehModelSid,dr.vehMConfigSid
order by dr.busOrgSid desc, dr.brandSid desc, bm.fuelTypeValue desc, bm.emissionStandardValue desc
</select>
<select id="selectByParameters" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyParameterVo">

83
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
View File

@ -34,26 +34,27 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
DailyReportQuery query = pagerQuery.getParams();
QueryWrapper<DailyReport> qw = new QueryWrapper<>();
if (query != null) {
//生成日期开始时间
String createTimeStart = query.getStartTime();
//生成日期结束时间
String createTimeEnd = query.getEndTime();
qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
);
String useOrgSid = query.getUseOrgSid();
qw.eq("useOrgSid", useOrgSid);
qw.eq("dr.useOrgSid", useOrgSid);
if(StringUtils.isNotBlank(query.getTodayDate())){
qw.like("dr.createTime",query.getTodayDate());
}
qw.orderByDesc("dr.useOrgSid");
qw.orderByDesc("dr.brandSid");
qw.orderByDesc("dr.vehModelSid");
qw.orderByDesc("dr.vehMConfigSid");
List<DailyParameterVo> parameterVoList = baseMapper.selectByParameters(useOrgSid);
parameterVoList.removeAll(Collections.singleton(null));
for (int i = 0; i < parameterVoList.size(); i++) {
DailyParameterVo dailyParameterVo = parameterVoList.get(i);
String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1);
if ("base_model_config".equals(tableName)) {
qw.groupBy("bmc." + dailyParameterVo.getColName());
qw.orderByDesc("bmc." + dailyParameterVo.getColName());
} else if ("base_vehicle_model".equals(tableName)) {
qw.groupBy("bm." + dailyParameterVo.getColName());
qw.orderByDesc("bm." + dailyParameterVo.getColName());
}
}
}
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery);
IPage<DailyReportVo> pagging = baseMapper.listPage(page, qw);
@ -66,8 +67,8 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
String configSid = dailyReportVo.getVehMConfigSid();
BaseVehicleModel baseVehicleModel = baseMapper.selectModel(modelSid);
BaseModelConfig baseModelConfig = baseMapper.selectConfig(configSid);
BeanUtil.copyProperties(baseModelConfig, dailyReportVo);
BeanUtil.copyProperties(baseVehicleModel, dailyReportVo);
BeanUtil.copyProperties(baseModelConfig, dailyReportVo,"useOrgName");
BeanUtil.copyProperties(baseVehicleModel, dailyReportVo,"useOrgName");
/*List<DailyParameterVo> parameterVoList = baseMapper.selectByParameters(useOrgSid);
parameterVoList.removeAll(Collections.singleton(null));
for (int j = 0; j < parameterVoList.size(); j++) {
@ -99,22 +100,38 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
DailyReportQuery query = pagerQuery.getParams();
QueryWrapper<DailyReport> qw = new QueryWrapper<>();
if (query != null) {
//生成日期开始时间
String createTimeStart = query.getStartTime();
//生成日期结束时间
String createTimeEnd = query.getEndTime();
qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
);
//查询事业部
if (StringUtils.isNotBlank(query.getOrgPath())) {
List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
String sybOrgSid = query.getOrgPath().substring(37, 73);
qw.eq("busOrgSid", sybOrgSid);
qw.eq("dr.busOrgSid", sybOrgSid);
}
if(StringUtils.isNotBlank(query.getTodayDate())){
qw.like("dr.createTime",query.getTodayDate());
}
qw.orderByDesc("dr.useOrgSid");
qw.orderByDesc("dr.brandSid");
qw.orderByDesc("dr.vehModelSid");
qw.orderByDesc("dr.vehMConfigSid");
qw.orderByDesc("bm.fuelTypeValue");
qw.orderByDesc("bm.emissionStandardValue");
}
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery);
IPage<DailyReportVo> pagging = baseMapper.listPage(page, qw);
List<DailyReportVo> recordList = pagging.getRecords();
recordList.removeAll(Collections.singleton(null));
if (!recordList.isEmpty()) {
for (int i = 0; i < recordList.size(); i++) {
DailyReportVo dailyReportVo = recordList.get(i);
String modelSid = dailyReportVo.getVehModelSid();
String configSid = dailyReportVo.getVehMConfigSid();
BaseVehicleModel baseVehicleModel = baseMapper.selectModel(modelSid);
BaseModelConfig baseModelConfig = baseMapper.selectConfig(configSid);
BeanUtil.copyProperties(baseModelConfig, dailyReportVo,"useOrgName");
BeanUtil.copyProperties(baseVehicleModel, dailyReportVo,"useOrgName");
}
}
PagerVo<DailyReportVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -123,16 +140,28 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
DailyReportQuery query = pagerQuery.getParams();
QueryWrapper<DailyReport> qw = new QueryWrapper<>();
if (query != null) {
//生成日期开始时间
String createTimeStart = query.getStartTime();
//生成日期结束时间
String createTimeEnd = query.getEndTime();
qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
);
if(StringUtils.isNotBlank(query.getTodayDate())){
qw.like("dr.createTime",query.getTodayDate());
}
}
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery);
IPage<DailyReportVo> pagging = baseMapper.listPage3(page, qw);
List<DailyReportVo> recordList = pagging.getRecords();
recordList.removeAll(Collections.singleton(null));
if (!recordList.isEmpty()) {
for (int i = 0; i < recordList.size(); i++) {
DailyReportVo dailyReportVo = recordList.get(i);
String modelSid = dailyReportVo.getVehModelSid();
String configSid = dailyReportVo.getVehMConfigSid();
BaseVehicleModel baseVehicleModel = baseMapper.selectModel(modelSid);
BaseModelConfig baseModelConfig = baseMapper.selectConfig(configSid);
BeanUtil.copyProperties(baseModelConfig, dailyReportVo,"useOrgName");
BeanUtil.copyProperties(baseVehicleModel, dailyReportVo,"useOrgName");
String busUseOrg = dailyReportVo.getBusOrgSid();
String prefix = "fd6435f2-0005-11ec-a033-48452053aa33/";
dailyReportVo.setOrgPath(prefix+busUseOrg);
}
}
PagerVo<DailyReportVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}

Write Preview
Loading…
Cancel
Save