更新流程记录接口

src/main/java/com/template/controller/ApplicationProcedureController.java

@@ -9,9 +9,14 @@ import com.template.api.ApplicationProcedureControllerAPI;
 import com.template.model.dto.AppletApprovalProcessDto;
 import com.template.model.dto.ApplicationProcedureDto;
 import com.template.model.dto.ApprovalProcessDto;
-import com.template.model.pojo.*;
+import com.template.model.pojo.AdminMenu;
+import com.template.model.pojo.ApplicationProcedure;
+import com.template.model.pojo.ApplicationProcedureSetting;
+import com.template.model.pojo.PermissionSetting;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.ApplicationProcedureRecordVo;
+import com.template.model.vo.ApplicationProcedureTemporaryRecordVo;
 import com.template.model.vo.ApplicationProcedureVo;
 import com.template.services.*;
 import org.springframework.beans.BeanUtils;
@@ -238,11 +243,11 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
             status="2";
         }
         applicationProcedure.setStatus(status);
-        applicationProcedure.setApproverId(adminId);
+        applicationProcedure.setSecondaryApproverId(adminId);
         //        审批时间
-        applicationProcedure.setExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
+        applicationProcedure.setSecondaryExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
 //            审批备注
-        applicationProcedure.setExamineAndApproveRemark(remark);
+        applicationProcedure.setSecondaryExamineAndApproveRemark(remark);
         applicationProcedureService.updateById(applicationProcedure);
 
 
@@ -334,11 +339,11 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
             status="2";
         }
         applicationProcedure.setStatus(status);
-        applicationProcedure.setApproverId(adminId);
+        applicationProcedure.setSecondaryApproverId(adminId);
         //        审批时间
-        applicationProcedure.setExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
+        applicationProcedure.setSecondaryExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
 //            审批备注
-        applicationProcedure.setExamineAndApproveRemark(remark);
+        applicationProcedure.setSecondaryExamineAndApproveRemark(remark);
         applicationProcedureService.updateById(applicationProcedure);
 
 
@@ -424,23 +429,14 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
 
         //教职工
         if (department==4) {
-            LambdaQueryWrapper<ApplicationProcedure> wrapper=new LambdaQueryWrapper<>();
-            wrapper.eq(ApplicationProcedure::getUsersId,userId)
-                            .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedure::getSubmissionTime,startTime,endTime)
-                                    .eq(ObjectUtils.isNotEmpty(status),ApplicationProcedure::getStatus,status);
 
-//            IPage<ApplicationProcedure> page1 = applicationProcedureService.appletRecordPage(new Page<>(page, size), wrapper);
-            IPage<ApplicationProcedure> page1 = applicationProcedureService.page(new Page<>(page, size), wrapper);
+            PageUtils<ApplicationProcedureRecordVo> page1 = applicationProcedureService.appletRecordPage(userId,startTime,endTime,status,page,size);
             return CommonResult.ok(page1);
 
         }else if (department==7){
 //          临时人员
-            LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
-            wrapper.eq(ApplicationProcedureTemporary::getUsersId,userId)
-                            .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
-                                    .eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status);
-//            applicationProcedureTemporaryService.appletRecordPage(new Page<>(page, size), wrapper);
-            applicationProcedureTemporaryService.page(new Page<>(page, size), wrapper);
+            PageUtils<ApplicationProcedureTemporaryRecordVo> page1=applicationProcedureTemporaryService.appletRecordPage(userId,startTime,endTime,status,page,size);
+            return CommonResult.ok(page1);
         }
 
 

src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -226,11 +226,11 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             status="2";
         }
         applicationProcedure.setStatus(status);
-        applicationProcedure.setApproverId(adminId);
+        applicationProcedure.setSecondaryApproverId(adminId);
         //        审批时间
-        applicationProcedure.setExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
+        applicationProcedure.setSecondaryExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
 //            审批备注
-        applicationProcedure.setExamineAndApproveRemark(remark);
+        applicationProcedure.setSecondaryExamineAndApproveRemark(remark);
         applicationProcedureTemporaryService.updateById(applicationProcedure);
 
 
@@ -326,11 +326,11 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             status="2";
         }
         applicationProcedure.setStatus(status);
-        applicationProcedure.setApproverId(adminId);
+        applicationProcedure.setSecondaryApproverId(adminId);
         //        审批时间
-        applicationProcedure.setExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
+        applicationProcedure.setSecondaryExamineAndApproveTime(LocalDateTime.now().format(dateTimeFormatter1));
 //            审批备注
-        applicationProcedure.setExamineAndApproveRemark(remark);
+        applicationProcedure.setSecondaryExamineAndApproveRemark(remark);
         applicationProcedureTemporaryService.updateById(applicationProcedure);
 
 

src/main/java/com/template/mapper/ApplicationProcedureMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.ApplicationProcedure;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.vo.ApplicationProcedureRecordVo;
 import com.template.model.vo.ApplicationProcedureVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -24,4 +25,5 @@ public interface ApplicationProcedureMapper extends BaseMapper<ApplicationProced
 
     IPage<ApplicationProcedureVo> parentPageList(Page<ApplicationProcedureVo> pageVo, @Param("submissionStartTime") String submissionStartTime,@Param("submissionEndTime") String submissionEndTime,@Param("examineAndApproveStartTime") String examineAndApproveStartTime,@Param("examineAndApproveEndTime") String examineAndApproveEndTime,@Param("type") String type,@Param("department") String department,@Param("key") String key);
 
+    Page<ApplicationProcedureRecordVo> appletRecordPage(Page<ApplicationProcedureRecordVo> recordVoPage,@Param("userId") Integer userId,@Param("startTime")  String startTime,@Param("endTime")  String endTime,@Param("status")  String status);
 }

src/main/java/com/template/mapper/ApplicationProcedureTemporaryMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.ApplicationProcedureTemporary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.vo.ApplicationProcedureTemporaryRecordVo;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
 import com.template.model.vo.ApplicationProcedureVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -25,4 +26,5 @@ public interface ApplicationProcedureTemporaryMapper extends BaseMapper<Applicat
     IPage<ApplicationProcedureTemporaryVo> parentPageList(Page<ApplicationProcedureVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key);
 
 
+    IPage<ApplicationProcedureTemporaryRecordVo> appletRecordPage(Page<ApplicationProcedureTemporaryRecordVo> pageVo, @Param("userId") Integer userId,@Param("startTime")  String startTime,@Param("endTime")  String endTime,@Param("status")  String status);
 }

src/main/java/com/template/model/pojo/ApplicationProcedure.java

@@ -1,19 +1,14 @@
 package com.template.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -67,6 +62,15 @@ public class ApplicationProcedure implements Serializable {
     @ApiModelProperty(value = "审批备注")
     private String examineAndApproveRemark;
 
+    @ApiModelProperty(value = "次级审批人id")
+    private String secondaryApproverId;
+
+    @ApiModelProperty(value = "次级审批时间")
+    private String secondaryExamineAndApproveTime;
+
+    @ApiModelProperty(value = "次级审批备注")
+    private String secondaryExamineAndApproveRemark;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private String createTime;

src/main/java/com/template/model/pojo/ApplicationProcedureTemporary.java

@@ -1,19 +1,14 @@
 package com.template.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -63,6 +58,16 @@ public class ApplicationProcedureTemporary implements Serializable {
     @ApiModelProperty(value = "审批备注")
     private String examineAndApproveRemark;
 
+    @ApiModelProperty(value = "次级审批人id")
+    private String secondaryApproverId;
+
+    @ApiModelProperty(value = "次级审批时间")
+    private String secondaryExamineAndApproveTime;
+
+    @ApiModelProperty(value = "次级审批备注")
+    private String secondaryExamineAndApproveRemark;
+
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private String createTime;

src/main/java/com/template/model/vo/ApplicationProcedureRecordVo.java

@@ -0,0 +1,61 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ApplicationProcedureRecordVo {
+    private Integer id;
+
+    @ApiModelProperty(value = "申请人id")
+    private Integer usersId;
+
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "部门")
+    private String department;
+
+    @ApiModelProperty(value = "换课人id")
+    private String changeUsersId;
+
+    private String changeUsersName;
+
+    @ApiModelProperty(value = "申请原因")
+    private String reasonApplication;
+
+    @ApiModelProperty(value = "提交时间")
+    private String submissionTime;
+
+    @ApiModelProperty(value = "状态，0：已拒绝，1：待审批，2：处理中，3：已同意")
+    private String status;
+
+    @ApiModelProperty(value = "审批人id")
+    private String approverId;
+
+    private String approverName;
+
+    @ApiModelProperty(value = "审批时间")
+    private String examineAndApproveTime;
+
+    @ApiModelProperty(value = "审批备注")
+    private String examineAndApproveRemark;
+
+    @ApiModelProperty(value = "次级审批人id")
+    private String secondaryApproverId;
+
+    private String secondaryApproverName;
+
+    @ApiModelProperty(value = "次级审批时间")
+    private String secondaryExamineAndApproveTime;
+
+    @ApiModelProperty(value = "次级审批备注")
+    private String secondaryExamineAndApproveRemark;
+
+
+
+}

src/main/java/com/template/model/vo/ApplicationProcedureTemporaryRecordVo.java

@@ -0,0 +1,53 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ApplicationProcedureTemporaryRecordVo {
+    private Integer id;
+
+    @ApiModelProperty(value = "申请人id")
+    private Integer usersId;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "部门")
+    private String department;
+
+    @ApiModelProperty(value = "申请原因")
+    private String reasonApplication;
+
+    @ApiModelProperty(value = "提交时间")
+    private String submissionTime;
+
+    @ApiModelProperty(value = "状态，0：已拒绝，1：待审批，2：处理中，3：已同意")
+    private String status;
+
+    @ApiModelProperty(value = "审批人id")
+    private String approverId;
+
+    private String approverName;
+
+    @ApiModelProperty(value = "审批时间")
+    private String examineAndApproveTime;
+
+    @ApiModelProperty(value = "审批备注")
+    private String examineAndApproveRemark;
+
+    @ApiModelProperty(value = "次级审批人id")
+    private String secondaryApproverId;
+
+    private String secondaryApproverName;
+
+    @ApiModelProperty(value = "次级审批时间")
+    private String secondaryExamineAndApproveTime;
+
+    @ApiModelProperty(value = "次级审批备注")
+    private String secondaryExamineAndApproveRemark;
+
+}

src/main/java/com/template/services/ApplicationProcedureService.java

@@ -1,8 +1,9 @@
 package com.template.services;
 
-import com.template.model.pojo.ApplicationProcedure;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.template.model.pojo.ApplicationProcedure;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.ApplicationProcedureRecordVo;
 import com.template.model.vo.ApplicationProcedureVo;
 
 /**
@@ -20,4 +21,6 @@ public interface ApplicationProcedureService extends IService<ApplicationProcedu
 
     PageUtils<ApplicationProcedureVo> parentPageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size);
 
+    PageUtils<ApplicationProcedureRecordVo> appletRecordPage( Integer userId, String startTime, String endTime, String status, int page, int size);
+
 }

src/main/java/com/template/services/ApplicationProcedureTemporaryService.java

@@ -3,6 +3,7 @@ package com.template.services;
 import com.template.model.pojo.ApplicationProcedureTemporary;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.ApplicationProcedureTemporaryRecordVo;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
 
 /**
@@ -20,4 +21,5 @@ public interface ApplicationProcedureTemporaryService extends IService<Applicati
     PageUtils<ApplicationProcedureTemporaryVo> parentPageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size);
 
 
+    PageUtils<ApplicationProcedureTemporaryRecordVo> appletRecordPage(Integer userId, String startTime, String endTime, String status, int page, int size);
 }

src/main/java/com/template/services/impl/ApplicationProcedureServiceImpl.java

@@ -2,13 +2,13 @@ package com.template.services.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.template.model.pojo.ApplicationProcedure;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.mapper.ApplicationProcedureMapper;
+import com.template.model.pojo.ApplicationProcedure;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.ApplicationProcedureRecordVo;
 import com.template.model.vo.ApplicationProcedureVo;
-import com.template.model.vo.HouseVo;
 import com.template.services.ApplicationProcedureService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,5 +40,13 @@ public class ApplicationProcedureServiceImpl extends ServiceImpl<ApplicationProc
         return new PageUtils(result);
     }
 
+    @Override
+    public PageUtils<ApplicationProcedureRecordVo> appletRecordPage( Integer userId, String startTime, String endTime, String status, int page, int size) {
+        Page<ApplicationProcedureRecordVo> recordVoPage = new Page<>(page, size);
+        Page<ApplicationProcedureRecordVo> result= applicationProcedureMapper.appletRecordPage(recordVoPage,userId,startTime,endTime,status);
+
+        return new PageUtils(result);
+    }
+
 
 }

src/main/java/com/template/services/impl/ApplicationProcedureTemporaryServiceImpl.java

@@ -2,14 +2,14 @@ package com.template.services.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.template.mapper.ApplicationProcedureMapper;
-import com.template.model.pojo.ApplicationProcedureTemporary;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.mapper.ApplicationProcedureTemporaryMapper;
+import com.template.model.pojo.ApplicationProcedureTemporary;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.ApplicationProcedureTemporaryRecordVo;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
 import com.template.model.vo.ApplicationProcedureVo;
 import com.template.services.ApplicationProcedureTemporaryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,5 +41,12 @@ public class ApplicationProcedureTemporaryServiceImpl extends ServiceImpl<Applic
         return new PageUtils(result);
     }
 
+    @Override
+    public PageUtils<ApplicationProcedureTemporaryRecordVo> appletRecordPage(Integer userId, String startTime, String endTime, String status, int page, int size) {
+        Page<ApplicationProcedureTemporaryRecordVo> pageVo = new Page<>(page, size);
+        IPage<ApplicationProcedureTemporaryRecordVo> result=applicationProcedureTemporaryMapper.appletRecordPage(pageVo,userId,startTime,endTime,status);
+        return new PageUtils(result);
+    }
+
 
 }

src/main/resources/mapper/template/ApplicationProcedureMapper.xml

@@ -4,40 +4,40 @@
 
     <select id="pageList" resultType="com.template.model.vo.ApplicationProcedureVo">
         SELECT
-            apu.id as id,
-            apu.user_name as usersName,
-            apu.start_time as startTime,
-            apu.end_time as endTime,
-            apu.department as department,
-            apu.change_user_name as changeUsersName,
-            apu.reason_application as reasonApplication,
-            apu.submission_time as submissionTime,
-            apu.`status` as status,
-            apu.approver_user_name as approverUserName,
-            apu.examine_and_approve_time as examineAndApproveTime,
-            apu.examine_and_approve_remark as examineAndApproveRemark
+        apu.id as id,
+        apu.user_name as usersName,
+        apu.start_time as startTime,
+        apu.end_time as endTime,
+        apu.department as department,
+        apu.change_user_name as changeUsersName,
+        apu.reason_application as reasonApplication,
+        apu.submission_time as submissionTime,
+        apu.`status` as status,
+        apu.approver_user_name as approverUserName,
+        apu.examine_and_approve_time as examineAndApproveTime,
+        apu.examine_and_approve_remark as examineAndApproveRemark
         FROM
-            (
-                SELECT
-                    ap.id,
-                    u.user_name AS user_name ,
-                    ap.start_time,
-                    ap.end_time,
-                    ap.department,
-                    u2.user_name as change_user_name,
-                    ap.reason_application,
-                    ap.submission_time,
-                    ap.`status`,
-                    u3.user_name as approver_user_name,
-                    ap.examine_and_approve_time,
-                    ap.examine_and_approve_remark
-                FROM
-                    `application_procedure` ap
-                        LEFT JOIN users u ON ap.users_id = u.id
-                        LEFT JOIN users u2 ON ap.change_users_id = u2.id
-                        LEFT JOIN users u3 ON ap.approver_id = u3.id
-                WHERE ap.deleted=0
-            ) apu
+        (
+        SELECT
+        ap.id,
+        u.user_name AS user_name ,
+        ap.start_time,
+        ap.end_time,
+        ap.department,
+        u2.user_name as change_user_name,
+        ap.reason_application,
+        ap.submission_time,
+        ap.`status`,
+        u3.user_name as approver_user_name,
+        ap.examine_and_approve_time,
+        ap.examine_and_approve_remark
+        FROM
+        `application_procedure` ap
+        LEFT JOIN users u ON ap.users_id = u.id
+        LEFT JOIN users u2 ON ap.change_users_id = u2.id
+        LEFT JOIN users u3 ON ap.approver_id = u3.id
+        WHERE ap.deleted=0
+        ) apu
         <where>
             <if test="submissionStartTime != null and submissionStartTime != '' and submissionEndTime != null and submissionEndTime != '' ">
                 and apu.submission_time >= #{submissionStartTime} and #{submissionEndTime}>= apu.submission_time
@@ -48,7 +48,8 @@
             </if>
 
             <if test="examineAndApproveStartTime != null and examineAndApproveStartTime != '' and examineAndApproveEndTime != null and examineAndApproveEndTime != '' ">
-                and apu.examine_and_approve_time >= #{examineAndApproveStartTime} and #{examineAndApproveEndTime}>= apu.examine_and_approve_time
+                and apu.examine_and_approve_time >= #{examineAndApproveStartTime} and #{examineAndApproveEndTime}>=
+                apu.examine_and_approve_time
             </if>
 
             <if test="type != null and type != ''">
@@ -108,7 +109,8 @@
             </if>
 
             <if test="examineAndApproveStartTime != null and examineAndApproveStartTime != '' and examineAndApproveEndTime != null and examineAndApproveEndTime != '' ">
-                and apu.examine_and_approve_time >= #{examineAndApproveStartTime} and #{examineAndApproveEndTime}>= apu.examine_and_approve_time
+                and apu.examine_and_approve_time >= #{examineAndApproveStartTime} and #{examineAndApproveEndTime}>=
+                apu.examine_and_approve_time
             </if>
 
             <!--<if test="type != null and type != ''">
@@ -122,4 +124,41 @@
         </where>
         ORDER BY apu.submission_time
     </select>
+    <select id="appletRecordPage" resultType="com.template.model.vo.ApplicationProcedureRecordVo">
+        SELECT
+        ap.id,
+        ap.users_id as usersId,
+        ap.start_time as startTime,
+        ap.end_time as endTime,
+        ap.department,
+        ap.change_users_id as changeUsersId,
+        ap.reason_application as reasonApplication,
+        ap.submission_time as submissionTime,
+        ap.status,
+        ap.approver_id as approverId,
+        ap.examine_and_approve_time as examineAndApproveTime,
+        ap.examine_and_approve_remark as examineAndApproveRemark,
+        ap.secondary_approver_id as secondaryApproverId,
+        ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
+        ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
+        u.user_name as changeUsersName,
+        a.name as approverName,
+        a2.name as secondaryApproverName
+        FROM
+        `application_procedure` ap
+        LEFT JOIN users u on u.id=ap.change_users_id
+        LEFT JOIN admin a on a.id=ap.approver_id
+        LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
+        where
+        ap.deleted=0
+        AND ap.users_id=#{userId}
+        <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
+            AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
+        </if>
+        <if test="status != null and status != ''">
+            AND ap.`status`=#{status}
+        </if>
+        ORDER BY ap.submission_time DESC
+
+    </select>
 </mapper>

src/main/resources/mapper/template/ApplicationProcedureTemporaryMapper.xml

@@ -118,4 +118,39 @@
         </where>
         ORDER BY apu.submission_time
     </select>
+    <select id="appletRecordPage" resultType="com.template.model.vo.ApplicationProcedureTemporaryRecordVo">
+        SELECT
+        ap.id,
+        ap.users_id as usersId,
+        ap.start_time as startTime,
+        ap.end_time as endTime,
+        ap.department,
+        ap.reason_application as reasonApplication,
+        ap.submission_time as submissionTime,
+        ap.status,
+        ap.approver_id as approverId,
+        ap.examine_and_approve_time as examineAndApproveTime,
+        ap.examine_and_approve_remark as examineAndApproveRemark,
+        ap.secondary_approver_id as secondaryApproverId,
+        ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
+        ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
+        a.name as approverName,
+        a2.name as secondaryApproverName
+        FROM
+        `application_procedure_temporary` ap
+        LEFT JOIN admin a on a.id=ap.approver_id
+        LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
+        where
+        ap.deleted=0
+        AND ap.users_id=#{userId}
+        <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
+            AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
+        </if>
+        <if test="status != null and status != ''">
+            AND ap.`status`=#{status}
+        </if>
+        ORDER BY ap.submission_time DESC
+
+
+    </select>
 </mapper>