hejinbo 2 vuotta sitten
vanhempi
commit
c7fad71ae2

+ 0
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SealSignRecordMapper.java Näytä tiedosto

@@ -1,7 +1,6 @@
1 1
 package com.ruoyi.wisdomarbitrate.mapper;
2 2
 
3 3
 import com.ruoyi.common.utils.bean.SealSignRecord;
4
-import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
5 4
 import org.apache.ibatis.annotations.Mapper;
6 5
 
7 6
 @Mapper

+ 9
- 7
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Näytä tiedosto

@@ -12,6 +12,7 @@ import com.google.gson.JsonArray;
12 12
 import com.google.gson.JsonObject;
13 13
 import com.ruoyi.common.annotation.DataScope;
14 14
 import com.ruoyi.common.constant.CaseApplicationConstants;
15
+import com.ruoyi.common.core.domain.AjaxResult;
15 16
 import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
16 17
 import com.ruoyi.common.core.domain.entity.SysDept;
17 18
 
@@ -723,8 +724,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
723 724
                     for (CaseAttach caseAttach : caseAttachList) {
724 725
                         if (caseAttach.getAnnexType() == 3) {
725 726
                             String annexPath = caseAttach.getAnnexPath();
726
-                            //String path = "/home/ruoyi/" + annexPath;
727
-                            String path ="D:\\home\\仲裁裁决书模板.docx";
727
+                            String path = "/home/ruoyi/" + annexPath;
728
+                            System.out.println("这是查询到的裁决书路径"+path);
729
+                            //String path ="D:\\home\\仲裁裁决书模板.docx";
728 730
                             //获取文件上传地址
729 731
                             EsignHttpResponse response = SaaSAPIFileUtils.getUploadUrl(path);
730 732
                             String body = response.getBody();
@@ -751,7 +753,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
751 753
                                         Gson gson = new Gson();
752 754
                                         JsonObject positionsJsonObject = gson.fromJson(positions.getBody(), JsonObject.class);
753 755
                                         JsonObject positionsData = positionsJsonObject.getAsJsonObject("data");
754
-                                        String keywordPositions = positionsData.get("keywordPositions").getAsString();
756
+                                        String keywordPositions = positionsData.get("keywordPositions").toString();
755 757
                                         //发起签署
756 758
                                         sealSignRecord.setFilename(fileName);
757 759
                                         String arbitratorId = caseApplication2.getArbitratorId();
@@ -764,8 +766,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
764 766
                                             sealSignRecord.setPensonName(sysUser.getNickName());
765 767
                                         }
766 768
                                         sealSignRecord.setOrgnizeName("西安云美电子科技有限公司");
767
-                                        sealSignRecord.setOrgnizeNamePsnAccount("秦桃则");
768
-                                        sealSignRecord.setOrgnizeName("西安云美电子科技有限公司");
769 769
                                         sealSignRecord.setOrgnizeNamePsnAccount("17691338406");
770 770
                                         sealSignRecord.setOrgnizeNamepsnName("韩超勃");
771 771
                                         //解析文件签名印章位置
@@ -773,7 +773,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
773 773
                                         for (int i = 0; i < jsonArray.size(); i++) {
774 774
                                             JSONObject jsonObject3 = jsonArray.getJSONObject(i);
775 775
                                             String keyword = jsonObject3.getString("keyword");
776
-                                            if (keyword.equals("仲裁员")){
776
+                                            if (keyword.equals("仲裁员:")){
777 777
                                                 //签名
778 778
                                                 JSONArray positionsArray = jsonObject3.getJSONArray("positions");
779 779
                                                 // 遍历 positionsArray 中的每个元素
@@ -807,7 +807,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
807 807
                                         }
808 808
                                         EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord);
809 809
                                         JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody());
810
-                                        if (jsonObject1.getIntValue("code")==0){
810
+                                        if (jsonObject3.getIntValue("code")==0){
811 811
                                             //获取签署流程ID
812 812
                                             JSONObject data1 = jsonObject3.getJSONObject("data");
813 813
                                             String signFlowId = data1.getString("signFlowId");
@@ -816,6 +816,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
816 816
                                             sealSignRecord.setSignFlowid(signFlowId);
817 817
                                             sealSignRecord.setSignFlowStatus(1);//待签名
818 818
                                             sealSignRecordMapper.insertSealSignRecord(sealSignRecord);
819
+                                        }else {
820
+                                            throw new ServiceException("发起签署流程失败,请检查参数是否有误");
819 821
                                         }
820 822
                                     }
821 823
                                 }

+ 1
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SealSignRecordMapper.xml Näytä tiedosto

@@ -5,7 +5,7 @@
5 5
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.SealSignRecordMapper">
6 6
     <insert id="insertSealSignRecord"  useGeneratedKeys="true" keyProperty="id">
7 7
         INSERT INTO seal_sign_record (file_id, file_name, sign_flow_id , penson_account
8
-        ,penson_name,orgnize_name,org_name_psn_acc,org_name_psn_name,position_page_psn
8
+        ,penson_name,orgnize_name,orgn_name_psn_acc,orgn_name_psn_name,position_pagepsn
9 9
         ,position_xpsn,position_ypsn,position_pageorg,position_xorg,position_yorg,case_appli_id
10 10
         ,sign_flow_status)
11 11
         VALUES (#{fileid}, #{filename}, #{signFlowid},#{pensonAccount},#{pensonName},#{orgnizeName}