diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java index 7b76bab5..c36095ff 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java @@ -116,6 +116,8 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.in(PayPackCompanyProject::getProjectId, Arrays.asList(payPackCompanyProject.getProjectIds())); List listPayPackCompanyProjectNew = payPackCompanyProjectService.list(query); + // TODO 将对应的project的待确收金额设为0 + if(!CollectionUtils.isEmpty(listPayPackCompanyProjectNew)){ throw new JeroBootException("项目已被打包!"); } @@ -162,6 +164,31 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { + // 找到工作组 看是否收费,如果不收费则填入默认字段 + payWorkingGroupService.validAndSetDefaultValue(payWorkingGroupSubItem); if (Objects.isNull(payWorkingGroupSubItem.getEstimatedArrivalDate())) { return Result.error("预估到账日期不能为空"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index a5fda272..8401daad 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.project.entity.PayWorkingGroupSearch; import com.jero.project.entity.PayWorkingGroupStatistics; +import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.vo.PayWorkingGroupVO; import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.extension.service.IService; @@ -241,4 +242,10 @@ public interface IPayWorkingGroupService extends IService { List queryListAllProjectMoneyExcel(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList); AllMoney queryAllMoney33(AllProjectStatisticsSearch allProjectStatisticsSearch); + + /** + * 工作组成员添加的时候判断是否是不收费项目,如果是不收费项目则填入默认值 + * @param payWorkingGroupSubItem 工作组成员 + */ + void validAndSetDefaultValue(PayWorkingGroupSubItem payWorkingGroupSubItem); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 61a5c7ac..4c4b4e35 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -708,6 +708,40 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl getAllProjectMoneyStatistics(AllProjectStatisticsSearch allProjectStatisticsSearch, List allMoneyList,