From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
index e994f2c..d9bb223 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
@@ -1,6 +1,8 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Certification;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.CertificationService;
@@ -24,7 +26,7 @@
public class CertificationController {
private CertificationService certificationService;
-
+ @ValueAuth
@ApiOperation(value = "鏌ヨ璧勮川鏄庣粏鍒楄〃")
@PostMapping("/getCertificationDetail")
public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {
@@ -32,22 +34,16 @@
Certification certification = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Certification.class);
return Result.success(certificationService.getCertificationDetail(page, certification));
}
-
+ @ValueClassify("瀹為獙瀹よ祫璐�")
@ApiOperation(value = "娣诲姞璧勮川鏄庣粏鍒楄〃")
@PostMapping("/addCertificationDetail")
public Result addCertificationDetail(@RequestBody Certification certification) {
return Result.success(certificationService.addCertificationDetail(certification));
}
-
+ @ValueClassify("瀹為獙瀹よ祫璐�")
@ApiOperation(value = "鍒犻櫎璧勮川鏄庣粏鍒楄〃")
@PostMapping("/delCertificationDetail")
- public Result<?> delCertificationDetail(List<Integer> ids) {
+ public Result<?> delCertificationDetail( String ids) {
return Result.success(certificationService.delCertificationDetail(ids));
- }
-
- @ApiOperation(value = "闄勪欢涓嬭浇")
- @PostMapping("/downFile")
- public Result<?> downFile(Integer id) {
- return Result.success(certificationService.downFile(id));
}
}
--
Gitblit v1.9.3