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/CodeFixedValueController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
index d55e13a..67b2d73 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
@@ -14,6 +14,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -49,9 +50,9 @@
*/
@GetMapping("/gridCodeFixedValue")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "鍒嗛〉 鐮佹鍩虹淇℃伅鍒楄〃", notes = "CodeFixedValueVO")
+ @ApiOperation(value = "鍥哄畾鐮佹鐨勭爜鍊煎垪琛�", notes = "CodeFixedValueVO")
public R<IPage<CodeFixedValueVO>> gridCodeFixedValue(CodeFixedValueVO codeFixedValueVO, Query query){
- return R.data(codeFixedValueService.gridCodeFixedValue(codeFixedValueVO, Condition.getPage(query.setAscs("ordernum"))));
+ return R.data(codeFixedValueService.gridCodeFixedValue(codeFixedValueVO, Condition.getPage(query.setAscs("orderNum"))));
}
/**
@@ -126,13 +127,13 @@
@PostMapping("/saveOrder")
public R batchSave4Order(@RequestBody Map<String,Object> param){
JSONArray json = JSONArray.parseArray(String.valueOf(param.get("dtoList")));
- List<CodeFixedValueDTO> dtoList = new ArrayList<>();
+ List<CodeFixedValueDTO> dtoList = new ArrayList<>();
for (int i = 0; i < json.size(); i++) {
CodeFixedValueDTO codeFixedValueDTO = JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(json.get(i))), CodeFixedValueDTO.class);
dtoList.add(codeFixedValueDTO);
}
String codefixedsecoid = (String) param.get("codeFixedSecOid");
- VciBaseUtil.alertNotNull(dtoList,"鐮佸�煎璞￠泦鍚�",codefixedsecoid,"鍥哄畾鐮佹鐨勪富閿�");
+ VciBaseUtil.alertNotNull(codefixedsecoid,"鍥哄畾鐮佹鐨勪富閿�");
if (CollectionUtils.isEmpty(dtoList)){
return R.status(codeFixedValueService.batchDeleteBySecOid(codefixedsecoid));
}
--
Gitblit v1.9.3