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

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFinanceController.java

@@ -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);
+    }
+
+
     /**
      * 根据时间查询
      */

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java

@@ -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());
+    }
+
 
     /**
      * 新增项目管理

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java

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

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

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

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

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

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

@@ -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;
 
     /**

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaFinanceMapper.java

@@ -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

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaProjectMapper.java

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

ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaFinanceService.java

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

ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java

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

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

@@ -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);
+    }
+
     /**
      * 批量删除进出账管理
      */

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

@@ -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());