Browse Source

修改配置

main
1341924763@qq.com 5 days ago
parent
commit
fe234efb8a

+ 0
- 8
zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjBalanceManageController.java View File

import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; 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.common.core.page.TableDataInfo;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.zhushi.entity.*; import com.ruoyi.zhushi.entity.*;
import com.ruoyi.zhushi.service.NjBalanceManageService; import com.ruoyi.zhushi.service.NjBalanceManageService;
import com.ruoyi.zhushi.service.NjRuleConfigService; import com.ruoyi.zhushi.service.NjRuleConfigService;
import com.ruoyi.zhushi.util.Constans;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.math.BigDecimal; 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;


/** /**
* 打卡控制台 * 打卡控制台

+ 0
- 1
zs-manager/src/main/java/com/ruoyi/zhushi/service/NjRuleConfigService.java View File



import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.zhushi.entity.NjRuleConfigAndUser;
import com.ruoyi.zhushi.entity.NjRuleConfigAndUserDTO; import com.ruoyi.zhushi.entity.NjRuleConfigAndUserDTO;
import com.ruoyi.zhushi.entity.NjRuleConfigDTO; import com.ruoyi.zhushi.entity.NjRuleConfigDTO;



+ 1
- 1
zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/NjBalanceManageServiceImpl.java View File

LocalDate now1 = LocalDate.now(); LocalDate now1 = LocalDate.now();
LocalDate localDate = now1.withDayOfYear(1); LocalDate localDate = now1.withDayOfYear(1);
// 判断是否满一年 // 判断是否满一年
boolean oneYearCompleted = isOneYearCompleted(joinedDate, localDate);
boolean oneYearCompleted = isOneYearCompleted(joinedDate, now1);
if(oneYearCompleted) if(oneYearCompleted)
{ {
njBalanceManage.setAnnualLeave(BigDecimal.valueOf(annualLeaveTiers)); njBalanceManage.setAnnualLeave(BigDecimal.valueOf(annualLeaveTiers));

Loading…
Cancel
Save