修改配置

zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjBalanceManageController.java

@@ -3,13 +3,11 @@ package com.ruoyi.zhushi.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.zhushi.entity.*;
 import com.ruoyi.zhushi.service.NjBalanceManageService;
 import com.ruoyi.zhushi.service.NjRuleConfigService;
-import com.ruoyi.zhushi.util.Constans;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,12 +15,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDate;
-import java.time.Period;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 打卡控制台

zs-manager/src/main/java/com/ruoyi/zhushi/service/NjRuleConfigService.java

@@ -2,7 +2,6 @@ package com.ruoyi.zhushi.service;
 
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.zhushi.entity.NjRuleConfigAndUser;
 import com.ruoyi.zhushi.entity.NjRuleConfigAndUserDTO;
 import com.ruoyi.zhushi.entity.NjRuleConfigDTO;
 

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/NjBalanceManageServiceImpl.java

@@ -146,7 +146,7 @@ public class NjBalanceManageServiceImpl implements NjBalanceManageService {
                         LocalDate now1 = LocalDate.now();
                         LocalDate localDate = now1.withDayOfYear(1);
                         // 判断是否满一年
-                        boolean oneYearCompleted = isOneYearCompleted(joinedDate, localDate);
+                        boolean oneYearCompleted = isOneYearCompleted(joinedDate, now1);
                         if(oneYearCompleted)
                         {
                             njBalanceManage.setAnnualLeave(BigDecimal.valueOf(annualLeaveTiers));