From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/api/RepairApi.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 32128d1..f9e0a11
--- a/service-community/src/main/java/com/java110/community/api/RepairApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RepairApi.java
@@ -8,6 +8,8 @@
import com.java110.community.bmo.repairReturnVisit.IUpdateRepairReturnVisitBMO;
import com.java110.dto.appraise.AppraiseDto;
import com.java110.dto.repairReturnVisit.RepairReturnVisitDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.repairReturnVisit.RepairReturnVisitPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -15,24 +17,32 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* 鎶ヤ慨 鎺у埗绫�
*/
@RestController
@RequestMapping("/repair")
public class RepairApi {
+
@Autowired
private IAppraiseRepairBMO appraiseRepairBMOImpl;
@Autowired
private ISaveRepairReturnVisitBMO saveRepairReturnVisitBMOImpl;
+
@Autowired
private IUpdateRepairReturnVisitBMO updateRepairReturnVisitBMOImpl;
+
@Autowired
private IDeleteRepairReturnVisitBMO deleteRepairReturnVisitBMOImpl;
@Autowired
private IGetRepairReturnVisitBMO getRepairReturnVisitBMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
/**
@@ -57,16 +67,23 @@
* @path /app/repair/saveRepairReturnVisit
*/
@RequestMapping(value = "/saveRepairReturnVisit", method = RequestMethod.POST)
- public ResponseEntity<String> saveRepairReturnVisit(
- @RequestHeader(value = "user-id") String userId,
- @RequestHeader(value = "user-name") String userName,
- @RequestBody JSONObject reqJson) {
+ 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();
RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
repairReturnVisitPo.setVisitPersonId(userId);
@@ -125,8 +142,10 @@
*/
@RequestMapping(value = "/queryRepairReturnVisit", method = RequestMethod.GET)
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 = "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) {
@@ -135,6 +154,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