Merge branch 'dev' into preview

tduck-api/src/main/java/com/tduck/cloud/api/handler/QuestionnaireSubmitSatisfactionProcessor.java

@@ -63,6 +63,7 @@ public class QuestionnaireSubmitSatisfactionProcessor extends AbstractQuestionna
         form.setSocialSecurityAspect((String) resultMap.get("field127"));
         form.setSocialSecurityReason((String) resultMap.get("field128"));
         form.setBasicEducationReason((String) resultMap.get("field135")); // 基础教育不满意原因文本框
+        form.setDissatisfactionReason((String) resultMap.get("field136")); // 对社区不满意的原因是什么
         form.setReporterName(reporterName);
         form.setReporterMobile(reporterMobile);
         form.setFollowUpStatus(followUpStatus);
@@ -76,4 +77,58 @@ public class QuestionnaireSubmitSatisfactionProcessor extends AbstractQuestionna
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "提交失败");
         }
     }
+
+    // @Override
+    // public void process(UserProjectResultEntity result, String userId, HttpServletRequest request) {
+    //     String projectKey = result.getProjectKey();
+    //     String agencyId = result.getAgencyId();
+    //
+    //     Map<String, Object> resultMap = result.getProcessData();
+    //
+    //     String reporterName = (String) resultMap.get("field129");// 姓名
+    //     String reporterMobile = (String) resultMap.get("field130");// 电话
+    //     String followUpStatus = (String) resultMap.get("field131");// 是否接受回访
+    //     String expectFollowUpWay = (String) resultMap.get("field132");// 回访方式
+    //     String addressDetail = (String) resultMap.get("field134");// 详细地址
+    //
+    //     // 将结果通知governance服务，进行持久化
+    //     SubmitQuestionnaireResultFormDTO form = new SubmitQuestionnaireResultFormDTO();
+    //     form.setAgencyId(agencyId);
+    //     form.setQuestionnaireProjectKey(projectKey);
+    //     form.setCultureFacilityEva((String) resultMap.get("field101"));
+    //     form.setCultureAspect((String) resultMap.get("field102"));
+    //     form.setCultureReason((String) resultMap.get("field102other"));
+    //     form.setSportsFacilityEva((String) resultMap.get("field104"));
+    //     form.setSportsAspect((String) resultMap.get("field105"));
+    //     form.setSportsReason((String) resultMap.get("field105other"));
+    //     form.setBasicEducationEva( (String) resultMap.get("field107"));
+    //     form.setMedicalEva((String) resultMap.get("field109"));
+    //     form.setMedicalAspect((String) resultMap.get("field114"));
+    //     form.setMedicalReason((String) resultMap.get("field114other"));
+    //     form.setOldPeopleProvideEva((String) resultMap.get("field118"));
+    //     form.setOldPeopleProvideAspect((String) resultMap.get("field117"));
+    //     form.setOldPeopleProvideReason((String) resultMap.get("field117other"));
+    //     form.setSocialAssistanceEva((String) resultMap.get("field120"));
+    //     form.setSocialAssistanceAspect((String) resultMap.get("field121"));
+    //     form.setSocialAssistanceReason((String) resultMap.get("field121other"));
+    //     form.setEcologicalEnvironmenEva((String) resultMap.get("field123"));
+    //     form.setEcologicalEnvironmenAspect((String) resultMap.get("field124"));
+    //     form.setEcologicalEnvironmenReason((String) resultMap.get("field124other"));
+    //     form.setSocialSecurityEva((String) resultMap.get("field126"));
+    //     form.setSocialSecurityAspect((String) resultMap.get("field127"));
+    //     form.setSocialSecurityReason((String) resultMap.get("field127other"));
+    //     // form.setBasicEducationReason((String) resultMap.get("field135")); // 基础教育不满意原因文本框
+    //     form.setReporterName(reporterName);
+    //     form.setReporterMobile(reporterMobile);
+    //     form.setFollowUpStatus(followUpStatus);
+    //     form.setExpectFollowUpWay(expectFollowUpWay);
+    //     form.setAddressDetail(addressDetail);
+    //
+    //     Result rst = governanceServiceOpenFeignClient.submitQuestionnaireRst(form);
+    //     if (rst.getCode() > 8000) {
+    //         throw new EpmetException(rst.getCode(), null, rst.getMsg());
+    //     } else if (rst.getCode() != 0) {
+    //         throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "提交失败");
+    //     }
+    // }
 }