diff --git a/after.sql b/after.sql index 2f749ae..0d42df8 100644 --- a/after.sql +++ b/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_phone` varchar(30) NOT NULL DEFAULT '0' comment '联系人电话'; -alter table ps_company_info add `contact_person_idcard` varchar(30) NOT NULL DEFAULT '0' comment '联系人身份证号'; \ No newline at end of file +alter table ps_company_info add `contact_person_name` varchar(15) comment '联系人姓名'; +alter table ps_company_info add `contact_person_phone` varchar(15) comment '联系人电话'; +alter table ps_company_info add `contact_person_idcard` varchar(20) comment '联系人身份证号'; diff --git a/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/PDFBuilder.java b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/PDFBuilder.java index 45d6b59..2c18a21 100644 --- a/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/PDFBuilder.java +++ b/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); diff --git a/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/PdfGenerator.java b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/PdfGenerator.java index dd9fd9c..4e47848 100644 --- a/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/util/PdfGenerator.java +++ b/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 data) throws IOException, TemplateException { StringWriter writer = new StringWriter(); template.process(data, writer); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsCompanyInfo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsCompanyInfo.java index 486d86b..351407b 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/PsCompanyInfo.java +++ b/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; + /** * 纳税人识别号 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyInfoBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyInfoBo.java index 84eb2ad..853120a 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyInfoBo.java +++ b/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; + + /** * 纳税人识别号 */ diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index 6059cad..3630a42 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/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