lxm_front/AJ-Report
1
0
Fork 0
mirror of https://gitee.com/anji-plus/report.git synced 2026-04-01 10:08:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.com/anji-plus/report into dev

Browse Source
This commit is contained in:
qianlishi
2022-05-17 17:40:12 +08:00
parent 7fc0bbbf20 a5070a27c5
commit 1f0d2ea0cd
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/ReportController.java
View File

@@ -43,11 +43,11 @@ public class ReportController extends GaeaBaseController<ReportParam, Report, Re
return new ReportDto();
}
@GetMapping("/copy")
@PostMapping("/copy")
@Permission(code = "copy", name = "复制")
@GaeaAuditLog(pageTitle = "复制")
public ResponseBean copy(@RequestParam("reportId") Long reportId) {
reportService.copy(reportId);
public ResponseBean copy(@RequestBody ReportDto dto) {
reportService.copy(dto);
return ResponseBean.builder().build();
}
}

4
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/service/ReportService.java
View File

@@ -21,7 +21,7 @@ public interface ReportService extends GaeaBaseService<ReportParam, Report> {
/**
* 复制大屏
* @param reportId
* @param dto
*/
void copy(Long reportId);
void copy(ReportDto dto);
}

26
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/service/impl/ReportServiceImpl.java
View File

@@ -3,7 +3,9 @@ package com.anjiplus.template.gaea.business.modules.report.service.impl;
import com.anji.plus.gaea.constant.BaseOperationEnum;
import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
import com.anji.plus.gaea.exception.BusinessException;
import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
import com.anji.plus.gaea.utils.GaeaBeanUtils;
import com.anjiplus.template.gaea.business.code.ResponseCode;
import com.anjiplus.template.gaea.business.enums.ReportTypeEnum;
import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard;
import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService;
@@ -16,6 +18,7 @@ import com.anjiplus.template.gaea.business.modules.report.service.ReportService;
import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel;
import com.anjiplus.template.gaea.business.modules.reportexcel.service.ReportExcelService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -107,10 +110,16 @@ public class ReportServiceImpl implements ReportService {
}
@Override
public void copy(Long reportId) {
Report report = selectOne(reportId);
public void copy(ReportDto dto) {
if (null == dto.getId()) {
throw BusinessExceptionBuilder.build(ResponseCode.NOT_NULL, "id");
}
if (StringUtils.isBlank(dto.getReportCode())) {
throw BusinessExceptionBuilder.build(ResponseCode.NOT_NULL, "报表编码");
}
Report report = selectOne(dto.getId());
String reportCode = report.getReportCode();
Report copyReport = copyReport(report);
Report copyReport = copyReport(report, dto);
//复制主表数据
insert(copyReport);
String copyReportCode = copyReport.getReportCode();
@@ -150,17 +159,12 @@ public class ReportServiceImpl implements ReportService {
}
}
private Report copyReport(Report report){
private Report copyReport(Report report, ReportDto dto){
//复制主表数据
Report copyReport = new Report();
GaeaBeanUtils.copyAndFormatter(report, copyReport);
copyReport.setId(null);
String copyReportCode = copyReport.getReportCode().concat("_").concat(String.valueOf(System.currentTimeMillis()));
if (copyReportCode.length() >= 100) {
copyReportCode = copyReportCode.substring(0, 100);
}
copyReport.setReportCode(copyReportCode);
copyReport.setReportName(copyReport.getReportName().concat("_copy"));
copyReport.setReportCode(dto.getReportCode());
copyReport.setReportName(dto.getReportName());
return copyReport;
}

2
report-ui/src/views/layout/components/Sidebar/index.vue
View File

@@ -3,7 +3,7 @@
<div class="admin-title" @click="goBigScreen">
<div class="con">
<img src="../../../../../static/logo-dp.png" width="50" />
<span class="version">V0.9.7</span>
<span class="version">V0.9.7.2</span>
</div>
</div>
<el-menu