Merge remote-tracking branch 'origin/master'

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));

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java

@@ -84,4 +84,6 @@ public interface DgComplianceInvestigationMapper extends BaseMapper<DgCompliance
     AttacheAndABUserIdPO getAttacheAndABByBusinessId(Integer businessId);
 
     List<DgNoticeListResponse> selectComplianceList(String userId, List<String> roleIdlist);
+
+    Integer getCUserId(Integer businessId);
 }

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;
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java

@@ -32,5 +32,4 @@ public interface IDgComplianceInvestigationService extends IService<DgCompliance
     Boolean excelExport(HttpServletResponse response, List<String> ids);
 
     String getFileUrl(String[] fileUrls);
-
 }

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<DgComplian
                 dgComplianceInvestigationInfoResponse.setOpinion(dgComplianceInvestigation.getOpinion());
             }
         }
+        // 获取C角姓名
+        Integer userId = this.getBaseMapper().getCUserId(this.getComplianceInvestigation(iid).getBusinessId());
+        if (userId != null) {
+            Integer[] userIds = new Integer[1];
+            userIds[0] = userId;
+            ResponseResult<List<EmployeeVO>> 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<DgComplian
      * 将接收的数组图片拼装成字符串类型
      */
     @Override
+    @Transactional
     public String getFileUrl(String[] fileUrls) {
         StringBuilder fileUrl = new StringBuilder();
         if (null != fileUrls && fileUrls.length != 0) {

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml

@@ -218,4 +218,9 @@
         </where>
     </select>
 
+    <!-- 根据业务id获取C角名称 -->
+    <select id="getCUserId" parameterType="integer" resultType="integer">
+        SELECT user_id FROM dg_compliance_investigation WHERE business_id = #{businessId} AND role_id = 69
+    </select>
+
 </mapper>