gxwebsoft/gxtyzx-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增:订单导出功能

Browse Source
This commit is contained in:
赵忠林
2024-08-08 15:04:43 +08:00
parent 19868e3047
commit cd958cabc3
9 changed files with 522 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gxwebsoft/booking/controller/OrderExportController.java
+115
View File
@@ -0,0 +1,115 @@
package com.gxwebsoft.booking.controller;
import com.gxwebsoft.common.core.web.BaseController;
import com.gxwebsoft.booking.service.OrderExportService;
import com.gxwebsoft.booking.entity.OrderExport;
import com.gxwebsoft.booking.param.OrderExportParam;
import com.gxwebsoft.common.core.web.ApiResult;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 统计报表导出控制器
*
* @author 科技小王子
* @since 2024-08-08 02:52:45
*/
@Api(tags = "统计报表导出管理")
@RestController
@RequestMapping("/api/booking/order-export")
public class OrderExportController extends BaseController {
@Resource
private OrderExportService orderExportService;
@ApiOperation("分页查询统计报表导出")
@GetMapping("/page")
public ApiResult<PageResult<OrderExport>> page(OrderExportParam param) {
// 使用关联查询
return success(orderExportService.pageRel(param));
}
@ApiOperation("查询全部统计报表导出")
@GetMapping()
public ApiResult<List<OrderExport>> list(OrderExportParam param) {
// 使用关联查询
return success(orderExportService.listRel(param));
}
@PreAuthorize("hasAuthority('booking:orderExport:list')")
@ApiOperation("根据id查询统计报表导出")
@GetMapping("/{id}")
public ApiResult<OrderExport> get(@PathVariable("id") Integer id) {
// 使用关联查询
return success(orderExportService.getByIdRel(id));
}
@ApiOperation("添加统计报表导出")
@PostMapping()
public ApiResult<?> save(@RequestBody OrderExport orderExport) {
// 记录当前登录用户id
User loginUser = getLoginUser();
if (loginUser != null) {
orderExport.setUserId(loginUser.getUserId());
}
if (orderExportService.save(orderExport)) {
return success("添加成功");
}
return fail("添加失败");
}
@ApiOperation("修改统计报表导出")
@PutMapping()
public ApiResult<?> update(@RequestBody OrderExport orderExport) {
if (orderExportService.updateById(orderExport)) {
return success("修改成功");
}
return fail("修改失败");
}
@ApiOperation("删除统计报表导出")
@DeleteMapping("/{id}")
public ApiResult<?> remove(@PathVariable("id") Integer id) {
if (orderExportService.removeById(id)) {
return success("删除成功");
}
return fail("删除失败");
}
@ApiOperation("批量添加统计报表导出")
@PostMapping("/batch")
public ApiResult<?> saveBatch(@RequestBody List<OrderExport> list) {
if (orderExportService.saveBatch(list)) {
return success("添加成功");
}
return fail("添加失败");
}
@ApiOperation("批量修改统计报表导出")
@PutMapping("/batch")
public ApiResult<?> removeBatch(@RequestBody BatchParam<OrderExport> batchParam) {
if (batchParam.update(orderExportService, "export_id")) {
return success("修改成功");
}
return fail("修改失败");
}
@ApiOperation("批量删除统计报表导出")
@DeleteMapping("/batch")
public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
if (orderExportService.removeByIds(ids)) {
return success("删除成功");
}
return fail("删除失败");
}
}
src/main/java/com/gxwebsoft/booking/entity/OrderExport.java
+95
View File
@@ -0,0 +1,95 @@
package com.gxwebsoft.booking.entity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 统计报表导出
*
* @author 科技小王子
* @since 2024-08-08 02:52:45
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "OrderExport对象", description = "统计报表导出")
@TableName("booking_order_export")
public class OrderExport implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "自增ID")
@TableId(value = "export_id", type = IdType.AUTO)
private Integer exportId;
@ApiModelProperty(value = "机构名称")
private String organizationName;
@ApiModelProperty(value = "实际消费的金额(不含退款)")
private BigDecimal expendMoney;
@ApiModelProperty(value = "早餐报餐次数")
private Integer breakfastPost;
@ApiModelProperty(value = "早餐签到次数")
private Integer breakfastSign;
@ApiModelProperty(value = "午餐报餐次数")
private Integer lunchPost;
@ApiModelProperty(value = "午餐签到次数")
private Integer lunchSign;
@ApiModelProperty(value = "晚餐报餐次数")
private Integer dinnerPost;
@ApiModelProperty(value = "晚餐签到次数")
private Integer dinnerSign;
@ApiModelProperty(value = "档口 10 食堂档口 20 物品档口 ")
private String gear;
@ApiModelProperty(value = "商品价格(单价)")
private BigDecimal goodsPrice;
@ApiModelProperty(value = "发货时间")
private LocalDateTime deliveryTime;
@ApiModelProperty(value = "状态, 0待发布, 1已发布")
private Integer status;
@ApiModelProperty(value = "备注")
private String comments;
@ApiModelProperty(value = "订单号")
private Integer orderId;
@ApiModelProperty(value = "机构id")
private Integer organizationId;
@ApiModelProperty(value = "发布人")
private Integer userId;
@ApiModelProperty(value = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
@ApiModelProperty(value = "租户id")
private Integer tenantId;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "修改时间")
private Date updateTime;
}
src/main/java/com/gxwebsoft/booking/mapper/OrderExportMapper.java
+37
View File
@@ -0,0 +1,37 @@
package com.gxwebsoft.booking.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gxwebsoft.booking.entity.OrderExport;
import com.gxwebsoft.booking.param.OrderExportParam;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 统计报表导出Mapper
*
* @author 科技小王子
* @since 2024-08-08 02:52:45
*/
public interface OrderExportMapper extends BaseMapper<OrderExport> {
/**
* 分页查询
*
* @param page 分页对象
* @param param 查询参数
* @return List<OrderExport>
*/
List<OrderExport> selectPageRel(@Param("page") IPage<OrderExport> page,
@Param("param") OrderExportParam param);
/**
* 查询全部
*
* @param param 查询参数
* @return List<User>
*/
List<OrderExport> selectListRel(@Param("param") OrderExportParam param);
}
src/main/java/com/gxwebsoft/booking/mapper/xml/OrderExportMapper.xml
+90
View File
@@ -0,0 +1,90 @@
<?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="com.gxwebsoft.booking.mapper.OrderExportMapper">
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*
FROM booking_order_export a
<where>
<if test="param.exportId != null">
AND a.export_id = #{param.exportId}
</if>
<if test="param.organizationName != null">
AND a.organization_name LIKE CONCAT('%', #{param.organizationName}, '%')
</if>
<if test="param.expendMoney != null">
AND a.expend_money = #{param.expendMoney}
</if>
<if test="param.breakfastPost != null">
AND a.breakfast_post = #{param.breakfastPost}
</if>
<if test="param.breakfastSign != null">
AND a.breakfast_sign = #{param.breakfastSign}
</if>
<if test="param.lunchPost != null">
AND a.lunch_post = #{param.lunchPost}
</if>
<if test="param.lunchSign != null">
AND a.lunch_sign = #{param.lunchSign}
</if>
<if test="param.dinnerPost != null">
AND a.dinner_post = #{param.dinnerPost}
</if>
<if test="param.dinnerSign != null">
AND a.dinner_sign = #{param.dinnerSign}
</if>
<if test="param.gear != null">
AND a.gear LIKE CONCAT('%', #{param.gear}, '%')
</if>
<if test="param.goodsPrice != null">
AND a.goods_price = #{param.goodsPrice}
</if>
<if test="param.deliveryTime != null">
AND a.delivery_time LIKE CONCAT('%', #{param.deliveryTime}, '%')
</if>
<if test="param.status != null">
AND a.status = #{param.status}
</if>
<if test="param.comments != null">
AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
</if>
<if test="param.orderId != null">
AND a.order_id = #{param.orderId}
</if>
<if test="param.organizationId != null">
AND a.organization_id = #{param.organizationId}
</if>
<if test="param.userId != null">
AND a.user_id = #{param.userId}
</if>
<if test="param.deleted != null">
AND a.deleted = #{param.deleted}
</if>
<if test="param.deleted == null">
AND a.deleted = 0
</if>
<if test="param.createTimeStart != null">
AND a.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null">
AND a.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
)
</if>
</where>
</sql>
<!-- 分页查询 -->
<select id="selectPageRel" resultType="com.gxwebsoft.booking.entity.OrderExport">
<include refid="selectSql"></include>
</select>
<!-- 查询全部 -->
<select id="selectListRel" resultType="com.gxwebsoft.booking.entity.OrderExport">
<include refid="selectSql"></include>
</select>
</mapper>
src/main/java/com/gxwebsoft/booking/param/OrderExportParam.java
+94
View File
@@ -0,0 +1,94 @@
package com.gxwebsoft.booking.param;
import java.math.BigDecimal;
import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 统计报表导出查询参数
*
* @author 科技小王子
* @since 2024-08-08 02:52:45
*/
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
@ApiModel(value = "OrderExportParam对象", description = "统计报表导出查询参数")
public class OrderExportParam extends BaseParam {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "自增ID")
@QueryField(type = QueryType.EQ)
private Integer exportId;
@ApiModelProperty(value = "机构名称")
private String organizationName;
@ApiModelProperty(value = "实际消费的金额(不含退款)")
@QueryField(type = QueryType.EQ)
private BigDecimal expendMoney;
@ApiModelProperty(value = "早餐报餐次数")
@QueryField(type = QueryType.EQ)
private Integer breakfastPost;
@ApiModelProperty(value = "早餐签到次数")
@QueryField(type = QueryType.EQ)
private Integer breakfastSign;
@ApiModelProperty(value = "午餐报餐次数")
@QueryField(type = QueryType.EQ)
private Integer lunchPost;
@ApiModelProperty(value = "午餐签到次数")
@QueryField(type = QueryType.EQ)
private Integer lunchSign;
@ApiModelProperty(value = "晚餐报餐次数")
@QueryField(type = QueryType.EQ)
private Integer dinnerPost;
@ApiModelProperty(value = "晚餐签到次数")
@QueryField(type = QueryType.EQ)
private Integer dinnerSign;
@ApiModelProperty(value = "档口 10 食堂档口 20 物品档口 ")
private String gear;
@ApiModelProperty(value = "商品价格(单价)")
@QueryField(type = QueryType.EQ)
private BigDecimal goodsPrice;
@ApiModelProperty(value = "发货时间")
private String deliveryTime;
@ApiModelProperty(value = "状态, 0待发布, 1已发布")
@QueryField(type = QueryType.EQ)
private Integer status;
@ApiModelProperty(value = "备注")
private String comments;
@ApiModelProperty(value = "订单号")
@QueryField(type = QueryType.EQ)
private Integer orderId;
@ApiModelProperty(value = "机构id")
@QueryField(type = QueryType.EQ)
private Integer organizationId;
@ApiModelProperty(value = "发布人")
@QueryField(type = QueryType.EQ)
private Integer userId;
@ApiModelProperty(value = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
}
src/main/java/com/gxwebsoft/booking/service/OrderExportService.java
+42
View File
@@ -0,0 +1,42 @@
package com.gxwebsoft.booking.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.booking.entity.OrderExport;
import com.gxwebsoft.booking.param.OrderExportParam;
import java.util.List;
/**
* 统计报表导出Service
*
* @author 科技小王子
* @since 2024-08-08 02:52:45
*/
public interface OrderExportService extends IService<OrderExport> {
/**
* 分页关联查询
*
* @param param 查询参数
* @return PageResult<OrderExport>
*/
PageResult<OrderExport> pageRel(OrderExportParam param);
/**
* 关联查询全部
*
* @param param 查询参数
* @return List<OrderExport>
*/
List<OrderExport> listRel(OrderExportParam param);
/**
* 根据id查询
*
* @param exportId 自增ID
* @return OrderExport
*/
OrderExport getByIdRel(Integer exportId);
}
src/main/java/com/gxwebsoft/booking/service/impl/OrderExportServiceImpl.java
+47
View File
@@ -0,0 +1,47 @@
package com.gxwebsoft.booking.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gxwebsoft.booking.mapper.OrderExportMapper;
import com.gxwebsoft.booking.service.OrderExportService;
import com.gxwebsoft.booking.entity.OrderExport;
import com.gxwebsoft.booking.param.OrderExportParam;
import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.PageResult;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 统计报表导出Service实现
*
* @author 科技小王子
* @since 2024-08-08 02:52:45
*/
@Service
public class OrderExportServiceImpl extends ServiceImpl<OrderExportMapper, OrderExport> implements OrderExportService {
@Override
public PageResult<OrderExport> pageRel(OrderExportParam param) {
PageParam<OrderExport, OrderExportParam> page = new PageParam<>(param);
page.setDefaultOrder("sort_number asc, create_time desc");
List<OrderExport> list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@Override
public List<OrderExport> listRel(OrderExportParam param) {
List<OrderExport> list = baseMapper.selectListRel(param);
// 排序
PageParam<OrderExport, OrderExportParam> page = new PageParam<>();
page.setDefaultOrder("sort_number asc, create_time desc");
return page.sortRecords(list);
}
@Override
public OrderExport getByIdRel(Integer exportId) {
OrderExportParam param = new OrderExportParam();
param.setExportId(exportId);
return param.getOne(baseMapper.selectListRel(param));
}
}
src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml
+1 -3
View File
@@ -150,12 +150,10 @@
AND a.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.keywords != null">
AND (a.order_no LIKE CONCAT('%', #{param.keywords}, '%')
AND (a.order_no = #{param.keywords}
OR a.order_id = #{param.keywords}
OR a.phone = #{param.keywords}
OR a.user_id = #{param.keywords}
OR a.merchant_id = #{param.keywords}
OR a.merchant_code =#{param.keywords}
)
</if>
</where>