From f50eb80d6ffe42a0e48f928303f1a03b46c216f3 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 5 Jul 2024 14:48:45 +0800 Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E9=A2=84=E4=BC=B0?= =?UTF-8?q?=E5=88=B0=E8=B4=A6=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayMemberProjectSubitemController.java | 34 ++++++++++++++++++- .../TbMemberProjectSubitemController.java | 19 ++++++++--- .../member/entity/TbMemberProjectSubitem.java | 14 ++++++-- .../ITbMemberProjectSubitemService.java | 8 +++++ .../vo/TbMemberProjectSubitemEditVO.java | 4 +-- .../controller/PayPackCompanyController.java | 17 ++++++++++ .../PayCommonProjectController.java | 26 +++++++++++++- .../PayWorkingGroupSubItemController.java | 31 +++++++++++++++++ .../entity/PayWorkingGroupSubItem.java | 2 +- .../PayWorkingGroupSubItemServiceImpl.java | 3 +- 10 files changed, 146 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 62188e81..dd2376cc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -2,6 +2,7 @@ package com.jero.member.controller; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.YearMonth; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -36,6 +37,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.member.vo.PayMemberProjectSubitemExcel; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.PayWorkingGroupSubItem; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.apache.commons.collections.CollectionUtils; @@ -87,6 +89,17 @@ public class PayMemberProjectSubitemController extends JeroController parameterMap = req.getParameterMap(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, parameterMap); + // 处理预计到账开始日期，拼接 -01 + if (StringUtils.isNotBlank(payMemberProjectSubitem.getEstimatedArrivalStartDate())) { + String startDate = payMemberProjectSubitem.getEstimatedArrivalStartDate() + "-01"; + payMemberProjectSubitem.setEstimatedArrivalStartDate(startDate); + } + // 处理预计到账结束日期，计算该月最后一天 + if (StringUtils.isNotBlank(payMemberProjectSubitem.getEstimatedArrivalEndDate())) { + YearMonth yearMonth = YearMonth.parse(payMemberProjectSubitem.getEstimatedArrivalEndDate(), DateTimeFormatter.ofPattern("yyyy-MM")); + LocalDate endDate = yearMonth.atEndOfMonth(); + payMemberProjectSubitem.setEstimatedArrivalEndDate(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + } // 预计到账开始日期 String estimatedArrivalStartDate = payMemberProjectSubitem.getEstimatedArrivalStartDate(); // 预计到账结束日期 @@ -112,6 +125,17 @@ public class PayMemberProjectSubitemController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = memberProjectSubitemService.getPage(page, queryWrapper); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ + List list = pageList.getRecords(); + list.forEach(p->{ + // 处理 预估到账日期 字段 ,变为yyyy-MM格式 + if(StringUtils.isNotBlank(p.getEstimatedArrivalDate())){ + String estimatedArrivalDate = p.getEstimatedArrivalDate(); + String formattedDate = estimatedArrivalDate.substring(0, 7); // 截取字符串的前7个字符 "yyyy-MM" + p.setEstimatedArrivalDate(formattedDate); + } + }); + } return Result.OK(pageList); } @@ -170,6 +194,7 @@ public class PayMemberProjectSubitemController extends JeroController page = new Page<>(pageNo, pageSize); + // 处理预计到账开始日期，拼接 -01 + if (StringUtils.isNotBlank(tbMemberProjectSubitem.getEstimatedArrivalDate_begin())) { + String startDate = tbMemberProjectSubitem.getEstimatedArrivalDate_begin() + "-01"; + tbMemberProjectSubitem.setEstimatedArrivalDate_begin(startDate); + } + // 处理预计到账结束日期，计算该月最后一天 + if (StringUtils.isNotBlank(tbMemberProjectSubitem.getEstimatedArrivalDate_end())) { + YearMonth yearMonth = YearMonth.parse(tbMemberProjectSubitem.getEstimatedArrivalDate_end(), DateTimeFormatter.ofPattern("yyyy-MM")); + LocalDate endDate = yearMonth.atEndOfMonth(); + tbMemberProjectSubitem.setEstimatedArrivalDate_end(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + } IPage pageList = tbMemberProjectSubitemService.pageList(page, req, tbMemberProjectSubitem); for (TbMemberProjectSubitem record : pageList.getRecords()) { record.setEmail(PasswordUtil.decrypt(record.getEmail())); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index 440d5a6e..b485c0c4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -174,12 +174,22 @@ public class TbMemberProjectSubitem implements Serializable { private BigDecimal confirmAmount; /**预估到账日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "预估到账日期") - @Excel(name = "预估到账日期", width = 15, format = "yyyy-MM-dd") + @Excel(name = "预估到账日期", width = 15, format = "yyyy-MM") private Date estimatedArrivalDate; + /**预计到账开始日期*/ + @ApiModelProperty(value = "预计到账开始的日期") + @TableField(exist = false) + private String estimatedArrivalDate_begin; + + /**预计到账结束的日期*/ + @ApiModelProperty(value = "预计到账结束的日期") + @TableField(exist = false) + private String estimatedArrivalDate_end; + /**需要发票*/ @Excel(name = "需要发票", width = 15,dicCode = "invoice_type") @ApiModelProperty(value = "需要发票") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index 019f1da0..22188dfa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -536,6 +536,8 @@ public class ITbMemberProjectSubitemService extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap()); String invalidationDateStr = tbMemberProjectSubitem.getInvalidationDateStr(); String effectiveDateStr = tbMemberProjectSubitem.getEffectiveDateStr(); + String estimatedArrivalDateBegin = tbMemberProjectSubitem.getEstimatedArrivalDate_begin(); + String estimatedArrivalDateEnd = tbMemberProjectSubitem.getEstimatedArrivalDate_end(); if (StringUtils.isNotBlank(invalidationDateStr)){ DateTime invalidationDate = DateUtil.parse(invalidationDateStr, DatePattern.NORM_MONTH_PATTERN); queryWrapper.eq("year(invalidation_date)",invalidationDate.year()); @@ -546,6 +548,12 @@ public class ITbMemberProjectSubitemService extends ServiceImpl add(@RequestBody PayPackCompany payPackCompany) { + if (!StringUtils.isBlank(payPackCompany.getEstimatedArrivalDate())) { + payPackCompany.setEstimatedArrivalDate(payPackCompany.getEstimatedArrivalDate() + "-01"); + } StringBuilder msg = ValidUtil.validateAll(payPackCompany); if(!StringUtils.isBlank(msg)){ return Result.error(msg.toString()); @@ -163,6 +172,9 @@ public class PayPackCompanyController extends JeroController edit(@RequestBody PayPackCompany payPackCompany) { + if (!StringUtils.isBlank(payPackCompany.getEstimatedArrivalDate())) { + payPackCompany.setEstimatedArrivalDate(payPackCompany.getEstimatedArrivalDate() + "-01"); + } StringBuilder msg = ValidUtil.validateAll(payPackCompany); if(!StringUtils.isBlank(msg)){ return Result.error(msg.toString()); @@ -351,6 +363,11 @@ public class PayPackCompanyController extends JeroController add(@RequestBody PayCommonProject payCommonProject) { - if (Objects.isNull(payCommonProject.getEstimatedArrivalDate())) { + if (StringUtils.isBlank(payCommonProject.getEstimatedArrivalDate())) { return Result.error("预估到账日期不能为空"); } + // 给预估到账日期字段 yyyy-MM 拼接 -01 以便正确入库 + payCommonProject.setEstimatedArrivalDate(payCommonProject.getEstimatedArrivalDate() + "-01"); StringBuilder msg = ValidUtil.validateAll(payCommonProject); if(!StringUtils.isBlank(msg)){ return Result.error(msg.toString()); @@ -412,6 +434,8 @@ public class PayCommonProjectController extends JeroController add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { + if (!StringUtils.isBlank(payWorkingGroupSubItem.getEstimatedArrivalDate())) { + payWorkingGroupSubItem.setEstimatedArrivalDate(payWorkingGroupSubItem.getEstimatedArrivalDate() + "-01"); + } // 找到工作组 看是否收费，如果不收费则填入默认字段 payWorkingGroupService.validAndSetDefaultValue(payWorkingGroupSubItem); StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem); @@ -472,6 +495,9 @@ public class PayWorkingGroupSubItemController extends JeroController edit(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { + if (!StringUtils.isBlank(payWorkingGroupSubItem.getEstimatedArrivalDate())) { + payWorkingGroupSubItem.setEstimatedArrivalDate(payWorkingGroupSubItem.getEstimatedArrivalDate() + "-01"); + } StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem); if (!StringUtils.isBlank(msg)) { return Result.error(msg.toString()); @@ -746,6 +772,11 @@ public class PayWorkingGroupSubItemController extends JeroController listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsList.stream().filter(o->Objects.equals(workingGroupSubItem.getId(),o.getWorkingGroupSubId())).collect(Collectors.toList()); 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 0ff6e969..13e68a2d 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 @@ -130,7 +130,7 @@ public class PayWorkingGroupSubItem implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "预估到账日期") - @Excel(name = "预估到账日期",width = 15,format = "yyyy-MM-dd") + @Excel(name = "预估到账日期",width = 15,format = "yyyy-MM") private String estimatedArrivalDate; /**实收金额（元）*/ 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 cf651e69..fb15b4ff 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 @@ -793,7 +793,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); } else { try { - LocalDate.parse(estimatedArrivalDate, DateTimeFormatter.ofPattern("yyyy-MM-dd")); + p.setEstimatedArrivalDate(estimatedArrivalDate + "-01"); + LocalDate.parse(estimatedArrivalDate + "-01", DateTimeFormatter.ofPattern("yyyy-MM-dd")); } catch (Exception e) { msg.append("第").append(list.indexOf(p) + 3).append("行预估到账日期格式不正确，请修改。
"); }