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

2
ruoyi-admin/Dockerfile
View File

@@ -18,6 +18,4 @@ ENTRYPOINT ["java", \
"-Djava.security.egd=file:/dev/./urandom", \
"-Dserver.port=${SERVER_PORT}", \
# 应用名称 如果想区分集群节点监控 改成不同的名称即可
# "-Dskywalking.agent.service_name=ruoyi-server", \
# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
"-jar", "app.jar"]

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));
}
}

62
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaApplication.java Normal file
View File

@@ -0,0 +1,62 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 应用集成对象 oa_application
*
* @author ruoyi
* @date 2025-06-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("oa_application")
public class OaApplication extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键ID
*/
@TableId(value = "application_id")
private Long applicationId;
/**
* 应用图标 URL 或本地路径
*/
private String icon;
/**
* 服务 IP 地址
*/
private String ip;
/**
* 服务端口号
*/
private Long port;
/**
* 应用名称
*/
private String applicationName;
/**
* 应用描述
*/
private String description;
/**
* 删除标志，0-正常，1-已删除
*/
@TableLogic
private Integer delFlag;
/**
* 备注
*/
private String remark;
}

82
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaApplicationBo.java Normal file
View File

@@ -0,0 +1,82 @@
package com.ruoyi.oa.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 应用集成业务对象 oa_application
*
* @author ruoyi
* @date 2025-06-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class OaApplicationBo extends BaseEntity {
/**
* 主键ID
*/
private Long applicationId;
/**
* 应用图标 URL 或本地路径
*/
private String icon;
/**
* 服务 IP 地址
*/
private String ip;
/**
* 服务端口号
*/
private Long port;
/**
* 应用名称
*/
private String applicationName;
/**
* 应用描述
*/
private String description;
/**
* 创建人
*/
private String createBy;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新人
*/
private String updateBy;
/**
* 更新时间
*/
private Date updateTime;
/**
* 备注
*/
private String remark;
}

12
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/BarDataDTO.java Normal file
View File

@@ -0,0 +1,12 @@
package com.ruoyi.oa.domain.dto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class BarDataDTO {
private String month;
private BigDecimal totalOut;
private BigDecimal totalIn;
}

13
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/FinanceDetailDTO.java Normal file
View File

@@ -0,0 +1,13 @@
package com.ruoyi.oa.domain.dto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class FinanceDetailDTO {
private String date; // YYYY-MM-DD
private String type; // exitType
private String currency; // 'USD' or 'CNY'
private BigDecimal amount;
private Long projectId;
}

14
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/ProjectActivityDTO.java Normal file
View File

@@ -0,0 +1,14 @@
package com.ruoyi.oa.domain.dto;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
public class ProjectActivityDTO {
private String projectName;
private LocalDateTime createTime;
private BigDecimal laborCost;
private String color;
}

13
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/ProjectDataDTO.java Normal file
View File

@@ -0,0 +1,13 @@
package com.ruoyi.oa.domain.dto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ProjectDataDTO {
private Long projectId;
private String projectName;
private String color;
private BigDecimal totalPrice;
}

69
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaApplicationVo.java Normal file
View File

@@ -0,0 +1,69 @@
package com.ruoyi.oa.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
/**
* 应用集成视图对象 oa_application
*
* @author ruoyi
* @date 2025-06-14
*/
@Data
@ExcelIgnoreUnannotated
public class OaApplicationVo {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long applicationId;
/**
* 应用图标 URL 或本地路径
*/
@ExcelProperty(value = "应用图标 URL 或本地路径")
private String icon;
/**
* 服务 IP 地址
*/
@ExcelProperty(value = "服务 IP 地址")
private String ip;
/**
* 服务端口号
*/
@ExcelProperty(value = "服务端口号")
private Long port;
/**
* 应用名称
*/
@ExcelProperty(value = "应用名称")
private String applicationName;
/**
* 应用描述
*/
@ExcelProperty(value = "应用描述")
private String description;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaApplicationMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.OaApplication;
import com.ruoyi.oa.domain.vo.OaApplicationVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 应用集成Mapper接口
*
* @author ruoyi
* @date 2025-06-14
*/
public interface OaApplicationMapper extends BaseMapperPlus<OaApplicationMapper, OaApplication, OaApplicationVo> {
}

20
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaFinanceMapper.java
View File

@@ -8,6 +8,8 @@ import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.oa.domain.SysOaFinance;
import com.ruoyi.oa.domain.bo.SysOaFinanceBo;
import com.ruoyi.oa.domain.dto.BarDataDTO;
import com.ruoyi.oa.domain.dto.FinanceDetailDTO;
import com.ruoyi.oa.domain.vo.SysOaFinanceVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
@@ -70,17 +72,21 @@ public interface SysOaFinanceMapper extends BaseMapperPlus<SysOaFinanceMapper, S
* @param bo
* @return
*/
List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo);
// List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo);
List<SysOaFinanceVo> selectByPaymentProgressId(Long progressId);
/**
* 项目资金管理，根据时间范围查询列表数据
* @param params
* @return
*/
// List<SysOaFinance> findFinanceByTimeAndProjectId(Map params);
List<BarDataDTO> getBarData(
@Param("projectId") Long projectId,
@Param("financeType") String financeType
);
List<FinanceDetailDTO> getFinanceDetails(
@Param("projectId") Long projectId,
@Param("financeType") String financeType
);
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaProjectMapper.java
View File

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.oa.domain.SysOaProject;
import com.ruoyi.oa.domain.bo.SysOaProjectBo;
import com.ruoyi.oa.domain.dto.ProjectActivityDTO;
import com.ruoyi.oa.domain.dto.ProjectDataDTO;
import com.ruoyi.oa.domain.vo.*;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
@@ -80,6 +82,9 @@ public interface SysOaProjectMapper extends BaseMapperPlus<SysOaProjectMapper, S
List<SysOaProjectVo> selectExpiringForeignProjects(@Param("now") Date now, @Param("expireDays") Integer expireDays, @Param("tradeType") Long tradeType);
List<ProjectDataDTO> getProjectData(@Param("month") String month);
List<ProjectActivityDTO> getProjectActivities();
BigDecimal selectPrevAvgTotalFunds(@Param("start") Date start, @Param("end") Date end, @Param("tradeType") Long tradeType);
BigDecimal selectPrevAvgContractCount(@Param("start") Date start, @Param("end") Date end, @Param("tradeType") Long tradeType);

49
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaApplicationService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaApplication;
import com.ruoyi.oa.domain.vo.OaApplicationVo;
import com.ruoyi.oa.domain.bo.OaApplicationBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 应用集成Service接口
*
* @author ruoyi
* @date 2025-06-14
*/
public interface IOaApplicationService {
/**
* 查询应用集成
*/
OaApplicationVo queryById(Long applicationId);
/**
* 查询应用集成列表
*/
TableDataInfo<OaApplicationVo> queryPageList(OaApplicationBo bo, PageQuery pageQuery);
/**
* 查询应用集成列表
*/
List<OaApplicationVo> queryList(OaApplicationBo bo);
/**
* 新增应用集成
*/
Boolean insertByBo(OaApplicationBo bo);
/**
* 修改应用集成
*/
Boolean updateByBo(OaApplicationBo bo);
/**
* 校验并批量删除应用集成信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaFeedbackService.java
View File

@@ -51,4 +51,6 @@ public interface IOaFeedbackService {
int delItem(Long feedbackId);
TableDataInfo<OaFeedbackVo> indexQueryList(OaFeedbackBo bo, PageQuery pageQuery);
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaFinanceService.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.oa.service;
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.SysOaFinanceVo;
import com.ruoyi.oa.domain.bo.SysOaFinanceBo;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -90,12 +92,15 @@ public interface ISysOaFinanceService {
*/
Boolean deleteSysOaFinanceById(Long financeId);
List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo);
public List<SysOaFinanceVo> getByProgressId(Long progressId);
public void deleteDetail(Long financeId);
public List<BarDataDTO> getBarData(Long projectId, String financeType) ;
public List<FinanceDetailDTO> getFinanceDetails(Long projectId, String financeType);
TableDataInfo<SysOaFinanceVo> progressList(SysOaFinanceBo bo, PageQuery pageQuery);
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.oa.service;
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;
@@ -88,4 +90,7 @@ public interface ISysOaProjectService {
DashboardChartsVo getCharts(Date start, Date end,Long tradeType);
List<SysOaProjectVo> getExpiringForeignProjects(Integer days,Long tradeType);
List<ProjectDataDTO> getProjectData(String month);
List<ProjectActivityDTO> getProjectActivities();
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseDetailService.java
View File

@@ -64,4 +64,9 @@ public interface ISysOaWarehouseDetailService {
TableDataInfo<SysOaWarehouseDetailVo> queryOutWarehouseByProjectId(@NotNull(message = "项目名不能为空") Long projectId);
/**
* 用于撤回车库 在上层已经恢复库存不需要再次方法中恢复
* @param id
*/
void deleteById(Long id);
}

113
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaApplicationServiceImpl.java Normal file
View File

@@ -0,0 +1,113 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.OaApplicationBo;
import com.ruoyi.oa.domain.vo.OaApplicationVo;
import com.ruoyi.oa.domain.OaApplication;
import com.ruoyi.oa.mapper.OaApplicationMapper;
import com.ruoyi.oa.service.IOaApplicationService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 应用集成Service业务层处理
*
* @author ruoyi
* @date 2025-06-14
*/
@RequiredArgsConstructor
@Service
public class OaApplicationServiceImpl implements IOaApplicationService {
private final OaApplicationMapper baseMapper;
/**
* 查询应用集成
*/
@Override
public OaApplicationVo queryById(Long applicationId){
return baseMapper.selectVoById(applicationId);
}
/**
* 查询应用集成列表
*/
@Override
public TableDataInfo<OaApplicationVo> queryPageList(OaApplicationBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaApplication> lqw = buildQueryWrapper(bo);
Page<OaApplicationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询应用集成列表
*/
@Override
public List<OaApplicationVo> queryList(OaApplicationBo bo) {
LambdaQueryWrapper<OaApplication> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaApplication> buildQueryWrapper(OaApplicationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaApplication> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getIcon()), OaApplication::getIcon, bo.getIcon());
lqw.eq(StringUtils.isNotBlank(bo.getIp()), OaApplication::getIp, bo.getIp());
lqw.eq(bo.getPort() != null, OaApplication::getPort, bo.getPort());
lqw.like(StringUtils.isNotBlank(bo.getApplicationName()), OaApplication::getApplicationName, bo.getApplicationName());
lqw.eq(StringUtils.isNotBlank(bo.getDescription()), OaApplication::getDescription, bo.getDescription());
return lqw;
}
/**
* 新增应用集成
*/
@Override
public Boolean insertByBo(OaApplicationBo bo) {
OaApplication add = BeanUtil.toBean(bo, OaApplication.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setApplicationId(add.getApplicationId());
}
return flag;
}
/**
* 修改应用集成
*/
@Override
public Boolean updateByBo(OaApplicationBo bo) {
OaApplication update = BeanUtil.toBean(bo, OaApplication.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaApplication entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除应用集成
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

12
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java
View File

@@ -52,6 +52,18 @@ public class OaFeedbackServiceImpl implements IOaFeedbackService {
return TableDataInfo.build(result);
}
/**
* 查询问题反馈列表
*/
@Override
public TableDataInfo<OaFeedbackVo> indexQueryList(OaFeedbackBo bo, PageQuery pageQuery) {
QueryWrapper<OaFeedback> lqw = buildQueryWrapper(bo);
lqw.eq("ofi.status", 0L);
val result = baseMapper.selectVoPageAndStatus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询问题反馈列表
*/

15
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java
View File

@@ -14,6 +14,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.oa.config.ContextUtil;
import com.ruoyi.oa.domain.SysOaDetail;
import com.ruoyi.oa.domain.bo.SysOaDetailBo;
import com.ruoyi.oa.domain.dto.BarDataDTO;
import com.ruoyi.oa.domain.dto.FinanceDetailDTO;
import com.ruoyi.oa.mapper.SysOaDetailMapper;
import lombok.RequiredArgsConstructor;
import org.apache.ibatis.javassist.runtime.Desc;
@@ -268,15 +270,14 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService {
return baseMapper.deleteById(financeId) > 0;
}
/**
* 获取饼图数据
* @param bo
* @return
*/
@Override
public List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo) {
public List<BarDataDTO> getBarData(Long projectId, String financeType) {
return baseMapper.getBarData(projectId, financeType);
}
return baseMapper.getBarData(bo);
@Override
public List<FinanceDetailDTO> getFinanceDetails(Long projectId, String financeType) {
return baseMapper.getFinanceDetails(projectId, financeType);
}
/**

12
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java
View File

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.*;
import com.ruoyi.oa.service.CodeGeneratorService;
import lombok.RequiredArgsConstructor;
@@ -352,6 +354,16 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
return baseMapper.selectExpiringForeignProjects(now, expireDays,tradeType);
}
@Override
public List<ProjectDataDTO> getProjectData(String month) {
return baseMapper.getProjectData(month);
}
@Override
public List<ProjectActivityDTO> getProjectActivities() {
return baseMapper.getProjectActivities();
}
private QueryWrapper<SysOaProject> buildOutWareQueryWrapper(SysOaWarehouseDetailBo bo) {
QueryWrapper<SysOaProject> lqw = Wrappers.query();
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.projec_name", bo.getProjectName());

12
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseDetailServiceImpl.java
View File

@@ -127,6 +127,7 @@ public class SysOaWarehouseDetailServiceImpl implements ISysOaWarehouseDetailSer
lqw.eq(bo.getAmount() != null, SysOaWarehouseDetail::getAmount, bo.getAmount());
lqw.eq(bo.getWarehouseId() != null, SysOaWarehouseDetail::getWarehouseId, bo.getWarehouseId());
lqw.eq(bo.getFatherId() != null, SysOaWarehouseDetail::getFatherId, bo.getFatherId());
lqw.eq(bo.getMasterId() != null, SysOaWarehouseDetail::getMasterId, bo.getMasterId());
return lqw;
}
@@ -248,8 +249,6 @@ public class SysOaWarehouseDetailServiceImpl implements ISysOaWarehouseDetailSer
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
//需要增加的对应物料数量
LambdaQueryWrapper<SysOaWarehouseDetail> lqw = Wrappers.lambdaQuery();
lqw.in(SysOaWarehouseDetail::getId, ids.toArray());
@@ -282,5 +281,14 @@ public class SysOaWarehouseDetailServiceImpl implements ISysOaWarehouseDetailSer
return TableDataInfo.build(sysOaWarehouseDetailVos);
}
/**
* 删除detail的简单方法
* @param id
*/
@Override
public void deleteById(Long id) {
baseMapper.deleteById(id);
}
}

3
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
View File

@@ -245,9 +245,10 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
sysOaWarehouseVo.setInventory(newInventory);
warehouseMapper.updateById(sysOaWarehouseVo);
}
warehouseDetailService.deleteById(sysOaWarehouseDetailVo.getId());
}
// 全部做完之后删除此出库单
return baseMapper.deleteById(masterId);
}
}

23
ruoyi-oa/src/main/resources/mapper/oa/OaApplicationMapper.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.oa.mapper.OaApplicationMapper">
<resultMap type="com.ruoyi.oa.domain.OaApplication" id="OaApplicationResult">
<result property="applicationId" column="application_id"/>
<result property="icon" column="icon"/>
<result property="ip" column="ip"/>
<result property="port" column="port"/>
<result property="applicationName" column="application_name"/>
<result property="description" column="description"/>
<result property="createdBy" column="created_by"/>
<result property="createdTime" column="created_time"/>
<result property="updatedBy" column="updated_by"/>
<result property="updatedTime" column="updated_time"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>

60
ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml
View File

@@ -191,20 +191,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and date_format(sof.finance_time,'%Y-%m-%d %H:%i:%s') >= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
and date_format(sof.finance_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
</select>
<select id="getBarData" resultMap="SysOaFinanceResult">
<!-- 月度收支对比：仅查询近 6 个月，使用 f.finance_type 判断进（1）出（0）账 -->
<select id="getBarData" resultType="com.ruoyi.oa.domain.dto.BarDataDTO">
SELECT
DATE_FORMAT(a.create_time, '%Y-%m') AS month,
SUM(CASE WHEN a.finance_type = '0' THEN b.price ELSE 0 END) AS total_out,
SUM(CASE WHEN a.finance_type = '1' THEN b.price ELSE 0 END) AS total_in
FROM sys_oa_finance a
LEFT JOIN sys_oa_detail b
ON a.finance_id = b.finance_id
AND a.create_time >= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 5 MONTH), '%Y-%m-01')
AND DATE_ADD(DATE_FORMAT(NOW(), '%Y-%m-01'), INTERVAL 1 MONTH) > a.create_time
GROUP BY DATE_FORMAT(a.create_time, '%Y-%m')
ORDER BY month;
DATE_FORMAT(f.finance_time, '%Y-%m') AS month,
SUM(CASE WHEN f.finance_type = '0' THEN d.price ELSE 0 END) AS totalOut,
SUM(CASE WHEN f.finance_type = '1' THEN d.price ELSE 0 END) AS totalIn
FROM sys_oa_detail d
JOIN sys_oa_finance f ON d.finance_id = f.finance_id
<where>
<!-- 可选的项目过滤 -->
<if test="projectId != null and projectId > 0">
AND f.project_id = #{projectId}
</if>
<!-- 只筛近 6 个月：从 5 个月前的第一天到当月最后一天 -->
AND f.finance_time BETWEEN
DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 5 MONTH), '%Y-%m-01')
AND LAST_DAY(CURDATE())
</where>
GROUP BY DATE_FORMAT(f.finance_time, '%Y-%m')
ORDER BY month
</select>
<!-- 明细列表：含币种判断（使用 f.remark 来模糊匹配币种），并只查询近 6 个月的数据 -->
<select id="getFinanceDetails" resultType="com.ruoyi.oa.domain.dto.FinanceDetailDTO">
SELECT
DATE_FORMAT(f.finance_time, '%Y-%m-%d') AS date,
f.finance_type AS type,
CASE
WHEN f.remark LIKE '%美金%' OR f.remark LIKE '%美元%' THEN 'USD'
ELSE 'CNY'
END AS currency,
d.price AS amount,
f.project_id AS projectId
FROM sys_oa_detail d
JOIN sys_oa_finance f ON d.finance_id = f.finance_id
<where>
<!-- 项目过滤 -->
<if test="projectId != null and projectId > 0">
AND f.project_id = #{projectId}
</if>
<!-- 进/出账类型过滤 -->
<if test="financeType != null and financeType != ''">
AND f.finance_type = #{financeType}
</if>
<!-- 只查询近 6 个月的记录 -->
AND f.finance_time BETWEEN
DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 5 MONTH), '%Y-%m-01')
AND LAST_DAY(CURDATE())
</where>
ORDER BY f.finance_time DESC
</select>
</mapper>

44
ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml
View File

@@ -597,6 +597,50 @@
</where>
</select>
<!-- 当月／指定月份各项目支出占比 -->
<select id="getProjectData"
parameterType="string"
resultType="com.ruoyi.oa.domain.dto.ProjectDataDTO">
SELECT
p.project_id AS projectId,
p.project_name AS projectName,
p.color AS color,
IFNULL(
SUM(
CASE WHEN f.finance_type = '0' THEN d.price ELSE 0 END
),
0
) AS totalPrice
FROM sys_oa_project p
LEFT JOIN sys_oa_finance f
ON f.project_id = p.project_id
LEFT JOIN sys_oa_detail d
ON d.finance_id = f.finance_id
<where>
<choose>
<when test="month != null and month != ''">
AND DATE_FORMAT(f.finance_time, '%Y-%m') = #{month}
</when>
<otherwise>
AND DATE_FORMAT(f.finance_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
</otherwise>
</choose>
</where>
GROUP BY p.project_id, p.project_name, p.color
</select>
<!-- 项目活跃度（明细） -->
<select id="getProjectActivities" resultType="com.ruoyi.oa.domain.dto.ProjectActivityDTO">
SELECT
p.project_name AS projectName,
f.finance_time AS createTime,
d.price AS laborCost,
p.color AS color
FROM sys_oa_project p
JOIN sys_oa_finance f ON f.project_id = p.project_id
JOIN sys_oa_detail d ON d.finance_id = f.finance_id
ORDER BY f.finance_time
</select>
<!-- 历史（月度）平均合同总额 -->
<select id="selectPrevAvgTotalFunds" resultType="java.math.BigDecimal">