From ce567eb11cd0cdbd826214c355d1a8caff175dca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:22 +0800
Subject: [PATCH] bug列表：181（修复新增，修改，删除接口，新增时没设置默认值，导致在建分类时无法查询到，关键属性查重规则）183（历史数据导入模板下载，过滤掉模板中配置的默认属性）
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java | 59 ++++++++++++++++-------------------------------------------
1 files changed, 16 insertions(+), 43 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java
index c675937..fc6cc7b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java
@@ -49,7 +49,7 @@
@Api(value = "鍏抽敭灞炴�ф煡閲嶈鍒�", tags = "鍏抽敭灞炴�ф煡閲嶈鍒欐帴鍙�")
public class CodeKeyAttrRepeatController extends BladeController {
- private final ICodeKeyAttrRepeatService plCodeKeyattrrepeatService;
+ private final ICodeKeyAttrRepeatService codeKeyattrrepeatService;
CodeKeyAttrRepeatMapper codeKeyattrrepeatMapper;
@@ -59,73 +59,47 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "璇︽儏", notes = "浼犲叆plCodeKeyattrrepeat")
- public R<CodeKeyAttrRepeatVO> detail(CodeKeyAttrRepeat plCodeKeyattrrepeat) {
- CodeKeyAttrRepeat detail = codeKeyattrrepeatMapper.selectOne(Condition.getQueryWrapper(plCodeKeyattrrepeat));
+ public R<CodeKeyAttrRepeatVO> detail(CodeKeyAttrRepeat codeKeyattrrepeat) {
+ CodeKeyAttrRepeat detail = codeKeyattrrepeatMapper.selectOne(Condition.getQueryWrapper(codeKeyattrrepeat));
return R.data(CodeKeyAttrRepeatWrapper.build().entityVO(detail));
}
+
/**
* 鍏抽敭灞炴�ф煡閲嶈鍒� 鍒嗛〉
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆plCodeKeyattrrepeat")
- public R<IPage<CodeKeyAttrRepeatVO>> list(CodeKeyAttrRepeat plCodeKeyattrrepeat, Query query) {
- IPage<CodeKeyAttrRepeat> pages = codeKeyattrrepeatMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(plCodeKeyattrrepeat));
+ public R<IPage<CodeKeyAttrRepeatVO>> list(CodeKeyAttrRepeat codeKeyAttrRepeat, Query query) {
+ IPage<CodeKeyAttrRepeat> pages = codeKeyattrrepeatMapper.selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeKeyAttrRepeat));
return R.data(CodeKeyAttrRepeatWrapper.build().pageVO(pages));
}
/**
- * 鍏抽敭灞炴�ф煡閲嶈鍒� 鑷畾涔夊垎椤�
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆plCodeKeyattrrepeat")
- public R<IPage<CodeKeyAttrRepeatVO>> page(CodeKeyAttrRepeatVO plCodeKeyattrrepeat, Query query) {
- IPage<CodeKeyAttrRepeatVO> pages = plCodeKeyattrrepeatService.selectPlCodeKeyattrrepeatPage(Condition.getPage(query), plCodeKeyattrrepeat);
- return R.data(pages);
- }
-
- /**
- * 鍏抽敭灞炴�ф煡閲嶈鍒� 鏂板
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "鏂板", notes = "浼犲叆plCodeKeyattrrepeat")
- public R save(@Valid @RequestBody CodeKeyAttrRepeat plCodeKeyattrrepeat) {
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.insert(plCodeKeyattrrepeat)));
- }
-
- /**
- * 鍏抽敭灞炴�ф煡閲嶈鍒� 淇敼
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "淇敼", notes = "浼犲叆plCodeKeyattrrepeat")
- public R update(@Valid @RequestBody CodeKeyAttrRepeat plCodeKeyattrrepeat) {
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.updateById(plCodeKeyattrrepeat)));
- }
-
- /**
* 鍏抽敭灞炴�ф煡閲嶈鍒� 鏂板鎴栦慨鏀�
+ * @param codeKeyAttrRepeat
+ * @return
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
- @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆plCodeKeyattrrepeat")
- public R submit(@Valid @RequestBody CodeKeyAttrRepeat plCodeKeyattrrepeat) {
- if(plCodeKeyattrrepeat.getOid() != null){
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.updateById(plCodeKeyattrrepeat)));
+ @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆codeKeyattrrepeat")
+ public R submit(@Valid @RequestBody CodeKeyAttrRepeat codeKeyAttrRepeat) {
+ if(codeKeyAttrRepeat.getOid() != null){
+ return R.status(codeKeyattrrepeatService.update(codeKeyAttrRepeat));
}
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.insert(plCodeKeyattrrepeat)));
+ return R.status(codeKeyattrrepeatService.addSave(codeKeyAttrRepeat));
}
/**
* 鍏抽敭灞炴�ф煡閲嶈鍒� 鍒犻櫎
+ * @param ids
+ * @return
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆ids")
public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) {
- return R.status(SqlHelper.retBool(codeKeyattrrepeatMapper.deleteBatchIds(Func.toLongList(ids))));
+ return R.status(codeKeyattrrepeatService.deleteByOids(ids));
}
/**
@@ -139,6 +113,5 @@
public R listCodeKeyAttrRepeatRuleByOids(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String oids) {
return R.data(codeKeyattrrepeatMapper.selectBatchIds(Func.toLongList(oids)));
}
-
}
--
Gitblit v1.9.3