From 4f3b666cd625381e4acb07d8ae4d68ae9554b1b8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 06 十一月 2023 18:12:49 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/api/RepairApi.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 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
index 650e66c..3b29b2d 100755
--- a/service-community/src/main/java/com/java110/community/api/RepairApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RepairApi.java
@@ -44,7 +44,6 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
-
/**
* 鎶ヤ慨璇勪环
*
@@ -57,7 +56,6 @@
return appraiseRepairBMOImpl.appraiseRepair(appraiseDto);
}
-
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -68,23 +66,16 @@
*/
@RequestMapping(value = "/saveRepairReturnVisit", method = RequestMethod.POST)
public ResponseEntity<String> saveRepairReturnVisit(@RequestHeader(value = "user-id") String userId,
-
@RequestBody JSONObject reqJson) {
-
Assert.hasKeyAndValue(reqJson, "repairId", "璇锋眰鎶ユ枃涓湭鍖呭惈repairId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "visitType", "璇锋眰鎶ユ枃涓湭鍖呭惈婊℃剰搴�");
Assert.hasKeyAndValue(reqJson, "context", "璇锋眰鎶ユ枃涓湭鍖呭惈context");
-
UserDto userDto = new UserDto();
userDto.setUserId(userId);
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
-
- Assert.listOnlyOne(userDtos,"鏈寘鍚敤鎴�");
-
-
- String userName = userDtos.get(0).getName();
-
+ Assert.listOnlyOne(userDtos, "鏈寘鍚敤鎴�");
+ String userName = userDtos.get(0).getName();
RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
repairReturnVisitPo.setVisitPersonId(userId);
repairReturnVisitPo.setVisitPersonName(userName);
@@ -101,14 +92,11 @@
*/
@RequestMapping(value = "/updateRepairReturnVisit", method = RequestMethod.POST)
public ResponseEntity<String> updateRepairReturnVisit(@RequestBody JSONObject reqJson) {
-
Assert.hasKeyAndValue(reqJson, "repairId", "璇锋眰鎶ユ枃涓湭鍖呭惈repairId");
Assert.hasKeyAndValue(reqJson, "visitPersonId", "璇锋眰鎶ユ枃涓湭鍖呭惈visitPersonId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "context", "璇锋眰鎶ユ枃涓湭鍖呭惈context");
Assert.hasKeyAndValue(reqJson, "visitId", "visitId涓嶈兘涓虹┖");
-
-
RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
return updateRepairReturnVisitBMOImpl.update(repairReturnVisitPo);
}
@@ -124,10 +112,7 @@
@RequestMapping(value = "/deleteRepairReturnVisit", method = RequestMethod.POST)
public ResponseEntity<String> deleteRepairReturnVisit(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
-
Assert.hasKeyAndValue(reqJson, "visitId", "visitId涓嶈兘涓虹┖");
-
-
RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
return deleteRepairReturnVisitBMOImpl.delete(repairReturnVisitPo);
}
@@ -158,7 +143,6 @@
repairReturnVisitDto.setTel(tel);
repairReturnVisitDto.setRepairType(repairType);
repairReturnVisitDto.setState(state);
-
return getRepairReturnVisitBMOImpl.get(repairReturnVisitDto);
}
}
--
Gitblit v1.8.0