From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/SaveReportInfoSettingTitleBMOImpl.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/SaveReportInfoSettingTitleBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/SaveReportInfoSettingTitleBMOImpl.java
index 8cb0900..1145887 100644
--- a/service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/SaveReportInfoSettingTitleBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/SaveReportInfoSettingTitleBMOImpl.java
@@ -1,9 +1,13 @@
package com.java110.report.bmo.reportInfoSettingTitle.impl;
+import com.alibaba.fastjson.JSONArray;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.reportInfo.ReportInfoSettingTitleDto;
import com.java110.intf.report.IReportInfoSettingTitleInnerServiceSMO;
-import com.java110.po.reportInfoSettingTitle.ReportInfoSettingTitlePo;
+import com.java110.intf.report.IReportInfoSettingTitleValueInnerServiceSMO;
+import com.java110.po.reportInfo.ReportInfoSettingTitlePo;
+import com.java110.po.reportInfo.ReportInfoSettingTitleValuePo;
import com.java110.report.bmo.reportInfoSettingTitle.ISaveReportInfoSettingTitleBMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +19,8 @@
@Autowired
private IReportInfoSettingTitleInnerServiceSMO reportInfoSettingTitleInnerServiceSMOImpl;
-
+ @Autowired
+ private IReportInfoSettingTitleValueInnerServiceSMO reportInfoSettingTitleValueInnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -23,16 +28,29 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
@Java110Transactional
- public ResponseEntity<String> save(ReportInfoSettingTitlePo reportInfoSettingTitlePo) {
+ public ResponseEntity<String> save(ReportInfoSettingTitlePo reportInfoSettingTitlePo, JSONArray titleValues) {
reportInfoSettingTitlePo.setTitleId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_titleId));
int flag = reportInfoSettingTitleInnerServiceSMOImpl.saveReportInfoSettingTitle(reportInfoSettingTitlePo);
- if (flag > 0) {
- return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+ if (flag < 0) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
+ }
+ if (ReportInfoSettingTitleDto.TITLE_TYPE_QUESTIONS.equals(reportInfoSettingTitlePo.getTitleType())) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+ }
+ ReportInfoSettingTitleValuePo reportInfoSettingTitleValuePo = null;
+ for (int titleValueIndex = 0; titleValueIndex < titleValues.size(); titleValueIndex++) {
+ reportInfoSettingTitleValuePo = new ReportInfoSettingTitleValuePo();
+ reportInfoSettingTitleValuePo.setQaValue(titleValues.getJSONObject(titleValueIndex).getString("qaValue"));
+ reportInfoSettingTitleValuePo.setSeq(titleValues.getJSONObject(titleValueIndex).getString("seq"));
+ reportInfoSettingTitleValuePo.setTitleId(reportInfoSettingTitlePo.getTitleId());
+ reportInfoSettingTitleValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
+ reportInfoSettingTitleValuePo.setCommunityId(reportInfoSettingTitlePo.getCommunityId());
+ reportInfoSettingTitleValueInnerServiceSMOImpl.saveReportInfoSettingTitleValue(reportInfoSettingTitleValuePo);
}
- return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
}
}
--
Gitblit v1.8.0