From f3637227614f3f7efa372d827f4dafb7cc8a85bf Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 28 十二月 2023 11:24:12 +0800
Subject: [PATCH] 第二阶段
---
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
index be9afb0..74b4779 100644
--- a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
+++ b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
@@ -1,27 +1,24 @@
package com.yuanchu.mom.controller;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.DataReportingPageDto;
import com.yuanchu.mom.dto.ProductCountDto;
import com.yuanchu.mom.dto.RegistrantCountDto;
import com.yuanchu.mom.pojo.DataReporting;
import com.yuanchu.mom.pojo.FansSubmit;
+import com.yuanchu.mom.pojo.FinanceSubmit;
import com.yuanchu.mom.service.DataReportingService;
import com.yuanchu.mom.service.FansSubmitService;
-import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.service.FinanceSubmitService;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.math.BigDecimal;
import java.util.Map;
@RequestMapping("/dataReporting")
@@ -34,12 +31,14 @@
private FansSubmitService fansSubmitService;
+ private FinanceSubmitService financeSubmitService;
+
@ApiOperation(value = "鑾峰彇鏁版嵁涓婃姤鍒楄〃")
@PostMapping("/selectDataReportingList")
public Result selectDataReportingList(@RequestBody Map<String, Object> data) {
Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
DataReportingPageDto dataReportingPageDto = JSON.parseObject(JSON.toJSONString(data.get("entity")), DataReportingPageDto.class);
- return Result.success(dataReportingService.selectUserList(page, dataReportingPageDto));
+ return Result.success(dataReportingService.selectDataReportingList(page, dataReportingPageDto));
}
@ApiOperation(value = "淇敼鏁版嵁涓婃姤")
@@ -90,4 +89,37 @@
return Result.success(fansSubmitService.addFansSubmit(fansSubmit));
}
+ @ApiOperation(value = "鑾峰彇璐㈠姟涓婃姤鍒楄〃")
+ @PostMapping("/selectFinanceSubmitList")
+ public Result selectFinanceSubmitList(@RequestBody Map<String, Object> data) {
+ Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
+ FinanceSubmit financeSubmit = JSON.parseObject(JSON.toJSONString(data.get("entity")), FinanceSubmit.class);
+ return Result.success(financeSubmitService.selectFinanceSubmitList(page, financeSubmit));
+ }
+
+ @ApiOperation(value = "鍒犻櫎璐㈠姟涓婃姤鍒楄〃")
+ @PostMapping("/delFinanceSubmit")
+ public Result delFinanceSubmit(Integer id){
+ return Result.success(financeSubmitService.delFinanceSubmit(id));
+ }
+
+ @ApiOperation(value = "淇敼璐㈠姟涓婃姤淇℃伅")
+ @PostMapping("/updateFinanceSubmit")
+ public Result<?> updateFinanceSubmit(@RequestBody FinanceSubmit financeSubmit) {
+ return Result.success(financeSubmitService.updateFinanceSubmit(financeSubmit));
+ }
+
+ @ApiOperation(value = "娣诲姞璐㈠姟涓婃姤淇℃伅")
+ @PostMapping("/addFinanceSubmit")
+ public Result<?> addFinanceSubmit(@RequestBody FinanceSubmit financeSubmit) {
+ return Result.success(financeSubmitService.addFinanceSubmit(financeSubmit));
+ }
+
+ @ApiOperation(value = "鑾峰彇棣栭〉鏁版嵁")
+ @GetMapping("/getDataList")
+ @ValueAuth
+ public Result<?> getDataList() {
+ return Result.success(dataReportingService.getDataList());
+ }
+
}
--
Gitblit v1.9.3