|
|
|
@ -1,11 +1,12 @@ |
|
|
|
package com.yxt.anrui.reportcenter.biz.dailyreport; |
|
|
|
|
|
|
|
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.base.api.basemodelconfig.BaseModelConfig; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReport; |
|
|
|
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportQuery; |
|
|
|
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; |
|
|
|
import com.yxt.anrui.reportcenter.api.dailyreport.*; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
|
import com.yxt.common.base.utils.PagerUtil; |
|
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
|
@ -15,6 +16,9 @@ import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.lang.reflect.Field; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
/** |
|
|
|
* @description: |
|
|
|
* @author: dimengzhe |
|
|
|
@ -37,13 +41,56 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da |
|
|
|
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())) { |
|
|
|
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); |
|
|
|
qw.eq("useOrgSid", useOrgSid); |
|
|
|
String useOrgSid = query.getUseOrgSid(); |
|
|
|
qw.eq("useOrgSid", useOrgSid); |
|
|
|
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()); |
|
|
|
} else if ("base_vehicle_model".equals(tableName)) { |
|
|
|
qw.groupBy("bm." + dailyParameterVo.getColName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
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); |
|
|
|
BeanUtil.copyProperties(baseVehicleModel, dailyReportVo); |
|
|
|
/*List<DailyParameterVo> parameterVoList = baseMapper.selectByParameters(useOrgSid); |
|
|
|
parameterVoList.removeAll(Collections.singleton(null)); |
|
|
|
for (int j = 0; j < parameterVoList.size(); j++) { |
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
DailyParameterVo dailyParameterVo = parameterVoList.get(j); |
|
|
|
String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1); |
|
|
|
if("base_model_config".equals(tableName)){ |
|
|
|
try { |
|
|
|
Field field = baseModelConfig.getClass().getDeclaredField(dailyParameterVo.getColName()); |
|
|
|
field.setAccessible(true); |
|
|
|
map.put(dailyParameterVo.getColName(),field.get(baseModelConfig)); |
|
|
|
|
|
|
|
} catch (NoSuchFieldException | IllegalAccessException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}else if("base_vehicle_model".equals(tableName)){ |
|
|
|
|
|
|
|
} |
|
|
|
}*/ |
|
|
|
} |
|
|
|
} |
|
|
|
PagerVo<DailyReportVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
@ -61,8 +108,9 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da |
|
|
|
); |
|
|
|
//查询事业部
|
|
|
|
if (StringUtils.isNotBlank(query.getOrgPath())) { |
|
|
|
String busOrgSid = sysStaffOrgFeign.getOrgSidByPath2(query.getOrgPath()).getData(); |
|
|
|
qw.eq("busOrgSid", busOrgSid); |
|
|
|
List<String> stringList = Arrays.asList(query.getOrgPath().split("/")); |
|
|
|
String sybOrgSid = query.getOrgPath().substring(37, 73); |
|
|
|
qw.eq("busOrgSid", sybOrgSid); |
|
|
|
} |
|
|
|
} |
|
|
|
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
@ -88,4 +136,72 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da |
|
|
|
PagerVo<DailyReportVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<List<DailyParameterVo>> selectListByUseOrgSid(String useOrgSid) { |
|
|
|
ResultBean<List<DailyParameterVo>> rb = ResultBean.fireFail(); |
|
|
|
List<DailyParameterVo> parameterVoList = baseMapper.selectByParameters(useOrgSid); |
|
|
|
return rb.success().setData(parameterVoList); |
|
|
|
} |
|
|
|
|
|
|
|
public PagerVo<DailyReportListVo> listPage3_1(PagerQuery<DailyReportQuery> pagerQuery) { |
|
|
|
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')" |
|
|
|
); |
|
|
|
} |
|
|
|
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
IPage<DailyReportListVo> pagging = baseMapper.listPage3_1(page, qw); |
|
|
|
PagerVo<DailyReportListVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public PagerVo<DailyReportListVo> listPage2_1(PagerQuery<DailyReportQuery> pagerQuery) { |
|
|
|
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); |
|
|
|
} |
|
|
|
} |
|
|
|
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
IPage<DailyReportListVo> pagging = baseMapper.listPage3_1(page, qw); |
|
|
|
PagerVo<DailyReportListVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public PagerVo<DailyReportListVo> listPage_1(PagerQuery<DailyReportQuery> pagerQuery) { |
|
|
|
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); |
|
|
|
} |
|
|
|
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
IPage<DailyReportListVo> pagging = baseMapper.listPage3_1(page, qw); |
|
|
|
PagerVo<DailyReportListVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
} |
|
|
|
|
dimengzhe
1 year ago