From 3534b13391b2a6152d0f91b72fda343b13a947cb Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 22 一月 2025 15:55:27 +0800
Subject: [PATCH] 分类码段码值管理查询去除null的情况，分类码段生成编码时去除码值为null的情况
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
index 425b65a..b9d1367b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
@@ -24,8 +24,6 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
-
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
@@ -33,12 +31,12 @@
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.rmi.ServerException;
import java.util.Collection;
import java.util.Map;
@@ -71,7 +69,7 @@
* 缂栫爜瑙勫垯 鑷畾涔夊垎椤�
* @return baseQueryObject
*/
- @GetMapping("/gridCodeRule")
+ @GetMapping(value = "/gridCodeRule")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeRule")
public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {
@@ -88,7 +86,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鏂板", notes = "浼犲叆CodeRule")
public R save(@Valid @RequestBody CodeRuleDTO codeRuleDTO) {
- return R.status(codeRuleService.addSave(codeRuleDTO));
+ return codeRuleService.addSave(codeRuleDTO);
}
/**
@@ -100,7 +98,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "淇敼", notes = "浼犲叆CodeRule")
public R update(@Valid @RequestBody CodeRuleDTO codeRuleDTO) {
- return R.status(codeRuleService.editSave(codeRuleDTO));
+ return codeRuleService.editSave(codeRuleDTO);
}
/**
@@ -111,7 +109,7 @@
@DeleteMapping( "/deleteData")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "鍒犻櫎", notes = "浼犲叆codeRuleDTO")
- public R delCodeRule(@Valid @RequestBody CodeRuleDTO codeRuleDTO) {
+ public R delCodeRule(@RequestBody CodeRuleDTO codeRuleDTO) {
return codeRuleService.deleteCodeRule(codeRuleDTO);
}
@@ -162,8 +160,7 @@
@ApiOperationSupport(order = 11)
@ApiOperation(value = "鏌ョ湅涓绘暟鎹紪鐮佽鍒欑殑浣跨敤鑼冨洿", notes = "浼犲叆oid")
public R<Collection<CodeClassifyVO>> listUseRange(@Valid @RequestParam String oid){
- Collection<CodeClassifyVO> voList = codeRuleService.listUseRangeInCodeClassify(oid);
- return R.data(voList);
+ return R.data(codeRuleService.listUseRangeInCodeClassify(oid));
}
/**
@@ -191,7 +188,7 @@
@PostMapping("/clone")
@ApiOperationSupport(order = 13)
@ApiOperation(value = "鍏嬮殕缂栫爜瑙勫垯", notes = "浼犲叆codeRuleDTO")
- public R cloneCodeRule(@RequestBody CodeRuleDTO codeRuleDTO){
+ public R cloneCodeRule(@RequestBody CodeRuleDTO codeRuleDTO) throws ServerException {
return codeRuleService.cloneCodeRule(codeRuleDTO);
}
@@ -207,4 +204,16 @@
return codeRuleService.clearAllCode(oid);
}
+ /**
+ * 妫�鏌ョ浉浼肩紪鐮佽鍒�
+ * @param oid
+ * @return 鎵ц缁撴灉
+ */
+ @GetMapping("/checkLikeCodeRule")
+ @ApiOperationSupport(order = 15)
+ @ApiOperation(value = "妫�鏌ョ浉浼肩紪鐮佽鍒�", notes = "浼犲叆oid")
+ public R checkLikeCodeRule(@Valid @RequestParam String oid){
+ return codeRuleService.checkLikeCodeRule(oid);
+ }
+
}
--
Gitblit v1.9.3