接口测试修正

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchPaperController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchConsultFeedbackDto;
@@ -7,6 +8,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchRepairFeedbackDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchSaveFeedbackDto;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchPaperServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +54,16 @@ public class DispatchPaperController extends BaseController {
 	public ResponseModel<DispatchSaveFeedbackDto> getSaveFeedback(@PathVariable Long alertId) {
 
 		DispatchSaveFeedbackDto dispatchSaveFeedbackDto = dispatchPaperServiceImpl.getDispatchSaveFeedbackDtoByAlertId(alertId);
+		ReginParams reginParams =getSelectedOrgInfo();
+		AgencyUserModel user = reginParams.getUserModel();
+		if(dispatchSaveFeedbackDto.getSaveFeedbackUid() == null && dispatchSaveFeedbackDto.getSaveFeedbackUser() == null) {
+			dispatchSaveFeedbackDto.setSaveFeedbackUser(user.getUserName());
+			dispatchSaveFeedbackDto.setSaveFeedbackUid(user.getUserId());
+		}
+		if(dispatchSaveFeedbackDto.getFeedbackUid() == null && dispatchSaveFeedbackDto.getFeedbackUname() == null) {
+			dispatchSaveFeedbackDto.setFeedbackUid(user.getUserId());
+			dispatchSaveFeedbackDto.setFeedbackUname(user.getUserName());
+		}
 		return ResponseHelper.buildResponse(dispatchSaveFeedbackDto);
 	}
 
@@ -81,6 +93,16 @@ public class DispatchPaperController extends BaseController {
 	public ResponseModel<DispatchRepairFeedbackDto> getRepairFeedBack(@PathVariable Long alertId) {
 
 		DispatchRepairFeedbackDto dispatchRepairFeedbackDto = dispatchPaperServiceImpl.getDispatchRepairFeedbackDtoByAlertId(alertId);
+		ReginParams reginParams =getSelectedOrgInfo();
+		AgencyUserModel user = reginParams.getUserModel();
+		if(dispatchRepairFeedbackDto.getFixFeedbackUid() == null && dispatchRepairFeedbackDto.getFixFeedbackUname() == null) {
+			dispatchRepairFeedbackDto.setFixFeedbackUname(user.getUserName());
+			dispatchRepairFeedbackDto.setFixFeedbackUid(user.getUserId());
+		}
+		if(dispatchRepairFeedbackDto.getFeedbackUid() == null && dispatchRepairFeedbackDto.getFeedbackUname() == null) {
+			dispatchRepairFeedbackDto.setFeedbackUid(user.getUserId());
+			dispatchRepairFeedbackDto.setFeedbackUname(user.getUserName());
+		}
 		return ResponseHelper.buildResponse(dispatchRepairFeedbackDto);
 	}
 
@@ -109,6 +131,18 @@ public class DispatchPaperController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "通过警情id 获取 投诉回访相关信息", notes = "通过警情id 获取 投诉回访相关信息")
 	public ResponseModel<DispatchConsultFeedbackDto> getConsultFeedBack(@PathVariable Long alertId) {
 		DispatchConsultFeedbackDto dispatchConsultFeedbackDto = dispatchPaperServiceImpl.getDispatchConsultFeedbackDtoByAlertId(alertId);
+		ReginParams reginParams =getSelectedOrgInfo();
+		AgencyUserModel user = reginParams.getUserModel();
+		if(dispatchConsultFeedbackDto.getConsultFeedbackUid() == null && dispatchConsultFeedbackDto.getConsultFeedbackUname() == null) {
+			dispatchConsultFeedbackDto.setConsultFeedbackUname(user.getUserName());
+			dispatchConsultFeedbackDto.setConsultFeedbackUid(user.getUserId());
+		}
+		if(dispatchConsultFeedbackDto.getFeedbackUid() == null && dispatchConsultFeedbackDto.getFeedbackUname() == null) {
+			dispatchConsultFeedbackDto.setFeedbackUid(user.getUserId());
+			dispatchConsultFeedbackDto.setFeedbackUname(user.getUserName());
+		}
+
+
 		return ResponseHelper.buildResponse(dispatchConsultFeedbackDto);
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueProcessController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
 import java.util.List;
 
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -67,7 +68,22 @@ public class RescueProcessController extends BaseController {
 	@GetMapping(value = "/alert/{alertId}")
 	@ApiOperation(httpMethod = "GET",value = "根据警情id 获取救援过程表",  notes = "根据警情id 获取救援过程表")
 	public ResponseModel<RescueProcessDto> selectOne(@PathVariable Long alertId) {
-	    return ResponseHelper.buildResponse(rescueProcessServiceImpl.getProcessByAlertId(alertId));
+		ReginParams reginParams =getSelectedOrgInfo();
+		AgencyUserModel user = reginParams.getUserModel();
+		RescueProcessDto dto = rescueProcessServiceImpl.getProcessByAlertId(alertId);
+		if(dto.getDispatchUserId() == null && dto.getDispatchUserName() == null) {
+			dto.setDispatchUserId(user.getUserId());
+			dto.setDispatchUserName(user.getUserName());
+		}
+		if(dto.getArriveUserId() == null && dto.getArriveUserName() == null) {
+			dto.setArriveUserId(user.getUserId());
+			dto.setArriveUserName(user.getUserName());
+		}
+		if(dto.getRescueUserId() == null && dto.getRescueUserName() == null) {
+			dto.setRescueUserId(user.getUserId());
+			dto.setRescueUserName(user.getUserName());
+		}
+	    return ResponseHelper.buildResponse(dto);
 	}
 
 }