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/CodeSynonymController.java | 104 ++++++++++++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java
index 5241479..9b781f2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java
@@ -17,12 +17,14 @@
package com.vci.ubcs.code.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.vci.ubcs.code.entity.CodeSynonymEntity;
-import com.vci.ubcs.code.mapper.CodeSynonymMapper;
+import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
+import com.vci.ubcs.code.entity.CodeSynonym;
import com.vci.ubcs.code.service.ICodeSynonymService;
-import com.vci.ubcs.code.vo.CodeSynonymVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeSynonymVO;
import com.vci.ubcs.code.wrapper.CodeSynonymWrapper;
+import com.vci.ubcs.starter.util.UBCSCondition;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -36,6 +38,11 @@
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import org.springblade.core.boot.ctrl.BladeController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* 杩戜箟璇嶇淮鎶� 鎺у埗鍣�
@@ -51,83 +58,92 @@
private final ICodeSynonymService codeSynonymService;
- CodeSynonymMapper codeSynonymMapper;
-
/**
* 杩戜箟璇嶇淮鎶� 璇︽儏
+ * @param codeSynonym
+ * @return
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "璇︽儏", notes = "codeSynonym")
- public R<CodeSynonymVO> detail(CodeSynonymEntity codeSynonym) {
- CodeSynonymEntity detail = codeSynonymMapper.selectOne(Condition.getQueryWrapper(codeSynonym));
+ public R<CodeSynonymVO> detail(CodeSynonym codeSynonym) {
+ CodeSynonym detail = codeSynonymService.getOne(Condition.getQueryWrapper(codeSynonym));
return R.data(CodeSynonymWrapper.build().entityVO(detail));
- }
- /**
- * 杩戜箟璇嶇淮鎶� 鍒嗛〉
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeSynonym")
- public R<IPage<CodeSynonymVO>> list(CodeSynonymEntity codeSynonym, Query query) {
- IPage<CodeSynonymEntity> pages = codeSynonymMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeSynonym));
- return R.data(CodeSynonymWrapper.build().pageVO(pages));
}
/**
- * 杩戜箟璇嶇淮鎶� 鑷畾涔夊垎椤�
+ * 杩戜箟璇嶇淮鎶� 鍒嗛〉
+ * @param condition
+ * @param query
+ * @return
*/
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeSynonym")
- public R<IPage<CodeSynonymVO>> page(CodeSynonymVO codeSynonym, Query query) {
- IPage<CodeSynonymVO> pages = codeSynonymService.selectPlCodeSynonymPage(Condition.getPage(query), codeSynonym);
- return R.data(pages);
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "", notes = "浼犲叆codeSynonym")
+ public R<IPage<CodeSynonymVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition,Query query) {
+ IPage<CodeSynonym> page = codeSynonymService.page(Condition.getPage(query), UBCSCondition.getQueryWrapper(condition, CodeSynonym.class).lambda().orderByAsc(CodeSynonym::getCreateTime));
+ return R.data(CodeSynonymWrapper.build().pageVO(page));
}
/**
* 杩戜箟璇嶇淮鎶� 鏂板
+ * @param codeSynonym
+ * @return
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鏂板", notes = "浼犲叆codeSynonym")
- public R save(@Valid @RequestBody CodeSynonymEntity codeSynonym) {
- return R.status(SqlHelper.retBool(codeSynonymMapper.insert(codeSynonym)));
+ public R save(@Valid @RequestBody CodeSynonym codeSynonym) {
+ codeSynonym.setLcStatus(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED);
+ return R.status(codeSynonymService.save(codeSynonym));
}
/**
* 杩戜箟璇嶇淮鎶� 淇敼
+ * @param codeSynonym
+ * @return
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "淇敼", notes = "浼犲叆codeSynonym")
- public R update(@Valid @RequestBody CodeSynonymEntity codeSynonym) {
- return R.status(SqlHelper.retBool(codeSynonymMapper.updateById(codeSynonym)));
- }
-
- /**
- * 杩戜箟璇嶇淮鎶� 鏂板鎴栦慨鏀�
- */
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆codeSynonym")
- public R submit(@Valid @RequestBody CodeSynonymEntity codeSynonym) {
- if(codeSynonym.getOid() != null){
- return R.status(SqlHelper.retBool(codeSynonymMapper.updateById(codeSynonym)));
- }
- return R.status(SqlHelper.retBool(codeSynonymMapper.insert(codeSynonym)));
-// return R.status(plCodeSynonymService.saveOrUpdate(plCodeSynonym));
+ public R update(@Valid @RequestBody CodeSynonym codeSynonym) {
+ return R.status(codeSynonymService.updateById(codeSynonym));
}
/**
* 杩戜箟璇嶇淮鎶� 鍒犻櫎
+ * @param oids
+ * @return
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆oids")
public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String oids) {
- return R.status(SqlHelper.retBool(codeSynonymMapper.deleteBatchIds(Func.toLongList(oids))));
+ return codeSynonymService.deleteDataByIds(oids);
}
+ /**
+ * 杩戜箟璇嶇姸鎬佸仠鐢ㄥ惎鐢�
+ * @param map
+ * @return
+ */
+ @PostMapping("/updateStatus")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "杩戜箟璇嶇姸鎬佸仠鐢ㄥ惎鐢�", notes = "浼犲叆map")
+ public R updateStatus(@Valid @RequestBody Map<String,String> map) {
+ return R.status(codeSynonymService.updateStatus(map));
+ }
+
+ /**
+ * 鏌ョ湅杩戜箟璇嶆煡璇㈣鍒欑殑浣跨敤鑼冨洿
+ * @param oid 涓婚敭
+ * @return 浣跨敤鑼冨洿
+ */
+ @GetMapping("/listUseRange")
+ @ApiOperationSupport(order = 11)
+ @ApiOperation(value = "鏌ョ湅涓绘暟鎹紪鐮佽鍒欑殑浣跨敤鑼冨洿", notes = "浼犲叆oid")
+ public R<List<CodeClassifyTemplateAttrVO>> listUseRange(@Valid @RequestParam String oid){
+ return R.data(codeSynonymService.listUseRangeInClsTempAttr(oid));
+ }
}
--
Gitblit v1.9.3