From 00edeb5ec8b1b19398b917ededb987f5d85d50f0 Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Wed, 15 Dec 2021 19:08:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCommonProjectController.java | 16 +++++++ .../PayWorkingGroupSubItemController.java | 41 ++++++++--------- .../jero/project/entity/PayCommonProject.java | 8 ++++ .../entity/PayWorkingGroupSubItem.java | 8 ++++ .../IPayWorkingGroupSubItemService.java | 9 ++++ .../PayWorkingGroupSubItemServiceImpl.java | 45 +++++++++++++++++++ 6 files changed, 107 insertions(+), 20 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 2b70b738..a49c37c3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -25,6 +25,7 @@ import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; import com.jero.common.vo.PayMailBillVO; @@ -259,6 +260,10 @@ public class PayCommonProjectController extends JeroController pageList = payCommonProjectService.page(page, queryWrapper); if(!CollectionUtils.isEmpty(pageList.getRecords())){ List list = pageList.getRecords(); + List listString = list.stream().map(PayCommonProject::getPrincipalId).collect(Collectors.toList()); + LambdaQueryWrapper querySysUser = new LambdaQueryWrapper<>(); + querySysUser.in(SysUser::getId,listString); + List listSysUser = sysUserService.list(querySysUser); list.forEach(p->{ if(Objects.isNull(p.getReceivableAmount())){ p.setReceivableAmount(new BigDecimal("0.00")); @@ -266,6 +271,17 @@ public class PayCommonProjectController extends JeroController listSysUserNew = listSysUser.stream().filter(item->Objects.equals(item.getId(),p.getPrincipalId())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listSysUserNew)){ + if(!StringUtils.isBlank(listSysUserNew.get(0).getPhone())){ + p.setPrincipalPhone(PasswordUtil.decrypt(listSysUserNew.get(0).getPhone())); + } + if(!StringUtils.isBlank(listSysUserNew.get(0).getEmail())){ + p.setPrincipalEmail(PasswordUtil.decrypt(listSysUserNew.get(0).getEmail())); + } + } + } }); pageList.setRecords(list); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 4e3ce5ac..f53de0cd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -31,6 +31,8 @@ import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.pack.entity.PayPackCompany; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; @@ -88,6 +90,8 @@ public class PayWorkingGroupSubItemController extends JeroController listString = listPayWorkingGroup.stream().map(PayWorkingGroup::getPrincipalIdA).collect(Collectors.toList()); + LambdaQueryWrapper querySysUser = new LambdaQueryWrapper<>(); + querySysUser.in(SysUser::getId,listString); + List listSysUser = sysUserService.list(querySysUser); + list.forEach(p->{ if(Objects.isNull(p.getReceivableAmount())){ p.setReceivableAmount(new BigDecimal("0.00")); @@ -254,10 +263,20 @@ public class PayWorkingGroupSubItemController extends JeroController listPrincipalIdA = listPayWorkingGroup.stream().filter(item->Objects.equals(item.getId(),p.getWorkingGroupId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listPrincipalIdA)){ + if(!CollectionUtils.isEmpty(listSysUser)){ + List listSysUserNew = listSysUser.stream().filter(item->Objects.equals(item.getId(),listPrincipalIdA.get(0).getPrincipalIdA())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listSysUserNew)){ + if(!StringUtils.isBlank(listSysUserNew.get(0).getPhone())){ + p.setPrincipalPhone(PasswordUtil.decrypt(listSysUserNew.get(0).getPhone())); + } + if(!StringUtils.isBlank(listSysUserNew.get(0).getEmail())){ + p.setPrincipalEmail(PasswordUtil.decrypt(listSysUserNew.get(0).getEmail())); + } + } + } p.setPrincipalName(listPrincipalIdA.get(0).getPrincipalNameA()); p.setYear(listPrincipalIdA.get(0).getYear()); } - }); pageList.setRecords(list); } @@ -439,25 +458,7 @@ public class PayWorkingGroupSubItemController extends JeroController setCharge(@RequestBody SetChargeInput input) { - if (StringUtils.isBlank(input.getIds())) { - return Result.error("id不能为空!"); - } - String[] s = input.getIds().split(","); - for (String s1 : s) { - if (StringUtils.isBlank(s1)) { - return Result.error("id不能为空!"); - } - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); - updatePayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getId,Arrays.asList(s)); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,input.getCharge()); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getReceivableAmount,input.getReceivableAmount()); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeNo,input.getChargeNoticeNo()); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeId,input.getChargeNoticeId()); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername()); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date()); - payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); + payWorkingGroupSubItemService.setCharge(input); return Result.OK("设置收费通知成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 182592bb..e41c0ed0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -61,6 +61,14 @@ public class PayCommonProject implements Serializable { @Excel(name = "项目负责人", width = 15,orderNum = "2") @ApiModelProperty(value = "负责人名称") private String principalName; + /**负责人联系电话*/ + @TableField(exist = false) + @ApiModelProperty(value = "负责人联系电话") + private String principalPhone; + /**负责人邮箱*/ + @TableField(exist = false) + @ApiModelProperty(value = "负责人邮箱") + private String principalEmail; /**来款企业id*/ @ApiModelProperty(value = "来款企业id") @NotEmpty(message = "来款企业id不能为空") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index def12aee..65a3140a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -242,6 +242,14 @@ public class PayWorkingGroupSubItem implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "负责人") private String principalName; + /**负责人联系电话*/ + @TableField(exist = false) + @ApiModelProperty(value = "负责人联系电话") + private String principalPhone; + /**负责人邮箱*/ + @TableField(exist = false) + @ApiModelProperty(value = "负责人邮箱") + private String principalEmail; /** * 运行年份 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java index 00d49ab8..5c603060 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java @@ -101,4 +101,13 @@ public interface IPayWorkingGroupSubItemService extends IService queryCompanyPageList(Page page,PayWorkingGroupSubItem payWorkingGroupSubItem,List listNeedInvoice,List listProjectIds); List importExcelStatistics2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id, ArrayList selections); + /** + * @Description 设置收费通知 + * @Author lqt + * @Date 2021/9/29 + * @Param listProjectIds 项目成员id集合 + * @Return + * @Exception + */ + void setCharge(SetChargeInput input); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index e12e934f..cfe9c15d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -32,6 +32,7 @@ import com.jero.project.entity.*; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; +import com.jero.project.vo.SetChargeInput; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -700,6 +701,50 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl list = payWorkingGroupSubItemService.listByIds(Arrays.asList(s)); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); + // 变更应收金额，重新校验状态 + ProjectStatusVO projectStatusVO = projectDetailService.getStatus(p.getId(),input.getReceivableAmount(),p.getNeedInvoice()); + if(!Objects.isNull(projectStatusVO)){ + if(!Objects.isNull(projectStatusVO.getInAccount())){ + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getInAccount,projectStatusVO.getInAccount()); + } + if(!Objects.isNull(projectStatusVO.getMakeInvoice())){ + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getMakeInvoice,projectStatusVO.getMakeInvoice()); + } + if(!Objects.isNull(projectStatusVO.getMail())){ + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getMail,projectStatusVO.getMail()); + } + } + updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,p.getId()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,input.getCharge()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getReceivableAmount,input.getReceivableAmount()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeNo,input.getChargeNoticeNo()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeId,input.getChargeNoticeId()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date()); + payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); + }); + } + + + } + /** * @Description 删除项目打包关联，临时企业、联系信息 * @Author lqt