From c3019597126f19e8508bd22e7da3a39058033510 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 23 一月 2025 11:41:24 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TModelController.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TModelController.java b/manage/src/main/java/com/jilongda/manage/controller/TModelController.java
index 8793aec..a2e2e5a 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TModelController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TModelController.java
@@ -89,20 +89,41 @@
@ApiOperation(value = "修改镜架型号")
@PostMapping(value = "/update")
public ApiResult<String> update(@RequestBody TModelDTO dto) {
-
- modelService.remove(Wrappers.lambdaQuery(TModel.class)
- .eq(TModel::getName,dto.getName()));
-
+ List<TModel> list = modelService.lambdaQuery()
+ .eq(TModel::getName, dto.getName()).list();
List<String> colorList = dto.getColorList();
- List<TModel> models = new ArrayList<>();
- for (String s : colorList) {
- TModel model = new TModel();
- BeanUtils.copyProperties(dto, model);
- model.setId(null);
- model.setColor(s);
- models.add(model);
+ if (list.size()<colorList.size()){
+ for (int i = 0; i < colorList.size(); i++) {
+ if (i>list.size()){
+ TModel model = new TModel();
+ BeanUtils.copyProperties(dto, model);
+ model.setId(null);
+ model.setColor(colorList.get(i));
+ list.add(model);
+ }else {
+ list.get(i).setColor(colorList.get(i));
+ }
+ }
+ }else if (list.size()>colorList.size()){
+ list = list.subList(0, colorList.size());
+ for (int i = 0; i < colorList.size(); i++) {
+ list.get(i).setColor(colorList.get(i));
+ }
+ }else {
+ for (int i = 0; i < list.size(); i++) {
+ list.get(i).setColor(colorList.get(i));
+ }
}
- modelService.saveBatch(models);
+ modelService.saveOrUpdateBatch(list);
+// List<TModel> models = new ArrayList<>();
+// for (String s : colorList) {
+// TModel model = new TModel();
+// BeanUtils.copyProperties(dto, model);
+// model.setId(null);
+// model.setColor(s);
+// models.add(model);
+// }
+// modelService.saveBatch(models);
return ApiResult.success();
}
--
Gitblit v1.7.1