qxp

suishenbang-system/src/main/java/com/dgtly/system/domain/SignerAccount.java

@@ -34,6 +34,10 @@ public class SignerAccount {
 		this.authorizedAccountId = authorizedAccountId;
 	}
 
+	public SignerAccount(String signerAccountId) {
+		this.signerAccountId = signerAccountId;
+	}
+
 	public SignerAccount() {
 	}
 	

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/EsignController.java

@@ -259,6 +259,8 @@ public class EsignController extends ApiBaseController {
         Boolean success = obj.getBoolean("success");
         if (success) {
             int result = userService.updateIsAuthentication("1", accountId);
+            /*设置静默签署*/
+            signService.signAuth(accountId);
             if (result > 0) {
                 return AjaxResult.success().putKV("result", result);
             } else {
@@ -310,6 +312,8 @@ public class EsignController extends ApiBaseController {
         String accountId = obj.getString("accountId");
         Boolean success = obj.getBoolean("success");
         if (success) {
+            /*设置静默签署*/
+            signService.signAuth(accountId);
             int result = customersExtService.updateCustomersIsAuthentication("1", accountId);
             if (result > 0) {
                 return AjaxResult.success().putKV("result", result);

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/IEsignSignService.java

@@ -26,6 +26,15 @@ public interface IEsignSignService {
      */
     public String processStart(String flowId);
 
+    /**
+     * @description: 设置静默签署
+     * @param: [accountId]
+     * @return: java.lang.String
+     * @author: qxm
+     * @date: 2020/10/12 16:05
+     */
+    public String signAuth(String accountId);
+
     /**
      * @description: 查询签署人列表
      * @param: [flowId]

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/EsignSignServiceImpl.java

@@ -82,6 +82,22 @@ public class EsignSignServiceImpl implements IEsignSignService {
         JSONObject jsonObject = eSignHttpUtil.doPutGetJson(ESignUrl.ProcessStartUrl, json,flowId);
         return jsonObject.toJSONString();
     }
+
+    /**
+     * @description: 设置静默签署
+     * @param: [accountId]
+     * @return: java.lang.String
+     * @author: qxm
+     * @date: 2020/10/29 17:18
+     */
+    @Override
+    public String signAuth(String accountId) {
+        JSONObject json = new JSONObject();
+//        json.put("flowId", flowId);
+        JSONObject jsonObject = eSignHttpUtil.doPostGetJson(ESignUrl.signAuthUrl, json,accountId);
+        return jsonObject.toJSONString();
+    }
+
     /**
      * @description: 查询签署人列表
      * @param: [flowId]
@@ -225,13 +241,13 @@ public class EsignSignServiceImpl implements IEsignSignService {
         // 签署方信息
         // 平台方
         PosBeanInfo posBean1 = new PosBeanInfo("1", posX, posY); // 签署位置
-        SignfieldInfo signfield1 = new SignfieldInfo(true,"2", fileId, null, null, null, posBean1, null); // 签署区（签署主体是公司）
+        SignfieldInfo signfield1 = new SignfieldInfo(true, fileId, null, null, null, posBean1, null); // 签署区（签署主体是公司）
 //        SignfieldInfo signfield1 = new SignfieldInfo(false, fileId, null, null, null, posBean1, null); // 签署区（个人签署）
         List<SignfieldInfo> signfields = new ArrayList<>();
         signfields.add(signfield1);
 //        SignerAccount signAccount = new SignerAccount(signerAccountId, signerAccountId);//签署方账号
-        SignerAccount signAccount = new SignerAccount(signerAccountId, authorizedAccountId);//签署方账号
-        Signer signer1 = new Signer(true, 1, signAccount, signfields, null); // 签署方
+        SignerAccount signAccount = new SignerAccount(authorizedAccountId);//签署方账号
+        Signer signer1 = new Signer(false, 1, signAccount, signfields, null); // 签署方
         // 用户方
 //        PosBeanInfo posBean2 = new PosBeanInfo("1", 200F, 100F); // 签署位置
 //        SignfieldInfo signfield2 = new SignfieldInfo(false, null, fileId, null, null, null, posBean2, null); // 签署区

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/ESign/ESignUrl.java

@@ -46,6 +46,8 @@ public enum ESignUrl {
     ,updatePersonalAccount("/v1/accounts/%s")
     //公司信息修改
     ,updateThirdParty("/v1/organizations/%s")
+    //设置静默签署
+    ,signAuthUrl("/v1/signAuth/%s")
     ;
     private String url;
     private ESignConfig eSignConfig ;

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/pdf/PDFUtil.java

@@ -253,18 +253,25 @@ public class PDFUtil {
         Paragraph p1 = new Paragraph();
         p1.add(new Chunk(new LineSeparator()));
         document.add(p1);
-        Paragraph paragraph1 = new Paragraph("客户名称： " +receivingNote.getCustomerName() +"                           " +
-        "                                                     运单号： " +receivingNote.getShipmentNumber(), namefont);
+        PdfPTable table1 = createTable(new float[] { 240, 100});
+        table1.addCell(createCell("客户名称： " +receivingNote.getCustomerName(), headfont, Element.ALIGN_LEFT, 1, false));
+        table1.addCell(createCell("运单号： " +receivingNote.getShipmentNumber(), headfont, Element.ALIGN_LEFT, 1, false));
+        table1.addCell(createCell("收货地址收货地址收货地址收货地址收货地址收货地址收货地址收货地址收货地址收货地址收货地址收货地址收货地址收货地址： " +receivingNote.getShipToAddress(), headfont, Element.ALIGN_LEFT, 1, false));
+        table1.addCell(createCell("经办人： " +receivingNote.getAgent(), headfont, Element.ALIGN_LEFT, 1, false));
+        document.add(table1);
+//        Paragraph paragraph1 = new Paragraph("客户名称： " +receivingNote.getCustomerName() +"                           " +
+//        "                                                     运单号： " +receivingNote.getShipmentNumber(), namefont);
+        Paragraph paragraph1 = new Paragraph();
         paragraph1.setLeading(20f); //行间距
         paragraph1.setSpacingBefore(5f); //设置段落上空白
         paragraph1.setSpacingAfter(5f); //设置段落下空白
         document.add(paragraph1);
-        Paragraph paragraph2 = new Paragraph( "收货地址： " +receivingNote.getShipToAddress()+"                           " +
-                "                                                     经办人： " +receivingNote.getAgent(), namefont);
-        paragraph2.setLeading(20f); //行间距
-        paragraph2.setSpacingBefore(5f); //设置段落上空白
-        paragraph2.setSpacingAfter(5f); //设置段落下空白
-        document.add(paragraph2);
+//        Paragraph paragraph2 = new Paragraph( "收货地址： " +receivingNote.getShipToAddress()+"                           " +
+//                "                                                     经办人： " +receivingNote.getAgent(), namefont);
+//        paragraph2.setLeading(20f); //行间距
+//        paragraph2.setSpacingBefore(5f); //设置段落上空白
+//        paragraph2.setSpacingAfter(5f); //设置段落下空白
+//        document.add(paragraph2);
         /*Paragraph paragraphNumber = new Paragraph("订单号： " +docNumber+"", textfont);
         paragraphNumber.setLeading(20f); //行间距
         paragraphNumber.setSpacingBefore(5f); //设置段落上空白
@@ -288,9 +295,9 @@ public class PDFUtil {
         gotoP.setReference("#top");
         //document.add(gotoP);
         // 添加图片
-        //Image image = Image.getInstance("https://img-blog.csdn.net/20180801174617455?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl8zNzg0ODcxMA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70");
-        //image.setAlignment(Image.ALIGN_CENTER);
-        //image.scalePercent(40); //依照比例缩放
+//        Image image = Image.getInstance("https://img-blog.csdn.net/20180801174617455?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl8zNzg0ODcxMA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70");
+//        image.setAlignment(Image.ALIGN_CENTER);
+//        image.scalePercent(40); //依照比例缩放
         //document.add(image);
         int size = 0;
         // 表格