From 8db876498c0179e8ffab848237eccd66436ccacc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 13:46:12 +0800
Subject: [PATCH] 优化疫情上报功能
---
service-report/src/main/java/com/java110/report/bmo/reportInfoAnswerValue/impl/SaveReportInfoAnswerValueBMOImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 f4c8bc7..e98db3a 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
@@ -54,18 +54,21 @@
@Java110Transactional
public ResponseEntity<String> save(JSONObject reqJson,String userId) {
- UserDto userDto = new UserDto();
+ /* UserDto userDto = new UserDto();
userDto.setUserId(userId);
List<UserDto> userDtoList = userInnerServiceSMOImpl.getUsers(userDto);
if (userDtoList == null || userDtoList.size() < 1) {
throw new IllegalArgumentException("鏌ヨ鐢ㄦ埛淇℃伅澶辫触锛�");
- }
+ }*/
ReportInfoAnswerPo reportInfoAnswerPo = new ReportInfoAnswerPo();
reportInfoAnswerPo.setUserAnId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userAnId));
reportInfoAnswerPo.setSettingId(reqJson.getString("settingId"));
- reportInfoAnswerPo.setPersonId(userDtoList.get(0).getUserId());
- reportInfoAnswerPo.setPersonName(userDtoList.get(0).getName());
+ 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 +92,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 +125,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 +152,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 +163,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