From c3c2f35d8fb91ecdf368a4b62dc8bb48ab5f39a1 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期四, 13 三月 2025 09:45:48 +0800
Subject: [PATCH] 报告编制修改2.0
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java
index c1824d4..922213e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java
@@ -48,14 +48,13 @@
@ApiOperation(value = "鏌ョ湅妫�楠屾姤鍛婂垪琛�")
@GetMapping("/pageInsReport")
- public Result pageInsReport(Page page , ReportPageDto reportPageDto) throws Exception {
+ public Result pageInsReport(Page page,ReportPageDto reportPageDto) throws Exception {
return Result.success(insReportService.pageInsReport(page, reportPageDto));
}
@ApiOperation(value = "涓�閿鎵规寜閽�")
@PostMapping("/batchApprovalReport")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.UPDATE)
public Result batchApprovalReport(@RequestBody BatchApprovalReportDTO batchApprovalReportDTO){
try {
insReportService.batchApprovalReport(batchApprovalReportDTO.getIds());
@@ -74,14 +73,12 @@
@ApiOperation(value = "鏌ョ湅妫�楠屾姤鍛婃暟閲忎俊鎭�")
@GetMapping("/getReportCountInfo")
- public Result getReportCountInfo(@RequestParam Map<String, Object> params) throws Exception {
- ReportPageDto reportPageDto = JackSonUtil.unmarshal(JackSonUtil.marshal(params), ReportPageDto.class);
+ public Result getReportCountInfo(ReportPageDto reportPageDto) throws Exception {
return Result.success(insReportService.getReportCountInfo(reportPageDto));
}
@ApiOperation(value = "涓婁紶鎸夐挳")
@PostMapping("/inReport")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.IMPORT)
public Result inReport(MultipartFile file, Integer id) {
String urlString;
String pathName;
@@ -111,7 +108,6 @@
}
//涓嬭浇
@GetMapping("/downReport")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.EXPORT)
public void downReport(@RequestParam("id") Integer id,@RequestParam("type") Integer type, HttpServletResponse response) {
insReportService.downReport(id,type, response);
}
@@ -120,22 +116,18 @@
@ApiOperation(value = "杩樺師鎸夐挳")
@PostMapping("/upReportUrl")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.UPDATE)
- public Result upReportUrl(Integer id,Integer type) {
- insReportService.upReportUrl(id,type);
- return Result.success();
+ public Result upReportUrl(Integer id) {
+ return Result.success(insReportService.upReportUrl(id));
}
@ApiOperation(value = "缂栧埗鎸夐挳")
@GetMapping("/upReportFile")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.UPDATE)
public Result upReportFile() {
return Result.success();
}
@ApiOperation(value = "鎻愪氦鎸夐挳")
@PostMapping("/writeReport")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.UPDATE)
public Result writeReport(Integer id) {
return Result.success(insReportService.writeReport(id));
@@ -143,20 +135,17 @@
@ApiOperation(value = "瀹℃牳鎸夐挳")
@PostMapping("/examineReport")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.UPDATE)
public Result examineReport(Integer id, Integer isExamine, String examineTell) {
return Result.success(insReportService.examineReport(id, isExamine, examineTell));
}
@ApiOperation(value = "鎵瑰噯鎸夐挳")
@PostMapping("/ratifyReport")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.UPDATE)
public Result ratifyReport(Integer id, Integer isRatify, String ratifyTell) {
return Result.success(insReportService.ratifyReport(id, isRatify, ratifyTell));
}
@RequestMapping("/onlyOffice/save")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.OTHER)
public void saveFile(@RequestParam String fileName, HttpServletRequest request, HttpServletResponse response) {
PrintWriter writer = null;
try {
@@ -187,21 +176,18 @@
@ApiOperation(value = "鎵归噺涓嬭浇鎸夐挳")
@GetMapping("/downAll")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.EXPORT)
public Result downAll(String ids) {
return Result.success(insReportService.downAll(ids));
}
@ApiOperation(value = "鎵归噺涓婁紶鎸夐挳")
@PostMapping("/upAll")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.IMPORT)
public Result upAll(MultipartFile file) throws IOException {
return Result.success(insReportService.upAll(file));
}
@ApiOperation(value = "鎾ゅ洖鎸夐挳")
@PostMapping("/withdraw")
- @Log(title = "妫�楠屾姤鍛�", businessType = BusinessType.UPDATE)
public Result withdraw(@RequestBody Map<String,Object> map) {
insReportService.withdraw(map);
return Result.success();
--
Gitblit v1.9.3