From c2c0c9370a72d253c624ff11d630d27c9cd0040d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 十月 2023 15:34:25 +0800
Subject: [PATCH] 主数据排序改为按id排序
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
index 08f5c65..5f81558 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
+import com.vci.ubcs.code.dto.CodeOrderDTO;
+import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.CodeBasicSec;
import com.vci.ubcs.code.service.ICodeBasicSecService;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
@@ -20,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.rmi.ServerException;
import java.util.Collection;
import java.util.List;
@@ -62,7 +66,7 @@
@PostMapping( "/addSave")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "澧炲姞 鐮佹鍩虹淇℃伅", notes = "codeBasicSecDTO")
- public R addSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO){
+ public R addSave(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO){
boolean resBoolean;
try {
resBoolean = codeBasicSecService.addSave(codeBasicSecDTO);
@@ -159,7 +163,7 @@
@PostMapping("/clone")
@ApiOperationSupport(order = 10)
@ApiOperation(value = "鍏嬮殕鐮佹淇℃伅", notes = "codeBasicSecDTO")
- public R cloneCodeBasicSec(@RequestBody CodeBasicSecDTO codeBasicSecDTO){
+ public R cloneCodeBasicSec(@RequestBody CodeBasicSecDTO codeBasicSecDTO) throws ServerException {
VciBaseUtil.alertNotNull(codeBasicSecDTO.getOidArr(),"閫夋嫨鐮佹涓婚敭");
List<String> oidArr = VciBaseUtil.str2List(codeBasicSecDTO.getOidArr());
if (CollectionUtils.isEmpty(oidArr)){
@@ -205,4 +209,28 @@
return R.status(codeBasicSecService.downOrderNum(oid));
}
+ /**
+ * 鏌ヨ缂栫爜瑙勫垯鐨勬墍鏈夋祦姘翠緷璧栫殑鐮佹
+ * @param ruleOid 缂栫爜瑙勫垯涓婚敭
+ * @return
+ */
+ @GetMapping("/getCodeRuleAndBasicSecByRuleOid")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "鏌ヨ缂栫爜瑙勫垯鐨勬墍鏈夋祦姘翠緷璧栫殑鐮佹", notes = "浼犲叆oid")
+ public R<CodeRuleVO> getCodeRuleAndBasicSecByRuleOid(String ruleOid){
+ return R.data(codeBasicSecService.getSerialNumberDepend(ruleOid));
+ }
+
+
+ /**
+ * 璁剧疆鏈�澶ф祦姘村彿
+ * @param codeOrderDTO 缂栫爜鐢宠浼犺緭瀵硅薄
+ * @return
+ */
+ @PostMapping("/setMaxSerialNumberForCodeRule")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "璁剧疆鏈�澶ф祦姘村彿", notes = "codeOrderDTO")
+ public R setMaxSerialNumberForCodeRule(@RequestBody CodeOrderDTO codeOrderDTO){
+ return R.success(codeBasicSecService.setMaxSerialNumberForCodeRule(codeOrderDTO));
+ }
}
--
Gitblit v1.9.3