feat(class): 添加班级统计功能的数据权限支持

web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java

@@ -11,6 +11,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+
 /**
 * web-app
 * @Author makejava
@@ -54,7 +56,7 @@ public class TrainingApplyRecordUpdateExe {
         if (!updateTrainingUserStatus) {
             throw new BizException("修改培训人员状态失败");
         }
-
+        trainingApplyRecordE.setApprovalTime(LocalDateTime.now());
         boolean res = trainingApplyRecordGateway.update(trainingApplyRecordE);
         if (!res) {
             throw new BizException("修改失败");

web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyUserCO.java

@@ -2,6 +2,7 @@ package com.zcloud.edu.dto.clientobject.training;
 
 import com.alibaba.cola.dto.ClientObject;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -79,7 +80,9 @@ public class TrainingApplyUserCO extends ClientObject {
     @ApiModelProperty(value = "审批用户名称")
     @TableField(exist = false)
     private String approvalUserName;
-
+    @ApiModelProperty(value = "审批时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime approvalTime;
 
     //乐观锁
     @ApiModelProperty(value = "乐观锁")

web-client/src/main/java/com/zcloud/edu/dto/study/StudentPageQry.java

@@ -1,6 +1,7 @@
 package com.zcloud.edu.dto.study;
 
 import com.alibaba.cola.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -31,6 +32,10 @@ public class StudentPageQry extends PageQuery {
     private String likeClassName;
     private Integer state;
     private String phone;
+    @ApiModelProperty(value = "培训开始时间")
+    private String startTime;
+    @ApiModelProperty(value = "培训结束时间")
+    private String endTime;
     private String menuPath;
 }
 

web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyRecordE.java

@@ -12,10 +12,8 @@ import com.zcloud.gbscommon.utils.Tools;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
+import java.time.LocalDateTime;
-import java.util.HashSet;
+import java.util.*;
-import java.util.List;
-import java.util.Set;
 
 /**
 * web-domain
@@ -52,6 +50,8 @@ public class TrainingApplyRecordE extends BaseE {
     private String projectName;
     //审批状态:1审批中,2审批完成
     private Long approvalStatus;
+    //审批时间
+    private LocalDateTime approvalTime;
 
     //申请人员列表
     private List<TrainingApplyUserE> applyUsers = new ArrayList<>();

web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java

@@ -7,6 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
 * web-infrastructure
 * @Author makejava
@@ -48,7 +51,8 @@ public class TrainingApplyRecordDO extends BaseDO {
     //审批状态1:审批中,2:审批完成
     @ApiModelProperty(value = "审批状态1:审批中,2:审批完成")
     private Long approvalStatus;
-
+    //审批时间
+    private LocalDateTime approvalTime;
     // 申请人数
     @TableField(exist = false)
     private Integer applyUserCount;

web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyUserDO.java

@@ -80,6 +80,9 @@ public class TrainingApplyUserDO extends BaseDO {
     @ApiModelProperty(value = "审批用户名称")
     @TableField(exist = false)
     private String approvalUserName;
+    @ApiModelProperty(value = "审批时间")
+    @TableField(exist = false)
+    private LocalDateTime approvalTime;
 
     public TrainingApplyUserDO(String trainingApplyUserId) {
         this.trainingApplyUserId = trainingApplyUserId;

web-infrastructure/src/main/resources/mapper/TrainingApplyUserMapper.xml

@@ -54,7 +54,8 @@
             sqco.corp_name apply_corpinfo_name,
             spco.corp_name approval_corpinfo_name,
             spdept.name approval_department_name,
-            spuser.name approval_user_name
+            spuser.name approval_user_name,
+            tar.approval_time
         from
             training_apply_user tau
             left join training_apply_record tar on tar.training_apply_record_id = tau.training_apply_record_id

web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml

@@ -222,6 +222,13 @@
             <if test="params.likeClassName != null and params.likeClassName != ''">
                 and c.name like concat('%',#{params.likeClassName},'%')
             </if>
+
+            <if test="params.startTime != null and params.startTime!=''">
+                and DATE(c.start_time) <![CDATA[>=]]> #{params.startTime}
+            </if>
+            <if test="params.endTime != null and params.endTime!=''">
+                and DATE(c.end_time) <![CDATA[<=]]> #{params.endTime}
+            </if>
             <if test="params.state != null ">
                 <if test="params.state == 0">
                     and s.state = 0