Merge branch 'master' of https://gitee.com/hdka/FURNITURE-OA

gear-oa/src/main/java/com/gear/oa/controller/GearAttendanceRecordController.java

@@ -42,7 +42,6 @@ public class GearAttendanceRecordController extends BaseController {
     /**
      * 查询考勤（含考勤/加班/出差）列表
      */
-    @SaCheckPermission("oa:attendanceRecord:list")
     @GetMapping("/list")
     public TableDataInfo<GearAttendanceRecordVo> list(GearAttendanceRecordBo bo, PageQuery pageQuery) {
         return iGearAttendanceRecordService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class GearAttendanceRecordController extends BaseController {
     /**
      * 导出考勤（含考勤/加班/出差）列表
      */
-    @SaCheckPermission("oa:attendanceRecord:export")
     @Log(title = "考勤（含考勤/加班/出差）", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(GearAttendanceRecordBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class GearAttendanceRecordController extends BaseController {
      *
      * @param recordId 主键
      */
-    @SaCheckPermission("oa:attendanceRecord:query")
     @GetMapping("/{recordId}")
     public R<GearAttendanceRecordVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long recordId) {
@@ -74,7 +71,6 @@ public class GearAttendanceRecordController extends BaseController {
     /**
      * 新增考勤（含考勤/加班/出差）
      */
-    @SaCheckPermission("oa:attendanceRecord:add")
     @Log(title = "考勤（含考勤/加班/出差）", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +81,6 @@ public class GearAttendanceRecordController extends BaseController {
     /**
      * 修改考勤（含考勤/加班/出差）
      */
-    @SaCheckPermission("oa:attendanceRecord:edit")
     @Log(title = "考勤（含考勤/加班/出差）", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -98,7 +93,6 @@ public class GearAttendanceRecordController extends BaseController {
      *
      * @param recordIds 主键串
      */
-    @SaCheckPermission("oa:attendanceRecord:remove")
     @Log(title = "考勤（含考勤/加班/出差）", businessType = BusinessType.DELETE)
     @DeleteMapping("/{recordIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

gear-oa/src/main/java/com/gear/oa/domain/vo/GearAttendanceRecordVo.java

@@ -71,5 +71,9 @@ public class GearAttendanceRecordVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    //昵称
+    @ExcelProperty(value = "姓名")
+    private String nickName;
+
 
 }

gear-oa/src/main/java/com/gear/oa/mapper/GearAttendanceRecordMapper.java

@@ -1,8 +1,12 @@
 package com.gear.oa.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gear.oa.domain.GearAttendanceRecord;
 import com.gear.oa.domain.vo.GearAttendanceRecordVo;
 import com.gear.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 考勤（含考勤/加班/出差）Mapper接口
@@ -12,4 +16,5 @@ import com.gear.common.core.mapper.BaseMapperPlus;
  */
 public interface GearAttendanceRecordMapper extends BaseMapperPlus<GearAttendanceRecordMapper, GearAttendanceRecord, GearAttendanceRecordVo> {
 
+    Page<GearAttendanceRecordVo> selectVoPagePlus(Page<Object> build, @Param("ew") QueryWrapper<GearAttendanceRecord> lqw);
 }

gear-oa/src/main/java/com/gear/oa/service/impl/GearAttendanceRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.gear.oa.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gear.common.utils.StringUtils;
 import com.gear.common.core.page.TableDataInfo;
 import com.gear.common.core.domain.PageQuery;
@@ -44,11 +45,26 @@ public class GearAttendanceRecordServiceImpl implements IGearAttendanceRecordSer
      */
     @Override
     public TableDataInfo<GearAttendanceRecordVo> queryPageList(GearAttendanceRecordBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<GearAttendanceRecord> lqw = buildQueryWrapper(bo);
-        Page<GearAttendanceRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        QueryWrapper<GearAttendanceRecord> lqw = buildQueryWrapperPlus(bo);
+        Page<GearAttendanceRecordVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
+    private QueryWrapper<GearAttendanceRecord> buildQueryWrapperPlus(GearAttendanceRecordBo bo) {
+        Map<String, Object> params = bo.getParams();
+        QueryWrapper<GearAttendanceRecord> lqw = Wrappers.query();
+        // 使用表别名 ar 来构建查询条件
+        lqw.eq(StringUtils.isNotBlank(bo.getUserId()), "ar.user_id", bo.getUserId());
+        lqw.eq(bo.getRecordDate() != null, "ar.record_date", bo.getRecordDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getRecordType()), "ar.record_type", bo.getRecordType());
+        lqw.eq(bo.getStartTime() != null, "ar.start_time", bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, "ar.end_time", bo.getEndTime());
+        lqw.eq(bo.getDurationHour() != null, "ar.duration_hour", bo.getDurationHour());
+        //逻辑删除
+        lqw.eq("ar.del_flag", "0");
+        return lqw;
+    }
+
     /**
      * 查询考勤（含考勤/加班/出差）列表
      */

gear-oa/src/main/resources/mapper/oa/GearAttendanceRecordMapper.xml

@@ -20,6 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
     </resultMap>
+    <select id="selectVoPagePlus" resultType="com.gear.oa.domain.vo.GearAttendanceRecordVo">
+    select ar.record_id, ar.user_id, ar.record_date, ar.record_type, ar.start_time,
+        ar.end_time, ar.duration_hour, ar.status, ar.create_time, ar.create_by,
+        ar.update_time, ar.update_by, ar.del_flag, ar.remark,
+        u.nick_name AS nickName
+    from gear_attendance_record ar
+    left join gear_user u on ar.user_id = u.user_id
+    ${ew.customSqlSegment}
+    </select>
 
 
 </mapper>