mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生成合同

Browse Source
This commit is contained in:
1073413548 2024-09-04 16:46:05 +08:00
parent 4dee483aac
commit ba4a622643
5 changed files with 155 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyQueryVo.java Normal file
View File

@ -0,0 +1,144 @@
package com.pusong.business.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pusong.business.domain.PsCompanyInfo;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 公司信息视图对象 ps_company_info
*
* @author wls
* @date 2024-07-29
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = PsCompanyInfo.class)
public class PsCompanyQueryVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 公司ID
*/
private Long id;
/**
* 客户id
*/
private Long customId;
/**
* 公司名称
*/
private String companyName;
/**
* 公司地址
*/
private String companyAdress;
/**
* 公司开户行
*/
private String companyAccountBank;
/**
* 公司开户行地址
*/
private String companyAccountBankAdress;
/**
* 法人姓名
*/
private String legalPersonName;
/**
* 法人证件号
*/
private String legalPersonIdcard;
/**
* 法人电话号
*/
private String legalPersonPhone;
/**
* 更新时间
*/
private Date updateTime;
/**
* 纳税人识别号
*/
private String customerNum;
/**
* 纳税人资格
*/
private String customerCert;
/**
* 个税密码
*/
private String companyPersonPassword;
/**
* 税务密码
*/
private String companyTaxPassword;
/**
* 开户行客户经理电话
*/
private String companyBankManagerPhone;
/**
* 刻章公司名称
*/
private String madeSignCompanyName;
/**
* 公司地址详情
*/
private String companyAdressDetail;
/**
* 账套号
*/
private String financeAccountNo;
/**
* 社保开户时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date socialStartDate;
/**
* 公积金开户时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date providentStartDate;
/**
* 营业执照开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date licenseStartDate;
/**
* 营业执照结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date licenseEndDate;
/**
* 经营范围
*/
private String companyScope;
/**
* 注册资金
*/
private BigDecimal registerAmount;
/**
* 注册类型
*/
private String registerType;
/**
* 发票类型
*/
private String billType;
}

7
pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java
View File

@ -1,8 +1,14 @@
package com.pusong.business.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pusong.business.domain.PsApproverRecord;
import com.pusong.business.domain.PsCompanyInfo;
import com.pusong.business.domain.vo.PsApproverRecordVo;
import com.pusong.business.domain.vo.PsCompanyInfoVo;
import com.pusong.common.mybatis.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
/**
* 公司信息Mapper接口
@ -12,4 +18,5 @@ import com.pusong.common.mybatis.core.mapper.BaseMapperPlus;
*/
public interface PsCompanyInfoMapper extends BaseMapperPlus<PsCompanyInfo, PsCompanyInfoVo> {
Page<PsApproverRecordVo> selectPageList(@Param("page") Page<PsApproverRecord> page, @Param(Constants.WRAPPER) Wrapper<PsApproverRecord> queryWrapper);
}

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java
View File

@ -103,7 +103,7 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
res.getRecords().forEach(item->{
item.setResidualMoney(item.getContractAmount().subtract(item.getPayMoney()));
//装填回款周期
List<PsContractPayVo> payList = queryListByContractCode(item.getBusinessId(),"1", PayStatusEnum.SUCCESS);
List<PsContractPayVo> payList = queryListByContractCode(item.getContractCode(),"1", PayStatusEnum.SUCCESS);
if(CollectionUtils.isNotEmpty(payList)){
item.setPeriod(DateUtils.calWorkDate(payList.get(0).getPayDate(),payList.get(payList.size()-1).getPayDate()));
}

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
View File

@ -68,6 +68,8 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
* @return 公司信息列表
*/
public List<PsCompanyInfoVo> queryPageList(PsCompanyQueryBo bo, PageQuery pageQuery){
return null;
}

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java
View File

@ -431,7 +431,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
Long num = contractInfoMapper.selectCount(Wrappers.<PsContractInfo>lambdaQuery().eq(PsContractInfo::getCustomId, customerId)
.notIn(PsContractInfo::getContractStatus, List.of(ContractStatusEnum.INIT.getCode(), ContractStatusEnum.SUCCESS.getCode()))
.ne(PsContractInfo::getIsCancel, CommonStatusEnum.SUCCESS.getCode()));
if(num>=0){
if(num>0){
throw new ServiceException("有未完成的合同，无法终止合作");
}
psCustomInfo.setCustomStatus(CustomerStatusEnum.STOP.getCode());