From ea1613944a1cb49bd8ac59dc6d0efd6032c9ab8c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 01 Apr 2024 14:40:44 +0800
Subject: [PATCH] e呼，用户，住户，房屋，报事报修，场所详情，从业人员等api,通用接口标注
---
src/main/java/org/springblade/modules/subjectChoices/controller/SubjectChoicesController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/subjectChoices/controller/SubjectChoicesController.java b/src/main/java/org/springblade/modules/subjectChoices/controller/SubjectChoicesController.java
index 406e7f2..df256c8 100644
--- a/src/main/java/org/springblade/modules/subjectChoices/controller/SubjectChoicesController.java
+++ b/src/main/java/org/springblade/modules/subjectChoices/controller/SubjectChoicesController.java
@@ -27,6 +27,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.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.subjectChoices.entity.SubjectChoicesEntity;
import org.springblade.modules.subjectChoices.service.ISubjectChoicesService;
@@ -34,6 +35,7 @@
import org.springblade.modules.subjectChoices.wrapper.SubjectChoicesWrapper;
import org.springblade.modules.subjectOption.entity.SubjectOptionEntity;
import org.springblade.modules.subjectOption.service.ISubjectOptionService;
+import org.springblade.modules.subjectOption.vo.SubjectOptionVO;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -95,12 +97,13 @@
public R save(@Valid @RequestBody SubjectChoicesVO subjectChoices) {
boolean save = subjectChoicesService.save(subjectChoices);
if (save) {
- List<SubjectOptionEntity> children = subjectChoices.getSubjectOptionList();
+ List<SubjectOptionVO> children = subjectChoices.getSubjectOptionList();
for (SubjectOptionEntity child : children) {
child.setSubjectChoicesId(subjectChoices.getId());
}
+ List<SubjectOptionEntity> copy = BeanUtil.copy(children, SubjectOptionEntity.class);
ISubjectOptionService bean = SpringUtils.getBean(ISubjectOptionService.class);
- bean.saveBatch(children);
+ bean.saveOrUpdateBatch(copy);
}
return R.status(save);
}
@@ -124,12 +127,13 @@
public R submit(@Valid @RequestBody SubjectChoicesVO subjectChoices) {
boolean save = subjectChoicesService.saveOrUpdate(subjectChoices);
if (save) {
- List<SubjectOptionEntity> children = subjectChoices.getSubjectOptionList();
+ List<SubjectOptionVO> children = subjectChoices.getSubjectOptionList();
for (SubjectOptionEntity child : children) {
child.setSubjectChoicesId(subjectChoices.getId());
}
+ List<SubjectOptionEntity> copy = BeanUtil.copy(children, SubjectOptionEntity.class);
ISubjectOptionService bean = SpringUtils.getBean(ISubjectOptionService.class);
- bean.saveOrUpdateBatch(children);
+ bean.saveOrUpdateBatch(copy);
}
return R.status(save);
}
--
Gitblit v1.9.3