特权期的计算逻辑

This commit is contained in:
2026-05-14 22:36:33 +08:00
parent c539363eaf
commit 5585f2c08a
4 changed files with 13 additions and 2 deletions

View File

@@ -95,9 +95,10 @@ public class LbPurchaseApplyController {
@RequestParam(required = false) String applyPhone, @RequestParam(required = false) String applyPhone,
@RequestParam(required = false) String colleagueName, @RequestParam(required = false) String colleagueName,
@RequestParam(required = false) String teamLeader, @RequestParam(required = false) String teamLeader,
@RequestParam(required = false) String teamBigLeader,
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate applyDate) { @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate applyDate) {
Map<String, Object> result = lbPurchaseApplyService.pageQuery( Map<String, Object> 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"); Boolean success = (Boolean) result.get("success");
if (success != null && success) { if (success != null && success) {

View File

@@ -60,6 +60,10 @@ public class LbPurchaseApply implements Serializable {
@Schema(description = "团队长") @Schema(description = "团队长")
private String teamLeader; private String teamLeader;
@TableField("team_big_leader")
@Schema(description = "双收益团队长")
private String teamBigLeader;
@TableField("apply_date") @TableField("apply_date")
@Schema(description = "申请日期") @Schema(description = "申请日期")
private LocalDate applyDate; private LocalDate applyDate;

View File

@@ -21,6 +21,7 @@ public interface ILbPurchaseApplyService extends IService<LbPurchaseApply> {
String applyPhone, String applyPhone,
String colleagueName, String colleagueName,
String teamLeader, String teamLeader,
String teamBigLeader,
LocalDate applyDate); LocalDate applyDate);
Map<String, Object> listNeedPrivilegeRecommenders(LocalDate startDate, LocalDate endDate); Map<String, Object> listNeedPrivilegeRecommenders(LocalDate startDate, LocalDate endDate);

View File

@@ -53,12 +53,13 @@ public class LbPurchaseApplyServiceImpl
字段名与含义JSON 键名必须完全一致): 字段名与含义JSON 键名必须完全一致):
applyUser 申请人姓名; applyUser 申请人姓名;
applyPhone 申请人电话; applyPhone 申请人电话;
tryDate 试用日期(原文怎么说就怎么填字符串,如 yyyy-MM-dd 或中文描述); tryDate 试用日期(原文怎么说就怎么填字符串,如 yyyy-MM-dd 或中文描述)起始日期是申请日期applyDate结束日期申请日期applyDate 加 2天跳过周六日 ,比如: 05.14 到 05.16
age 年龄(整数); age 年龄(整数);
workExperience 从业经历; workExperience 从业经历;
colleagueName 同事姓名; colleagueName 同事姓名;
colleaguePhone 同事电话; colleaguePhone 同事电话;
teamLeader 团队长; teamLeader 团队长;
teamBigLeader 双收益团队长;
applyDate 申请日期,格式 yyyy-MM-dd若原文无明确日期可省略。 applyDate 申请日期,格式 yyyy-MM-dd若原文无明确日期可省略。
不要输出 id、tenantId、createTime、updateTime。 不要输出 id、tenantId、createTime、updateTime。
"""; """;
@@ -246,6 +247,7 @@ public class LbPurchaseApplyServiceImpl
String applyPhone, String applyPhone,
String colleagueName, String colleagueName,
String teamLeader, String teamLeader,
String teamBigLeader,
LocalDate applyDate) { LocalDate applyDate) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
try { try {
@@ -272,6 +274,9 @@ public class LbPurchaseApplyServiceImpl
if (teamLeader != null && !teamLeader.trim().isEmpty()) { if (teamLeader != null && !teamLeader.trim().isEmpty()) {
queryWrapper.like(LbPurchaseApply::getTeamLeader, teamLeader.trim()); queryWrapper.like(LbPurchaseApply::getTeamLeader, teamLeader.trim());
} }
if (teamBigLeader != null && !teamBigLeader.trim().isEmpty()) {
queryWrapper.like(LbPurchaseApply::getTeamBigLeader, teamBigLeader.trim());
}
if (applyDate != null) { if (applyDate != null) {
queryWrapper.eq(LbPurchaseApply::getApplyDate, applyDate); queryWrapper.eq(LbPurchaseApply::getApplyDate, applyDate);
} }