diff --git a/src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java b/src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java index 047cb7f..bf48a89 100644 --- a/src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java +++ b/src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java @@ -93,4 +93,14 @@ public class ProjectFinanceController { log.info("查看所有的费用申请结束:{}",financeOfProjectList); return JsonResponse.newInstance().ok(financeOfProjectList); } + + @MustLogin + @ApiOperation(value = "时间财务图-统计", notes = "") + @RequestMapping(value = "/timeFinancialChart", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> timeFinancialChart(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查看所有的费用申请开始{}",params); + List timeFinancialChart = projectFinanceService.timeFinancialChart(params.getParam(),params.getUserId()); + log.info("查看所有的费用申请结束:{}",timeFinancialChart); + return JsonResponse.newInstance().ok(timeFinancialChart); + } } diff --git a/src/main/java/com/ccsens/ptccsens/bean/dto/ProjectFinanceDto.java b/src/main/java/com/ccsens/ptccsens/bean/dto/ProjectFinanceDto.java index c890841..713ad7b 100644 --- a/src/main/java/com/ccsens/ptccsens/bean/dto/ProjectFinanceDto.java +++ b/src/main/java/com/ccsens/ptccsens/bean/dto/ProjectFinanceDto.java @@ -93,4 +93,12 @@ public class ProjectFinanceDto { @ApiModelProperty("每页的数量") private Integer pageSize = 10; } + + @Data + @ApiModel("时间财务图-入参") + public static class TimeFinancialChart { + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + } } diff --git a/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java b/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java index 0e637e9..a2d962e 100644 --- a/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java +++ b/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.charts.ChartData; import java.util.List; @@ -131,4 +132,22 @@ public class ProjectFinanceVo { @ApiModelProperty("类目名") private String categoryName; } + + @Data + @ApiModel("时间财务图-返参") + public static class TimeFinancialChart { + @ApiModelProperty("时间") + private String time; + @ApiModelProperty("数据") + private List data; + } + @Data + @ApiModel("时间财务图-具体数据") + public static class ChartData { + @ApiModelProperty("任务名称") + private String name; + @ApiModelProperty("支出") + private Long expend; + } + } diff --git a/src/main/java/com/ccsens/ptccsens/persist/dao/PluFinanceApplyDao.java b/src/main/java/com/ccsens/ptccsens/persist/dao/PluFinanceApplyDao.java index d61d8eb..1444d90 100644 --- a/src/main/java/com/ccsens/ptccsens/persist/dao/PluFinanceApplyDao.java +++ b/src/main/java/com/ccsens/ptccsens/persist/dao/PluFinanceApplyDao.java @@ -36,4 +36,11 @@ public interface PluFinanceApplyDao extends PluFinanceMapper { * @return 所有的费用申请 */ List queryAllMoneyApply(@Param("projectId") Long projectId); + + /** + * 时间财务图-统计 + * @param projectId 项目id + * @return 时间财务图 + */ + List timeFinancialChart(@Param("projectId") Long projectId); } diff --git a/src/main/java/com/ccsens/ptccsens/service/IProjectFinanceService.java b/src/main/java/com/ccsens/ptccsens/service/IProjectFinanceService.java index e39835b..dc9c3b1 100644 --- a/src/main/java/com/ccsens/ptccsens/service/IProjectFinanceService.java +++ b/src/main/java/com/ccsens/ptccsens/service/IProjectFinanceService.java @@ -5,6 +5,8 @@ import com.ccsens.ptccsens.bean.vo.ProjectFinanceVo; import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; +import java.util.List; + /** * @author AUSU */ @@ -54,4 +56,12 @@ public interface IProjectFinanceService { * @return 项目下所有的费用申请 */ PageInfo queryAllMoneyApply(ProjectFinanceDto.QueryAllMoneyApply param, Long userId); + + /** + * 时间财务图-统计 + * @param param 入参 + * @param userId 用户id + * @return 时间财务图 + */ + List timeFinancialChart(ProjectFinanceDto.TimeFinancialChart param, Long userId); } diff --git a/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java b/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java index 94429aa..835b3db 100644 --- a/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java +++ b/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java @@ -203,4 +203,9 @@ public class ProjectFinanceService implements IProjectFinanceService{ return new PageInfo<>(allMoneyApplyList); } + + @Override + public List timeFinancialChart(ProjectFinanceDto.TimeFinancialChart param, Long userId) { + return pluFinanceApplyDao.timeFinancialChart(param.getProjectId()); + } } diff --git a/src/main/resources/mapper_dao/PluFinanceApplyDao.xml b/src/main/resources/mapper_dao/PluFinanceApplyDao.xml index 48e3958..20939b5 100644 --- a/src/main/resources/mapper_dao/PluFinanceApplyDao.xml +++ b/src/main/resources/mapper_dao/PluFinanceApplyDao.xml @@ -101,5 +101,45 @@ AND ft2.rec_status = 0 + + + + + + + + + \ No newline at end of file