From ba4a622643a737cdaeb6234cae2dd14d510d5498 Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Wed, 4 Sep 2024 16:46:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/domain/vo/PsCompanyQueryVo.java | 144 ++++++++++++++++++ .../business/mapper/PsCompanyInfoMapper.java | 7 + .../impl/ApproverAbstractServiceImpl.java | 2 +- .../impl/PsCompanyInfoServiceImpl.java | 2 + .../service/impl/PsCustomInfoServiceImpl.java | 2 +- 5 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyQueryVo.java diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyQueryVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyQueryVo.java new file mode 100644 index 0000000..2d7c0c6 --- /dev/null +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyQueryVo.java @@ -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; +} diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java index 0533e64..8375544 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java @@ -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 { + Page selectPageList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java index d957287..4b3e86c 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java @@ -103,7 +103,7 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService { res.getRecords().forEach(item->{ item.setResidualMoney(item.getContractAmount().subtract(item.getPayMoney())); //装填回款周期 - List payList = queryListByContractCode(item.getBusinessId(),"1", PayStatusEnum.SUCCESS); + List 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())); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java index f83d3f7..e6c2b76 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java @@ -68,6 +68,8 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService { * @return 公司信息列表 */ public List queryPageList(PsCompanyQueryBo bo, PageQuery pageQuery){ + + return null; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java index d01eef3..def918d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java @@ -431,7 +431,7 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { Long num = contractInfoMapper.selectCount(Wrappers.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());