diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index 7f2bde48..e2840b93 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -132,7 +132,7 @@ public class PayDraftingGroupSubItemController extends JeroController page = new Page<>(pageNo, pageSize); List listNeedInvoice = new ArrayList<>(); -// if(!Objects.isNull(payDraftingGroupSubItem.getNeedInvoice())){ -// // 需要发票 : 3为 需要发票,小程序需要 -// if(Objects.equals(payDraftingGroupSubItem.getNeedInvoice(), PayProjectCommon.NEED_INVOICE3)){ -// listNeedInvoice.add(1); -// listNeedInvoice.add(2); -// }else{ -// listNeedInvoice.add(payDraftingGroupSubItem.getNeedInvoice()); -// } -// } if(!StringUtils.isBlank(payDraftingGroupSubItem.getChargeProject())){ payDraftingGroupSubItem.setChargeProject(oConvertUtils.replaceAllPercent(payDraftingGroupSubItem.getChargeProject())); } @@ -167,7 +158,7 @@ public class PayDraftingGroupSubItemController extends JeroController listProjectIds = new ArrayList<>(); - // 工作组的企业联系人 + // 起草组的企业联系人 LambdaQueryWrapper queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getContactsId,sysUser.getId()); List listPayDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts); @@ -175,52 +166,6 @@ public class PayDraftingGroupSubItemController extends JeroController listProjectId = listPayDraftingGroupSubItemContacts.stream().map(PayDraftingGroupSubItemContacts::getDraftingGroupSubId).collect(Collectors.toList()); listProjectIds.addAll(listProjectId); } - - // 邮寄联系人 - LambdaQueryWrapper queryPayMailBill = new LambdaQueryWrapper<>(); - queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId()); - List listPayMailBill = payMailBillService.list(queryPayMailBill); - if(!CollectionUtils.isEmpty(listPayMailBill)){ - List listId = listPayMailBill.stream().map(PayMailBill::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryPayMailBillProject = new LambdaQueryWrapper<>(); - queryPayMailBillProject.in(PayMailBillProject::getBillId,listId); - List listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject); - if(!CollectionUtils.isEmpty(listPayMailBillProject)){ - List listProjectId = listPayMailBillProject.stream().map(PayMailBillProject::getProjectId).collect(Collectors.toList()); - listProjectIds.addAll(listProjectId); - } - } - // 打包的企业联系人和打包联系人 - LambdaQueryWrapper queryPayPackCompany = new LambdaQueryWrapper<>(); - queryPayPackCompany.eq(PayPackCompany::getCompanyContactId,sysUser.getId()).or() - .eq(PayPackCompany::getPackContactId,sysUser.getId()); - List listPayPackCompany = payPackCompanyService.list(queryPayPackCompany); - if(!CollectionUtils.isEmpty(listPayPackCompany)){ - List listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryPayPackCompanyProject = new LambdaQueryWrapper<>(); - queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId); - queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType, PayProjectCommon.PROJECT_TYPE2); - List listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject); - if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){ - List listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList()); - listProjectIds.addAll(listId); - } - } - // 关联合同的签订单位联系人 - LambdaQueryWrapper queryPayIncomeContract = new LambdaQueryWrapper<>(); - queryPayIncomeContract.eq(PayIncomeContract::getSignedContactsId,sysUser.getId()); - List listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract); - if(!CollectionUtils.isEmpty(listPayIncomeContract)){ - List listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); - queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId); - queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE2); - List listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); - if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){ - List listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList()); - listProjectIds.addAll(listProjectId); - } - } List listProjectIdsNew = new ArrayList<>(); if(!CollectionUtils.isEmpty(listProjectIds)){ listProjectIdsNew = listProjectIds.stream().distinct().collect(Collectors.toList()); @@ -232,8 +177,6 @@ public class PayDraftingGroupSubItemController extends JeroController list = pageList.getRecords(); List listIds = list.stream().map(PayDraftingGroupSubItem::getDraftingGroupId).collect(Collectors.toList()); @@ -241,7 +184,7 @@ public class PayDraftingGroupSubItemController extends JeroController listPayDraftingGroup = payDraftingGroupService.list(queryPayDraftingGroup); if(CollectionUtils.isEmpty(listPayDraftingGroup)){ - return Result.error("工作组不存在"); + return Result.error("起草组不存在"); } List listString = listPayDraftingGroup.stream().map(PayDraftingGroup::getPrincipalIdA).collect(Collectors.toList()); LambdaQueryWrapper querySysUser = new LambdaQueryWrapper<>(); @@ -249,12 +192,6 @@ public class PayDraftingGroupSubItemController extends JeroController listSysUser = sysUserService.list(querySysUser); list.forEach(p->{ -// if(Objects.isNull(p.getReceivableAmount())){ -// p.setReceivableAmount(new BigDecimal("0.00")); -// } -// if(Objects.isNull(p.getPaidAmount())){ -// p.setPaidAmount(new BigDecimal("0.00")); -// } List listPrincipalIdA = listPayDraftingGroup.stream().filter(item->Objects.equals(item.getId(),p.getDraftingGroupId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listPrincipalIdA)){ if(!CollectionUtils.isEmpty(listSysUser)){ @@ -331,12 +268,12 @@ public class PayDraftingGroupSubItemController extends JeroController edit(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) { StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml index 4594047e..e96a25a5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml @@ -73,18 +73,9 @@ AND pwg.drafting_group_project like concat('%',concat(#{payDraftingGroupSubItem.chargeProject},'%')) - - AND pwgs.pack = #{payDraftingGroupSubItem.pack} - AND pwg.year = #{payDraftingGroupSubItem.year} - - AND pwgs.need_invoice in - - #{item} - - AND pwgs.id in @@ -103,18 +94,9 @@ AND pwg.drafting_group_project like concat('%',concat(#{payDraftingGroupSubItem.chargeProject},'%')) - - AND pwgs.pack = #{payDraftingGroupSubItem.pack} - AND pwg.year = #{payDraftingGroupSubItem.year} - - AND pwgs.need_invoice in - - #{item} - - and pwgs.charge_company_id = #{companyId} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index e2ceb5a4..edb0f73d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -1,11 +1,15 @@ package com.jero.drafting.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.common.ProjectCommon; +import com.jero.common.dto.PaySendContactsMessageDTO; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.ContractCreateProjectSendMessageService; import com.jero.common.service.RolePermissionService; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ImportExcelUtil; @@ -26,6 +30,7 @@ import com.jero.drafting.service.IPayDraftingGroupSubItemService; import com.jero.drafting.vo.CheckVo; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -43,6 +48,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -80,6 +86,8 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl