From ec41d2c9f14673a2248597f9570d252aecf425e2 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Wed, 16 Oct 2024 19:52:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=94=9F=E6=97=A5=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=8E=92=E5=BA=8F=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=B0=86=20AdminUserMapper=20=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=94=9F=E6=97=A5=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E4=BB=8E=20"birth?= =?UTF-8?q?day=5Fday"=20=E6=9B=B4=E6=94=B9=E4=B8=BA=20"DAY(t.birthday=5Fda?= =?UTF-8?q?y)"=EF=BC=8C=E4=BB=A5=E7=A1=AE=E4=BF=9D=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=94=9F=E6=97=A5=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/hr/SalaryTypeItemController.java | 10 ++++------ .../system/dal/dataobject/hr/SalaryTypeItemDO.java | 1 - .../module/system/dal/mysql/user/AdminUserMapper.java | 2 +- .../system/service/hr/SalaryTypeItemService.java | 3 --- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/hr/SalaryTypeItemController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/hr/SalaryTypeItemController.java index a3ba247f..825ccce2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/hr/SalaryTypeItemController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/hr/SalaryTypeItemController.java @@ -1,20 +1,18 @@ package cn.iocoder.yudao.module.system.controller.admin.hr; 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.SalaryTypeRespVO; 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.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; 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.validation.Valid; -import java.util.List; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/hr/SalaryTypeItemDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/hr/SalaryTypeItemDO.java index d45d9265..ec5a5cac 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/hr/SalaryTypeItemDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/hr/SalaryTypeItemDO.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.system.dal.dataobject.hr; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.models.security.SecurityScheme; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java index 78b5b44f..10c9da4a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java @@ -191,7 +191,7 @@ public interface AdminUserMapper extends BaseMapperX { queryWrapper.ge("DAY(t.birthday_day)", date.getDayOfMonth()); } queryWrapper.groupBy("t.id"); - queryWrapper.orderByAsc("t.birthday_day"); + queryWrapper.orderByAsc("DAY(t.birthday_day)"); return selectJoinPage(pageReqVO, UserBirthdayRespVO.class, queryWrapper); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/hr/SalaryTypeItemService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/hr/SalaryTypeItemService.java index 0dec279a..19164590 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/hr/SalaryTypeItemService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/hr/SalaryTypeItemService.java @@ -1,9 +1,6 @@ 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.dal.dataobject.hr.SalaryTypeItemDO; - -import java.util.List; /** * 工资类型配置 Service 接口