Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java

@@ -169,12 +169,13 @@ public class SignAward {
         double positionXorg = sealSignRecord.getPositionXorg();
         double positionYorg = sealSignRecord.getPositionYorg();
 
+        String availableSealId = "209af82b-5f87-4e0a-b0d8-cc4923b6e652";
+
         String jsonParm = "{\n" +
                 "    \"docs\": [\n" +
                 "        {\n" +
                 "            \"fileId\": \"" + fileId +  "\",\n" +
                 "            \"fileName\": \"" + fileName +  "\"\n" +
-
                 "        }\n" +
                 "    ],\n" +
                 "    \"signFlowConfig\": {\n" +
@@ -192,32 +193,24 @@ public class SignAward {
                 "           ]\n" +
                 "       },\n" +
 
-
                 "       \"signConfig\": {\n" +
                 "           \"availableSignClientTypes\":  \"1\"\n" +
                 "       },\n" +
 
-
                 "        \"autoFinish\": true\n" +
                 "    },\n" +
 
                 "    \"signers\": [\n" +
-
                 "          {\n" +
-
                 "            \"psnSignerInfo\": {\n" +
                 "                \"psnAccount\": \"" + psnAccount +  "\",\n" +
-
                 "                \"psnInfo\": {\n" +
                 "                            \"psnName\": \"" + psnName +  "\"\n" +
                 "                        }\n" +
-
                 "            },\n" +
                 "            \"signFields\": [\n" +
                 "                {\n" +
-
                 "                    \"fileId\": \"" + fileId +  "\",\n" +
-
                 "                    \"normalSignFieldConfig\": {\n" +
                 "                        \"autoSign\": false,\n" +
                 "                        \"freeMode\": false,\n" +
@@ -235,31 +228,30 @@ public class SignAward {
                 "            \"signerType\": 0\n" +
                 "        },\n" +
 
-
                 "        {\n" +
                 "            \"orgSignerInfo\": {\n" +
                 "                \"orgName\": \"" + orgName +  "\",\n" +
                 "                \"transactorInfo\": {\n" +
                 "                \"psnAccount\": \"" + orgNamePsnAccount +  "\",\n" +
-
                 "                \"psnInfo\": {\n" +
-
                 "                            \"psnName\": \"" + orgNamepsnName +  "\"\n" +
                 "                        }\n" +
-
                 "                }\n" +
                 "            },\n" +
 
                 "            \"signFields\": [\n" +
                 "                {\n" +
                 "                    \"fileId\": \"" + fileId +  "\",\n" +
-
                 "                    \"normalSignFieldConfig\": {\n" +
                 "                        \"autoSign\": false,\n" +
                 "                        \"freeMode\": false,\n" +
 
-                "                        \"signFieldPosition\": {\n" +
+                "                        \"availableSealIds\": [\n" +
+                "                               \"" + availableSealId +  "\"\n" +
+                "                           ],\n" +
 
+
+                "                        \"signFieldPosition\": {\n" +
                 "                            \"positionPage\": \"" + positionPageorg +  "\",\n" +
                 "                            \"positionX\": " + positionXorg +  ",\n" +
                 "                            \"positionY\": " + positionYorg +  "\n" +