diff --git a/src/main/java/com/rj/controller/LbPurchaseApplyController.java b/src/main/java/com/rj/controller/LbPurchaseApplyController.java index aeed859..2dcf6f7 100644 --- a/src/main/java/com/rj/controller/LbPurchaseApplyController.java +++ b/src/main/java/com/rj/controller/LbPurchaseApplyController.java @@ -95,9 +95,10 @@ public class LbPurchaseApplyController { @RequestParam(required = false) String applyPhone, @RequestParam(required = false) String colleagueName, @RequestParam(required = false) String teamLeader, + @RequestParam(required = false) String teamBigLeader, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate applyDate) { Map result = lbPurchaseApplyService.pageQuery( - current, size, tenantId, applyUser, applyPhone, colleagueName, teamLeader, applyDate + current, size, tenantId, applyUser, applyPhone, colleagueName, teamLeader, teamBigLeader, applyDate ); Boolean success = (Boolean) result.get("success"); if (success != null && success) { diff --git a/src/main/java/com/rj/entity/LbPurchaseApply.java b/src/main/java/com/rj/entity/LbPurchaseApply.java index 9f3d54b..9852016 100644 --- a/src/main/java/com/rj/entity/LbPurchaseApply.java +++ b/src/main/java/com/rj/entity/LbPurchaseApply.java @@ -60,6 +60,10 @@ public class LbPurchaseApply implements Serializable { @Schema(description = "团队长") private String teamLeader; + @TableField("team_big_leader") + @Schema(description = "双收益团队长") + private String teamBigLeader; + @TableField("apply_date") @Schema(description = "申请日期") private LocalDate applyDate; diff --git a/src/main/java/com/rj/service/ILbPurchaseApplyService.java b/src/main/java/com/rj/service/ILbPurchaseApplyService.java index 5ccb1bd..62bea44 100644 --- a/src/main/java/com/rj/service/ILbPurchaseApplyService.java +++ b/src/main/java/com/rj/service/ILbPurchaseApplyService.java @@ -21,6 +21,7 @@ public interface ILbPurchaseApplyService extends IService { String applyPhone, String colleagueName, String teamLeader, + String teamBigLeader, LocalDate applyDate); Map listNeedPrivilegeRecommenders(LocalDate startDate, LocalDate endDate); diff --git a/src/main/java/com/rj/service/impl/LbPurchaseApplyServiceImpl.java b/src/main/java/com/rj/service/impl/LbPurchaseApplyServiceImpl.java index d417257..604ecba 100644 --- a/src/main/java/com/rj/service/impl/LbPurchaseApplyServiceImpl.java +++ b/src/main/java/com/rj/service/impl/LbPurchaseApplyServiceImpl.java @@ -53,12 +53,13 @@ public class LbPurchaseApplyServiceImpl 字段名与含义(JSON 键名必须完全一致): applyUser 申请人姓名; applyPhone 申请人电话; - tryDate 试用日期(原文怎么说就怎么填字符串,如 yyyy-MM-dd 或中文描述); + tryDate 试用日期(原文怎么说就怎么填字符串,如 yyyy-MM-dd 或中文描述),起始日期是:申请日期applyDate,结束日期:申请日期applyDate 加 2天,跳过周六日 ,比如: 05.14 到 05.16 ; age 年龄(整数); workExperience 从业经历; colleagueName 同事姓名; colleaguePhone 同事电话; teamLeader 团队长; + teamBigLeader 双收益团队长; applyDate 申请日期,格式 yyyy-MM-dd,若原文无明确日期可省略。 不要输出 id、tenantId、createTime、updateTime。 """; @@ -246,6 +247,7 @@ public class LbPurchaseApplyServiceImpl String applyPhone, String colleagueName, String teamLeader, + String teamBigLeader, LocalDate applyDate) { Map result = new HashMap<>(); try { @@ -272,6 +274,9 @@ public class LbPurchaseApplyServiceImpl if (teamLeader != null && !teamLeader.trim().isEmpty()) { queryWrapper.like(LbPurchaseApply::getTeamLeader, teamLeader.trim()); } + if (teamBigLeader != null && !teamBigLeader.trim().isEmpty()) { + queryWrapper.like(LbPurchaseApply::getTeamBigLeader, teamBigLeader.trim()); + } if (applyDate != null) { queryWrapper.eq(LbPurchaseApply::getApplyDate, applyDate); }