From bc93aa423424c0e7ff66e4ab9ab643fcd0d7ac41 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Fri, 8 Jan 2021 14:17:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=B0=83=E6=9F=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=9F=A5=E7=9C=8BC=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DgComplianceInvestigationController.java | 3 ++- .../mapper/DgComplianceInvestigationMapper.java | 2 ++ .../DgComplianceInvestigationInfoResponse.java | 2 ++ .../service/IDgComplianceInvestigationService.java | 1 - .../impl/DgComplianceInvestigationServiceImpl.java | 12 ++++++++++++ .../guarantee/DgComplianceInvestigationMapper.xml | 5 +++++ 6 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java index bfbd043e..826d94ab 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java @@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationCheckRequest; import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; +import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationInfoResponse; import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService; import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; @@ -79,7 +80,7 @@ public class DgComplianceInvestigationController { * 查看 */ @GetMapping("/query") - @ApiOperation(value = "查看", notes = "查看", response = DgComplianceInvestigation.class) + @ApiOperation(value = "查看", notes = "查看", response = DgComplianceInvestigationInfoResponse.class) public ResponseResult query(@RequestParam("iid") Integer iid) { return ResponseResult.SUCCESS(iDgComplianceInvestigationService.query(iid)); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java index 6f70564d..cb8a9a2f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java @@ -84,4 +84,6 @@ public interface DgComplianceInvestigationMapper extends BaseMapper selectComplianceList(String userId, List roleIdlist); + + Integer getCUserId(Integer businessId); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java index 338af416..5d8037bf 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java @@ -28,4 +28,6 @@ public class DgComplianceInvestigationInfoResponse implements Serializable { @ApiModelProperty("合规调查的审核(调查)意见") private String opinion; + @ApiModelProperty("C角姓名") + private String CName; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java index 55d75907..33b0647f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java @@ -32,5 +32,4 @@ public interface IDgComplianceInvestigationService extends IService ids); String getFileUrl(String[] fileUrls); - } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java index ab1dd4f9..b9b8de4d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java @@ -20,6 +20,7 @@ import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider; import com.daqing.framework.domain.guarantee.GuaranteeCode; import com.daqing.framework.domain.guarantee.po.AttacheAndABUserIdPO; +import com.daqing.framework.domain.hrms.ext.EmployeeVO; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.CommonCode; @@ -528,6 +529,16 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl> result = hrmsFeignService.listEmpNameByUserId(userIds); + if (result.getData() != null && result.getData().size() != 0) { + dgComplianceInvestigationInfoResponse.setCName(result.getData().get(0).getName()); + } + } return dgComplianceInvestigationInfoResponse; } @@ -557,6 +568,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl + + +