签到记录导出，根据用户id或年月导出用户所在公司的签到记录

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -6,7 +6,6 @@ import cn.com.ty.lift.common.utils.ValuePool;
 import cn.com.ty.lift.common.verify.Val;
 import cn.com.ty.lift.common.verify.Validate;
 import cn.com.ty.lift.common.verify.Validation;
-import cn.com.ty.lift.common.verify.VerifyUtils;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceRequest;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceResponse;
 import cn.com.ty.lift.enterprise.oa.entity.Attendance;
@@ -282,7 +281,6 @@ public class AttendanceController {
     }
 
     @PostMapping("export")
-    @Validation(fields = {"ids"})
     public void export(@Val @RequestBody AttendanceRequest request, HttpServletResponse response) {
         log.info("headerAlias: {}", headerAlias);
         List<AttendanceResponse> attendances = attendanceService.listByIdList(request);

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/dto/AttendanceRequest.java

@@ -11,10 +11,11 @@ import java.util.List;
 
 /**
  * <p>
- *     签到管理接口请求入参
+ * 签到管理接口请求入参
  * </p>
+ *
  * @author wcz
- * @since  2019/12/12
+ * @since 2019/12/12
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -22,12 +23,12 @@ public class AttendanceRequest extends PageRequest {
     /**
      * 主键id
      */
-    @Min(value = 1,message = "签到记录ID有误")
+    @Min(value = 1, message = "签到记录ID有误")
     private Long id;
     /**
      * 维保公司id
      */
-    @Min(value = 1,message = "维保公司ID有误")
+    @Min(value = 1, message = "维保公司ID有误")
     private Long mtCompanyId;
     /**
      * 用户名称
@@ -102,8 +103,8 @@ public class AttendanceRequest extends PageRequest {
      * 21 下午上班 22 下午下班
      * 31 加班上班 32 加班下班
      */
-    @Min(value = 11,message = "签到类型有误")
-    @Max(value = 32,message = "签到类型有误")
+    @Min(value = 11, message = "签到类型有误")
+    @Max(value = 32, message = "签到类型有误")
     private Integer type;
 
     @Min(value = 1, message = "当前用户ID有误")
@@ -112,6 +113,7 @@ public class AttendanceRequest extends PageRequest {
     /**
      * 导出记录的id列表
      */
-    @NotEmpty(message = "签到记录ID列表有误")
     private List<Long> ids;
+
+    private String attendanceYearMonth;
 }

lift-enterprise-service/src/main/resources/mapper/oa/AttendanceMapper.xml

@@ -77,6 +77,16 @@
                     #{id}
                 </foreach>
             </if>
+            <if test="cond.userId != null and cond.userId != ''">
+                AND att.user_id = #{cond.userId}
+            </if>
+            <if test="cond.mtCompanyId != null and cond.mtCompanyId != ''">
+                AND att.mt_company_id = #{cond.mtCompanyId}
+            </if>
+            <if test="cond.attendanceYearMonth != null and cond.attendanceYearMonth != ''">
+                AND DATE_FORMAT(att.create_date,'%Y-%m') = #{cond.attendanceYearMonth}
+            </if>
+            ORDER BY att.create_date DESC
         </where>
     </select>