From 1927fb5d1afbf508883d802b2a5b356a45edfd96 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 15 Jan 2024 15:28:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=8A=98?= =?UTF-8?q?=E5=8F=A0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dailyreport/DailyReportFeign.java | 8 +- .../api/dailyreport/ReportVo.java | 5 + .../reportcenter/api/reportset/ReportSet.java | 33 ++++ .../api/reportset/ReportSetFeign.java | 25 +++ .../api/reportset/ReportSetFeignFallback.java | 12 ++ .../api/reportset/ReportSetQuery.java | 19 +++ .../api/reportset/ReportSetVo.java | 19 +++ .../biz/dailyreport/DailyReportRest.java | 12 +- .../biz/dailyreport/DailyReportService.java | 35 +++- .../biz/reportset/ReportSetMapper.java | 19 +++ .../biz/reportset/ReportSetMapper.xml | 15 ++ .../biz/reportset/ReportSetRest.java | 28 ++++ .../biz/reportset/ReportSetService.java | 155 ++++++++++++++++++ doc/databases/reportcenter.sql | 26 +++ 14 files changed, 394 insertions(+), 17 deletions(-) create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeignFallback.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetQuery.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetVo.java create mode 100644 anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetMapper.java create mode 100644 anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetMapper.xml create mode 100644 anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetRest.java create mode 100644 anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java create mode 100644 doc/databases/reportcenter.sql 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 528245a8b8..c589ecec94 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 @@ -89,7 +89,7 @@ public interface DailyReportFeign { @ApiOperation("集团日期初始化") @GetMapping("getReport") @ResponseBody - ResultBean getReport(@RequestParam("date") String date); + ResultBean getReport(@RequestParam("date") String date,@RequestParam("userSid") String userSid); @ApiOperation("集团事业部合集日报表") @GetMapping("list2") @@ -114,7 +114,7 @@ public interface DailyReportFeign { @ApiOperation("事业部日期初始化") @GetMapping("getReport2") @ResponseBody - ResultBean getReport2(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath); + ResultBean getReport2(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid); @ApiOperation("分公司日报表分页列表") @PostMapping("pageList3") @@ -124,5 +124,7 @@ public interface DailyReportFeign { @ApiOperation("分公司日期初始化") @GetMapping("getReport3") @ResponseBody - ResultBean getReport3(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath); + ResultBean getReport3(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid); + + } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java index 404d841d26..10bd3f4356 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java @@ -1,9 +1,12 @@ package com.yxt.anrui.reportcenter.api.dailyreport; +import com.yxt.anrui.reportcenter.api.reportset.ReportSetVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -113,4 +116,6 @@ public class ReportVo implements Vo { private String busOrgSid; private String useOrgSid; + + private List list; } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java new file mode 100644 index 0000000000..3f3bec9f1f --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.reportcenter.api.reportset; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/15 + **/ +@Data +public class ReportSet extends BaseEntity { + private static final long serialVersionUID = 5482028936042457717L; + @ApiModelProperty("库存") + private int stock; + @ApiModelProperty("排产") + private int pcOrder; + @ApiModelProperty("订车") + private int reserveCar; + @ApiModelProperty("销售") + private int sales; + @ApiModelProperty("交付") + private int deliver; + @ApiModelProperty("买断") + private int buyout; + @ApiModelProperty("欠款出库") + private int outbound; + @ApiModelProperty("金融未放款") + private int loanDis; + + +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java new file mode 100644 index 0000000000..33f335e2eb --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.reportcenter.api.reportset; + +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback; +import com.yxt.common.core.result.ResultBean; +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: 2024/1/15 + **/ +@FeignClient( + contextId = "anrui-reportcenter-ReportSet", + name = "anrui-reportcenter", + path = "v1/ReportSet", + fallback = ReportSetFeignFallback.class) +public interface ReportSetFeign { + + @PostMapping("save") + @ResponseBody + ResultBean save(@RequestBody ReportSetQuery reportSetQuery); +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeignFallback.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeignFallback.java new file mode 100644 index 0000000000..2348fc507a --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.reportcenter.api.reportset; + +import org.springframework.stereotype.Component; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/15 + **/ +@Component +public class ReportSetFeignFallback { +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetQuery.java new file mode 100644 index 0000000000..853b164f27 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.reportcenter.api.reportset; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/15 + **/ +@Data +public class ReportSetQuery { + + private String userSid; + + private List list = new ArrayList<>(); +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetVo.java new file mode 100644 index 0000000000..074078644f --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.reportcenter.api.reportset; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/15 + **/ +@Data +public class ReportSetVo { + + private String dictKey; + + private String dictValue; + @ApiModelProperty("是否折叠，true，fasle不折叠") + private boolean selected; +} 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 a14f43114b..f1bb8a441a 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 @@ -85,8 +85,8 @@ public class DailyReportRest implements DailyReportFeign { } @Override - public ResultBean getReport(String date) { - return dailyReportService.getReport(date); + public ResultBean getReport(String date,String userSid) { + return dailyReportService.getReport(date,userSid); } @Override @@ -112,8 +112,8 @@ public class DailyReportRest implements DailyReportFeign { } @Override - public ResultBean getReport2(String date, String orgPath) { - return dailyReportService.getReport2(date,orgPath); + public ResultBean getReport2(String date, String orgPath,String userSid) { + return dailyReportService.getReport2(date,orgPath,userSid); } @Override @@ -124,7 +124,7 @@ public class DailyReportRest implements DailyReportFeign { } @Override - public ResultBean getReport3(String date, String orgPath) { - return dailyReportService.getReport3(date,orgPath); + public ResultBean getReport3(String date, String orgPath,String userSid) { + return dailyReportService.getReport3(date,orgPath,userSid); } } 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 ccafbc5148..87d90a9d61 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 @@ -7,6 +7,8 @@ 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.*; +import com.yxt.anrui.reportcenter.api.reportset.ReportSetVo; +import com.yxt.anrui.reportcenter.biz.reportset.ReportSetService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -32,6 +34,8 @@ public class DailyReportService extends MybatisBaseService listPage(PagerQuery pagerQuery) { DailyReportQuery query = pagerQuery.getParams(); @@ -627,7 +631,7 @@ public class DailyReportService extends MybatisBaseService getReport(String date) { + public ResultBean getReport(String date, String userSid) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(date)) { @@ -645,6 +649,11 @@ public class DailyReportService extends MybatisBaseService> listResultBean = reportSetService.selectVoByUserSid(userSid); + if (listResultBean.getSuccess()) { + List list = listResultBean.getData(); + reportVo.setList(list); + } return rb.success().setData(reportVo); } @@ -1783,13 +1792,13 @@ public class DailyReportService extends MybatisBaseService getReport2(String date, String orgPath) { + public ResultBean getReport2(String date, String orgPath, String userSid) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(date)) { qw.like("createTime", date); } - if(StringUtils.isNotBlank(orgPath)){ + if (StringUtils.isNotBlank(orgPath)) { List stringList = Arrays.asList(orgPath.split("/")); String busOrgSid = orgPath.substring(37, 73); qw.eq("busOrgSid", busOrgSid); @@ -1806,6 +1815,11 @@ public class DailyReportService extends MybatisBaseService> listResultBean = reportSetService.selectVoByUserSid(userSid); + if (listResultBean.getSuccess()) { + List list = listResultBean.getData(); + reportVo.setList(list); + } return rb.success().setData(reportVo); } @@ -1817,7 +1831,7 @@ public class DailyReportService extends MybatisBaseService stringList = Arrays.asList(query.getOrgPath().split("/")); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); - qw.eq("useOrgSid",useOrgSid); + qw.eq("useOrgSid", useOrgSid); } } IPage page = PagerUtil.queryToPage(pagerQuery); @@ -1844,15 +1858,15 @@ public class DailyReportService extends MybatisBaseService getReport3(String date, String orgPath) { + public ResultBean getReport3(String date, String orgPath, String userSid) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(date)) { qw.like("createTime", date); } - if(StringUtils.isNotBlank(orgPath)){ - String useOrgSid= sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - qw.eq("useOrgSid",useOrgSid); + if (StringUtils.isNotBlank(orgPath)) { + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + qw.eq("useOrgSid", useOrgSid); } ReportVo reportVo = baseMapper.getReport(qw); String ratio = ""; @@ -1866,6 +1880,11 @@ public class DailyReportService extends MybatisBaseService> listResultBean = reportSetService.selectVoByUserSid(userSid); + if (listResultBean.getSuccess()) { + List list = listResultBean.getData(); + reportVo.setList(list); + } return rb.success().setData(reportVo); } } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetMapper.java new file mode 100644 index 0000000000..f7f712e3d9 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetMapper.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.reportcenter.biz.reportset; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.reportcenter.api.reportset.ReportSet; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/15 + **/ +@Mapper +public interface ReportSetMapper extends BaseMapper { + int deleteByUserSid(String userSid); + + ReportSet selectByUserSid(String userSid); +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetMapper.xml new file mode 100644 index 0000000000..152fa6fc5a --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetMapper.xml @@ -0,0 +1,15 @@ + + + + + delete + from report_set + where createBySid = #{userSid} + + + + \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetRest.java new file mode 100644 index 0000000000..04be1c309e --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetRest.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.reportcenter.biz.reportset; + +import com.yxt.anrui.reportcenter.api.reportset.ReportSetFeign; +import com.yxt.anrui.reportcenter.api.reportset.ReportSetQuery; +import com.yxt.common.core.result.ResultBean; +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: 2024/1/15 + **/ +@Api(tags = "统计报表折叠设置") +@RestController +@RequestMapping("v1/ReportSet") +public class ReportSetRest implements ReportSetFeign { + + @Autowired + private ReportSetService reportSetService; + + @Override + public ResultBean save(ReportSetQuery reportSetQuery) { + return reportSetService.saveSet(reportSetQuery); + } +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java new file mode 100644 index 0000000000..24f92cba07 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java @@ -0,0 +1,155 @@ +package com.yxt.anrui.reportcenter.biz.reportset; + +import com.yxt.anrui.reportcenter.api.dailyreport.ReportVo; +import com.yxt.anrui.reportcenter.api.reportset.ReportSet; +import com.yxt.anrui.reportcenter.api.reportset.ReportSetQuery; +import com.yxt.anrui.reportcenter.api.reportset.ReportSetVo; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/15 + **/ +@Service +public class ReportSetService extends MybatisBaseService { + public ResultBean saveSet(ReportSetQuery reportSetQuery) { + ResultBean rb = ResultBean.fireFail(); + List reportSetVosList = reportSetQuery.getList(); + reportSetVosList.removeAll(Collections.singleton(null)); + if (!reportSetVosList.isEmpty()) { + baseMapper.deleteByUserSid(reportSetQuery.getUserSid()); + ReportSet reportSet = new ReportSet(); + reportSet.setCreateBySid(reportSetQuery.getUserSid()); + for (int i = 0; i < reportSetVosList.size(); i++) { + ReportSetVo reportSetVo = reportSetVosList.get(i); + switch (reportSetVo.getDictKey()) { + case "stock": + reportSet.setStock(reportSetVo.isSelected() ? 1 : 0); + break; + case "pcOrder": + reportSet.setPcOrder(reportSetVo.isSelected() ? 1 : 0); + break; + case "reserveCar": + reportSet.setReserveCar(reportSetVo.isSelected() ? 1 : 0); + break; + case "sales": + reportSet.setSales(reportSetVo.isSelected() ? 1 : 0); + break; + case "deliver": + reportSet.setDeliver(reportSetVo.isSelected() ? 1 : 0); + break; + case "buyout": + reportSet.setBuyout(reportSetVo.isSelected() ? 1 : 0); + break; + case "outbound": + reportSet.setOutbound(reportSetVo.isSelected() ? 1 : 0); + break; + case "loanDis": + reportSet.setLoanDis(reportSetVo.isSelected() ? 1 : 0); + break; + default: + break; + } + } + baseMapper.insert(reportSet); + } + return rb.success(); + } + + public ResultBean> selectVoByUserSid(String userSid) { + ResultBean> rb = ResultBean.fireFail(); + List list = new ArrayList<>(); + ReportSet reportSet = baseMapper.selectByUserSid(userSid); + if (reportSet != null) { + ReportSetVo reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("stock"); + reportSetVo.setDictValue("库存"); + reportSetVo.setSelected(reportSet.getStock() == 1); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("pcOrder"); + reportSetVo.setDictValue("排产"); + reportSetVo.setSelected(reportSet.getPcOrder() == 1); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("reserveCar"); + reportSetVo.setDictValue("订车"); + reportSetVo.setSelected(reportSet.getReserveCar() == 1); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("sales"); + reportSetVo.setDictValue("销售"); + reportSetVo.setSelected(reportSet.getSales() == 1); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("deliver"); + reportSetVo.setDictValue("交付"); + reportSetVo.setSelected(reportSet.getDeliver() == 1); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("buyout"); + reportSetVo.setDictValue("买断"); + reportSetVo.setSelected(reportSet.getBuyout() == 1); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("outbound"); + reportSetVo.setDictValue("欠款出库"); + reportSetVo.setSelected(reportSet.getOutbound() == 1); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("loanDis"); + reportSetVo.setDictValue("金融未放款"); + reportSetVo.setSelected(reportSet.getLoanDis() == 1); + list.add(reportSetVo); + } else { + ReportSetVo reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("stock"); + reportSetVo.setDictValue("库存"); + reportSetVo.setSelected(false); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("pcOrder"); + reportSetVo.setDictValue("排产"); + reportSetVo.setSelected(false); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("reserveCar"); + reportSetVo.setDictValue("订车"); + reportSetVo.setSelected(false); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("sales"); + reportSetVo.setDictValue("销售"); + reportSetVo.setSelected(false); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("deliver"); + reportSetVo.setDictValue("交付"); + reportSetVo.setSelected(false); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("buyout"); + reportSetVo.setDictValue("买断"); + reportSetVo.setSelected(false); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("outbound"); + reportSetVo.setDictValue("欠款出库"); + reportSetVo.setSelected(false); + list.add(reportSetVo); + reportSetVo = new ReportSetVo(); + reportSetVo.setDictKey("loanDis"); + reportSetVo.setDictValue("金融未放款"); + reportSetVo.setSelected(false); + list.add(reportSetVo); + } + return rb.success().setData(list); + } +} diff --git a/doc/databases/reportcenter.sql b/doc/databases/reportcenter.sql new file mode 100644 index 0000000000..153fe48437 --- /dev/null +++ b/doc/databases/reportcenter.sql @@ -0,0 +1,26 @@ +DROP TABLE IF EXISTS `report_set`; +CREATE TABLE `report_set` +( + `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 NOT NULL DEFAULT CURRENT_TIMESTAMP 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', + `stock` int(32) DEFAULT NULL COMMENT '库存', + `pcOrder` int(32) DEFAULT NULL COMMENT '排产', + `reserveCar` int(32) DEFAULT NULL COMMENT '订车', + `sales` int(32) DEFAULT NULL COMMENT '销售', + `deliver` int(32) DEFAULT NULL COMMENT '交付', + `buyout` int(32) DEFAULT NULL COMMENT '买断', + `outbound` int(32) DEFAULT NULL COMMENT '欠款出库', + `loanDis` int(32) DEFAULT NULL COMMENT '金融未放款', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='统计报表设计折叠'; \ No newline at end of file