Skip to content

B
bailuntec-cost
Commit 5926eb7b by liyanlin
Options

增加查询审批历史接口

parent 1586e07d
Showing with 183 additions and 6 deletions
cost-service/src/main/java/com/blt/other/module/cost/controller/ApprovalHistoryController.java 0 → 100644
package com.blt.other.module.cost.controller;
import com.blt.other.module.cost.dto.request.ApprovalHistoryReq;
import com.blt.other.module.cost.dto.response.ApprovalHistoryResult;
import com.blt.other.module.cost.service.ApprovalHistoryService;
import com.blt.other.module.cost.vo.ApprovalHistoryVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author: li.yanlin
* @Description：
* @Date: Created in
* @Modified by:
*/
@Api(tags = "审批历史")
@RestController
@RequestMapping("/cost/approval/history")
public class ApprovalHistoryController {
@Resource
ApprovalHistoryService approvalHistoryService;
@ApiOperation("获取审批历史列表")
@GetMapping
public ApprovalHistoryResult get(ApprovalHistoryReq req){
ApprovalHistoryResult result = new ApprovalHistoryResult();
try {
List<ApprovalHistoryVo> list = approvalHistoryService.getApprovalHistoryList(req);
result.setSuccess(true);
result.setList(list);
}
catch (Exception ex){
result.setSuccess(false);
result.setMsg(ex.getMessage());
}
return result;
}
}
cost-service/src/main/java/com/blt/other/module/cost/dao/ApprovalHistoryMapper.java
package com.blt.other.module.cost.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.blt.other.module.cost.dto.request.ApprovalHistoryReq;
import com.blt.other.module.cost.model.ApprovalHistoryDomain;
import com.blt.other.module.cost.vo.ApprovalHistoryVo;
import java.util.List;
/**
* @Author: li.yanlin
......@@ -10,4 +14,6 @@ import com.blt.other.module.cost.model.ApprovalHistoryDomain;
* @Modified by:
*/
public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistoryDomain> {
List<ApprovalHistoryVo> getApprovalHistoryList(ApprovalHistoryReq req);
}
cost-service/src/main/java/com/blt/other/module/cost/dto/request/ApprovalHistoryReq.java 0 → 100644
package com.blt.other.module.cost.dto.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @Author: li.yanlin
* @Description：
* @Date: Created in
* @Modified by:
*/
@Data
@ApiModel("审批请求Model")
public class ApprovalHistoryReq {
@ApiModelProperty("审批时间-起始时间")
private LocalDateTime startTime;
@ApiModelProperty("审批时间-结束时间")
private LocalDateTime endTime;
@ApiModelProperty("审批前费用单状态")
private Integer costStatus;
@ApiModelProperty("费用类型")
private String typeNo;
}
cost-service/src/main/java/com/blt/other/module/cost/dto/response/ApprovalHistoryResult.java 0 → 100644
package com.blt.other.module.cost.dto.response;
import com.blt.other.module.cost.vo.ApprovalHistoryVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author: li.yanlin
* @Description：
* @Date: Created in
* @Modified by:
*/
@Data
public class ApprovalHistoryResult {
@ApiModelProperty("是否查询成功")
private Boolean success;
@ApiModelProperty("结果集")
private List<ApprovalHistoryVo> list;
@ApiModelProperty("返回消息")
private String msg;
}
cost-service/src/main/java/com/blt/other/module/cost/service/ApprovalHistoryService.java
......@@ -2,7 +2,11 @@ package com.blt.other.module.cost.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.blt.other.module.cost.dao.ApprovalHistoryMapper;
import com.blt.other.module.cost.dto.request.ApprovalHistoryReq;
import com.blt.other.module.cost.model.ApprovalHistoryDomain;
import com.blt.other.module.cost.vo.ApprovalHistoryVo;
import java.util.List;
/**
* @Author: li.yanlin
......@@ -11,4 +15,11 @@ import com.blt.other.module.cost.model.ApprovalHistoryDomain;
* @Modified by:
*/
public interface ApprovalHistoryService extends IService<ApprovalHistoryDomain> {
/**
* 获取审批历史列表
* @param req
* @return
*/
List<ApprovalHistoryVo> getApprovalHistoryList(ApprovalHistoryReq req);
}
cost-service/src/main/java/com/blt/other/module/cost/service/impl/ApprovalHistoryServiceImpl.java
package com.blt.other.module.cost.service.impl;
import com.bailuntec.common.exception.BizException;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.blt.other.module.cost.dao.ApprovalHistoryMapper;
import com.blt.other.module.cost.dto.request.ApprovalHistoryReq;
import com.blt.other.module.cost.model.ApprovalHistoryDomain;
import com.blt.other.module.cost.service.ApprovalHistoryService;
import com.blt.other.module.cost.vo.ApprovalHistoryVo;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author: li.yanlin
* @Description：
......@@ -14,4 +20,18 @@ import org.springframework.stereotype.Service;
*/
@Service
public class ApprovalHistoryServiceImpl extends ServiceImpl<ApprovalHistoryMapper, ApprovalHistoryDomain> implements ApprovalHistoryService {
@Resource
ApprovalHistoryMapper approvalHistoryMapper;
@Override
public List<ApprovalHistoryVo> getApprovalHistoryList(ApprovalHistoryReq req) {
if(req.getStartTime() == null || req.getEndTime() == null){
throw new BizException("查询时间不可为空");
}
if(req.getStartTime().isAfter(req.getEndTime())){
throw new BizException("查询起始时间不可大于查询结束时间");
}
return approvalHistoryMapper.getApprovalHistoryList(req);
}
}
cost-service/src/main/java/com/blt/other/module/cost/vo/ApprovalHistoryVo.java 0 → 100644
package com.blt.other.module.cost.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @Author: li.yanlin
* @Description：
* @Date: Created in
* @Modified by:
*/
@Data
@ApiModel("审批历史查询Vo")
public class ApprovalHistoryVo {
@ApiModelProperty(value = "费用单号")
private String costNo;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "审批时间")
private LocalDateTime approvalTime;
@ApiModelProperty(value = "审批前费用状态")
private Integer costStatus;
@ApiModelProperty(value = "是否通过")
private boolean isPassed;
@ApiModelProperty(value = "审批人")
private String username;
@ApiModelProperty("费用类型")
private String typeName;
}
cost-service/src/main/resources/mapper/ApprovalHistoryMapper.xml
......@@ -3,10 +3,12 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.blt.other.module.cost.dao.ApprovalHistoryMapper">
<!--<select id="select" resultType="com.blt.other.module.cost.model.ApprovalHistoryDomain">
SELECT
*
FROM
approval_history
</select>-->
<select id="getApprovalHistoryList" parameterType="com.blt.other.module.cost.dto.request.ApprovalHistoryReq" resultType="com.blt.other.module.cost.vo.ApprovalHistoryVo">
select ah.cost_no as costNo ,ah.cost_status as costStatus ,ah.is_passed as isPassed ,ah.approval_time as approvalTime ,c.type_name as typeName,u.username from approval_history ah
left join cost c on c.cost_no = ah.cost_no
left join `user` u on u.userid = ah.approval_user_id
where ah.approval_time between #{startTime} and #{endTime}
<if test="costStatus != null">and ah.cost_status = #{costStatus}</if>
<if test="typeNo != null">and ah.type_no = #{typeNo}</if>
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment