ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正生日统计查询的排序逻辑将 AdminUserMapper 类中的生日统计查询的排序字段从 "birthday_day" 更改为 "DAY(t.birthday_day)"，以确保按照生日的

Browse Source
This commit is contained in:
furongxin 2024-10-16 19:52:49 +08:00
parent 701cb06508
commit ec41d2c9f1
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/hr/SalaryTypeItemController.java
View File

@ -1,20 +1,18 @@
package cn.iocoder.yudao.module.system.controller.admin.hr; package cn.iocoder.yudao.module.system.controller.admin.hr;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.controller.admin.hr.vo.type.SalaryTypeItemCreateReqVO; import cn.iocoder.yudao.module.system.controller.admin.hr.vo.type.SalaryTypeItemCreateReqVO;
import cn.iocoder.yudao.module.system.controller.admin.hr.vo.type.SalaryTypeRespVO;
import cn.iocoder.yudao.module.system.service.hr.SalaryTypeItemService; import cn.iocoder.yudao.module.system.service.hr.SalaryTypeItemService;
import cn.iocoder.yudao.module.system.service.hr.SalaryTypeService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/hr/SalaryTypeItemDO.java
View File

@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.system.dal.dataobject.hr;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.models.security.SecurityScheme;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
View File

@ -191,7 +191,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
queryWrapper.ge("DAY(t.birthday_day)", date.getDayOfMonth()); queryWrapper.ge("DAY(t.birthday_day)", date.getDayOfMonth());
} }
queryWrapper.groupBy("t.id"); queryWrapper.groupBy("t.id");
queryWrapper.orderByAsc("t.birthday_day"); queryWrapper.orderByAsc("DAY(t.birthday_day)");
return selectJoinPage(pageReqVO, UserBirthdayRespVO.class, queryWrapper); return selectJoinPage(pageReqVO, UserBirthdayRespVO.class, queryWrapper);
} }

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/hr/SalaryTypeItemService.java
View File

@ -1,9 +1,6 @@
package cn.iocoder.yudao.module.system.service.hr; package cn.iocoder.yudao.module.system.service.hr;
import cn.iocoder.yudao.module.system.controller.admin.hr.vo.type.SalaryTypeItemCreateReqVO; import cn.iocoder.yudao.module.system.controller.admin.hr.vo.type.SalaryTypeItemCreateReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.hr.SalaryTypeItemDO;
import java.util.List;
/** /**
* 工资类型配置 Service 接口 * 工资类型配置 Service 接口