From ec5a6ede3f88abebdf7a280744ea762757f310aa Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 四月 2024 13:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
index 8f6248c..46aae35 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
@@ -2,7 +2,9 @@
import annotation.Log;
import com.ycl.platform.domain.entity.CheckTemplate;
+import com.ycl.platform.domain.entity.CheckTemplateRule;
import com.ycl.platform.domain.query.CheckTemplateQuery;
+import com.ycl.platform.service.ICheckTemplateRuleService;
import com.ycl.platform.service.ICheckTemplateService;
import com.ycl.system.AjaxResult;
import com.ycl.system.Result;
@@ -30,6 +32,8 @@
@Autowired
private ICheckTemplateService checkTemplateService;
+ @Autowired
+ private ICheckTemplateRuleService checkTemplateRuleService;
/**
* 鏌ヨ鑰冩牳妯℃澘鍒楄〃
*/
@@ -57,7 +61,7 @@
* 鏂板鑰冩牳妯℃澘
*/
@PreAuthorize("@ss.hasPermi('check:template:add')")
- @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
+ @Log(title = "鏂板鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody @Validated CheckTemplateQuery checkTemplateDTO)
{
@@ -69,7 +73,7 @@
* 澶嶅埗鑰冩牳妯℃澘
*/
@PreAuthorize("@ss.hasPermi('check:template:copy')")
- @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
+ @Log(title = "澶嶅埗鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
@PostMapping("/copy")
public AjaxResult copy(@RequestBody CheckTemplateQuery checkTemplateDTO)
{
@@ -80,18 +84,28 @@
* 淇敼鑰冩牳妯℃澘
*/
@PreAuthorize("@ss.hasPermi('check:template:edit')")
- @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.UPDATE)
+ @Log(title = "淇敼鑰冩牳妯℃澘", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CheckTemplateQuery checkTemplateDTO)
{
- return toAjax(checkTemplateService.updateCheckTemplate(checkTemplateDTO));
+ return checkTemplateService.updateCheckTemplate(checkTemplateDTO);
}
+ /**
+ * 淇敼鑰冩牳妯℃澘鏉冮噸
+ */
+ @PreAuthorize("@ss.hasPermi('check:template:edit')")
+ @Log(title = "淇敼鑰冩牳妯℃澘鏉冮噸", businessType = BusinessType.UPDATE)
+ @PutMapping("/weight")
+ public AjaxResult editWeight(@RequestBody CheckTemplateRule checkTemplateRule)
+ {
+ return toAjax(checkTemplateRuleService.updateCheckTemplateRule(checkTemplateRule));
+ }
/**
* 鍒犻櫎鑰冩牳妯℃澘
*/
@PreAuthorize("@ss.hasPermi('check:template:remove')")
- @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.DELETE)
+ @Log(title = "鍒犻櫎鑰冩牳妯℃澘", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable String id)
{
--
Gitblit v1.8.0