Преглед на файлове

Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

hejinbo преди 2 години
родител
ревизия
1a51edfa8a

+ 3
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Целия файл

1755
                                                 }
1755
                                                 }
1756
                                             }
1756
                                             }
1757
                                         }
1757
                                         }
1758
-                                        DeptIdentify deptIdentify1 = new DeptIdentify();
1758
+                                        /*DeptIdentify deptIdentify1 = new DeptIdentify();
1759
                                         deptIdentify1.setSealStatus(1); // 印章状态为启用
1759
                                         deptIdentify1.setSealStatus(1); // 印章状态为启用
1760
                                         //根据机构名称查询部门id
1760
                                         //根据机构名称查询部门id
1761
                                         SysDept sysDept = new SysDept();
1761
                                         SysDept sysDept = new SysDept();
1772
                                                 String sealId = identify.getSealId();
1772
                                                 String sealId = identify.getSealId();
1773
                                                 sealIds.add(sealId);
1773
                                                 sealIds.add(sealId);
1774
                                             }
1774
                                             }
1775
-                                        }
1776
-                                        EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord, sealIds);
1775
+                                        }*/
1776
+                                        EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord);
1777
                                         JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody());
1777
                                         JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody());
1778
                                         if (jsonObject3.getIntValue("code") == 0) {
1778
                                         if (jsonObject3.getIntValue("code") == 0) {
1779
                                             //获取签署流程ID
1779
                                             //获取签署流程ID

+ 3
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java Целия файл

147
      * @return
147
      * @return
148
      * @throws EsignDemoException
148
      * @throws EsignDemoException
149
      */
149
      */
150
-    public static EsignHttpResponse createByFile(SealSignRecord sealSignRecord, List<String> sealIds) throws EsignDemoException {
150
+    public static EsignHttpResponse createByFile(SealSignRecord sealSignRecord) throws EsignDemoException {
151
         String apiaddr = "/v3/sign-flow/create-by-file";
151
         String apiaddr = "/v3/sign-flow/create-by-file";
152
 
152
 
153
         String fileId = sealSignRecord.getFileid();
153
         String fileId = sealSignRecord.getFileid();
167
         String positionPageorg = sealSignRecord.getPositionPageorg();
167
         String positionPageorg = sealSignRecord.getPositionPageorg();
168
         double positionXorg = sealSignRecord.getPositionXorg();
168
         double positionXorg = sealSignRecord.getPositionXorg();
169
         double positionYorg = sealSignRecord.getPositionYorg();
169
         double positionYorg = sealSignRecord.getPositionYorg();
170
+        String availableSealId = "209af82b-5f87-4e0a-b0d8-cc4923b6e652";
170
 
171
 
171
 
172
 
172
         String jsonParm = "{\n" +
173
         String jsonParm = "{\n" +
245
                 "                        \"freeMode\": false,\n" +
246
                 "                        \"freeMode\": false,\n" +
246
 
247
 
247
                 "                        \"availableSealIds\": [\n" +
248
                 "                        \"availableSealIds\": [\n" +
248
-                "                               \"" + sealIds + "\"\n" +
249
+                "                               \"" + availableSealId + "\"\n" +
249
                 "                           ],\n" +
250
                 "                           ],\n" +
250
 
251
 
251
 
252