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

首页大型更新，修正通信ui

Browse Source
This commit is contained in:
hdka
2024-12-30 16:44:53 +08:00
parent a23c049c7d
commit 28e379aa2a
26 changed files with 929 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,14 @@ public class SysOaFinanceController extends BaseController {
return sysOaFinanceList;
}
@GetMapping("/pieData")
public R<List<SysOaFinanceVo>> pieData(SysOaFinanceBo bo) {
List<SysOaFinanceVo> sysOaFinanceList = iSysOaFinanceService.getPieData(bo);
return R.ok(sysOaFinanceList);
}
/**
* 根据时间查询
*/

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

@@ -80,13 +80,21 @@ public class SysOaProjectController extends BaseController {
/**
* 获取项目管理详细信息
*
* @param projectId 主键
*/
@GetMapping("/projectDataByMonth")
public R<List<SysOaProjectVo>> getProjectDataByMonth() {
return R.ok(iSysOaProjectService.getProjectDataByMonth());
}
/**
* 获取项目管理详细信息
*
*/
@GetMapping("/projectDataByMonthAndDate")
public R<List<SysOaProjectVo>> getProjectDataByMonthAndDate() {
return R.ok(iSysOaProjectService.getProjectDataByMonthAndDate());
}
/**
* 新增项目管理

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java
View File

@@ -96,6 +96,11 @@ public class SysOaFinance extends BaseEntity {
*/
private Long receiveAccountId;
/**
* 出账类型
*/
private String outType;
/**
* 一对多关联进出账明细
*/

6
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java
View File

@@ -115,4 +115,10 @@ public class SysOaFinanceBo extends BaseEntity {
private List<SysOaDetail> detailList;
/**
* 出账类型
*/
private String outType;
}

10
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java
View File

@@ -134,5 +134,15 @@ public class SysOaFinanceVo extends SysOaFinance {
*/
private List<SysOaDetail> detailList;
/**
* 出账类型
*/
private String outType;
/**
* 类型金钱综合用于饼图数据
*/
private Double outMoney;
}

3
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java
View File

@@ -2,6 +2,8 @@ package com.ruoyi.oa.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -156,6 +158,7 @@ public class SysOaProjectVo {
* 创建时间
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd")
private Date createTime;
/**

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

@@ -64,6 +64,14 @@ public interface SysOaFinanceMapper extends BaseMapperPlus<SysOaFinanceMapper, S
*/
List<SysOaFinance> findFinanceByTime(Map params);
/**
* 获取饼图数据
* @param bo
* @return
*/
List<SysOaFinanceVo> getPieData(SysOaFinanceBo bo);
/**
* 项目资金管理，根据时间范围查询列表数据
* @param params

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

@@ -28,5 +28,7 @@ public interface SysOaProjectMapper extends BaseMapperPlus<SysOaProjectMapper, S
List<SysOaProjectVo> getProjectDataByMonth(@Param("firstDay") Date firstDay, @Param("lastDay") Date lastDay);
List<SysOaProjectVo> getProjectDataByMonthAndDate(@Param("firstDay") Date firstDay, @Param("lastDay") Date lastDay);
}

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

@@ -89,4 +89,6 @@ public interface ISysOaFinanceService {
* @return
*/
Boolean deleteSysOaFinanceById(Long financeId);
List<SysOaFinanceVo> getPieData(SysOaFinanceBo bo);
}

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

@@ -58,4 +58,9 @@ public interface ISysOaProjectService {
List<SysOaProjectVo> getProjectDataByMonth();
/**
* 统计项目活跃度需要
* @return
*/
List<SysOaProjectVo> getProjectDataByMonthAndDate();
}

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

@@ -262,6 +262,17 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService {
return baseMapper.deleteById(financeId) > 0;
}
/**
* 获取饼图数据
* @param bo
* @return
*/
@Override
public List<SysOaFinanceVo> getPieData(SysOaFinanceBo bo) {
return baseMapper.getPieData(bo);
}
/**
* 批量删除进出账管理
*/

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

@@ -140,6 +140,18 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
return projectVos;
}
/**
* 统计数据需要
* @return
*/
@Override
public List<SysOaProjectVo> getProjectDataByMonthAndDate() {
Date date = new Date();
List<SysOaProjectVo> projectVos = baseMapper.getProjectDataByMonthAndDate(getFirstDay(date),getLastDay(date));
return projectVos;
}
private QueryWrapper<SysOaProject> buildOutWareQueryWrapper(SysOaOutWarehouseBo bo) {
QueryWrapper<SysOaProject> lqw = Wrappers.query();
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.projec_name", bo.getProjectName());

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

@@ -22,6 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="outType" column="out_type"/>
<result property="outMoney" column="out_money"/>
<result property="receiveAccountId" column="receive_account_id"/>
<result property="receiveAccountName" column="receive_account_name"/>
<association property="project" column="project_id" javaType="SysOaProject" resultMap="SysOaProjectResult"/>
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.update_time,
b.detail_id,
b.detail_title,
a.out_type,
b.price,
b.big_price,
b.remark as detail_remark
@@ -93,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sof.create_time,
sof.update_by,
sof.update_time,
sof.out_type,
b.detail_id,
b.detail_title,
b.price,
@@ -127,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sof.create_time,
sof.update_by,
sof.update_time,
sof.out_type,
b.detail_id,
b.detail_title,
b.price,
@@ -145,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--进出账查询-->
<select id="selectFinanceByProjectId" resultMap="SysOaFinanceResult">
select a.finance_id, a.project_id, a.finance_title, a.finance_parties, a.pay_type, a.finance_type, a.finance_time, a.make_ratio, a.make_price, a.make_time, a.make_explain, a.accessory, a.remark as finance_remark, a.create_by, a.create_time, a.update_by, a.update_time,
b.detail_id, b.detail_title, b.price, b.big_price, b.remark as detail_remark
b.detail_id, b.detail_title, b.price, b.big_price, b.remark as detail_remark,a.out_type
from sys_oa_finance a
left join sys_oa_detail b on a.finance_id = b.finance_id
where a.project_id = #{projectId} and a.finance_type = #{financeType}
@@ -163,6 +169,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and date_format(a.finance_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
</select>
<select id="getPieData" resultMap="SysOaFinanceResult">
select
sum(b.price) as out_money,a.out_type
from sys_oa_finance a
left join sys_oa_detail b on a.finance_id = b.finance_id
where a.finance_type = '0' AND YEAR(a.create_time) = YEAR(NOW()) and a.project_id = '0'
group by a.out_type
</select>
<!--项目进出账查询-->
<!-- <select id="findFinanceByTimeAndProjectId" resultMap="SysOaFinanceResult">
<include refid="selectFinanceVo" />

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

@@ -97,5 +97,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by sop.project_id
</select>
<select id="getProjectDataByMonthAndDate" resultType="com.ruoyi.oa.domain.vo.SysOaProjectVo">
select sum(soa.day_length+soa.hour/8) as labor_cost ,color,sop.project_name,date_format(soa.create_time,'%Y-%m-%d') as create_time from sys_oa_project sop
left join sys_oa_attendance soa on sop.project_id = soa.project_id
where soa.create_time between #{firstDay} and #{lastDay}
and soa.del_flag = '0'
group by sop.project_id,create_time
</select>
</mapper>