修改契约锁定位问题

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

@@ -102,10 +102,12 @@ public class QiyuesuoServiceImpl {
       String companyContact=contractDataDto.getCompanyContact();
       Long emplateId= contractDataDto.getEmplateId();
       String  companykeyword= contractDataDto.getCompanykeyword();
+      Integer companykeywordIndex=contractDataDto.getCompanyKeywordIndex();
       Integer  companyPage= contractDataDto.getCompanyPage();
       Double  companyOffsetX= contractDataDto.getCompanyOffsetX();
       Double companyOffsetY= contractDataDto.getCompanyOffsetY();
       String  personalkeyword= contractDataDto.getPersonalkeyword();
+      Integer personalkeywordIndex=contractDataDto.getPersonalKeywordIndex();
       Integer personalPage= contractDataDto.getPersonalPage();
       Double  personalOffsetX= contractDataDto.getPersonalOffsetX();
       Double  personalOffsetY= contractDataDto.getPersonalOffsetY();
@@ -174,17 +176,19 @@ public class QiyuesuoServiceImpl {
       stamper.setDocumentId(documentAddResult.getDocumentId());
       stamper.setKeyword(companykeyword);
       stamper.setType("COMPANY");
-      stamper.setPage(companyPage);
+     // stamper.setPage(companyPage);
       stamper.setOffsetX(companyOffsetX);
       stamper.setOffsetY(companyOffsetY);
+      stamper.setKeywordIndex(companykeywordIndex);
       Stamper stamper2 = new Stamper();
       stamper2.setSignatoryId(SignatoryId);
       stamper2.setDocumentId(documentAddResult.getDocumentId());
       stamper2.setKeyword(personalkeyword);
       stamper2.setType("PERSONAL");
-      stamper2.setPage(personalPage);
+     // stamper2.setPage(personalPage);
       stamper2.setOffsetX(personalOffsetX);
       stamper2.setOffsetY(personalOffsetY);
+      stamper2.setKeywordIndex(personalkeywordIndex);
       List<Stamper> stampers = new ArrayList<>();
       stampers.add(stamper);
       stampers.add(stamper2);
@@ -208,10 +212,10 @@ public class QiyuesuoServiceImpl {
         logger.info("添加合同文档参数"+JSON.toJSONString(params));
         DocumentAddByTemplateRequest request = new DocumentAddByTemplateRequest(contractId,
                 emplateId , params, subject);
-        logger.info("添加合同文档前", JSON.toJSONString(request));
+        logger.info("添加合同文档前"+ JSON.toJSONString(request));
         String response = sdkClient.service(request);
         responseObj = JSONUtils.toQysResponse(response, DocumentAddResult.class);
-        logger.info("添加合同文档后", JSON.toJSONString(responseObj));
+        logger.info("添加合同文档后"+ JSON.toJSONString(responseObj));
 
         }catch (Exception e){
             e.printStackTrace();
@@ -234,14 +238,14 @@ public class QiyuesuoServiceImpl {
 
         SdkClient sdkClient = new SdkClient(serverUrl, accessKey, accessSecret);
         ContractSendRequest request = new ContractSendRequest(contractId, stampers);
-        logger.info("请求契约锁发起合同前", JSON.toJSONString(request));
+        logger.info("请求契约锁发起合同前"+JSON.toJSONString(request));
         String response = sdkClient.service(request);
         responseObj = JSONUtils.toQysResponse(response);
        }catch (Exception e){
            e.printStackTrace();
            throw new BadRequest("请求契约锁发起合同接口失败");
        }
-        logger.info("请求契约锁发起合同后", JSON.toJSONString(responseObj));
+        logger.info("请求契约锁发起合同后"+JSON.toJSONString(responseObj));
         if(responseObj!=null&&responseObj.getCode() == 0) {
             logger.info("请求契约锁发起合同成功");
         } else {