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/reportInfoAnswerValue/impl/SaveReportInfoAnswerValueBMOImpl.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/reportInfoAnswerValue/impl/SaveReportInfoAnswerValueBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportInfoAnswerValue/impl/SaveReportInfoAnswerValueBMOImpl.java
index 6d849e2..6308716 100644
--- a/service-report/src/main/java/com/java110/report/bmo/reportInfoAnswerValue/impl/SaveReportInfoAnswerValueBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportInfoAnswerValue/impl/SaveReportInfoAnswerValueBMOImpl.java
@@ -4,27 +4,22 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.reportInfoAnswerValue.ReportInfoAnswerValueDto;
-import com.java110.dto.reportInfoSetting.ReportInfoSettingDto;
-import com.java110.dto.reportInfoSettingTitleValue.ReportInfoSettingTitleValueDto;
-import com.java110.dto.user.UserDto;
+import com.java110.dto.reportInfo.ReportInfoAnswerValueDto;
+import com.java110.dto.reportInfo.ReportInfoSettingTitleValueDto;
import com.java110.intf.report.IReportInfoAnswerInnerServiceSMO;
import com.java110.intf.report.IReportInfoAnswerValueInnerServiceSMO;
import com.java110.intf.report.IReportInfoSettingInnerServiceSMO;
import com.java110.intf.report.IReportInfoSettingTitleValueInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
-import com.java110.po.reportInfoAnswer.ReportInfoAnswerPo;
-import com.java110.po.reportInfoAnswerValue.ReportInfoAnswerValuePo;
-import com.java110.po.userQuestionAnswer.UserQuestionAnswerPo;
+import com.java110.po.reportInfo.ReportInfoAnswerPo;
+import com.java110.po.reportInfo.ReportInfoAnswerValuePo;
import com.java110.report.bmo.reportInfoAnswerValue.ISaveReportInfoAnswerValueBMO;
-import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
@Service("saveReportInfoAnswerValueBMOImpl")
@@ -63,9 +58,12 @@
ReportInfoAnswerPo reportInfoAnswerPo = new ReportInfoAnswerPo();
reportInfoAnswerPo.setUserAnId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userAnId));
reportInfoAnswerPo.setSettingId(reqJson.getString("settingId"));
- reportInfoAnswerPo.setPersonId("-1");
- reportInfoAnswerPo.setPersonName("鏈煡");
+ reportInfoAnswerPo.setPersonId(StringUtil.isNullOrNone(reqJson.getString("personId")) == true?"-1":reqJson.getString("personId"));
+ reportInfoAnswerPo.setPersonName(StringUtil.isNullOrNone(reqJson.getString("personName")) == true?"鏈煡":reqJson.getString("personName"));
reportInfoAnswerPo.setCommunityId(reqJson.getString("communityId"));
+ reportInfoAnswerPo.setOpenId(reqJson.getString("openId"));
+ reportInfoAnswerPo.setIdCard(reqJson.getString("idCard"));
+ reportInfoAnswerPo.setTel(reqJson.getString("tel"));
int flag = reportInfoAnswerInnerServiceSMOImpl.saveReportInfoAnswer(reportInfoAnswerPo);
if (flag < 1) {
return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨澶辫触");
@@ -89,6 +87,7 @@
reportInfoAnswerValuePo.setAnValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_anValueId));
reportInfoAnswerValuePo.setUserAnId(reportInfoAnswerPo.getUserAnId());
reportInfoAnswerValuePo.setValueId(valueContent.getString(checkBoxIndex));
+ reportInfoAnswerValuePo.setSettingId(reqJson.getString("settingId"));
reportInfoAnswerValuePo.setTitleId(titleObj.getString("titleId"));
reportInfoAnswerValuePo.setCommunityId(titleObj.getString("communityId"));
ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto = new ReportInfoSettingTitleValueDto();
@@ -121,6 +120,7 @@
reportInfoAnswerValuePo.setValueId(valueContent);
reportInfoAnswerValuePo.setTitleId(titleObj.getString("titleId"));
reportInfoAnswerValuePo.setCommunityId(titleObj.getString("communityId"));
+ reportInfoAnswerValuePo.setSettingId(reqJson.getString("settingId"));
ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto = new ReportInfoSettingTitleValueDto();
@@ -147,7 +147,8 @@
ReportInfoAnswerValuePo reportInfoAnswerValuePo = new ReportInfoAnswerValuePo();
reportInfoAnswerValuePo.setAnValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_anValueId));
reportInfoAnswerValuePo.setUserAnId(reportInfoAnswerPo.getUserAnId());
- reportInfoAnswerValuePo.setValueId(valueContent);
+ reportInfoAnswerValuePo.setValueId("-1");
+ reportInfoAnswerValuePo.setSettingId(reqJson.getString("settingId"));
reportInfoAnswerValuePo.setTitleId(titleObj.getString("titleId"));
reportInfoAnswerValuePo.setCommunityId(titleObj.getString("communityId"));
reportInfoAnswerValuePo.setValueContent(valueContent);
@@ -157,14 +158,10 @@
return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨澶辫触");
}
}
-
- if (flag > 0) {
- return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
- }
}
- return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
}
}
--
Gitblit v1.8.0