From b8e7bb1791ff41be5ee8150cc46af082d7444a65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 31 五月 2023 01:02:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java b/service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java
index dd3a9c7..c4fb9fb 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java
@@ -1,7 +1,7 @@
package com.java110.report.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.reportInfoBackCity.ReportInfoBackCityDto;
+import com.java110.dto.reportInfoAnswer.ReportInfoBackCityDto;
import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
import com.java110.report.bmo.reportInfoBackCity.IDeleteReportInfoBackCityBMO;
import com.java110.report.bmo.reportInfoBackCity.IGetReportInfoBackCityBMO;
@@ -38,12 +38,21 @@
*/
@RequestMapping(value = "/saveReportInfoBackCity", method = RequestMethod.POST)
public ResponseEntity<String> saveReportInfoBackCity(@RequestBody JSONObject reqJson) {
-
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-
-
ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
+ /*//姝ｅ垯鍖归厤韬唤璇佸彿鏄惁鏄纭殑锛�15浣嶆垨鑰�17浣嶆暟瀛�+鏁板瓧/x/X
+ if (reqJson.containsKey("idCard") && !StringUtil.isEmpty(reqJson.getString("idCard"))) {
+ if (reqJson.getString("idCard").matches("^\\d{15}|\\d{17}[\\dxX]$")) {
+ ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
+ return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
+ } else {
+ throw new IllegalArgumentException("韬唤璇佸彿鏍煎紡涓嶅锛�");
+ }
+ } else {
+ ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
+ return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
+ }*/
}
/**
--
Gitblit v1.8.0