From b0f6a35b37eb97a53963daccdc49037f8a19a183 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 7 Nov 2023 17:40:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/sysstafforg/SysStaffOrgFeign.java | 1 + .../api/dailyreport/DailyParameterVo.java | 19 +++ .../api/dailyreport/DailyReportFeign.java | 23 ++- .../api/dailyreport/DailyReportListVo.java | 34 +++++ .../api/dailyreport/DailyReportQuery.java | 4 +- .../api/dailyreport/DailyReportVo.java | 100 +++++++++++++ .../reportcenter/ReportcenterApplication.java | 2 +- .../biz/dailyreport/DailyReportMapper.java | 14 ++ .../biz/dailyreport/DailyReportMapper.xml | 45 +++++- .../biz/dailyreport/DailyReportRest.java | 32 ++++- .../biz/dailyreport/DailyReportService.java | 132 ++++++++++++++++-- 11 files changed, 386 insertions(+), 20 deletions(-) create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyParameterVo.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java index bae02bd293..8501fb834a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -120,4 +120,5 @@ public interface SysStaffOrgFeign { @ResponseBody @ApiOperation("根据分公司全路径和角色sid模糊查询本公司本角色下的所有员工userSid") ResultBean> selAllByOrgPath(@RequestParam("orgSidPath") String orgSidPath,@RequestParam("roleSid") String roleSid); + } \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyParameterVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyParameterVo.java new file mode 100644 index 0000000000..72c6431dab --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyParameterVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.reportcenter.api.dailyreport; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/11/7 + **/ +@Data +public class DailyParameterVo { + + private String colName; + + private String colText; + @JsonIgnore + private String tableNameKey; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java index 84d071537b..ce9a21b7b1 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java @@ -4,10 +4,9 @@ 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.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * @description: @@ -31,6 +30,10 @@ public interface DailyReportFeign { @ResponseBody ResultBean> listPage(@RequestBody PagerQuery pagerQuery); + @GetMapping("selectListByUseOrgSid") + @ResponseBody + ResultBean> selectListByUseOrgSid(@RequestParam("useOrgSid")String useOrgSid); + /** * 按照生成日期、 * 事业部sid查询，并按分公司sid，品牌sid，车型sid，配置sid排序 @@ -51,4 +54,16 @@ public interface DailyReportFeign { @PostMapping("listPage3") @ResponseBody ResultBean> listPage3(@RequestBody PagerQuery pagerQuery); + + @PostMapping("listPage3_1") + @ResponseBody + ResultBean> listPage3_1(@RequestBody PagerQuery pagerQuery); + + @PostMapping("listPage2_1") + @ResponseBody + ResultBean> listPage2_1(@RequestBody PagerQuery pagerQuery); + + @PostMapping("listPage_1") + @ResponseBody + ResultBean> listPage_1(@RequestBody PagerQuery pagerQuery); } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java new file mode 100644 index 0000000000..1fc96a4472 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportListVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.reportcenter.api.dailyreport; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/11/7 + **/ +@Data +public class DailyReportListVo { + @ApiModelProperty("日期") + private String date; + + //存销比 + private String saleOfStockRatio; + //库存小计 + private String stock_subtotal; + //排产小计 + private String pcOrder_subtotal; + //本日销售订单 + private String saleOrder_subtotal_day; + //本日销售 + private String sale_subtotal_day; + //欠款出库金额 + private String arrears_carry_veh_amount; + //金融未放款金额 + private String loan_not_amount; + @ApiModelProperty("本日买断") + private String buyout_day; + + private String useOrgSid; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java index d16f85f4bd..1d072ad4ff 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java @@ -17,6 +17,8 @@ public class DailyReportQuery implements Query { private String startTime; @ApiModelProperty("生成日期结束") private String endTime; - + @ApiModelProperty("分公司报表时传：分公司的sid") + private String useOrgSid; + @ApiModelProperty("事业部报表时传：组织sid全路径") private String orgPath; } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java index 836f2929fd..a370b57067 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java @@ -4,6 +4,9 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -110,4 +113,101 @@ public class DailyReportVo implements Vo { private String loan_not_amount; @ApiModelProperty("备注") private String remarks; + //=========================================================车型配置相关参数 + @ApiModelProperty("车身颜色") + private String carColor; + @ApiModelProperty("驾驶室规格") + private String specification; + @ApiModelProperty("燃料箱") + private String fuelTank; + @ApiModelProperty("导流罩") + private String baffleModel; + @ApiModelProperty("独立热源") + private String independentSources; + @ApiModelProperty("护轮罩") + private String tireCover; + @ApiModelProperty("鞍座") + private String saddle; + @ApiModelProperty("空调") + private String airConditioner; + @ApiModelProperty("更多配置") + private String otherConfig; + @ApiModelProperty("速比") + private String rearAxleRatio; + @ApiModelProperty("后桥") + private String rearAxleValue; + @ApiModelProperty("轮胎规格") + private String tireSize; + @ApiModelProperty("缓速器") + private String slowMachine; + @ApiModelProperty("后视镜") + private String rearViewMirror; + @ApiModelProperty("轴距") + private String wheelbase; + @ApiModelProperty("悬架（重汽、欧曼）") + private String suspension; + @ApiModelProperty("货箱（重汽、欧曼）") + private String packingCase; + @ApiModelProperty("座椅（陕汽、欧曼）") + private String seat; + @ApiModelProperty("轮毂材质（重汽）") + private String hubMaterial; + @ApiModelProperty("配置包（陕汽）") + private String configuringBao; + @ApiModelProperty("多媒体（陕汽）") + private String multimedia; + @ApiModelProperty("保险杠（欧曼）") + private String bumper; + @ApiModelProperty("离合器") + private String clutchValue; + @ApiModelProperty("方向机") + private String dirMachineValue; + @ApiModelProperty("前桥") + private String proponsValue; + @ApiModelProperty("门窗") + private String doorAndWindowValue; + @ApiModelProperty("门锁") + private String doorLockValue; + @ApiModelProperty("大灯") + private String headlightValue; + @ApiModelProperty("上车踏板") + private String boardPedalValue; + @ApiModelProperty("方向盘") + private String steerWheelValue; + @ApiModelProperty("蓄电池") + private String storagBatteryValue; + @ApiModelProperty("舒适包") + private String comfortPackValue; + @ApiModelProperty("危化品基础包") + private String cheBasePackValue; + @ApiModelProperty("节油包") + private String savingPackValue; + @ApiModelProperty("便捷包") + private String conPackValue; + + + //车型================================== + @ApiModelProperty("车辆功能") + private String vehicleTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; + @ApiModelProperty("产品线") + private String productLineValue; + @ApiModelProperty("驱动") + private String driveFormValue; + @ApiModelProperty("马力") + private String powerValue; + @ApiModelProperty("变速箱类型") + private String tranCaseTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("燃料种类") + private String fuelTypeValue; + @ApiModelProperty("车辆版本") + private String vehicleVersionValue; + @ApiModelProperty("发动机型号") + private String engineTypeValue; + @ApiModelProperty("规格型号") + private String specifications; + } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java index 32fc480298..d3db6b6027 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java @@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.reportcenter" }) @EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal","com.yxt.anrui.base"}) public class ReportcenterApplication { public static void main(String[] args) { diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java index 53a7d6cd93..397e527bbd 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java @@ -4,11 +4,17 @@ 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.base.api.basemodelconfig.BaseModelConfig; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyParameterVo; import com.yxt.anrui.reportcenter.api.dailyreport.DailyReport; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo; import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -19,4 +25,12 @@ public interface DailyReportMapper extends BaseMapper { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage listPage3(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + + List selectByParameters(String useOrgSid); + + BaseVehicleModel selectModel(String modelSid); + + BaseModelConfig selectConfig(String configSid); + + IPage listPage3_1(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml index fc8b9b85b0..71e55f567e 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml @@ -2,12 +2,14 @@ + + + + + + + + \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java index fc6f0a6632..842521e04e 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java @@ -1,8 +1,6 @@ package com.yxt.anrui.reportcenter.biz.dailyreport; -import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeign; -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.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -11,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -31,6 +31,11 @@ public class DailyReportRest implements DailyReportFeign { return rb.success().setData(pv); } + @Override + public ResultBean> selectListByUseOrgSid(String useOrgSid) { + return dailyReportService.selectListByUseOrgSid(useOrgSid); + } + @Override public ResultBean> listPage2(PagerQuery pagerQuery) { ResultBean rb = ResultBean.fireFail(); @@ -44,4 +49,25 @@ public class DailyReportRest implements DailyReportFeign { PagerVo pv = dailyReportService.listPage3(pagerQuery); return rb.success().setData(pv); } + + @Override + public ResultBean> listPage3_1(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dailyReportService.listPage3_1(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listPage2_1(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dailyReportService.listPage2_1(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listPage_1(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dailyReportService.listPage_1(pagerQuery); + return rb.success().setData(pv); + } } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java index 10fd580623..756e33e4c7 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java @@ -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= 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 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 page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.listPage(page, qw); + List 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 parameterVoList = baseMapper.selectByParameters(useOrgSid); + parameterVoList.removeAll(Collections.singleton(null)); + for (int j = 0; j < parameterVoList.size(); j++) { + Map 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 p = PagerUtil.pageToVo(pagging, null); return p; } @@ -61,8 +108,9 @@ public class DailyReportService extends MybatisBaseService stringList = Arrays.asList(query.getOrgPath().split("/")); + String sybOrgSid = query.getOrgPath().substring(37, 73); + qw.eq("busOrgSid", sybOrgSid); } } IPage page = PagerUtil.queryToPage(pagerQuery); @@ -88,4 +136,72 @@ public class DailyReportService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean> selectListByUseOrgSid(String useOrgSid) { + ResultBean> rb = ResultBean.fireFail(); + List parameterVoList = baseMapper.selectByParameters(useOrgSid); + return rb.success().setData(parameterVoList); + } + + public PagerVo listPage3_1(PagerQuery pagerQuery) { + DailyReportQuery query = pagerQuery.getParams(); + QueryWrapper 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 page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage3_1(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo listPage2_1(PagerQuery pagerQuery) { + DailyReportQuery query = pagerQuery.getParams(); + QueryWrapper 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 stringList = Arrays.asList(query.getOrgPath().split("/")); + String sybOrgSid = query.getOrgPath().substring(37, 73); + qw.eq("busOrgSid", sybOrgSid); + } + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage3_1(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo listPage_1(PagerQuery pagerQuery) { + DailyReportQuery query = pagerQuery.getParams(); + QueryWrapper 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 page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage3_1(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } }