From 0f338bf642827ce4e617facb06a7a74ab654edcf Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 21 六月 2022 09:23:26 +0800
Subject: [PATCH] 优化代码

---
 service-community/src/main/java/com/java110/community/api/RepairApi.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 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 b763d34..a6e5e1b
--- a/service-community/src/main/java/com/java110/community/api/RepairApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RepairApi.java
@@ -21,13 +21,16 @@
 @RestController
 @RequestMapping("/repair")
 public class RepairApi {
+
     @Autowired
     private IAppraiseRepairBMO appraiseRepairBMOImpl;
 
     @Autowired
     private ISaveRepairReturnVisitBMO saveRepairReturnVisitBMOImpl;
+
     @Autowired
     private IUpdateRepairReturnVisitBMO updateRepairReturnVisitBMOImpl;
+
     @Autowired
     private IDeleteRepairReturnVisitBMO deleteRepairReturnVisitBMOImpl;
 
@@ -57,15 +60,18 @@
      * @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);
     }
 
@@ -120,8 +126,10 @@
      */
     @RequestMapping(value = "/queryRepairReturnVisit", method = RequestMethod.GET)
     public ResponseEntity<String> queryRepairReturnVisit(@RequestParam(value = "communityId") String communityId,
-                                                         @RequestParam(value = "repairId") String repairId,
-                                                         @RequestParam(value = "repairName") String repairName,
+                                                         @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 +138,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