年假实体对象增加

common/src/main/java/com/jpsoft/shinestar/modules/business/dao/YearRequestForLeaveInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.shinestar.modules.business.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.shinestar.modules.business.entity.YearRequestForLeaveInfo;
+import java.util.Map;
+import com.jpsoft.shinestar.modules.common.dto.Sort;
+
+@Repository
+public interface YearRequestForLeaveInfoDAO {
+	int insert(YearRequestForLeaveInfo entity);
+	int update(YearRequestForLeaveInfo entity);
+	int exist(String id);
+	YearRequestForLeaveInfo get(String id);
+	int delete(String id);
+	List<YearRequestForLeaveInfo> list();
+	List<YearRequestForLeaveInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/shinestar/modules/business/entity/YearRequestForLeaveInfo.java

@@ -0,0 +1,104 @@
+package com.jpsoft.shinestar.modules.business.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:business_year_request_for_leave_info的实体类
+ */
+@Data
+@ApiModel(value = "business_year_request_for_leave_info的实体类")
+public class YearRequestForLeaveInfo {
+		@ApiModelProperty(value = "uuid")
+	private String id;
+	
+					@ApiModelProperty(value = "开始时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date startTime;
+	
+				@ApiModelProperty(value = "结束时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date endTime;
+	
+			@ApiModelProperty(value = "上传照片")
+	private String imageUrl;
+	
+				@ApiModelProperty(value = "请假理由")
+	private String reason;
+	
+				@ApiModelProperty(value = "请假人")
+	private Long personId;
+	
+				@ApiModelProperty(value = "申请人的角色id")
+	private String personPopedomId;
+	
+				@ApiModelProperty(value = "备注")
+	private String remark;
+	
+				@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+			@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+					@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	
+				@ApiModelProperty(value = "审核状态（0：审核中，1：同意，2：退回，3：拒绝，4：无需审核，6：已撤销）")
+	private Integer status;
+	
+				@ApiModelProperty(value = "意见说明")
+	private String approvalExplain;
+	
+					@ApiModelProperty(value = "审批时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date approvedTime;
+	
+			@ApiModelProperty(value = "开始时间段（0：上午，1：下午）")
+	private String startTimeQuantum;
+	
+				@ApiModelProperty(value = "结束时间段（0：上午，1：下午）")
+	private String endTimeQuantum;
+	
+				@ApiModelProperty(value = "审批人id（包含历史记录）")
+	private String approvalPersonIdStr;
+	
+				@ApiModelProperty(value = "审批状态（包含历史记录）")
+	private String approvalStatusStr;
+	
+				@ApiModelProperty(value = "审核时间（包含历史记录）")
+	private String approvalTimeStr;
+	
+				@ApiModelProperty(value = "审核意见（包含历史记录）")
+	private String approvalContentStr;
+	
+				@ApiModelProperty(value = "审批人身份id")
+	private String approvedPersonPopedomId;
+	
+				@ApiModelProperty(value = "年假天数")
+	private String days;
+	
+				@ApiModelProperty(value = "流程实例编号")
+	private String procinstId;
+	
+		}

common/src/main/java/com/jpsoft/shinestar/modules/business/service/YearRequestForLeaveInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.shinestar.modules.business.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.shinestar.modules.business.entity.YearRequestForLeaveInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.shinestar.modules.common.dto.Sort;
+
+public interface YearRequestForLeaveInfoService {
+	YearRequestForLeaveInfo get(String id);
+	boolean exist(String id);
+	int insert(YearRequestForLeaveInfo model);
+	int update(YearRequestForLeaveInfo model);
+	int delete(String id);
+	List<YearRequestForLeaveInfo> list();
+	Page<YearRequestForLeaveInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/shinestar/modules/business/service/impl/YearRequestForLeaveInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.shinestar.modules.business.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.shinestar.modules.business.dao.YearRequestForLeaveInfoDAO;
+import com.jpsoft.shinestar.modules.business.entity.YearRequestForLeaveInfo;
+import com.jpsoft.shinestar.modules.business.service.YearRequestForLeaveInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.shinestar.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="yearRequestForLeaveInfoService")
+public class YearRequestForLeaveInfoServiceImpl implements YearRequestForLeaveInfoService {
+	@Resource(name="yearRequestForLeaveInfoDAO")
+	private YearRequestForLeaveInfoDAO yearRequestForLeaveInfoDAO;
+
+	@Override
+	public YearRequestForLeaveInfo get(String id) {
+		// TODO Auto-generated method stub
+		return yearRequestForLeaveInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(YearRequestForLeaveInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return yearRequestForLeaveInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(YearRequestForLeaveInfo model) {
+		// TODO Auto-generated method stub
+		return yearRequestForLeaveInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return yearRequestForLeaveInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = yearRequestForLeaveInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<YearRequestForLeaveInfo> list() {
+		// TODO Auto-generated method stub
+		return yearRequestForLeaveInfoDAO.list();
+	}
+		
+	@Override
+	public Page<YearRequestForLeaveInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<YearRequestForLeaveInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            yearRequestForLeaveInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/resources/mapper/business/YearRequestForLeaveInfo.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.shinestar.modules.business.dao.YearRequestForLeaveInfoDAO">
+	<resultMap id="YearRequestForLeaveInfoMap" type="com.jpsoft.shinestar.modules.business.entity.YearRequestForLeaveInfo">
+		<id property="id" column="id_" />
+			<result property="startTime" column="start_time" />
+			<result property="endTime" column="end_time" />
+			<result property="imageUrl" column="image_url" />
+			<result property="reason" column="reason_" />
+			<result property="personId" column="person_id" />
+			<result property="personPopedomId" column="person_popedom_id" />
+			<result property="remark" column="remark_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="status" column="status_" />
+			<result property="approvalExplain" column="approval_explain" />
+			<result property="approvedTime" column="approved_time" />
+			<result property="startTimeQuantum" column="start_time_quantum" />
+			<result property="endTimeQuantum" column="end_time_quantum" />
+			<result property="approvalPersonIdStr" column="approval_person_id_str" />
+			<result property="approvalStatusStr" column="approval_status_str" />
+			<result property="approvalTimeStr" column="approval_time_str" />
+			<result property="approvalContentStr" column="approval_content_str" />
+			<result property="approvedPersonPopedomId" column="approved_person_popedom_id" />
+			<result property="days" column="days_" />
+			<result property="procinstId" column="procinst_id" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.shinestar.modules.business.entity.YearRequestForLeaveInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into business_year_request_for_leave_info
+	    (id_,start_time,end_time,image_url,reason_,person_id,person_popedom_id,remark_,create_by,create_time,update_by,update_time,del_flag,status_,approval_explain,approved_time,start_time_quantum,end_time_quantum,approval_person_id_str,approval_status_str,approval_time_str,approval_content_str,approved_person_popedom_id,days_,procinst_id)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{startTime,jdbcType= TIMESTAMP }
+,#{endTime,jdbcType= TIMESTAMP }
+,#{imageUrl,jdbcType=VARCHAR}
+,#{reason,jdbcType=VARCHAR}
+,#{personId,jdbcType= NUMERIC }
+,#{personPopedomId,jdbcType=VARCHAR}
+,#{remark,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{status,jdbcType= NUMERIC }
+,#{approvalExplain,jdbcType=VARCHAR}
+,#{approvedTime,jdbcType= TIMESTAMP }
+,#{startTimeQuantum,jdbcType=VARCHAR}
+,#{endTimeQuantum,jdbcType=VARCHAR}
+,#{approvalPersonIdStr,jdbcType=VARCHAR}
+,#{approvalStatusStr,jdbcType=VARCHAR}
+,#{approvalTimeStr,jdbcType=VARCHAR}
+,#{approvalContentStr,jdbcType=VARCHAR}
+,#{approvedPersonPopedomId,jdbcType=VARCHAR}
+,#{days,jdbcType=VARCHAR}
+,#{procinstId,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from business_year_request_for_leave_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.shinestar.modules.business.entity.YearRequestForLeaveInfo">
+		update business_year_request_for_leave_info
+		<set>
+				<if test="startTime!=null">
+		start_time=#{startTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="endTime!=null">
+		end_time=#{endTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="imageUrl!=null">
+		image_url=#{imageUrl,jdbcType=VARCHAR},
+		</if>
+				<if test="reason!=null">
+		reason_=#{reason,jdbcType=VARCHAR},
+		</if>
+				<if test="personId!=null">
+		person_id=#{personId,jdbcType= NUMERIC },
+		</if>
+				<if test="personPopedomId!=null">
+		person_popedom_id=#{personPopedomId,jdbcType=VARCHAR},
+		</if>
+				<if test="remark!=null">
+		remark_=#{remark,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="status!=null">
+		status_=#{status,jdbcType= NUMERIC },
+		</if>
+				<if test="approvalExplain!=null">
+		approval_explain=#{approvalExplain,jdbcType=VARCHAR},
+		</if>
+				<if test="approvedTime!=null">
+		approved_time=#{approvedTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="startTimeQuantum!=null">
+		start_time_quantum=#{startTimeQuantum,jdbcType=VARCHAR},
+		</if>
+				<if test="endTimeQuantum!=null">
+		end_time_quantum=#{endTimeQuantum,jdbcType=VARCHAR},
+		</if>
+				<if test="approvalPersonIdStr!=null">
+		approval_person_id_str=#{approvalPersonIdStr,jdbcType=VARCHAR},
+		</if>
+				<if test="approvalStatusStr!=null">
+		approval_status_str=#{approvalStatusStr,jdbcType=VARCHAR},
+		</if>
+				<if test="approvalTimeStr!=null">
+		approval_time_str=#{approvalTimeStr,jdbcType=VARCHAR},
+		</if>
+				<if test="approvalContentStr!=null">
+		approval_content_str=#{approvalContentStr,jdbcType=VARCHAR},
+		</if>
+				<if test="approvedPersonPopedomId!=null">
+		approved_person_popedom_id=#{approvedPersonPopedomId,jdbcType=VARCHAR},
+		</if>
+				<if test="days!=null">
+		days_=#{days,jdbcType=VARCHAR},
+		</if>
+				<if test="procinstId!=null">
+		procinst_id=#{procinstId,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="YearRequestForLeaveInfoMap">
+		select * from business_year_request_for_leave_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from business_year_request_for_leave_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="YearRequestForLeaveInfoMap">
+		select * from business_year_request_for_leave_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="YearRequestForLeaveInfoMap">
+		<![CDATA[
+			select * from business_year_request_for_leave_info
+		]]>
+		<where>
+			del_flag = false
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

web/src/main/java/com/jpsoft/shinestar/modules/business/controller/YearRequestForLeaveInfoController.java

@@ -0,0 +1,228 @@
+package com.jpsoft.shinestar.modules.business.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.shinestar.modules.common.dto.MessageResult;
+import com.jpsoft.shinestar.modules.common.dto.Sort;
+import com.jpsoft.shinestar.modules.business.entity.YearRequestForLeaveInfo;
+import com.jpsoft.shinestar.modules.business.service.YearRequestForLeaveInfoService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.mapping.ResultMap;
+import com.jpsoft.shinestar.modules.common.utils.PojoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/business/yearRequestForLeaveInfo")
+public class YearRequestForLeaveInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private YearRequestForLeaveInfoService yearRequestForLeaveInfoService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<YearRequestForLeaveInfo> create(){
+        MessageResult<YearRequestForLeaveInfo> msgResult = new MessageResult<>();
+
+        YearRequestForLeaveInfo yearRequestForLeaveInfo = new YearRequestForLeaveInfo();
+
+        msgResult.setData(yearRequestForLeaveInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<YearRequestForLeaveInfo> add(@RequestBody YearRequestForLeaveInfo yearRequestForLeaveInfo,@RequestAttribute String subject){
+        MessageResult<YearRequestForLeaveInfo> msgResult = new MessageResult<>();
+
+        try {
+            yearRequestForLeaveInfo.setId(UUID.randomUUID().toString());
+			yearRequestForLeaveInfo.setDelFlag(false);
+            yearRequestForLeaveInfo.setCreateBy(subject);
+            yearRequestForLeaveInfo.setCreateTime(new Date());
+
+            int affectCount = yearRequestForLeaveInfoService.insert(yearRequestForLeaveInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(yearRequestForLeaveInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<YearRequestForLeaveInfo> edit(@PathVariable("id") String id){
+        MessageResult<YearRequestForLeaveInfo> msgResult = new MessageResult<>();
+
+        try {
+            YearRequestForLeaveInfo yearRequestForLeaveInfo = yearRequestForLeaveInfoService.get(id);
+
+            if (yearRequestForLeaveInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(yearRequestForLeaveInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<YearRequestForLeaveInfo> update(@RequestBody YearRequestForLeaveInfo yearRequestForLeaveInfo,@RequestAttribute String subject){
+        MessageResult<YearRequestForLeaveInfo> msgResult = new MessageResult<>();
+
+        try {
+		    yearRequestForLeaveInfo.setUpdateBy(subject);
+            yearRequestForLeaveInfo.setUpdateTime(new Date());
+		
+            int affectCount = yearRequestForLeaveInfoService.update(yearRequestForLeaveInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(yearRequestForLeaveInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="删除用户")
+    @PostMapping("delete/{id}")
+    public MessageResult<YearRequestForLeaveInfo> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<YearRequestForLeaveInfo> msgResult = new MessageResult<>();
+
+        try {
+			
+			YearRequestForLeaveInfo yearRequestForLeaveInfo = yearRequestForLeaveInfoService.get(id);
+            yearRequestForLeaveInfo.setDelFlag(true);
+            yearRequestForLeaveInfo.setUpdateBy(subject);
+            yearRequestForLeaveInfo.setUpdateTime(new Date());
+			
+			int affectCount = yearRequestForLeaveInfoService.update(yearRequestForLeaveInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                YearRequestForLeaveInfo yearRequestForLeaveInfo = yearRequestForLeaveInfoService.get(id);
+                yearRequestForLeaveInfo.setDelFlag(true);
+                yearRequestForLeaveInfo.setUpdateBy(subject);
+                yearRequestForLeaveInfo.setUpdateTime(new Date());
+
+                affectCount += yearRequestForLeaveInfoService.update(yearRequestForLeaveInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<YearRequestForLeaveInfo> page = yearRequestForLeaveInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}