From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 service-report/src/main/java/com/java110/report/bmo/reportInfoAnswerValue/impl/SaveReportInfoAnswerValueBMOImpl.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 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..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
@@ -63,9 +63,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 +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