diff --git a/after.sql b/after.sql new file mode 100644 index 0000000..2f749ae --- /dev/null +++ b/after.sql @@ -0,0 +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 diff --git a/doc/report.ftl b/doc/report.ftl index 37bc386..36062d5 100644 --- a/doc/report.ftl +++ b/doc/report.ftl @@ -77,7 +77,7 @@ ${company.companyName} - ${company.businessAmount}元 + ${company.contractAmount}元 <#list company.businessList as item> diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java index fa43c41..d022a63 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java @@ -35,7 +35,6 @@ import java.util.Map; @RequiredArgsConstructor @RestController @RequestMapping("/business/home") -@SaIgnore public class HomeController extends BaseController { private final HomeService homeService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsApproverRecordController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsApproverRecordController.java index 835fc88..01270e9 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsApproverRecordController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsApproverRecordController.java @@ -34,7 +34,6 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/approverRecord") -@SaIgnore public class PsApproverRecordController extends BaseController { private final IPsApproverRecordService psApproverRecordService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java index 40a1958..e0a395b 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java @@ -39,7 +39,6 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/companyInfo") -@SaIgnore public class PsCompanyInfoController extends BaseController { private final IPsCompanyInfoService psCompanyInfoService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java index 19b6ed1..f97a13d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java @@ -42,7 +42,6 @@ import javax.management.Query; @RequiredArgsConstructor @RestController @RequestMapping("/business/contractInfo") -@SaIgnore public class PsContractInfoController extends BaseController { private final IPsContractInfoService psContractInfoService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractOperateController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractOperateController.java index d4f5ea0..ec528fd 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractOperateController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractOperateController.java @@ -39,7 +39,6 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/business/contractOperate") -@SaIgnore public class PsContractOperateController extends BaseController { private final IPsContractPayService payService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractPayController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractPayController.java index 4b4d265..4af9d6d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractPayController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractPayController.java @@ -37,7 +37,6 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor @RestController @RequestMapping("/business/contractPay") -@SaIgnore public class PsContractPayController extends BaseController { private final IPsContractPayService psContractPayService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java index 1903a4e..861547d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java @@ -38,7 +38,6 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/customInfo") -@SaIgnore public class PsCustomController extends BaseController { private final IPsCustomInfoService psCustomInfoService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java index 0443535..244572e 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java @@ -34,7 +34,6 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/business/home") -@SaIgnore public class PsHomeController extends BaseController { private final IPsCustomInfoService psCustomInfoService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryConfigController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryConfigController.java index e478fb3..0ea53aa 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryConfigController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryConfigController.java @@ -35,7 +35,6 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/salaryConfig") -@SaIgnore public class PsSalaryConfigController extends BaseController { private final IPsSalaryConfigService psSalaryConfigService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryController.java index 59f932e..7dcf8a5 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryController.java @@ -34,7 +34,6 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/salary") -@SaIgnore public class PsSalaryController extends BaseController { private final IPsSalaryService psSalaryService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java index 59d8293..97fa2d9 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java @@ -40,7 +40,6 @@ import java.util.Map; @RequiredArgsConstructor @RestController @RequestMapping("/business/task") -@SaIgnore public class PsTaskController extends BaseController { private final IPsTaskService psTaskMainService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java index f371af4..40b4dbc 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java @@ -32,7 +32,6 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/taskWorkRecord") -@SaIgnore public class PsTaskWorkRecordController extends BaseController { private final IPsTaskWorkRecordService psTaskWorkRecordService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/ServiceConfigController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/ServiceConfigController.java index 4f6a2c9..47af5d3 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/ServiceConfigController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/ServiceConfigController.java @@ -22,7 +22,7 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/business/serviceConfig") -@SaIgnore +//@SaIgnore public class ServiceConfigController { private final IServiceConfigService configService; /** diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java index 7507ce0..3309cb1 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyInfoVo.java @@ -78,6 +78,22 @@ public class PsCompanyInfoVo implements Serializable { * 法人电话号 */ 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/service/approver/impl/SignApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/SignApproverServiceImpl.java index b05e206..154c998 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/SignApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/SignApproverServiceImpl.java @@ -12,6 +12,7 @@ import com.pusong.business.domain.vo.PsApproverRecordVo; import com.pusong.business.domain.vo.PsCompanyInfoVo; import com.pusong.business.domain.vo.PsContractBusinessVo; import com.pusong.business.domain.vo.PsContractInfoVo; +import com.pusong.business.enums.ApproverStatusEnum; import com.pusong.business.enums.ApproverTypeEnum; import com.pusong.business.enums.CommonStatusEnum; import com.pusong.business.mapper.PsApproverRecordMapper; @@ -53,6 +54,8 @@ public class SignApproverServiceImpl extends ApproverAbstractServiceImpl { PsContractInfoVo vo = contractInfoService.queryContractByCode(psApproverRecord.getContractCode()); //合同信息bo PsContractInfoBo bo = new PsContractInfoBo(); + bo.setSignStatus(CommonStatusEnum.SUCCESS.getCode()); + bo.setContactPersonName(vo.getContactPersonName()); //合同信息 PsContractInfo info = new PsContractInfo(); BeanUtils.copyProperties(vo, info); 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 9071462..6059cad 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 @@ -323,6 +323,13 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { */ @Transactional public boolean updateContractByCode(PsContractInfoBo updateBo){ + if (updateBo.getFirstPartyType() == PsContractInfoBo.FIRSTPARTYTYPE.INDIVIDUALS.getType()){ + updateBo.setContactPersonName(updateBo.getCompanyInfoBo().getLegalPersonName()); + updateBo.setContactPersonPhone(updateBo.getCompanyInfoBo().getLegalPersonPhone()); + updateBo.setContactPersonIdcard(updateBo.getCompanyInfoBo().getLegalPersonIdcard()); +// bo.setCompanyInfoBo(null); + } + //1获取合同详情 PsContractInfoVo old = queryContractByCode(updateBo.getContractCode()); //2校验状态 @@ -628,10 +635,13 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { //合同标题 map.put(PdfGenerator.HEAD, head); //是否签章 - map.put(PdfGenerator.SIGN, StringUtils.equals(CommonStatusEnum.SUCCESS.getCode(),add.getSignStatus())); + map.put(PdfGenerator.SIGN, StringUtils.equals(CommonStatusEnum.SUCCESS.getCode(), add.getSignStatus())); - String path = System.getProperty("user.dir") + "/" + (StringUtils.isBlank(bo.getCompanyInfoBo().getCompanyName()) ? "" : bo.getCompanyInfoBo().getCompanyName() + "-")+add.getContractCode()+".pdf"; - log.info(JSON.toJSONString(map)); + String path = System.getProperty("user.dir") + "/" + + (StringUtils.isBlank(bo.getCompanyInfoBo().getCompanyName()) ? bo.getContactPersonName() + "-" : bo.getCompanyInfoBo().getCompanyName() + "-") + + add.getContractCode() + + (CommonStatusEnum.SUCCESS.getCode().equals(bo.getSignStatus()) ? "-已盖章" : "-未盖章") + + ".pdf"; // path = "D:/王立帅/临时/output.pdf"; PdfGenerator.makePdf(map, path, TenplateEnum.CONTRACT.getName()); File file = new File(path); diff --git a/已完成-2024100913505557-未盖章.pdf b/已完成-2024100913505557-未盖章.pdf new file mode 100644 index 0000000..d86b0bd Binary files /dev/null and b/已完成-2024100913505557-未盖章.pdf differ