DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增工具中心和财务报表修改

Browse Source
This commit is contained in:
hdka
2025-06-14 19:35:05 +08:00
parent 03d2d1afcb
commit d9ae540fd7
29 changed files with 776 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaApplicationController.java Normal file
View File

@@ -0,0 +1,102 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.OaApplicationVo;
import com.ruoyi.oa.domain.bo.OaApplicationBo;
import com.ruoyi.oa.service.IOaApplicationService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 应用集成
*
* @author ruoyi
* @date 2025-06-14
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/application")
public class OaApplicationController extends BaseController {
private final IOaApplicationService iOaApplicationService;
/**
* 查询应用集成列表
*/
@GetMapping("/list")
public TableDataInfo<OaApplicationVo> list(OaApplicationBo bo, PageQuery pageQuery) {
return iOaApplicationService.queryPageList(bo, pageQuery);
}
/**
* 导出应用集成列表
*/
@Log(title = "应用集成", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaApplicationBo bo, HttpServletResponse response) {
List<OaApplicationVo> list = iOaApplicationService.queryList(bo);
ExcelUtil.exportExcel(list, "应用集成", OaApplicationVo.class, response);
}
/**
* 获取应用集成详细信息
*
* @param applicationId 主键
*/
@GetMapping("/{applicationId}")
public R<OaApplicationVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long applicationId) {
return R.ok(iOaApplicationService.queryById(applicationId));
}
/**
* 新增应用集成
*/
@Log(title = "应用集成", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody OaApplicationBo bo) {
return toAjax(iOaApplicationService.insertByBo(bo));
}
/**
* 修改应用集成
*/
@Log(title = "应用集成", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaApplicationBo bo) {
return toAjax(iOaApplicationService.updateByBo(bo));
}
/**
* 删除应用集成
*
* @param applicationIds 主键串
*/
@Log(title = "应用集成", businessType = BusinessType.DELETE)
@DeleteMapping("/{applicationIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] applicationIds) {
return toAjax(iOaApplicationService.deleteWithValidByIds(Arrays.asList(applicationIds), true));
}
}

8
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaFeedbackController.java
View File

@@ -47,6 +47,14 @@ public class OaFeedbackController extends BaseController {
return iOaFeedbackService.queryPageList(bo, pageQuery);
}
/**
* 查询问题反馈列表
*/
@GetMapping("/index-list")
public TableDataInfo<OaFeedbackVo> indexList(OaFeedbackBo bo, PageQuery pageQuery) {
return iOaFeedbackService.indexQueryList(bo, pageQuery);
}
/**
* 导出问题反馈列表
*/

19
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFinanceController.java
View File

@@ -6,6 +6,8 @@ import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import com.ruoyi.oa.domain.SysOaFinance;
import com.ruoyi.oa.domain.dto.BarDataDTO;
import com.ruoyi.oa.domain.dto.FinanceDetailDTO;
import com.ruoyi.oa.domain.vo.SysOaProjectVo;
import com.ruoyi.oa.service.ISysOaDetailService;
import com.ruoyi.oa.service.ISysOaProjectService;
@@ -73,10 +75,21 @@ public class SysOaFinanceController extends BaseController {
return sysOaFinanceVoTableDataInfo;
}
@GetMapping("/barData")
public R<List<SysOaFinanceVo>> pieData(SysOaFinanceBo bo) {
List<SysOaFinanceVo> sysOaFinanceList = iSysOaFinanceService.getBarData(bo);
return R.ok(sysOaFinanceList);
public R<List<BarDataDTO>> barData(
@RequestParam(required = false) Long projectId,
@RequestParam(required = false) String financeType
) {
return R.ok(iSysOaFinanceService.getBarData(projectId, financeType));
}
@GetMapping("/findFinanceList")
public R<List<FinanceDetailDTO>> findFinanceList(
@RequestParam(required = false) Long projectId,
@RequestParam(required = false) String financeType
) {
return R.ok(iSysOaFinanceService.getFinanceDetails(projectId, financeType));
}

15
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
View File

@@ -1,11 +1,15 @@
package com.ruoyi.oa.controller;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import java.util.Arrays;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo;
import com.ruoyi.oa.domain.dto.ProjectActivityDTO;
import com.ruoyi.oa.domain.dto.ProjectDataDTO;
import com.ruoyi.oa.domain.vo.DashboardChartsVo;
import com.ruoyi.oa.domain.vo.DashboardMetricsVo;
import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo;
@@ -192,7 +196,7 @@ public class SysOaProjectController extends BaseController {
}
/**
* GET /api/projects/foreign/dashboard/charts
* GET /projects/foreign/dashboard/charts
* @param start yyyy/MM/dd
* @param end yyyy/MM/dd
*/
@@ -207,7 +211,7 @@ public class SysOaProjectController extends BaseController {
}
/**
* GET /api/projects/foreign/expiring
* GET /projects/foreign/expiring
* @param days 预警天数，默认 7
*/
@GetMapping("/expiring")
@@ -219,5 +223,12 @@ public class SysOaProjectController extends BaseController {
return R.ok(list);
}
@GetMapping("/projectData")
public R<List<ProjectDataDTO>> projectData(
@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate date
) {
String month = date.format(DateTimeFormatter.ofPattern("yyyy-MM"));
return R.ok(iSysOaProjectService.getProjectData(month));
}
}