修改bug

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -46,6 +48,11 @@ public class HouseholdContractController extends BaseController {
     HouseholdContractServiceImpl householdContractServiceImpl;
     @Value("${regionalCompanies.company.seq}")
     private Long regionalCompanies;
+    @Autowired
+    QiyuesuoServiceImpl qiyuesuoServiceImpl;
+    @Autowired
+      HouseholdContractMapper householdContractMapper;
+
     /**
      * 新增
      *
@@ -95,8 +102,17 @@ public class HouseholdContractController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<HouseholdContractDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(householdContractServiceImpl.queryBySeq(sequenceNbr));
+	public ResponseModel<HouseholdContract> selectOne(@PathVariable Long sequenceNbr) {
+
+        HouseholdContract householdContract = householdContractMapper.selectById(sequenceNbr);
+
+	    if(householdContract.getContractLockId()!=null&&householdContract.getContractUrl()==null){
+
+         String url=   qiyuesuoServiceImpl.getdownloadUrl(householdContract.getContractLockId());
+         householdContract.setContractUrl(url);
+            householdContractMapper.updateById(householdContract);
+        }
+	    return ResponseHelper.buildResponse(householdContract);
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/QiyuesuoServiceImpl.java

@@ -3,9 +3,11 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.qiyuesuo.sdk.v2.SdkClient;
 import com.qiyuesuo.sdk.v2.bean.*;
+import com.qiyuesuo.sdk.v2.bean.vo.DocumentUrlVO;
 import com.qiyuesuo.sdk.v2.exception.BaseSdkException;
 import com.qiyuesuo.sdk.v2.json.JSONUtils;
 import com.qiyuesuo.sdk.v2.request.*;
+import com.qiyuesuo.sdk.v2.response.ContractDownloadUrlResult;
 import com.qiyuesuo.sdk.v2.response.DocumentAddResult;
 import com.qiyuesuo.sdk.v2.response.MiniappTicketResult;
 import com.qiyuesuo.sdk.v2.response.SdkResponse;
@@ -207,7 +209,7 @@ public class QiyuesuoServiceImpl {
             result = responseObj.getResult();
             logger.info("添加合同文档成功，文档ID:{}", JSON.toJSONString(result));
         } else {
-            logger.info("请求失败，错误码:{}，错误信息:{}", responseObj.getCode(), responseObj.getMessage());
+            throw new RuntimeException("请求失败");
         }
 
         return  result;
@@ -224,11 +226,39 @@ public class QiyuesuoServiceImpl {
         if(responseObj.getCode() == 0) {
             logger.info("合同发起成功");
         } else {
-            logger.info("请求失败，错误码:{}，错误信息:{}", responseObj.getCode(), responseObj.getMessage());
+            throw new RuntimeException("请求失败");
         }
         return responseObj;
 
 
     }
 
+
+    public  String getdownloadUrl(Long contractId ) {
+
+          String url=null;
+        SdkClient sdkClient = new SdkClient(serverUrl, accessKey, accessSecret);
+        ContractDownloadUrlRequest downloadRequest = new ContractDownloadUrlRequest(contractId);
+        String response = sdkClient.service(downloadRequest);
+        SdkResponse<ContractDownloadUrlResult> responseObj = JSONUtils.toQysResponse(response, ContractDownloadUrlResult.class);
+        if (responseObj.getCode().equals(0)) {
+
+            List<DocumentUrlVO> downloadUrls = responseObj.getResult().getDownloadUrls();
+            for (DocumentUrlVO vo : downloadUrls) {
+                if("CONTRACT".equals(vo.getDownloadItems())){
+                    url= vo.getDownloadUrl();
+                }
+            }
+        } else {
+            throw new RuntimeException("请求失败");
+        }
+      return url;
+    }
+
+
+
+
+
+
+
 }