合同章大小，公司添加联系人信息

after.sql

@@ -1,3 +1,3 @@
-alter table ps_company_info add `contact_person_name` varchar(20) NOT NULL DEFAULT '0' comment '联系人姓名';
+alter table ps_company_info add `contact_person_name` varchar(15) comment '联系人姓名';
-alter table ps_company_info add `contact_person_phone` varchar(30) NOT NULL DEFAULT '0' comment '联系人电话';
+alter table ps_company_info add `contact_person_phone` varchar(15) comment '联系人电话';
-alter table ps_company_info add `contact_person_idcard` varchar(30) NOT NULL DEFAULT '0' comment '联系人身份证号';
+alter table ps_company_info add `contact_person_idcard` varchar(20) comment '联系人身份证号';

pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/PDFBuilder.java

@@ -118,7 +118,7 @@ public class PDFBuilder extends PdfPageEventHelper {
     //加半章图片
     public void addSign(PdfWriter writer){
         String psth;
-        if(writer.getPageNumber()%2 == 1){
+        if(writer.getPageNumber() % 2 == 1){
             psth = imagepath+"/doc/image/leftZ.png";
         }else/* if (writer.getPageNumber() == 2)*/{
             psth = imagepath+"/doc/image/rightZ.png";
@@ -129,7 +129,7 @@ public class PDFBuilder extends PdfPageEventHelper {
         Image image;
         try {
             image = Image.getInstance(psth);
-            image.scaleAbsolute(75,150);
+            image.scaleAbsolute(75 * 0.75f,150 * 0.75f);
             PdfContentByte content = writer.getDirectContentUnder();
             content.beginText();
             image.setAbsolutePosition(450+75,400);

pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/PdfGenerator.java

@@ -81,8 +81,8 @@ public class PdfGenerator {
         // 生成PDF
         PDFBuilder builder = new PDFBuilder(data.get(HEAD),data.get(SIGN),System.getProperty("user.dir"));
         generatePdf(html, pdfpath, builder);
-
     }
+
     private static String processTemplate(Template template, Map<String, Object> data) throws IOException, TemplateException {
         StringWriter writer = new StringWriter();
         template.process(data, writer);

pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsCompanyInfo.java

@@ -65,6 +65,22 @@ public class PsCompanyInfo extends TenantEntity {
      * 法人电话号
      */
     private String legalPersonPhone;
+
+    /**
+     * 签约个人时联系人姓名
+     */
+    private String contactPersonName;
+
+    /**
+     * 签约个人时联系人手机号
+     */
+    private String contactPersonPhone;
+
+    /**
+     * 签约个人时联系人身份证号
+     */
+    private String contactPersonIdcard;
+
     /**
      * 纳税人识别号
      */

pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyInfoBo.java

@@ -8,6 +8,7 @@ import com.pusong.common.mybatis.core.domain.BaseEntity;
 import com.pusong.common.core.validate.AddGroup;
 import com.pusong.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
@@ -73,6 +74,25 @@ public class PsCompanyInfoBo {
      */
     private String legalPersonPhone;
 
+    /**
+     * 签约个人时联系人姓名
+     */
+    @AutoMapping(target = "contactPersonName")
+    private String contactPersonName;
+
+    /**
+     * 签约个人时联系人手机号
+     */
+    @AutoMapping(target = "contactPersonPhone")
+    private String contactPersonPhone;
+
+    /**
+     * 签约个人时联系人身份证号
+     */
+    @AutoMapping(target = "contactPersonIdcard")
+    private String contactPersonIdcard;
+
+
     /**
      * 纳税人识别号
      */

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java

@@ -649,7 +649,8 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService {
             SysOssVo sysOssVo = ossService.upload(new File(path));
             ossId = sysOssVo.getOssId();
             //删除临时的合同文件
-            if(file.exists())file.delete();
+            if(file.exists())
+                file.delete();
             //是否保存合同信息
             if(isSave){
                 //更新合同id