Browse Source

请假统计调整

dzx 11 months ago
parent
commit
91ec1b4eb0

+ 4 - 0
src/main/java/com/xjrsoft/module/ledger/dto/LedgerStatisticsPageDto.java

@@ -41,4 +41,8 @@ public class LedgerStatisticsPageDto extends PageInput {
     @JsonIgnore
     @ApiModelProperty("用户ids")
     private List<Long> userIds;
+
+
+    @ApiModelProperty("请假类型")
+    private String leaveType;
 }

+ 6 - 0
src/main/resources/mapper/teacher/WfTeacherleaveMapper.xml

@@ -88,6 +88,9 @@
                 #{userId}
             </foreach>
         </if>
+        <if test="dto.leaveType != null and dto.leaveType != ''">
+            AND #{dto.leaveType} like concat('%', t1.leave_type, '%')
+        </if>
         GROUP BY t1.user_id,t1.leave_type
         ORDER BY t2.user_name
     </select>
@@ -117,6 +120,9 @@
                 #{userId}
             </foreach>
         </if>
+        <if test="dto.leaveType != null and dto.leaveType != ''">
+            AND #{dto.leaveType} like concat('%', t1.leave_type, '%')
+        </if>
         GROUP BY t1.user_id,t1.leave_type
         ORDER BY t2.user_name
     </select>