diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 26bd250f..eac4fd02 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -10,11 +10,23 @@ import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.mapper.PayMailBillMapper; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; +import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.mapper.PayMeetingSituationMapper; +import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.TbMemberProjectSubitem; +import com.jero.member.mapper.PayMemberProjectSubitemMapper; +import com.jero.member.mapper.TbMemberProjectSubitemMapper; import com.jero.payment.entity.PayPaymentRecord; +import com.jero.project.entity.PayCommonProject; +import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.mapper.PayCommonProjectMapper; +import com.jero.project.mapper.PayWorkingGroupSubItemMapper; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -31,6 +43,16 @@ public class PayMailBillServiceImpl extends ServiceImpl selectMailBillVO(String projectId) { @@ -56,9 +78,17 @@ public class PayMailBillServiceImpl extends ServiceImpl addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes){ + String[] projectIdArray = projectIds.split(","); String[] projectTypeArray = projectTypes.split(","); + //校验不同项目是否属于同一个公司 + String res=checkCompanyProject(projectIdArray,projectTypeArray); + if(!"success".equals(res)){ + return Result.error(res); + } + + for (int i = 0; i < projectIdArray.length; i++) { if(PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(projectIdArray[i]))){ @@ -86,4 +116,73 @@ public class PayMailBillServiceImpl extends ServiceImpl