From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 service-community/src/main/java/com/java110/community/api/RepairApi.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/api/RepairApi.java b/service-community/src/main/java/com/java110/community/api/RepairApi.java
old mode 100644
new mode 100755
index a0fdf66..73a6fa8
--- a/service-community/src/main/java/com/java110/community/api/RepairApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RepairApi.java
@@ -57,15 +57,20 @@
      * @path /app/repair/saveRepairReturnVisit
      */
     @RequestMapping(value = "/saveRepairReturnVisit", method = RequestMethod.POST)
-    public ResponseEntity<String> saveRepairReturnVisit(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> saveRepairReturnVisit(
+            @RequestHeader(value = "user-id") String userId,
+            @RequestHeader(value = "user-name") String userName,
+            @RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "repairId", "璇锋眰鎶ユ枃涓湭鍖呭惈repairId");
-        Assert.hasKeyAndValue(reqJson, "visitPersonId", "璇锋眰鎶ユ枃涓湭鍖呭惈visitPersonId");
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+        Assert.hasKeyAndValue(reqJson, "visitType", "璇锋眰鎶ユ枃涓湭鍖呭惈婊℃剰搴�");
         Assert.hasKeyAndValue(reqJson, "context", "璇锋眰鎶ユ枃涓湭鍖呭惈context");
 
 
         RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
+        repairReturnVisitPo.setVisitPersonId(userId);
+        repairReturnVisitPo.setVisitPersonName(userName);
         return saveRepairReturnVisitBMOImpl.save(repairReturnVisitPo);
     }
 
@@ -122,6 +127,8 @@
     public ResponseEntity<String> queryRepairReturnVisit(@RequestParam(value = "communityId") String communityId,
                                                          @RequestParam(value = "repairId",required = false) String repairId,
                                                          @RequestParam(value = "repairName",required = false) String repairName,
+                                                         @RequestParam(value = "tel",required = false) String tel,
+                                                         @RequestParam(value = "repairType",required = false) String repairType,
                                                          @RequestParam(value = "state") String state,
                                                          @RequestParam(value = "page") int page,
                                                          @RequestParam(value = "row") int row) {
@@ -130,6 +137,9 @@
         repairReturnVisitDto.setRow(row);
         repairReturnVisitDto.setCommunityId(communityId);
         repairReturnVisitDto.setRepairId(repairId);
+        repairReturnVisitDto.setRepairName(repairName);
+        repairReturnVisitDto.setTel(tel);
+        repairReturnVisitDto.setRepairType(repairType);
         repairReturnVisitDto.setState(state);
 
         return getRepairReturnVisitBMOImpl.get(repairReturnVisitDto);

--
Gitblit v1.8.0