区分查看和修改时查看详情接口

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java

@@ -406,4 +406,17 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
 
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }
+
+    /**
+     * 根据业务id查询业务申请详情
+     * @param id
+     * @return
+     */
+    @Log(detail = "小程序业务申请详情",level = 3,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.SELECT)
+    @GetMapping("/xcxBusinessAppDetail")
+    @ApiOperation(value = "小程序业务申请详情")
+    public ResponseResult xcxBusinessAppDetail(Integer id){
+        BusinessApplicationDetailResponse response = applyAmountInfoService.xcxBusinessAppDetail(id);
+        return ResponseResult.SUCCESS(response);
+    }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationDetailResponse.java

@@ -32,8 +32,8 @@ public class BusinessApplicationDetailResponse implements Serializable {
     /**
      * 企业详细
      */
-/*    @ApiModelProperty(value = "企业详细")
+    @ApiModelProperty(value = "企业详细")
-    private LinkedHashMap linkedHashMap;*/
+    private LinkedHashMap linkedHashMap;
 
     /**
      * 附件详细

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

@@ -39,4 +39,6 @@ public interface IDgApplyAmountInfoService extends IService<DgApplyAmountInfo> {
     DgApplyField queryApplyField();
 
     Boolean updateApplyField(DgApplyField dgApplyField);
+
+    BusinessApplicationDetailResponse xcxBusinessAppDetail(Integer id);
 }

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

@@ -300,6 +300,19 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
     @Override
     public BusinessApplicationDetailResponse businessApplicationDetail(Integer id) {
+        //根据id查询业务id
+        DgApplyAmountList dgApplyAmountList = dgApplyAmountListMapper.selectById(id);
+        BusinessApplicationDetailResponse response = publicBusinessCommon(id);
+
+        //根据业务id查询备份企业信息
+        DgBusinessCompany dgBusinessCompany = dgBusinessCompanyMapper.selectOne(new QueryWrapper<DgBusinessCompany>()
+                .eq("business_id", dgApplyAmountList.getBusinessId()));
+
+        response.setDgBusinessCompany(dgBusinessCompany);
+        return response;
+    }
+
+    public BusinessApplicationDetailResponse publicBusinessCommon(Integer id) {
         //根据id查询业务id
         DgApplyAmountList dgApplyAmountList = dgApplyAmountListMapper.selectById(id);
         //根据主键id查询业务申请详细信息
@@ -316,10 +329,6 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         }
         dgApplyAmountInfo.setRemark(dgApplyAmountList.getApplyContent());
 
-        //根据业务id查询备份企业信息
-        DgBusinessCompany dgBusinessCompany = dgBusinessCompanyMapper.selectOne(new QueryWrapper<DgBusinessCompany>()
-                .eq("business_id", dgApplyAmountList.getBusinessId()));
-
         //查询附件详细，附件关联业务主键id
         DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(dgApplyAmountList.getBusinessId());
 
@@ -355,29 +364,45 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         }
 /*        if(arr1List2.size()>0){
             if(!arr1List2.get(0).toString().equals("[]"))*/
-            dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
+        dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-            dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
+        dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-            dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
+        dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-            dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
+        dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-            dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
+        dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-            dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
+        dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-            dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
+        dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-            dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
+        dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-            dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
+        dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-            dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
+        dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-            dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
+        dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-            dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+        dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
-            dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+        dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
-            dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+        dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
 //        }
 
         BusinessApplicationDetailResponse businessApplicationDetail= new BusinessApplicationDetailResponse();
         businessApplicationDetail.setDgApplyAmountInfo(dgApplyAmountInfo);
         businessApplicationDetail.setDgEnclosureInfo(dgEnclosureInfo);
-        businessApplicationDetail.setDgBusinessCompany(dgBusinessCompany);
         return businessApplicationDetail;
     }
 
+    @Override
+    public BusinessApplicationDetailResponse xcxBusinessAppDetail(Integer id) {
+        //根据id查询业务id
+        DgApplyAmountList dgApplyAmountList = dgApplyAmountListMapper.selectById(id);
+        BusinessApplicationDetailResponse response = publicBusinessCommon(id);
+
+        DgApplyAmountInfo dgApplyAmountInfo = dgApplyAmountInfoMapper.selectById(dgApplyAmountList.getBusinessId());
+        DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
+        applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
+        //根据企业id查询企业详情
+        ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
+
+        LinkedHashMap linkedList = (LinkedHashMap)result.getData();
+        response.setLinkedHashMap(linkedList);
+        return response;
+    }
+
     @Override
     public int updateBusinessApplication(BusinessApplicationRequest businessApplication) {
         //根据业务id以及type查询对应的记录