骑行时长减免和强制还车

jiangping

2023-10-10 90d576d41167dc383b499027c8f5624c7a5c63e0

骑行时长减免和强制还车

 server/platform/src/main/java/com/doumee/api/business/ActionLogController.java

@@ -6,7 +6,9 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.ActionLog;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.service.business.ActionLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -73,6 +75,12 @@
    public ApiResponse<PageData<ActionLog>> findPage (@RequestBody PageWrap<ActionLog> pageWrap) {
        return ApiResponse.success(actionLogService.findPage(pageWrap));
    }
    @ApiOperation("分页查询")
    @PostMapping("/findRidePae")
    @RequiresPermissions("business:actionlog:query")
    public ApiResponse<PageData<ActionLog>> findRidePae (@RequestBody PageWrap<ActionLog> pageWrap) {
        return ApiResponse.success(actionLogService.findRidePae(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
@@ -80,6 +88,13 @@
    public void exportExcel (@RequestBody PageWrap<ActionLog> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(ActionLog.class).export(actionLogService.findPage(pageWrap).getRecords(), "系统行为操作记录表", response);
    }
    @ApiOperation("导出调整记录Excel")
    @PostMapping("/exportRideExcel")
    @RequiresPermissions("business:actionlog:exportExcel")
    public void exportRideExcel (@RequestBody PageWrap<ActionLog> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(ActionLog.class).exportWithFirstAndEnd(actionLogService.findRidePae(pageWrap).getRecords(), "调整记录_"+System.currentTimeMillis(),"调整记录_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);

    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")

 server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java

@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.poi.ss.usermodel.HorizontalAlignment;

import java.util.Date;
import java.util.List;

@@ -23,98 +25,96 @@
public class ActionLog {

    @ApiModelProperty(value = "编码")
    @ExcelColumn(name="编码")
    private String id;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    @ExcelColumn(name="创建时间",index = 6,width = 10,align = HorizontalAlignment.CENTER)
    private Date createDate;

    @ApiModelProperty(value = "创建人")
    @ExcelColumn(name="创建人")
    @ExcelColumn(name="创建人",index = 7,width = 10,align = HorizontalAlignment.CENTER)
    private String creator;

    @ApiModelProperty(value = "编辑时间")
    @ExcelColumn(name="编辑时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "编辑人")
    @ExcelColumn(name="编辑人")
    private String editor;

    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String info;

    @ApiModelProperty(value = "标题")
    @ExcelColumn(name="标题")
    private String title;

    @ApiModelProperty(value = "内容")
    @ExcelColumn(name="内容")
    private String content;

    @ApiModelProperty(value = "类型 0强制还车 1骑行时长修改", example = "1")
    @ExcelColumn(name="类型 ")
    @ExcelColumn(name="类型 " ,valueMapping = "0=强制还车;1=骑行时长修改;",index = 5,width = 10,align = HorizontalAlignment.CENTER)
    private Integer type;
    @ApiModelProperty(value = "类型集合", example = "1")
    @TableField(exist = false)
    private List<Integer> typeList;

    @ApiModelProperty(value = "关联对象编码")
    @ExcelColumn(name="关联对象编码")
    private String objId;

    @ApiModelProperty(value = "关联对象类型  ", example = "1")
    @ExcelColumn(name="关联对象类型  ")
    private Integer objType;

    @ApiModelProperty(value = "用户编码")
    @ExcelColumn(name="用户编码")
    private String userId;

    @ApiModelProperty(value = "用户类型 0会员 1系统用户", example = "1")
    @ExcelColumn(name="用户类型 0会员 1系统用户")
    private Integer userType;

    @ApiModelProperty(value = "操作前内容")
    @ExcelColumn(name="操作前内容")
    private String beforeContent;

    @ApiModelProperty(value = "操作后内容")
    @ExcelColumn(name="操作后内容")
    private String afterContent;

    @ApiModelProperty(value = "参数1")
    @ExcelColumn(name="参数1")
    private String param;

    @ApiModelProperty(value = "参数2")
    @ExcelColumn(name="参数2")
    private String param2;

    @ApiModelProperty(value = "参数3")
    @ExcelColumn(name="参数3")
    private String param3;

    @ApiModelProperty(value = "操作结果 0成功 1失败", example = "1")
    @ExcelColumn(name="操作结果 0成功 1失败")
    private Integer result;
    @ApiModelProperty(value = "操作原因")
    @ExcelColumn(name="操作原因",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private String actReason;

    @ApiModelProperty(value = "操作备注")
    @ExcelColumn(name="操作备注",index = 9,width = 10,align = HorizontalAlignment.CENTER)
    private String actInfo;

    @ApiModelProperty(value = "骑行记录对象" )
    @TableField(exist = false)
    private MemberRides ridesObj;
    @ApiModelProperty(value = "车编号" )
    @TableField(exist = false)
    private String bikeCode;
    @ApiModelProperty(value = "用户" )
    @ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    @TableField(exist = false)
    private String openid;
    @ApiModelProperty(value = "借出站点" )
    @ExcelColumn(name="借出站点",index = 3,width = 10,align = HorizontalAlignment.CENTER)
    @TableField(exist = false)
    private String rentSiteId;
    @ApiModelProperty(value = "借出时间" )
    @ExcelColumn(name="借出时间",index = 4,width = 10,align = HorizontalAlignment.CENTER)
    @TableField(exist = false)
    private Date rentDate;
    @ApiModelProperty(value = "查询开始日期（包含）", example = "2023-10-01 15:12:01")
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

 server/services/src/main/java/com/doumee/service/business/ActionLogService.java

@@ -94,4 +94,6 @@
     * @return long
     */
    long count(ActionLog actionLog);

    PageData<ActionLog>  findRidePae(PageWrap<ActionLog> pageWrap);
}

 server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java

@@ -106,7 +106,6 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.orderByDesc(ActionLog::getCreateDate);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,ActionLog::getUserId);
        queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId);
        queryWrapper.eq(ActionLog::getIsdeleted, Constants.ZERO);
        queryWrapper.ge(pageWrap.getModel().getStartDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getStartDate());
        queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate());
@@ -117,6 +116,37 @@

        IPage<ActionLog> result = actionLogJoinMapper.selectJoinPage(page, ActionLog.class, queryWrapper);



        return PageData.from(result);
    }
    @Override
    public     PageData<ActionLog>  findRidePae(PageWrap<ActionLog> pageWrap){

        IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());

        MPJLambdaWrapper<ActionLog> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.orderByDesc(ActionLog::getCreateDate);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,ActionLog::getUserId);
        queryWrapper.leftJoin(MemberRides.class,MemberRides::getMemberId,ActionLog::getObjId);
        queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId);
        queryWrapper.eq(ActionLog::getIsdeleted, Constants.ZERO);
        queryWrapper.ge(pageWrap.getModel().getStartDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getStartDate());
        queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate());
        queryWrapper.eq(pageWrap.getModel().getCreator()!=null, ActionLog::getCreator,pageWrap.getModel().getCreator());
        queryWrapper.in(pageWrap.getModel().getTypeList()!=null && pageWrap.getModel().getTypeList().size()>0, ActionLog::getType,pageWrap.getModel().getTypeList());
        queryWrapper.selectAs(ActionLog::getCreateDate,ActionLog::getCreateDate)
                .selectAs(ActionLog::getActInfo,ActionLog::getActInfo)
                .selectAs(ActionLog::getActReason,ActionLog::getActReason)
                .selectAs(SystemUser::getNickname,ActionLog::getCreator)
                .selectAs(Member::getOpenid,ActionLog::getOpenid)
                .selectAs(MemberRides::getBikeCode,ActionLog::getBikeCode)
                .selectAs(MemberRides::getRentSiteId,ActionLog::getRentSiteId)
                .selectAs(MemberRides::getRentDate,ActionLog::getRentDate);

        IPage<ActionLog> result = actionLogJoinMapper.selectJoinPage(page, ActionLog.class, queryWrapper);

        if(result !=null && result.getRecords()!=null){
            for (int i = 0; i < result.getRecords().size(); i++) {
                ActionLog log = result.getRecords().get(i);