diff --git a/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java index 550e704..32c8fbb 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java +++ b/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("修改失败"); diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyUserCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyUserCO.java index f7a7998..e7e3f96 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyUserCO.java +++ b/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 = "乐观锁") diff --git a/web-client/src/main/java/com/zcloud/edu/dto/study/StudentPageQry.java b/web-client/src/main/java/com/zcloud/edu/dto/study/StudentPageQry.java index 6e3f5fa..21466d2 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/study/StudentPageQry.java +++ b/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; } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyRecordE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyRecordE.java index 91b86a4..ea54cbb 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyRecordE.java +++ b/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.util.HashSet; -import java.util.List; -import java.util.Set; +import java.time.LocalDateTime; +import java.util.*; /** * web-domain @@ -52,6 +50,8 @@ public class TrainingApplyRecordE extends BaseE { private String projectName; //审批状态:1审批中,2审批完成 private Long approvalStatus; + //审批时间 + private LocalDateTime approvalTime; //申请人员列表 private List applyUsers = new ArrayList<>(); diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java index 4c05088..3db6160 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java +++ b/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; diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyUserDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyUserDO.java index 8557927..3502094 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyUserDO.java +++ b/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; diff --git a/web-infrastructure/src/main/resources/mapper/TrainingApplyUserMapper.xml b/web-infrastructure/src/main/resources/mapper/TrainingApplyUserMapper.xml index 99c35de..60dc8ff 100644 --- a/web-infrastructure/src/main/resources/mapper/TrainingApplyUserMapper.xml +++ b/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 diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml index e271773..91eaa55 100644 --- a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml @@ -222,6 +222,13 @@ and c.name like concat('%',#{params.likeClassName},'%') + + + and DATE(c.start_time) =]]> #{params.startTime} + + + and DATE(c.end_time) #{params.endTime} + and s.state = 0