通用项目详情完善

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
-import com.jero.common.service.ProjectPackService;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ValidUtil;
 import com.jero.contract.common.PayIncomeContractCommon;
@@ -21,6 +20,7 @@ import com.jero.contract.service.IPayIncomeContractInstallmentService;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.contract.vo.PayIncomeContractInput;
 import com.jero.contract.vo.ProjectOutput;
+import com.jero.meeting.service.IPayMeetingService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.pack.entity.PayPackCompany;
@@ -44,9 +44,7 @@ import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -89,6 +87,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
     private IPayPackCompanyService payPackCompanyService;
     @Autowired
     private IPayPackCompanyProjectService payPackCompanyProjectService;
+    @Resource
+    private IPayMeetingService payMeetingService;
 
     @Override
     public IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime) {
@@ -306,6 +306,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     }
                     // 验证项目是否已被关联
                     getIncomeContractAssociated(p.getContractId(),p.getProjectId());
+
                     // 合同选择打包 && 企业没有打包，添加打包企业
                     if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) && !Objects.equals(payCommonProject.getPack(),PayIncomeContractCommon.PACK1)){
                         LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
@@ -381,6 +382,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     projectOutput.setReceivableAmount(listPayWorkingGroupSubItem.get(0).getReceivableAmount());
                     break;
                 case PayIncomeContractCommon.PROJECT_TYPE3:
+
+
+
                     // todo 会议项目
                     break;
                 case PayIncomeContractCommon.PROJECT_TYPE4: