Commit 9185e70e authored by 332784038@qq.com's avatar 332784038@qq.com

批量订单费用申请查询列表补充返回值

parent 27bb0b70
......@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.order.dal.dataobject.batchOrderFeeApply.BatchOrde
import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.order.vo.batchOrderFeeApply.*;
import org.apache.ibatis.annotations.Param;
/**
* 批量费用申请 Mapper
......@@ -46,4 +47,8 @@ public interface BatchOrderFeeApplyMapper extends AbstractMapper<BatchOrderFeeAp
return null;
}
long batchOrderFeeApplyCount(@Param("query") BatchOrderFeeApplyQueryVO query);
List<BatchOrderFeeApplyBackVO> batchOrderFeeApplyList(@Param("start") int start, @Param("size") int size, @Param("query") BatchOrderFeeApplyQueryVO query);
}
......@@ -45,7 +45,7 @@ public interface BatchOrderFeeApplyService extends IService<BatchOrderFeeApplyDO
* @param query 查询
* @return 批量费用申请分页
*/
PageResult<BatchOrderFeeApplyDO> getBatchOrderFeeApplyPage(BatchOrderFeeApplyQueryVO query, PageVO page);
PageResult<BatchOrderFeeApplyBackVO> getBatchOrderFeeApplyPage(BatchOrderFeeApplyQueryVO query, PageVO page);
/**
* 获得批量费用申请列表, 用于 Excel 导出
......
......@@ -14,6 +14,8 @@ import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
import cn.iocoder.yudao.framework.http.util.StrUtils;
import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.bpm.api.BpmCreateServiceFactory;
import cn.iocoder.yudao.module.bpm.enums.WorkFlowEmus;
......@@ -26,9 +28,11 @@ import cn.iocoder.yudao.module.order.service.order.OrderFeeApplicationService;
import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
import cn.iocoder.yudao.module.order.service.order.OrderService;
import cn.iocoder.yudao.module.order.vo.order.ApplyInfoVO;
import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
import cn.iocoder.yudao.module.order.vo.orderFeeApplication.OrderFeeApplicationCreateReqVO;
import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
......@@ -171,8 +175,14 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
}
@Override
public PageResult<BatchOrderFeeApplyDO> getBatchOrderFeeApplyPage(BatchOrderFeeApplyQueryVO query, PageVO page) {
return batchOrderFeeApplyMapper.selectPage(page, query);
public PageResult<BatchOrderFeeApplyBackVO> getBatchOrderFeeApplyPage(BatchOrderFeeApplyQueryVO query, PageVO page) {
IPage<BatchOrderFeeApplyBackVO> mpPage = MyBatisUtils.buildPage(page);
long total = batchOrderFeeApplyMapper.batchOrderFeeApplyCount(query);
int start = (page.getPage() - 1) * page.getRows();
int size = page.getRows();
List<BatchOrderFeeApplyBackVO> list = batchOrderFeeApplyMapper.batchOrderFeeApplyList(start, size, query);
return new PageResult<>(list, total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
}
@Override
......
package cn.iocoder.yudao.module.order.vo.batchOrderFeeApply;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.*;
import java.util.*;
import io.swagger.annotations.*;
......@@ -17,15 +18,15 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
public class BatchOrderFeeApplyBackVO {
@ExcelProperty("主键")
@ApiModelProperty(value = "主键", required = true)
@ApiModelProperty(value = "主键")
private Long id;
@ExcelProperty("编号")
@ApiModelProperty(value = "编号", required = true)
@ApiModelProperty(value = "编号")
private String no;
@ExcelProperty("申请详情")
@ApiModelProperty(value = "申请详情", required = true)
@ApiModelProperty(value = "申请详情")
private String details;
@ExcelProperty("原因")
......@@ -41,9 +42,22 @@ public class BatchOrderFeeApplyBackVO {
private String formId;
@ExcelProperty("创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "创建时间", required = true)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "申请人id")
private String creator;
@ApiModelProperty(value = "申请人名称")
private String creatorName;
@ApiModelProperty(value = "审批人id")
private String audit;
@ApiModelProperty(value = "审批人名称")
private String auditName;
@ApiModelProperty("批量申请详情信息")
private BatchApplyDetailsInfoVO batchApplyDetailsInfoVO;
......
......@@ -28,4 +28,7 @@ public class BatchOrderFeeApplyQueryVO {
@ApiModelProperty(value = "结束创建时间")
private Date endCreateTime;
@ApiModelProperty(value = "创建人")
private String creator;
}
<?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">
<mapper namespace="cn.iocoder.yudao.module.order.dal.mysql.batchOrderFeeApply.BatchOrderFeeApplyMapper">
<select id="batchOrderFeeApplyCount" resultType="java.lang.Long">
select
count(1)
from ecw_batch_order_fee_apply a
where a.`deleted` = 0
<include refid="query"/>
</select>
<select id="batchOrderFeeApplyList"
resultType="cn.iocoder.yudao.module.order.vo.batchOrderFeeApply.BatchOrderFeeApplyBackVO">
select
a.id,
a.no,
a.reason,
a.state,
a.form_id,
a.creator,
u.creator_name,
a.audit,
u2.audit_name
from ecw_batch_order_fee_apply a
left join system_user u
on a.creator = u.id
left join system_user u2
on a.audit = u2.id
where a.`deleted` = 0
<include refid="query"/>
order by a.id desc
</select>
<sql id="query">
<if test="query.no != null and query.no != '' ">
AND a.`no` like concat('%',concat(#{query.no},'%'))
</if>
<if test="query.beginCreateTime != null and query.endCreateTime != null ">
AND a.`create_time` between #{query.beginCreateTime} and #{query.endCreateTime}
</if>
<if test="query.creator != null and query.creator != '' ">
AND a.`creator` = #{query.creator}
</if>
</sql>
</mapper>
......@@ -71,8 +71,8 @@ public class BatchOrderFeeApplyController {
@ApiOperation("获得批量订单费用申请分页")
@PreAuthorize("@ss.hasPermission('ecw:batch-order-fee-apply:query')")
public CommonResult<PageResult<BatchOrderFeeApplyBackVO>> getBatchOrderFeeApplyPage(@Valid BatchOrderFeeApplyQueryVO query, PageVO page) {
PageResult<BatchOrderFeeApplyDO> pageResult = batchOrderFeeApplyService.getBatchOrderFeeApplyPage(query, page);
return success(BatchOrderFeeApplyConvert.INSTANCE.convertPage(pageResult));
PageResult<BatchOrderFeeApplyBackVO> pageResult = batchOrderFeeApplyService.getBatchOrderFeeApplyPage(query, page);
return success(pageResult);
}
}
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