提交 20a17f75 authored 作者: aiqingguo's avatar aiqingguo

司机上报

上级 9d86c241
......@@ -85,6 +85,28 @@ public enum OrderChildEnum {
}
}
@Getter
@AllArgsConstructor
public enum CancelType {
PERSONAL(1, "个人原因"),
PRICE(2, "价格不合适"),
LOAD(3, "无法装货"),
TRUCK(4, "车辆原因"),
TRAFFIC_RESTRICTION(5, "交通管制"),
TRAFFIC_ACCIDENT(6, "交通事故"),
ADDRESS(7, "无法找到地址"),
OTHER(9, "其他原因"),
;
private final int code;
private final String msg;
public static Optional<CancelType> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
}
}
// 运输中
public static final List<Integer> TRANSIT_lIST = Arrays.asList(
Status.CREATED.getCode(),
......
......@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import java.util.List;
@Getter
@Setter
......@@ -16,8 +17,13 @@ public class OrderChildDriverCancelParam extends PositionParam {
@NotBlank(message = "运单编号不能为空")
private String childNo;
@ApiModelProperty(value = "取消原因类型:1个人原因, 2价格不合适, 3无法装货, 4车辆原因, 5交通管制, 6交通事故, 7无法找到地址, 8排队时间较长, 9其他原因", example = "1")
private Integer cancelType;
@ApiModelProperty(value = "取消原因", example = "信息错误")
@NotBlank(message = "取消原因不能为空")
private String remark;
@ApiModelProperty(value = "图片列表")
private List<String> imageList;
}
......@@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank;
@Getter
@Setter
@NoArgsConstructor
public class CollectLineReportOrderChildCancelAbnormalSaveParam {
public class CollectLineReportNoTakeOrderAbnormalSaveParam {
@ApiModelProperty(value = "运单编号")
@NotBlank(message = "运单编号不能为空")
......
......@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import java.util.List;
@Getter
@Setter
......@@ -15,5 +16,6 @@ public class CollectLineReportOtherSaveParam {
@ApiModelProperty(value = "上报信息")
@NotBlank(message = "上报信息不能为空")
private String remark;
@ApiModelProperty(value = "上报图片")
private List<String> imageList;
}
......@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import java.util.List;
@Getter
@Setter
......@@ -15,6 +16,8 @@ public class CollectLineReportQualitySaveParam {
@ApiModelProperty(value = "运单编号")
@NotBlank(message = "运单编号不能为空")
private String childNo;
@ApiModelProperty(value = "图片列表")
private List<String> imageList;
@ApiModelProperty(value = "无法到达交货地原因", example = "车辆问题")
@NotBlank(message = "无法到达交货地原因不能为空")
......
package com.clx.performance.param.app.collect;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Getter
@Setter
@NoArgsConstructor
public class CollectLineReportSendAddressAuditParam {
@ApiModelProperty(value = "id")
@NotBlank(message = "id不能为空")
private Integer id;
// @ApiModelProperty(value = "审核状态:0待审核 1已审核", example = "1")
// private Integer auditStatus;
}
package com.clx.performance.param.app.collect;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
@Getter
@Setter
@NoArgsConstructor
public class CollectLineReportTruckWaitAuditParam {
@ApiModelProperty(value = "id")
@NotBlank(message = "id不能为空")
private Integer id;
// @ApiModelProperty(value = "审核状态:0待审核 1已审核", example = "1")
// private Integer auditStatus;
}
package com.clx.performance.param.app.collect;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
@Getter
@Setter
@NoArgsConstructor
public class CollectTrafficCongestionAuditParam {
@ApiModelProperty(value = "id")
@NotBlank(message = "id不能为空")
private Integer id;
// @ApiModelProperty(value = "审核状态:0待审核 1已审核", example = "1")
// private Integer auditStatus;
}
......@@ -20,6 +20,16 @@ public class CollectTrafficCongestionSaveParam {
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
@ApiModelProperty(value = "省", example = "")
private String province;
@ApiModelProperty(value = "市", example = "")
private String city;
@ApiModelProperty(value = "区县", example = "")
private String county;
@ApiModelProperty(value = "乡镇", example = "")
private String town;
@ApiModelProperty(value = "街道", example = "")
private String street;
@ApiModelProperty(value = "详细地址", example = "北京路1号")
private String address;
......
......@@ -18,7 +18,7 @@ public class CollectTruckLocationSaveParam {
@NotBlank(message = "车牌号不能为空")
private String truckNo;
@ApiModelProperty(value = "车辆出车状态 1:空车 2:运单-空车 3:运单-重车", example = "1")
@ApiModelProperty(value = "车辆出车状态 1:空车 2重车", example = "1")
@NotNull(message = "车辆出车状态不能空")
private Integer truckOrderStatus;
......@@ -27,6 +27,16 @@ public class CollectTruckLocationSaveParam {
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
@ApiModelProperty(value = "省", example = "")
private String province;
@ApiModelProperty(value = "市", example = "")
private String city;
@ApiModelProperty(value = "区县", example = "")
private String county;
@ApiModelProperty(value = "乡镇", example = "")
private String town;
@ApiModelProperty(value = "街道", example = "")
private String street;
@ApiModelProperty(value = "详细地址", example = "北京路1号")
private String address;
......
......@@ -23,10 +23,6 @@ public class CollectWaitReportReceiveAddressSaveParam {
@NotNull(message = "排队状态不能为空")
private Integer waitType;
@ApiModelProperty(value = "预计站内等待时长", example = "1")
private BigDecimal stationInTime;
@ApiModelProperty(value = "预计站内等待时长图片列表")
private List<String> stationInImageList;
@ApiModelProperty(value = "预计站外等待时长", example = "1")
private BigDecimal stationOutTime;
@ApiModelProperty(value = "预计站外等待时长图片列表")
......
......@@ -27,9 +27,5 @@ public class CollectWaitReportSendAddressSaveParam {
private BigDecimal stationInTime;
@ApiModelProperty(value = "预计站内等待时长图片列表")
private List<String> stationInImageList;
@ApiModelProperty(value = "预计站外等待时长", example = "1")
private BigDecimal stationOutTime;
@ApiModelProperty(value = "预计站外等待时长图片列表")
private List<String> stationOutImageList;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectAbnormalReportParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "车牌号", example = "")
private String truckNo;
@ApiModelProperty(value = "运单编号", example = "")
private String childNo;
@ApiModelProperty(value = "发货地", example = "")
private String sendAddress;
@ApiModelProperty(value = "收货地", example = "")
private String receiveAddress;
@ApiModelProperty(value = "上报开始时间")
private String beginTime;
@ApiModelProperty(value = "上报结束时间")
private String endTime;
@ApiModelProperty(value = "审核状态:0待审核 1已审核")
private Integer auditStatus;
@ApiModelProperty(value = "异常类型:1:无法到达货源地 2:无法装货 3:无法到达目的地 4:运单取消 5:装车卸车异常", example = "1")
private Integer reportType;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectNoTakeOrderReportParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "运单编号", example = "")
private String childNo;
@ApiModelProperty(value = "发货地", example = "")
private String sendAddress;
@ApiModelProperty(value = "收货地", example = "")
private String receiveAddress;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectOtherReportParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "上报开始时间")
private String beginTime;
@ApiModelProperty(value = "上报结束时间")
private String endTime;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectQualityReportParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "上报开始时间")
private String beginTime;
@ApiModelProperty(value = "上报结束时间")
private String endTime;
@ApiModelProperty(value = "审核状态:0待审核 1已审核")
private Integer auditStatus;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectSendAddressReportParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "车牌号", example = "")
private String truckNo;
@ApiModelProperty(value = "是否可拉运:1可以拉运 2不可用拉运", example = "1")
private Integer reportStatus;
@ApiModelProperty(value = "货源地", example = "")
private String sendAddress;
@ApiModelProperty(value = "上报开始时间")
private String beginTime;
@ApiModelProperty(value = "上报结束时间")
private String endTime;
@ApiModelProperty(value = "审核状态:0待审核 1已审核")
private Integer auditStatus;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectTraficCongestionParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "运单编号", example = "")
private String childNo;
@ApiModelProperty(value = "拥堵位置", example = "")
private String address;
@ApiModelProperty(value = "审核状态:0待审核 1已审核")
private Integer auditStatus;
@ApiModelProperty(value = "上报开始时间")
private String beginTime;
@ApiModelProperty(value = "上报结束时间")
private String endTime;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectTruckLeaveParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "上报开始时间")
private String beginTime;
@ApiModelProperty(value = "上报结束时间")
private String endTime;
@ApiModelProperty(value = "请假开始时间范围")
private String beginTime1;
@ApiModelProperty(value = "请假开始时间范围")
private String endTime1;
@ApiModelProperty(value = "请假结束时间范围")
private String beginTime2;
@ApiModelProperty(value = "请假结束时间范围")
private String endTime2;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectTruckLocationParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "车牌号", example = "")
private String truckNo;
@ApiModelProperty(value = "车辆出车状态 1:空车 2:重车", example = "")
private Integer truckOrderStatus;
@ApiModelProperty(value = "详细地址", example = "")
private String address;
@ApiModelProperty(value = "上报开始时间")
private String beginTime;
@ApiModelProperty(value = "上报结束时间")
private String endTime;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectTruckRefuelParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "车牌号", example = "")
private String truckNo;
@ApiModelProperty(value = "运单编号", example = "")
private String childNo;
@ApiModelProperty(value = "发货地", example = "")
private String sendAddress;
@ApiModelProperty(value = "收货地", example = "")
private String receiveAddress;
@ApiModelProperty(value = "上报开始时间")
private String beginTime;
@ApiModelProperty(value = "上报结束时间")
private String endTime;
}
package com.clx.performance.param.pc.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CarrierPageCollectTruckWaitParam extends PageParam {
@ApiModelProperty(value = "司机姓名", example = "")
private String name;
@ApiModelProperty(value = "联系方式", example = "")
private String mobile;
@ApiModelProperty(value = "车牌号", example = "")
private String truckNo;
@ApiModelProperty(value = "运单编号", example = "")
private String childNo;
@ApiModelProperty(value = "排队地点", example = "")
private String address;
@ApiModelProperty(value = "排队类型:1 货源地排队 2目的地排队", example = "")
private Integer reportType;
@ApiModelProperty(value = "是否排队:1 无需排队 2 场内需要排队 3 厂外需要排队", example = "")
private Integer waitType;
@ApiModelProperty(value = "上报开始时间")
private String beginTime;
@ApiModelProperty(value = "上报结束时间")
private String endTime;
@ApiModelProperty(value = "审核状态:0待审核 1已审核")
private Integer auditStatus;
}
package com.clx.performance.vo.app.collect;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
/**
* @Author: aiqinguo
......@@ -33,22 +38,36 @@ public class CollectLineReportVO {
private String truckNo;
@ApiModelProperty(value = "运单编号", example = "")
private String childNo;
@ApiModelProperty(value = "地址id", example = "")
private Integer addressId;
@ApiModelProperty(value = "详细地址", example = "")
private String address;
@ApiModelProperty(value = "发货地址id", example = "")
private Integer sendAddressId;
@ApiModelProperty(value = "发货地址", example = "")
private String sendAddress;
@ApiModelProperty(value = "收货地址id", example = "")
private Integer receiveAddressId;
@ApiModelProperty(value = "收货地址", example = "")
private String receiveAddress;
@ApiModelProperty(value = "类型:1 发货地 2 目的地", example = "")
private Integer type;
@ApiModelProperty(value = "上报类型:1:货源地情况\r\n 2:无法到达货源地 3:无法装货 4:无法到达目的地 4:运单取消 5:没有接单\r\n 6:装车异常 7:卸车异常", example = "")
@ApiModelProperty(value = "上报类型:1:无法到达货源地 2:无法装货 3:无法到达目的地 4:运单取消 5:装车卸车异常 6:没有接单 7:货源地情况 8:其它上报 9:煤炭质量上报", example = "")
private Integer reportType;
@ApiModelProperty(value = "拉运状态 1: 正常 2:异常", example = "")
private Integer reportStatus;
@ApiModelProperty(value = "状态描述", example = "")
private String remark;
@ApiModelProperty(value = "上报图片", example = "")
@ApiModelProperty(value = "上报图片", example = "", hidden = true)
private String image;
@ApiModelProperty(value = "上报图片")
private List<String> imageList;
public List<String> getImageList() {
return StringUtils.isEmpty(image)? new ArrayList<>() : JSON.parseArray(image, String.class);
}
@ApiModelProperty(value = "上报时间", example = "")
private String reportTime;
@ApiModelProperty(value = "审核状态:0待审核 1已审核", example = "")
private Integer auditStatus;
@ApiModelProperty(value = "创建时间", example = "")
private String createTime;
@ApiModelProperty(value = "修改时间", example = "")
......
package com.clx.performance.vo.app.collect;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
/**
* @Author: aiqinguo
......@@ -52,10 +56,19 @@ public class CollectTrafficCongestionVO {
private BigDecimal latitude;
@ApiModelProperty(value = "预计拥堵时长", example = "")
private BigDecimal jamTime;
@ApiModelProperty(value = "现场照片", example = "")
@ApiModelProperty(value = "现场照片", example = "", hidden = true)
private String jamImage;
@ApiModelProperty(value = "现场照片", example = "")
private List<String> jamImageList;
public List<String> getJamImageList() {
return StringUtils.isEmpty(jamImage)? new ArrayList<>() : JSON.parseArray(jamImage, String.class);
}
@ApiModelProperty(value = "上报时间", example = "")
private String reportTime;
@ApiModelProperty(value = "审核状态:0待审核 1已审核", example = "")
private Integer auditStatus;
@ApiModelProperty(value = "创建时间", example = "")
private String createTime;
@ApiModelProperty(value = "修改时间", example = "")
......
......@@ -34,23 +34,26 @@ public class CollectTruckLocationVO {
private String mobile;
@ApiModelProperty(value = "车牌号", example = "")
private String truckNo;
@ApiModelProperty(value = "省", example = "")
private String province;
@ApiModelProperty(value = "市", example = "")
private String city;
@ApiModelProperty(value = "区县", example = "")
private String county;
@ApiModelProperty(value = "乡镇", example = "")
private String town;
@ApiModelProperty(value = "街道", example = "")
private String street;
@ApiModelProperty(value = "详细地址", example = "")
private String address;
// @ApiModelProperty(value = "省", example = "")
// private String province;
// @ApiModelProperty(value = "市", example = "")
// private String city;
// @ApiModelProperty(value = "区县", example = "")
// private String county;
// @ApiModelProperty(value = "乡镇", example = "")
// private String town;
// @ApiModelProperty(value = "街道", example = "")
// private String street;
// @ApiModelProperty(value = "详细地址", example = "")
// private String address;
@ApiModelProperty(value = "全地址", example = "")
private String fullAddress;
@ApiModelProperty(value = "经度", example = "")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度", example = "")
private BigDecimal latitude;
@ApiModelProperty(value = "车辆出车状态 1:空车 2:运单-空车 3:运单-重车", example = "")
@ApiModelProperty(value = "车辆出车状态 1:空车 2重车", example = "")
private Integer truckOrderStatus;
@ApiModelProperty(value = "上报时间", example = "")
private String reportTime;
......
package com.clx.performance.vo.app.collect;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* @Author: aiqinguo
......@@ -35,16 +39,32 @@ public class CollectTruckRefuelVO {
private String truckNo;
@ApiModelProperty(value = "运单编号", example = "")
private String childNo;
@ApiModelProperty(value = "发货所在详细地址", example = "")
@ApiModelProperty(value = "发货地址id", example = "")
private Integer sendAddressId;
@ApiModelProperty(value = "发货地址", example = "")
private String sendAddress;
@ApiModelProperty(value = "收货所在详细地址", example = "")
@ApiModelProperty(value = "收货地址id", example = "")
private Integer receiveAddressId;
@ApiModelProperty(value = "收货地址", example = "")
private String receiveAddress;
@ApiModelProperty(value = "装车油表list集合", example = "")
@ApiModelProperty(value = "装车油表", example = "", hidden = true)
private String loadImage;
@ApiModelProperty(value = "装车油表list集合", example = "")
private List<String> loadImageList;
public List<String> getLoadImageList() {
return StringUtils.isEmpty(loadImage)? new ArrayList<>() : JSON.parseArray(loadImage, String.class);
}
@ApiModelProperty(value = "装车油量", example = "")
private BigDecimal loadOil;
@ApiModelProperty(value = "卸车油表list集合", example = "")
@ApiModelProperty(value = "卸车油表集合", example = "", hidden = true)
private String unloadImage;
@ApiModelProperty(value = "装车油表list集合", example = "")
private List<String> unloadImageList;
public List<String> getUnloadImageList() {
return StringUtils.isEmpty(unloadImage)? new ArrayList<>() : JSON.parseArray(unloadImage, String.class);
}
@ApiModelProperty(value = "卸车油量", example = "")
private BigDecimal unloadOil;
@ApiModelProperty(value = "上报时间", example = "")
......
......@@ -46,20 +46,14 @@ public class AppDriverCollectLineReportController {
return Result.ok();
}
@ApiOperation(value = "上报异常无法到达装货地", notes = "<br>By:艾庆国")
@ApiOperation(value = "上报异常无法到达目的地", notes = "<br>By:艾庆国")
@PostMapping("/saveReceiveAddressAbnormalReport")
public Result<Void> saveReceiveAddressAbnormalReport(@RequestBody @Validated CollectLineReportReceiveAddressAbnormalSaveParam param) {
collectLineReportService.saveReceiveAddressAbnormalReport(param);
return Result.ok();
}
@ApiOperation(value = "上报异常没有接单原因", notes = "<br>By:艾庆国")
@PostMapping("/saveOrderChildCancelAbnormalReport")
public Result<Void> saveOrderChildCancelAbnormalReport(@RequestBody @Validated CollectLineReportOrderChildCancelAbnormalSaveParam param) {
collectLineReportService.saveOrderChildCancelAbnormalReport(param);
return Result.ok();
}
@ApiOperation(value = "上报装卸车异常", notes = "<br>By:艾庆国")
@PostMapping("/saveLoadUnloadAbnormalReport")
public Result<Void> saveLoadUnloadAbnormalReport(@RequestBody @Validated CollectLineReportLoadUnloadAbnormalSaveParam param) {
......@@ -68,6 +62,15 @@ public class AppDriverCollectLineReportController {
return Result.ok();
}
@ApiOperation(value = "上报异常没有接单原因", notes = "<br>By:艾庆国")
@PostMapping("/saveNoTakeOrderAbnormalReport")
public Result<Void> saveNoTakeOrderAbnormalReport(@RequestBody @Validated CollectLineReportNoTakeOrderAbnormalSaveParam param) {
collectLineReportService.saveNoTakeOrderAbnormalReport(param);
return Result.ok();
}
@ApiOperation(value = "上报其它情况", notes = "<br>By:艾庆国")
@PostMapping("/saveOtherReport")
public Result<Void> saveOtherReport(@RequestBody @Validated CollectLineReportOtherSaveParam param) {
......
......@@ -49,7 +49,7 @@ public class AppDriverCollectTruckWaitController {
return Result.ok(collectWaitReportService.getReportInfo(id));
}
@ApiOperation(value = "分页查询线路上报列表",notes = "<br>By:艾庆国")
@ApiOperation(value = "分页查询排队上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageWaitReport")
@UnitCovert(param = false)
public Result<PageData<CollectTruckWaitVO>> pageWaitReport(@RequestBody @Validated PageCollectTruckWaitParam param) {
......
package com.clx.performance.controller.pc.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.*;
import com.clx.performance.param.pc.carrier.*;
import com.clx.performance.service.collect.CollectLineReportService;
import com.clx.performance.vo.app.collect.CollectLineReportVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping(value="/pc/carrier/driver/collect/line")
@Validated
@Api(tags = "承运PC-线路上报")
@AllArgsConstructor
public class CarrierDriverCollectLineReportController {
private final CollectLineReportService collectLineReportService;
@ApiOperation(value = "分页查询货源地上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageSendAddressReport")
public Result<PageData<CollectLineReportVO>> pageSendAddressReport(@RequestBody @Validated CarrierPageCollectSendAddressReportParam param) {
IPage<CollectLineReportVO> page = collectLineReportService.carrierPageSendAddressReport(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
@ApiOperation(value = "货源地上报审核", notes = "<br>By:艾庆国")
@PostMapping("/updateSendAddressReportAudit")
public Result<Void> updateSendAddressReportAudit(@RequestBody @Validated CollectLineReportSendAddressAuditParam param) {
collectLineReportService.updateSendAddressReportAudit(param);
return Result.ok();
}
@ApiOperation(value = "分页查询异常上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageAbnormalReport")
public Result<PageData<CollectLineReportVO>> pageAbnormalReport(@RequestBody @Validated CarrierPageCollectAbnormalReportParam param) {
IPage<CollectLineReportVO> page = collectLineReportService.carrierPageAbnormalReport(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
@ApiOperation(value = "异常上报审核", notes = "<br>By:艾庆国")
@PostMapping("/updateAbnormalReportAudit")
public Result<Void> updateAbnormalReportAudit(@RequestBody @Validated CollectLineReportSendAddressAuditParam param) {
collectLineReportService.updateSendAddressReportAudit(param);
return Result.ok();
}
@ApiOperation(value = "分页查询无接单上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageNoTakeOrderReport")
public Result<PageData<CollectLineReportVO>> pageNoTakeOrderReport(@RequestBody @Validated CarrierPageCollectNoTakeOrderReportParam param) {
IPage<CollectLineReportVO> page = collectLineReportService.carrierPageNoTakeOrderReport(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
@ApiOperation(value = "无接单上报审核", notes = "<br>By:艾庆国")
@PostMapping("/updateNoTakeOrderReportAudit")
public Result<Void> updateNoTakeOrderReportAudit(@RequestBody @Validated CollectLineReportSendAddressAuditParam param) {
collectLineReportService.updateSendAddressReportAudit(param);
return Result.ok();
}
@ApiOperation(value = "分页查询煤炭质量上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageQualityReport")
public Result<PageData<CollectLineReportVO>> pageQualityReport(@RequestBody @Validated CarrierPageCollectQualityReportParam param) {
IPage<CollectLineReportVO> page = collectLineReportService.carrierPageQualityReport(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
@ApiOperation(value = "排队上报审核", notes = "<br>By:艾庆国")
@PostMapping("/updateQualityReportAudit")
public Result<Void> updateQualityReportAudit(@RequestBody @Validated CollectLineReportSendAddressAuditParam param) {
collectLineReportService.updateSendAddressReportAudit(param);
return Result.ok();
}
@ApiOperation(value = "分页查询其它上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageOtherReport")
public Result<PageData<CollectLineReportVO>> pageOtherReport(@RequestBody @Validated CarrierPageCollectOtherReportParam param) {
IPage<CollectLineReportVO> page = collectLineReportService.carrierPageOtherReport(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
}
package com.clx.performance.controller.pc.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CollectLineReportSendAddressAuditParam;
import com.clx.performance.param.app.collect.CollectTrafficCongestionAuditParam;
import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
import com.clx.performance.service.collect.CollectTrafficCongestionService;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping(value="/pc/carrier/driver/collect/traffic")
@Validated
@Api(tags = "承运PC-交通上报")
@AllArgsConstructor
public class CarrierDriverCollectTrafficCongestionController {
private final CollectTrafficCongestionService collectTrafficCongestionService;
@ApiOperation(value = "无接单上报审核", notes = "<br>By:艾庆国")
@PostMapping("/updateTrafficCongestionAudit")
public Result<Void> updateTrafficCongestionAudit(@RequestBody @Validated CollectTrafficCongestionAuditParam param) {
collectTrafficCongestionService.updateTrafficCongestionAudit(param);
return Result.ok();
}
@ApiOperation(value = "分页查询交通上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageTrafficReport")
public Result<PageData<CollectTrafficCongestionVO>> pageTrafficReport(@RequestBody @Validated CarrierPageCollectTraficCongestionParam param) {
IPage<CollectTrafficCongestionVO> page = collectTrafficCongestionService.carrierPageTrafficReport(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
}
package com.clx.performance.controller.pc.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
import com.clx.performance.service.collect.CollectTruckLeaveService;
import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping(value="/pc/carrier/driver/collect/leave")
@Validated
@Api(tags = "承运PC-请假")
@AllArgsConstructor
public class CarrierDriverCollectTruckLeaveController {
private final CollectTruckLeaveService collectTruckLeaveService;
@ApiOperation(value = "分页查询请假列表",notes = "<br>By:艾庆国")
@PostMapping("/pageLeave")
public Result<PageData<CollectTruckLeaveVO>> pageLeave(@RequestBody @Validated CarrierPageCollectTruckLeaveParam param) {
IPage<CollectTruckLeaveVO> page = collectTruckLeaveService.carrierPageLeave(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
}
package com.clx.performance.controller.pc.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
import com.clx.performance.service.collect.CollectTruckLocationService;
import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping(value="/pc/carrier/driver/collect/location")
@Validated
@Api(tags = "承运PC-位置上报")
@AllArgsConstructor
public class CarrierDriverCollectTruckLocationController {
private final CollectTruckLocationService collectTruckLocationService;
@ApiOperation(value = "分页查询司机位置上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageLocationReport")
public Result<PageData<CollectTruckLocationVO>> pageLocationReport(@RequestBody @Validated CarrierPageCollectTruckLocationParam param) {
IPage<CollectTruckLocationVO> page = collectTruckLocationService.carrierPageLocationReport(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
}
package com.clx.performance.controller.pc.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
import com.clx.performance.service.collect.CollectTruckRefuelService;
import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping(value="/pc/carrier/driver/collect/refuel")
@Validated
@Api(tags = "承运PC-油表上报")
@AllArgsConstructor
public class CarrierDriverCollectTruckRefuelController {
private final CollectTruckRefuelService collectTruckRefuelService;
@ApiOperation(value = "分页查询油表上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageRefuelReport")
public Result<PageData<CollectTruckRefuelVO>> pageRefuelReport(@RequestBody @Validated CarrierPageCollectTruckRefuelParam param) {
IPage<CollectTruckRefuelVO> page = collectTruckRefuelService.carrierPageRefuelReport(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
}
package com.clx.performance.controller.pc.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.*;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
import com.clx.performance.service.collect.CollectWaitReportService;
import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping(value="/pc/carrier/driver/collect/wait")
@Validated
@Api(tags = "承运PC-排队上报")
@AllArgsConstructor
public class CarrierDriverCollectTruckWaitController {
private final CollectWaitReportService collectWaitReportService;
@ApiOperation(value = "排队上报审核", notes = "<br>By:艾庆国")
@PostMapping("/updateWaitReportAudit")
public Result<Void> updateWaitReportAudit(@RequestBody @Validated CollectLineReportTruckWaitAuditParam param) {
collectWaitReportService.updateWaitReportAudit(param);
return Result.ok();
}
@ApiOperation(value = "分页查询排队上报列表",notes = "<br>By:艾庆国")
@PostMapping("/pageWaitReport")
public Result<PageData<CollectTruckWaitVO>> pageWaitReport(@RequestBody @Validated CarrierPageCollectTruckWaitParam param) {
IPage<CollectTruckWaitVO> page = collectWaitReportService.carrierPageWaitReport(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
}
......@@ -2,8 +2,10 @@ package com.clx.performance.dao.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.mapper.collect.CollectLineReportMapper;
import com.clx.performance.model.OrderChild;
import com.clx.performance.model.collect.CollectLineReport;
import com.clx.performance.param.app.collect.PageCollectLineReportParam;
import com.clx.performance.param.pc.carrier.*;
import com.clx.performance.vo.app.collect.CollectLineReportVO;
import com.msl.common.dao.BaseDao;
......@@ -14,7 +16,13 @@ import com.msl.common.dao.BaseDao;
* @Version: 1.0
*/
public interface CollectLineReportDao extends BaseDao<CollectLineReportMapper, CollectLineReport, Integer> {
boolean updateAuditStatus(CollectLineReport item);
IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam param);
IPage<CollectLineReportVO> carrierPageSendAddressReport(CarrierPageCollectSendAddressReportParam param);
IPage<CollectLineReportVO> carrierPageAbnormalReport(CarrierPageCollectAbnormalReportParam param);
IPage<CollectLineReportVO> carrierPageNoTakeOrderReport(CarrierPageCollectNoTakeOrderReportParam param);
IPage<CollectLineReportVO> carrierPageQualityReport(CarrierPageCollectQualityReportParam param);
IPage<CollectLineReportVO> carrierPageOtherReport(CarrierPageCollectOtherReportParam param);
}
......@@ -2,8 +2,10 @@ package com.clx.performance.dao.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.mapper.collect.CollectTrafficCongestionMapper;
import com.clx.performance.model.collect.CollectLineReport;
import com.clx.performance.model.collect.CollectTrafficCongestion;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import com.msl.common.dao.BaseDao;
......@@ -14,7 +16,9 @@ import com.msl.common.dao.BaseDao;
* @Version: 1.0
*/
public interface CollectTrafficCongestionDao extends BaseDao<CollectTrafficCongestionMapper, CollectTrafficCongestion, Integer> {
boolean updateAuditStatus(CollectTrafficCongestion item);
IPage<CollectTrafficCongestionVO> pageTraffic(PageCollectTraficCongestionParam param);
IPage<CollectTrafficCongestionVO> carrierPageTraffic(CarrierPageCollectTraficCongestionParam param);
}
......@@ -5,6 +5,7 @@ import com.clx.performance.mapper.collect.CollectTruckLeaveMapper;
import com.clx.performance.model.collect.CollectTruckLeave;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
import com.msl.common.dao.BaseDao;
......@@ -18,5 +19,6 @@ import com.msl.common.dao.BaseDao;
public interface CollectTruckLeaveDao extends BaseDao<CollectTruckLeaveMapper, CollectTruckLeave, Integer> {
IPage<CollectTruckLeaveVO> pageLeave(PageCollectTruckLeaveParam param);
IPage<CollectTruckLeaveVO> carrierPageLeave(CarrierPageCollectTruckLeaveParam param);
}
......@@ -5,6 +5,7 @@ import com.clx.performance.mapper.collect.CollectTruckLocationMapper;
import com.clx.performance.model.collect.CollectTruckLocation;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
import com.msl.common.dao.BaseDao;
......@@ -19,4 +20,6 @@ public interface CollectTruckLocationDao extends BaseDao<CollectTruckLocationMap
IPage<CollectTruckLocationVO> pageLocation(PageCollectTruckLocationParam param);
IPage<CollectTruckLocationVO> carrierPageLocation(CarrierPageCollectTruckLocationParam param);
}
......@@ -5,6 +5,7 @@ import com.clx.performance.mapper.collect.CollectTruckRefuelMapper;
import com.clx.performance.model.collect.CollectTruckRefuel;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
import com.msl.common.dao.BaseDao;
......@@ -18,5 +19,6 @@ import com.msl.common.dao.BaseDao;
public interface CollectTruckRefuelDao extends BaseDao<CollectTruckRefuelMapper, CollectTruckRefuel, Integer> {
IPage<CollectTruckRefuelVO> pageRefuel(PageCollectTruckRefuelParam param);
IPage<CollectTruckRefuelVO> carrierPageRefuel(CarrierPageCollectTruckRefuelParam param);
}
......@@ -2,8 +2,10 @@ package com.clx.performance.dao.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.mapper.collect.CollectTruckWaitMapper;
import com.clx.performance.model.collect.CollectLineReport;
import com.clx.performance.model.collect.CollectTruckWait;
import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
import com.msl.common.dao.BaseDao;
......@@ -14,7 +16,9 @@ import com.msl.common.dao.BaseDao;
* @Version: 1.0
*/
public interface CollectTruckWaitDao extends BaseDao<CollectTruckWaitMapper, CollectTruckWait, Integer> {
boolean updateAuditStatus(CollectTruckWait item);
IPage<CollectTruckWaitVO> pageWaitReport(PageCollectTruckWaitParam param);
IPage<CollectTruckWaitVO> carrierPageWaitReport(CarrierPageCollectTruckWaitParam param);
}
......@@ -135,6 +135,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
return update(lUdWrapper()
.eq(OrderChild::getId, item.getId())
.set(OrderChild::getCancelRemark, item.getCancelRemark())
.set(OrderChild::getCancelType, item.getCancelType())
.set(OrderChild::getCancelDetail, item.getCancelDetail())
.set(OrderChild::getCancelTime, item.getCancelTime())
.set(OrderChild::getFinishTime, item.getFinishTime())
.set(OrderChild::getStatus, item.getStatus())
......
......@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.collect.CollectLineReportDao;
import com.clx.performance.mapper.collect.CollectLineReportMapper;
import com.clx.performance.model.OrderChild;
import com.clx.performance.model.collect.CollectLineReport;
import com.clx.performance.param.app.collect.PageCollectLineReportParam;
import com.clx.performance.param.pc.carrier.*;
import com.clx.performance.vo.app.collect.CollectLineReportVO;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Repository;
......@@ -19,9 +21,48 @@ import org.springframework.stereotype.Repository;
@Repository
public class CollectLineReportDaoImpl extends BaseDaoImpl<CollectLineReportMapper, CollectLineReport, Integer> implements CollectLineReportDao {
@Override
public boolean updateAuditStatus(CollectLineReport item) {
return update(lUdWrapper()
.eq(CollectLineReport::getId, item.getId())
.set(CollectLineReport::getAuditStatus, item.getAuditStatus())
);
}
@Override
public IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam param) {
Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.pageLineReport(page,param);
}
@Override
public IPage<CollectLineReportVO> carrierPageSendAddressReport(CarrierPageCollectSendAddressReportParam param) {
Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageSendAddressReport(page,param);
}
@Override
public IPage<CollectLineReportVO> carrierPageAbnormalReport(CarrierPageCollectAbnormalReportParam param) {
Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageAbnormalReport(page,param);
}
@Override
public IPage<CollectLineReportVO> carrierPageNoTakeOrderReport(CarrierPageCollectNoTakeOrderReportParam param) {
Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageNoTakeOrderReport(page,param);
}
@Override
public IPage<CollectLineReportVO> carrierPageQualityReport(CarrierPageCollectQualityReportParam param) {
Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageQualityReport(page,param);
}
@Override
public IPage<CollectLineReportVO> carrierPageOtherReport(CarrierPageCollectOtherReportParam param) {
Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageOtherReport(page,param);
}
}
......@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.collect.CollectTrafficCongestionDao;
import com.clx.performance.mapper.collect.CollectTrafficCongestionMapper;
import com.clx.performance.model.collect.CollectLineReport;
import com.clx.performance.model.collect.CollectTrafficCongestion;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
import com.clx.performance.vo.app.OrderChildVO;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import com.msl.common.dao.impl.BaseDaoImpl;
......@@ -20,9 +22,23 @@ import org.springframework.stereotype.Repository;
@Repository
public class CollectTrafficCongestionDaoImpl extends BaseDaoImpl<CollectTrafficCongestionMapper, CollectTrafficCongestion, Integer> implements CollectTrafficCongestionDao {
@Override
public boolean updateAuditStatus(CollectTrafficCongestion item) {
return update(lUdWrapper()
.eq(CollectTrafficCongestion::getId, item.getId())
.set(CollectTrafficCongestion::getAuditStatus, item.getAuditStatus())
);
}
@Override
public IPage<CollectTrafficCongestionVO> pageTraffic(PageCollectTraficCongestionParam param) {
Page<CollectTrafficCongestionVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.pageTraffic(page,param);
}
@Override
public IPage<CollectTrafficCongestionVO> carrierPageTraffic(CarrierPageCollectTraficCongestionParam param) {
Page<CollectTrafficCongestionVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageTraffic(page,param);
}
}
......@@ -6,6 +6,7 @@ import com.clx.performance.dao.collect.CollectTruckLeaveDao;
import com.clx.performance.mapper.collect.CollectTruckLeaveMapper;
import com.clx.performance.model.collect.CollectTruckLeave;
import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
import com.msl.common.dao.impl.BaseDaoImpl;
......@@ -25,4 +26,10 @@ public class CollectTruckLeaveDaoImpl extends BaseDaoImpl<CollectTruckLeaveMappe
Page<CollectTruckLeaveVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.pageLeave(page,param);
}
@Override
public IPage<CollectTruckLeaveVO> carrierPageLeave(CarrierPageCollectTruckLeaveParam param) {
Page<CollectTruckLeaveVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageLeave(page,param);
}
}
......@@ -6,6 +6,7 @@ import com.clx.performance.dao.collect.CollectTruckLocationDao;
import com.clx.performance.mapper.collect.CollectTruckLocationMapper;
import com.clx.performance.model.collect.CollectTruckLocation;
import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
import com.msl.common.dao.impl.BaseDaoImpl;
......@@ -25,4 +26,10 @@ public class CollectTruckLocationDaoImpl extends BaseDaoImpl<CollectTruckLocatio
Page<CollectTruckLocationVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.pageLocation(page,param);
}
@Override
public IPage<CollectTruckLocationVO> carrierPageLocation(CarrierPageCollectTruckLocationParam param) {
Page<CollectTruckLocationVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageLocation(page,param);
}
}
......@@ -6,6 +6,7 @@ import com.clx.performance.dao.collect.CollectTruckRefuelDao;
import com.clx.performance.mapper.collect.CollectTruckRefuelMapper;
import com.clx.performance.model.collect.CollectTruckRefuel;
import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Repository;
......@@ -24,4 +25,10 @@ public class CollectTruckRefuelDaoImpl extends BaseDaoImpl<CollectTruckRefuelMap
Page<CollectTruckRefuelVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.pageRefuel(page,param);
}
@Override
public IPage<CollectTruckRefuelVO> carrierPageRefuel(CarrierPageCollectTruckRefuelParam param) {
Page<CollectTruckRefuelVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageRefuel(page,param);
}
}
......@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.collect.CollectTruckWaitDao;
import com.clx.performance.mapper.collect.CollectTruckWaitMapper;
import com.clx.performance.model.collect.CollectLineReport;
import com.clx.performance.model.collect.CollectTruckWait;
import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Repository;
......@@ -19,9 +21,23 @@ import org.springframework.stereotype.Repository;
@Repository
public class CollectTruckWaitDaoImpl extends BaseDaoImpl<CollectTruckWaitMapper, CollectTruckWait, Integer> implements CollectTruckWaitDao {
@Override
public boolean updateAuditStatus(CollectTruckWait item) {
return update(lUdWrapper()
.eq(CollectTruckWait::getId, item.getId())
.set(CollectTruckWait::getAuditStatus, item.getAuditStatus())
);
}
@Override
public IPage<CollectTruckWaitVO> pageWaitReport(PageCollectTruckWaitParam param) {
Page<CollectTruckWaitVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.pageWaitReport(page,param);
}
@Override
public IPage<CollectTruckWaitVO> carrierPageWaitReport(CarrierPageCollectTruckWaitParam param) {
Page<CollectTruckWaitVO> page = Page.of(param.getPage(), param.getPageSize());
return baseMapper.carrierPageWaitReport(page,param);
}
}
......@@ -96,7 +96,7 @@ public class OrderChildDtsListener {
List<OrderGoods> list = orderGoodsDao.getOrderGoodsListByOrderNoAndLastArriveSendTime(after.getOrderNo(), nowDateTime);
BigDecimal childSum = list.stream().map(OrderGoods::getExtractWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
log.info("算出所有货单总量:{}, 订单总吨数:{}", childSum, orderInfoFeign.getTransportWeight());
if (childSum.compareTo(new BigDecimal(orderInfoFeign.getTransportWeight())) == 0) {
if (childSum.compareTo(orderInfoFeign.getTransportWeight()) == 0) {
// 按照时间 倒序查出最后一条进行中的运单
OrderChild orderChild = orderChildDao.getGoingLatestOrderChildByOrderNo(after.getOrderNo());
if(Objects.nonNull(orderChild) && orderChild.getChildNo().equals(after.getChildNo())){
......
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.model.collect.CollectLineReport;
import com.clx.performance.param.app.collect.PageCollectLineReportParam;
import com.clx.performance.param.pc.carrier.*;
import com.clx.performance.sqlProvider.collect.CollectLineReportSqlProvider;
import com.clx.performance.vo.app.collect.CollectLineReportVO;
import org.apache.ibatis.annotations.Mapper;
......@@ -26,4 +27,34 @@ public interface CollectLineReportMapper extends BaseMapper<CollectLineReport> {
@SelectProvider(type = CollectLineReportSqlProvider.class, method = "pageLineReport")
IPage<CollectLineReportVO> pageLineReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") PageCollectLineReportParam param);
/**
* @see CollectLineReportSqlProvider#carrierPageSendAddressReport(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectSendAddressReportParam)
*/
@SelectProvider(type = CollectLineReportSqlProvider.class, method = "carrierPageSendAddressReport")
IPage<CollectLineReportVO> carrierPageSendAddressReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectSendAddressReportParam param);
/**
* @see CollectLineReportSqlProvider#carrierPageAbnormalReport(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectAbnormalReportParam)
*/
@SelectProvider(type = CollectLineReportSqlProvider.class, method = "carrierPageAbnormalReport")
IPage<CollectLineReportVO> carrierPageAbnormalReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectAbnormalReportParam param);
/**
* @see CollectLineReportSqlProvider#carrierPageNoTakeOrderReport(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectNoTakeOrderReportParam)
*/
@SelectProvider(type = CollectLineReportSqlProvider.class, method = "carrierPageNoTakeOrderReport")
IPage<CollectLineReportVO> carrierPageNoTakeOrderReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectNoTakeOrderReportParam param);
/**
* @see CollectLineReportSqlProvider#carrierPageQualityReport(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectQualityReportParam)
*/
@SelectProvider(type = CollectLineReportSqlProvider.class, method = "carrierPageQualityReport")
IPage<CollectLineReportVO> carrierPageQualityReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectQualityReportParam param);
/**
* @see CollectLineReportSqlProvider#carrierPageOtherReport(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectOtherReportParam)
*/
@SelectProvider(type = CollectLineReportSqlProvider.class, method = "carrierPageOtherReport")
IPage<CollectLineReportVO> carrierPageOtherReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectOtherReportParam param);
}
\ No newline at end of file
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.model.collect.CollectTrafficCongestion;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
import com.clx.performance.sqlProvider.collect.CollectTrafficCongestionSqlProvider;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import org.apache.ibatis.annotations.Mapper;
......@@ -26,4 +27,10 @@ public interface CollectTrafficCongestionMapper extends BaseMapper<CollectTraffi
@SelectProvider(type = CollectTrafficCongestionSqlProvider.class, method = "pageTraffic")
IPage<CollectTrafficCongestionVO> pageTraffic(@Param("page") Page<CollectTrafficCongestionVO> page, @Param("param") PageCollectTraficCongestionParam param);
/**
* @see CollectTrafficCongestionSqlProvider#carrierPageTraffic(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam)
*/
@SelectProvider(type = CollectTrafficCongestionSqlProvider.class, method = "carrierPageTraffic")
IPage<CollectTrafficCongestionVO> carrierPageTraffic(@Param("page") Page<CollectTrafficCongestionVO> page, @Param("param") CarrierPageCollectTraficCongestionParam param);
}
\ No newline at end of file
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.model.collect.CollectTruckLeave;
import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
import com.clx.performance.sqlProvider.collect.CollectTruckLeaveSqlProvider;
import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
import org.apache.ibatis.annotations.Mapper;
......@@ -25,5 +26,10 @@ public interface CollectTruckLeaveMapper extends BaseMapper<CollectTruckLeave> {
*/
@SelectProvider(type = CollectTruckLeaveSqlProvider.class, method = "pageLeave")
IPage<CollectTruckLeaveVO> pageLeave(@Param("page") Page<CollectTruckLeaveVO> page, @Param("param") PageCollectTruckLeaveParam param);
/**
* @see CollectTruckLeaveSqlProvider#carrierPageLeave(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam)
*/
@SelectProvider(type = CollectTruckLeaveSqlProvider.class, method = "carrierPageLeave")
IPage<CollectTruckLeaveVO> carrierPageLeave(@Param("page") Page<CollectTruckLeaveVO> page, @Param("param") CarrierPageCollectTruckLeaveParam param);
}
\ No newline at end of file
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.model.collect.CollectTruckLocation;
import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
import com.clx.performance.sqlProvider.collect.CollectTruckLocationSqlProvider;
import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
import org.apache.ibatis.annotations.Mapper;
......@@ -26,4 +27,10 @@ public interface CollectTruckLocationMapper extends BaseMapper<CollectTruckLocat
@SelectProvider(type = CollectTruckLocationSqlProvider.class, method = "pageLocation")
IPage<CollectTruckLocationVO> pageLocation(@Param("page") Page<CollectTruckLocationVO> page, @Param("param") PageCollectTruckLocationParam param);
/**
* @see CollectTruckLocationSqlProvider#carrierPageLocation(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam)
*/
@SelectProvider(type = CollectTruckLocationSqlProvider.class, method = "carrierPageLocation")
IPage<CollectTruckLocationVO> carrierPageLocation(@Param("page") Page<CollectTruckLocationVO> page, @Param("param") CarrierPageCollectTruckLocationParam param);
}
\ No newline at end of file
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.model.collect.CollectTruckRefuel;
import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
import com.clx.performance.sqlProvider.collect.CollectTruckRefuelSqlProvider;
import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
import org.apache.ibatis.annotations.Mapper;
......@@ -25,5 +26,10 @@ public interface CollectTruckRefuelMapper extends BaseMapper<CollectTruckRefuel>
*/
@SelectProvider(type = CollectTruckRefuelSqlProvider.class, method = "pageRefuel")
IPage<CollectTruckRefuelVO> pageRefuel(@Param("page") Page<CollectTruckRefuelVO> page, @Param("param") PageCollectTruckRefuelParam param);
/**
* @see CollectTruckRefuelSqlProvider#carrierPageRefuel(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam)
*/
@SelectProvider(type = CollectTruckRefuelSqlProvider.class, method = "carrierPageRefuel")
IPage<CollectTruckRefuelVO> carrierPageRefuel(@Param("page") Page<CollectTruckRefuelVO> page, @Param("param") CarrierPageCollectTruckRefuelParam param);
}
\ No newline at end of file
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.model.collect.CollectTruckWait;
import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
import com.clx.performance.sqlProvider.collect.CollectTruckWaitSqlProvider;
import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
import org.apache.ibatis.annotations.Mapper;
......@@ -25,5 +26,10 @@ public interface CollectTruckWaitMapper extends BaseMapper<CollectTruckWait> {
*/
@SelectProvider(type = CollectTruckWaitSqlProvider.class, method = "pageWaitReport")
IPage<CollectTruckWaitVO> pageWaitReport(@Param("page") Page<CollectTruckWaitVO> page, @Param("param") PageCollectTruckWaitParam param);
/**
* @see CollectTruckWaitSqlProvider#carrierPageWaitReport(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam)
*/
@SelectProvider(type = CollectTruckWaitSqlProvider.class, method = "carrierPageWaitReport")
IPage<CollectTruckWaitVO> carrierPageWaitReport(@Param("page") Page<CollectTruckWaitVO> page, @Param("param") CarrierPageCollectTruckWaitParam param);
}
\ No newline at end of file
......@@ -69,6 +69,8 @@ public class OrderChild implements HasKey<Integer> {
private BigDecimal freight; //运费(分)
private String cancelRemark; //取消原因
private Integer cancelType; //司机取消原因类型
private String cancelDetail; //司机取消详细原因
private Integer poundStatus; //磅单审核状态 0 待审核 1 审核通过 2 审核驳回
private Integer status; //状态
......
......@@ -45,7 +45,8 @@ public class OrderChildImage implements HasKey<Integer> {
@AllArgsConstructor
public enum Type {
LOAD(1, "装货磅单图片"),
UNLOAD(2, "卸货磅单图片")
UNLOAD(2, "卸货磅单图片"),
DRIVER_CANCEL(3, "司机取消")
;
......
......@@ -34,12 +34,17 @@ public class CollectLineReport implements HasKey<Integer> {
private String childNo; //运单编号
private Integer addressId; //地址id
private String address; //详细地址
private Integer sendAddressId; //发货地址id
private String sendAddress; //发货地址
private Integer receiveAddressId; //收货地址id
private String receiveAddress; //收货地址
private Integer type; //类型:1 发货地 2 目的地
private Integer reportType; //上报类型:1:货源地情况\r\n 2:无法到达货源地 3:无法装货 4:无法到达目的地 4:运单取消 5:没有接单\r\n 6:装车异常 7:卸车异常
private Integer reportType; //上报类型:1:无法到达货源地 2:无法装货 3:无法到达目的地 4:运单取消 5:装车卸车异常 6:没有接单 7:货源地情况 8:其它上报 9:煤炭质量上报
private Integer reportStatus; //拉运状态 1: 正常 2:异常
private String remark; //状态描述
private String image; //上报图片
private LocalDateTime reportTime; //上报时间
private Integer auditStatus; //审核状态:0待审核 1已审核
private LocalDateTime createTime; //创建时间
private LocalDateTime modifiedTime; //修改时间
......@@ -62,11 +67,23 @@ public class CollectLineReport implements HasKey<Integer> {
}
}
//1:无法到达货源地 2:无法装货 3:无法到达目的地 4:运单取消 5:装车卸车异常 6:没有接单 7:货源地情况 8:其它上报 9:煤炭质量上报
@Getter
@AllArgsConstructor
public enum ReportType {
SEND(1, "货源地情况"),
RECEIVE(2, "目的地");
UNABLE_TO_SEND_ADDRESS(1, "无法到达货源地"),
UNABLE_LOAD(2, "无法装货"),
UNABLE_TO_RECEIVE_ADDRESS(3, "无法到达目的地"),
CANCEL(4, "运单取消"),
LOAD_UNLOAD(5, "装车卸车异常"),
NO_TAKE_ORDER(6, "没有接单"),
SEND_ADDRESS(7, "货源地情况"),
OTHER(8, "其它上报"),
QUALITY(9, "煤炭质量上报"),
;
private final Integer code;
private final String msg;
......@@ -88,4 +105,17 @@ public class CollectLineReport implements HasKey<Integer> {
}
}
@Getter
@AllArgsConstructor
public enum AuditStatus {
UNAUDIT(0, "待审核"),
AUDIT(1, "已审核");
private final Integer code;
private final String msg;
public static Optional<AuditStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
}
}
}
\ No newline at end of file
......@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.msl.common.config.KeyColumn;
import com.msl.common.model.HasKey;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Optional;
/**
* @Author: aiqinguo
......@@ -38,11 +37,13 @@ public class CollectTrafficCongestion implements HasKey<Integer> {
private String town; //乡镇
private String street; //街道
private String address; //详细地址
private String fullAddress; //全地址
private BigDecimal longitude; //经度
private BigDecimal latitude; //纬度
private BigDecimal jamTime; //预计拥堵时长
private String jamImage; //现场照片
private LocalDateTime reportTime; //上报时间
private Integer auditStatus; //审核状态:0待审核 1已审核
private LocalDateTime createTime; //创建时间
private LocalDateTime modifiedTime; //修改时间
......@@ -52,4 +53,16 @@ public class CollectTrafficCongestion implements HasKey<Integer> {
return id;
}
@Getter
@AllArgsConstructor
public enum AuditStatus {
UNAUDIT(0, "待审核"),
AUDIT(1, "已审核");
private final Integer code;
private final String msg;
public static Optional<AuditStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
}
}
}
\ No newline at end of file
......@@ -38,6 +38,7 @@ public class CollectTruckLocation implements HasKey<Integer> {
private String town; //乡镇
private String street; //街道
private String address; //详细地址
private String fullAddress; //全地址
private BigDecimal longitude; //经度
private BigDecimal latitude; //纬度
private Integer truckOrderStatus; //车辆出车状态 1:空车 2:运单-空车 3:运单-重车
......
......@@ -33,8 +33,10 @@ public class CollectTruckRefuel implements HasKey<Integer> {
private String mobile; //手机号码
private String truckNo; //车牌号
private String childNo; //运单编号
private String sendAddress; //发货所在详细地址
private String receiveAddress; //收货所在详细地址
private Integer sendAddressId; //发货地址id
private String sendAddress; //发货地址
private Integer receiveAddressId; //收货地址id
private String receiveAddress; //收货地址
private String loadImage; //装车油表list集合
private BigDecimal loadOil; //装车油量
private String unloadImage; //卸车油表list集合
......
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.msl.common.config.KeyColumn;
import com.msl.common.model.HasKey;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
......@@ -41,6 +42,7 @@ public class CollectTruckWait implements HasKey<Integer> {
private BigDecimal stationOutTime; //预计站外等待时长
private String stationOutImage; //预计站外等待时长图片
private LocalDateTime reportTime; //上报时间
private Integer auditStatus; //审核状态:0待审核 1已审核
private LocalDateTime createTime; //创建时间
private LocalDateTime modifiedTime; //修改时间
......@@ -76,4 +78,17 @@ public class CollectTruckWait implements HasKey<Integer> {
}
}
@Getter
@AllArgsConstructor
public enum AuditStatus {
UNAUDIT(0, "待审核"),
AUDIT(1, "已审核");
private final Integer code;
private final String msg;
public static Optional<AuditStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
}
}
}
\ No newline at end of file
......@@ -2,8 +2,11 @@ package com.clx.performance.service.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.*;
import com.clx.performance.param.pc.carrier.*;
import com.clx.performance.vo.app.collect.CollectLineReportVO;
import java.util.List;
public interface CollectLineReportService {
void saveSendAddressReport(CollectLineReportSendAddressSaveParam param);
......@@ -11,10 +14,12 @@ public interface CollectLineReportService {
void saveSendAddressAbnormalReport(CollectLineReportSendAddressAbnormalSaveParam param);
void saveLoadAbnormalReport(CollectLineReportLoadAbnormalSaveParam param);
void saveReceiveAddressAbnormalReport(CollectLineReportReceiveAddressAbnormalSaveParam param);
void saveOrderChildCancelAbnormalReport(CollectLineReportOrderChildCancelAbnormalSaveParam param);
void saveNoTakeOrderAbnormalReport(CollectLineReportNoTakeOrderAbnormalSaveParam param);
void saveLoadUnloadAbnormalReport(CollectLineReportLoadUnloadAbnormalSaveParam param);
void saveCancelAbnormalReport(String childNo, String remark, List<String> imageList);
void saveOtherReport(CollectLineReportOtherSaveParam param);
void saveQualityReport(CollectLineReportQualitySaveParam param);
......@@ -22,4 +27,14 @@ public interface CollectLineReportService {
IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam param);
void updateSendAddressReportAudit(CollectLineReportSendAddressAuditParam param);
IPage<CollectLineReportVO> carrierPageSendAddressReport(CarrierPageCollectSendAddressReportParam param);
IPage<CollectLineReportVO> carrierPageAbnormalReport(CarrierPageCollectAbnormalReportParam param);
IPage<CollectLineReportVO> carrierPageNoTakeOrderReport(CarrierPageCollectNoTakeOrderReportParam param);
IPage<CollectLineReportVO> carrierPageQualityReport(CarrierPageCollectQualityReportParam param);
IPage<CollectLineReportVO> carrierPageOtherReport(CarrierPageCollectOtherReportParam param);
}
package com.clx.performance.service.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CollectTrafficCongestionAuditParam;
import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
public interface CollectTrafficCongestionService {
......@@ -13,4 +15,8 @@ public interface CollectTrafficCongestionService {
IPage<CollectTrafficCongestionVO> pageTrafficReport(PageCollectTraficCongestionParam param);
void updateTrafficCongestionAudit(CollectTrafficCongestionAuditParam param);
IPage<CollectTrafficCongestionVO> carrierPageTrafficReport(CarrierPageCollectTraficCongestionParam param);
}
......@@ -3,6 +3,7 @@ package com.clx.performance.service.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
public interface CollectTruckLeaveService {
......@@ -13,4 +14,6 @@ public interface CollectTruckLeaveService {
IPage<CollectTruckLeaveVO> pageLeave(PageCollectTruckLeaveParam param);
IPage<CollectTruckLeaveVO> carrierPageLeave(CarrierPageCollectTruckLeaveParam param);
}
......@@ -3,6 +3,7 @@ package com.clx.performance.service.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
public interface CollectTruckLocationService {
......@@ -13,4 +14,6 @@ public interface CollectTruckLocationService {
IPage<CollectTruckLocationVO> pageLocationReport(PageCollectTruckLocationParam param);
IPage<CollectTruckLocationVO> carrierPageLocationReport(CarrierPageCollectTruckLocationParam param);
}
......@@ -3,6 +3,7 @@ package com.clx.performance.service.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
public interface CollectTruckRefuelService {
......@@ -12,6 +13,7 @@ public interface CollectTruckRefuelService {
CollectTruckRefuelVO getReportInfo(Integer id);
IPage<CollectTruckRefuelVO> pageRefuelReport(PageCollectTruckRefuelParam param);
IPage<CollectTruckRefuelVO> carrierPageRefuelReport(CarrierPageCollectTruckRefuelParam param);
}
package com.clx.performance.service.collect;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.app.collect.CollectLineReportTruckWaitAuditParam;
import com.clx.performance.param.app.collect.CollectWaitReportReceiveAddressSaveParam;
import com.clx.performance.param.app.collect.CollectWaitReportSendAddressSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
public interface CollectWaitReportService {
......@@ -15,4 +17,8 @@ public interface CollectWaitReportService {
IPage<CollectTruckWaitVO> pageWaitReport(PageCollectTruckWaitParam param);
void updateWaitReportAudit(CollectLineReportTruckWaitAuditParam param);
IPage<CollectTruckWaitVO> carrierPageWaitReport(CarrierPageCollectTruckWaitParam param);
}
......@@ -30,6 +30,7 @@ import com.clx.performance.service.OrderChildPoundLogService;
import com.clx.performance.service.OrderChildService;
import com.clx.performance.service.OrderGoodsService;
import com.clx.performance.service.*;
import com.clx.performance.service.collect.CollectLineReportService;
import com.clx.performance.service.settle.SettlementDriverDetailService;
import com.clx.performance.service.settle.SettlementMqService;
import com.clx.performance.service.settle.SettlementOwnerDetailService;
......@@ -111,6 +112,7 @@ public class OrderChildServiceImpl implements OrderChildService {
private final OrderChildMqService orderChildMqService;
private final OwnerInfoService ownerInfoService;
private final CollectLineReportService collectLineReportService;
@Override
public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
......@@ -991,6 +993,29 @@ public class OrderChildServiceImpl implements OrderChildService {
return;
}
if (param.getCancelType() != null){
orderChild.setCancelType(param.getCancelType());
orderChild.setCancelRemark(OrderChildEnum.CancelType.getByCode(param.getCancelType()).orElse(OrderChildEnum.CancelType.OTHER).getMsg());
orderChild.setCancelDetail(param.getRemark());
}
else {
orderChild.setCancelRemark(param.getRemark());
}
// 图片
List<OrderChildImage> imageList = new ArrayList<>();
if (param.getImageList() != null){
for (String item : param.getImageList()) {
OrderChildImage image = new OrderChildImage();
image.setChildNo(orderChild.getChildNo());
image.setType(OrderChildImage.Type.DRIVER_CANCEL.getCode());
image.setImage(item);
imageList.add(image);
}
}
if (!imageList.isEmpty()){
orderChildImageDao.batchSaveEntity(imageList);
}
// 禁止取消
if (orderChild.getStatus() >= OrderChildEnum.Status.LOAD.getCode()) {
throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCEL_FORBID);
......@@ -1028,6 +1053,9 @@ public class OrderChildServiceImpl implements OrderChildService {
// 更新出车状态
updateDriverOrderStatusCancel(orderChild.getDriverUserNo(), orderChild.getTruckId());
// 取消上报
collectLineReportService.saveCancelAbnormalReport(childNo, orderChild.getCancelRemark(), param.getImageList());
// 日志
orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(),
OrderChildLogEnum.Type.DRIVER_CANCEL.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
......
......@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dao.collect.CollectTrafficCongestionDao;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.model.collect.CollectTrafficCongestion;
import com.clx.performance.param.app.collect.CollectTrafficCongestionAuditParam;
import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
import com.clx.performance.service.collect.CollectTrafficCongestionService;
import com.clx.performance.struct.collect.CollectTrafficCongestionStruct;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
......@@ -15,6 +17,7 @@ import com.msl.user.utils.TokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
......@@ -43,11 +46,26 @@ public class CollectTrafficCongestionServiceImpl implements CollectTrafficConges
collectTrafficCongestion.setLongitude(param.getLongitude());
collectTrafficCongestion.setLatitude(param.getLatitude());
collectTrafficCongestion.setProvince(param.getProvince());
collectTrafficCongestion.setCity(param.getCity());
collectTrafficCongestion.setCounty(param.getCounty());
collectTrafficCongestion.setTown(param.getTown());
collectTrafficCongestion.setStreet(param.getStreet());
collectTrafficCongestion.setAddress(param.getAddress());
collectTrafficCongestion.setFullAddress("");
if (!StringUtils.isEmpty(param.getProvince())){collectTrafficCongestion.setFullAddress(collectTrafficCongestion.getFullAddress()+param.getProvince());}
if (!StringUtils.isEmpty(param.getCity())){collectTrafficCongestion.setFullAddress(collectTrafficCongestion.getFullAddress()+param.getCity());}
if (!StringUtils.isEmpty(param.getCounty())){collectTrafficCongestion.setFullAddress(collectTrafficCongestion.getFullAddress()+param.getCounty());}
if (!StringUtils.isEmpty(param.getTown())){collectTrafficCongestion.setFullAddress(collectTrafficCongestion.getFullAddress()+param.getTown());}
if (!StringUtils.isEmpty(param.getStreet())){collectTrafficCongestion.setFullAddress(collectTrafficCongestion.getFullAddress()+param.getStreet());}
if (!StringUtils.isEmpty(param.getAddress())){collectTrafficCongestion.setFullAddress(collectTrafficCongestion.getFullAddress()+param.getAddress());}
collectTrafficCongestion.setJamTime(param.getJamTime());
collectTrafficCongestion.setJamImage(JSON.toJSONString(param.getJamImageList()));
collectTrafficCongestion.setJamImage(param.getJamImageList()==null? null:JSON.toJSONString(param.getJamImageList()));
collectTrafficCongestion.setReportTime(LocalDateTime.now());
collectTrafficCongestion.setCreateTime(collectTrafficCongestion.getReportTime());
collectTrafficCongestionDao.saveEntity(collectTrafficCongestion);
}
......@@ -65,4 +83,17 @@ public class CollectTrafficCongestionServiceImpl implements CollectTrafficConges
param.setUserNo(userNo);
return collectTrafficCongestionDao.pageTraffic(param);
}
@Override
public void updateTrafficCongestionAudit(CollectTrafficCongestionAuditParam param) {
CollectTrafficCongestion collectTrafficCongestion = collectTrafficCongestionDao.getEntityByKey(param.getId()).orElseThrow();
collectTrafficCongestion.setAuditStatus(CollectTrafficCongestion.AuditStatus.AUDIT.getCode());
collectTrafficCongestionDao.updateAuditStatus(collectTrafficCongestion);
}
@Override
public IPage<CollectTrafficCongestionVO> carrierPageTrafficReport(CarrierPageCollectTraficCongestionParam param) {
return collectTrafficCongestionDao.carrierPageTraffic(param);
}
}
......@@ -6,6 +6,7 @@ import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.model.collect.CollectTruckLeave;
import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
import com.clx.performance.service.collect.CollectTruckLeaveService;
import com.clx.performance.struct.collect.CollectTruckLeaveStruct;
import com.clx.performance.utils.LocalDateTimeUtils;
......@@ -58,4 +59,10 @@ public class CollectTruckLeaveServiceImpl implements CollectTruckLeaveService {
param.setUserNo(userNo);
return collectTruckLeaveDao.pageLeave(param);
}
@Override
public IPage<CollectTruckLeaveVO> carrierPageLeave(CarrierPageCollectTruckLeaveParam param) {
return collectTruckLeaveDao.carrierPageLeave(param);
}
}
......@@ -7,6 +7,7 @@ import com.clx.performance.model.collect.CollectTruckLocation;
import com.clx.performance.model.collect.CollectTruckRefuel;
import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
import com.clx.performance.service.collect.CollectTruckLocationService;
import com.clx.performance.struct.collect.CollectTruckLocationStruct;
import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
......@@ -15,6 +16,7 @@ import com.msl.user.utils.TokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
......@@ -43,9 +45,23 @@ public class CollectTruckLocationServiceImpl implements CollectTruckLocationServ
collectTruckLocation.setTruckOrderStatus(param.getTruckOrderStatus());
collectTruckLocation.setLongitude(param.getLongitude());
collectTruckLocation.setLatitude(param.getLatitude());
collectTruckLocation.setProvince(param.getProvince());
collectTruckLocation.setCity(param.getCity());
collectTruckLocation.setCounty(param.getCounty());
collectTruckLocation.setTown(param.getTown());
collectTruckLocation.setStreet(param.getStreet());
collectTruckLocation.setAddress(param.getAddress());
collectTruckLocation.setReportTime(LocalDateTime.now());
collectTruckLocation.setFullAddress("");
if (!StringUtils.isEmpty(param.getProvince())){collectTruckLocation.setFullAddress(collectTruckLocation.getFullAddress()+param.getProvince());}
if (!StringUtils.isEmpty(param.getCity())){collectTruckLocation.setFullAddress(collectTruckLocation.getFullAddress()+param.getCity());}
if (!StringUtils.isEmpty(param.getCounty())){collectTruckLocation.setFullAddress(collectTruckLocation.getFullAddress()+param.getCounty());}
if (!StringUtils.isEmpty(param.getTown())){collectTruckLocation.setFullAddress(collectTruckLocation.getFullAddress()+param.getTown());}
if (!StringUtils.isEmpty(param.getStreet())){collectTruckLocation.setFullAddress(collectTruckLocation.getFullAddress()+param.getStreet());}
if (!StringUtils.isEmpty(param.getAddress())){collectTruckLocation.setFullAddress(collectTruckLocation.getFullAddress()+param.getAddress());}
collectTruckLocation.setReportTime(LocalDateTime.now());
collectTruckLocation.setCreateTime(collectTruckLocation.getReportTime());
collectTruckLocationDao.saveEntity(collectTruckLocation);
}
......@@ -63,4 +79,9 @@ public class CollectTruckLocationServiceImpl implements CollectTruckLocationServ
param.setUserNo(userNo);
return collectTruckLocationDao.pageLocation(param);
}
@Override
public IPage<CollectTruckLocationVO> carrierPageLocationReport(CarrierPageCollectTruckLocationParam param) {
return collectTruckLocationDao.carrierPageLocation(param);
}
}
......@@ -9,6 +9,7 @@ import com.clx.performance.model.OrderChild;
import com.clx.performance.model.collect.CollectTruckRefuel;
import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
import com.clx.performance.service.collect.CollectTruckRefuelService;
import com.clx.performance.struct.collect.CollectTruckRefuelStruct;
import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
......@@ -47,15 +48,18 @@ public class CollectTruckRefuelServiceImpl implements CollectTruckRefuelService
collectTruckRefuel.setMobile(loginUserInfo.getUserMobile());
collectTruckRefuel.setTruckNo(orderChild.getTruckNo());
collectTruckRefuel.setChildNo(orderChild.getChildNo());
collectTruckRefuel.setChildNo(param.getChildNo());
collectTruckRefuel.setSendAddressId(orderChild.getSendAddressId());
collectTruckRefuel.setSendAddress(orderChild.getSendAddress());
collectTruckRefuel.setReceiveAddressId(orderChild.getReceiveAddressId());
collectTruckRefuel.setReceiveAddress(orderChild.getReceiveAddress());
collectTruckRefuel.setLoadImage(JSON.toJSONString(param.getLoadImageList()));
collectTruckRefuel.setUnloadImage(JSON.toJSONString(param.getUnloadImageList()));
collectTruckRefuel.setLoadImage(param.getLoadImageList()==null? null:JSON.toJSONString(param.getLoadImageList()));
collectTruckRefuel.setUnloadImage(param.getUnloadImageList()==null? null:JSON.toJSONString(param.getUnloadImageList()));
collectTruckRefuel.setLoadOil(param.getLoadOil());
collectTruckRefuel.setUnloadOil(param.getUnloadOil());
collectTruckRefuel.setReportTime(LocalDateTime.now());
collectTruckRefuel.setCreateTime(collectTruckRefuel.getReportTime());
collectTruckRefuelDao.saveEntity(collectTruckRefuel);
}
......@@ -74,4 +78,9 @@ public class CollectTruckRefuelServiceImpl implements CollectTruckRefuelService
param.setUserNo(userNo);
return collectTruckRefuelDao.pageRefuel(param);
}
@Override
public IPage<CollectTruckRefuelVO> carrierPageRefuelReport(CarrierPageCollectTruckRefuelParam param) {
return collectTruckRefuelDao.carrierPageRefuel(param);
}
}
......@@ -6,10 +6,13 @@ import com.clx.performance.dao.OrderChildDao;
import com.clx.performance.dao.collect.CollectTruckWaitDao;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.model.OrderChild;
import com.clx.performance.model.collect.CollectLineReport;
import com.clx.performance.model.collect.CollectTruckWait;
import com.clx.performance.param.app.collect.CollectLineReportTruckWaitAuditParam;
import com.clx.performance.param.app.collect.CollectWaitReportReceiveAddressSaveParam;
import com.clx.performance.param.app.collect.CollectWaitReportSendAddressSaveParam;
import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
import com.clx.performance.service.collect.CollectWaitReportService;
import com.clx.performance.struct.collect.CollectTruckWaitStruct;
import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
......@@ -55,11 +58,10 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
collectTruckWait.setWaitType(param.getWaitType());
collectTruckWait.setStationInTime(param.getStationInTime());
collectTruckWait.setStationInImage(JSON.toJSONString(param.getStationInImageList()));
// collectTruckWait.setStationOutTime(param.getStationOutTime());
// collectTruckWait.setStationOutImage(JSON.toJSONString(param.getStationOutImageList()));
collectTruckWait.setStationInImage(param.getStationInImageList()==null? null : JSON.toJSONString(param.getStationInImageList()));
collectTruckWait.setReportTime(LocalDateTime.now());
collectTruckWait.setCreateTime(collectTruckWait.getReportTime());
collectTruckWaitDao.saveEntity(collectTruckWait);
}
......@@ -83,12 +85,11 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
collectTruckWait.setReportType(CollectTruckWait.ReportType.UNLOAD.getCode());
collectTruckWait.setWaitType(param.getWaitType());
// collectTruckWait.setStationInTime(param.getStationInTime());
// collectTruckWait.setStationInImage(JSON.toJSONString(param.getStationInImageList()));
collectTruckWait.setStationOutTime(param.getStationOutTime());
collectTruckWait.setStationOutImage(JSON.toJSONString(param.getStationOutImageList()));
collectTruckWait.setStationOutImage(param.getStationOutImageList()==null? null:JSON.toJSONString(param.getStationOutImageList()));
collectTruckWait.setReportTime(LocalDateTime.now());
collectTruckWait.setCreateTime(collectTruckWait.getReportTime());
collectTruckWaitDao.saveEntity(collectTruckWait);
}
......@@ -106,4 +107,17 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
param.setUserNo(userNo);
return collectTruckWaitDao.pageWaitReport(param);
}
@Override
public void updateWaitReportAudit(CollectLineReportTruckWaitAuditParam param) {
CollectTruckWait report = collectTruckWaitDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
report.setAuditStatus(CollectTruckWait.AuditStatus.AUDIT.getCode());
collectTruckWaitDao.updateAuditStatus(report);
}
@Override
public IPage<CollectTruckWaitVO> carrierPageWaitReport(CarrierPageCollectTruckWaitParam param) {
return collectTruckWaitDao.carrierPageWaitReport(param);
}
}
......@@ -3,7 +3,9 @@ package com.clx.performance.sqlProvider.collect;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.param.app.collect.PageCollectLineReportParam;
import com.clx.performance.param.pc.carrier.*;
import com.clx.performance.vo.app.collect.CollectLineReportVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.jdbc.SQL;
......@@ -12,9 +14,9 @@ public class CollectLineReportSqlProvider {
public String pageLineReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") PageCollectLineReportParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, child_no as childNo, address_id as addressId, " +
" address, " +
" type, report_type as reportType, report_status as reportStatus, remark, image, " +
" truck_no as truckNo, child_no as childNo, address_id as addressId, address, " +
" send_address_id, send_address, receive_address_id, receive_address, " +
" type, report_type as reportType, report_status as reportStatus, remark, image, audit_status, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
......@@ -22,10 +24,134 @@ public class CollectLineReportSqlProvider {
FROM("collect_line_report ");
WHERE("user_no = #{param.userNo} ");
ORDER_BY("create_time desc");
ORDER_BY("report_time desc");
}}.toString();
}
public String carrierPageSendAddressReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectSendAddressReportParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, child_no as childNo, address_id as addressId, address, " +
" send_address_id, send_address, receive_address_id, receive_address, " +
" type, report_type as reportType, report_status as reportStatus, remark, image, audit_status, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM("collect_line_report ");
WHERE("report_type = 7");
if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address <= like CONCAT(#{param.sendAddress},'%')");}
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
if (param.getReportStatus() != null) {WHERE("report_status = #{param.reportStatus}");}
if (param.getAuditStatus() != null) {WHERE("audit_status = #{param.auditStatus}");}
if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("report_time >= #{param.beginTime}");}
if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("report_time <= #{param.endTime}");}
ORDER_BY("report_time desc");
}}.toString();
}
public String carrierPageAbnormalReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectAbnormalReportParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, child_no as childNo, address_id as addressId, address, " +
" send_address_id, send_address, receive_address_id, receive_address, " +
" type, report_type as reportType, report_status as reportStatus, remark, image, audit_status, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM("collect_line_report ");
if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT(#{param.sendAddress},'%')");}
if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveRddress},'%')");}
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
if (param.getReportType() != null) {WHERE("report_type = #{param.reportType}");}
if (param.getAuditStatus() != null) {WHERE("audit_status = #{param.auditStatus}");}
if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("report_time >= #{param.beginTime}");}
if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("report_time <= #{param.endTime}");}
ORDER_BY("report_time desc");
}}.toString();
}
public String carrierPageNoTakeOrderReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectNoTakeOrderReportParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, child_no as childNo, address_id as addressId, address, " +
" send_address_id, send_address, receive_address_id, receive_address, " +
" type, report_type as reportType, report_status as reportStatus, remark, image, audit_status, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM("collect_line_report ");
WHERE("report_type = 6");
if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT(#{param.sendAddress},'%')");}
if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveRddress},'%')");}
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
ORDER_BY("report_time desc");
}}.toString();
}
public String carrierPageQualityReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectQualityReportParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, child_no as childNo, address_id as addressId, address, " +
" send_address_id, send_address, receive_address_id, receive_address, " +
" type, report_type as reportType, report_status as reportStatus, remark, image, audit_status, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM("collect_line_report ");
WHERE("report_type = 9");
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
if (param.getAuditStatus() != null) {WHERE("audit_status = #{param.auditStatus}");}
if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("report_time >= #{param.beginTime}");}
if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("report_time <= #{param.endTime}");}
ORDER_BY("report_time desc");
}}.toString();
}
public String carrierPageOtherReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") CarrierPageCollectOtherReportParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, child_no as childNo, address_id as addressId, address, " +
" send_address_id, send_address, receive_address_id, receive_address, " +
" type, report_type as reportType, report_status as reportStatus, remark, image, audit_status, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM("collect_line_report ");
WHERE("report_type = 8");
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("report_time >= #{param.beginTime}");}
if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("report_time <= #{param.endTime}");}
ORDER_BY("report_time desc");
}}.toString();
}
}
......@@ -3,7 +3,9 @@ package com.clx.performance.sqlProvider.collect;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.jdbc.SQL;
......@@ -13,7 +15,7 @@ public class CollectTrafficCongestionSqlProvider {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, " +
" province, city, county, town, street, address, " +
" province, city, county, town, street, address, full_address" +
" longitude, latitude, " +
" jam_time as jamTime, jam_image as jamImage, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
......@@ -27,6 +29,30 @@ public class CollectTrafficCongestionSqlProvider {
}}.toString();
}
public String carrierPageTraffic(@Param("page") Page<CollectTrafficCongestionVO> page, @Param("param") CarrierPageCollectTraficCongestionParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, " +
" province, city, county, town, street, address, full_address" +
" longitude, latitude, " +
" jam_time as jamTime, jam_image as jamImage, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
"date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM("collect_traffic_congestion ");
if (StringUtils.isNotBlank(param.getAddress())) {WHERE("full_address like CONCAT(#{param.address},'%')");}
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
if (param.getAuditStatus() != null) {WHERE("audit_status = #{param.auditStatus}");}
if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("report_time >= #{param.beginTime}");}
if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("report_time <= #{param.endTime}");}
ORDER_BY("report_time desc");
}}.toString();
}
}
......@@ -3,7 +3,9 @@ package com.clx.performance.sqlProvider.collect;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.jdbc.SQL;
......@@ -14,6 +16,7 @@ public class CollectTruckLeaveSqlProvider {
SELECT(" id, user_no as userNo, name, mobile, truck_no as truckNo, " +
" date_format(begin_time, '%Y-%m-%d %H:%i:%s') as beginTime, " +
" date_format(end_time, '%Y-%m-%d %H:%i:%s') as endTime, " +
" remark, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
......@@ -23,7 +26,30 @@ public class CollectTruckLeaveSqlProvider {
ORDER_BY("create_time desc");
}}.toString();
}
public String carrierPageLeave(@Param("page") Page<CollectTruckLeaveVO> page, @Param("param") CarrierPageCollectTruckLeaveParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, truck_no as truckNo, " +
" date_format(begin_time, '%Y-%m-%d %H:%i:%s') as beginTime, " +
" date_format(end_time, '%Y-%m-%d %H:%i:%s') as endTime, " +
" remark, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM("collect_truck_leave ");
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}
if (StringUtils.isNotBlank(param.getBeginTime1())) {WHERE("begin_time >= #{param.beginTime1}");}
if (StringUtils.isNotBlank(param.getEndTime1())) {WHERE("begin_time <= #{param.endTime1}");}
if (StringUtils.isNotBlank(param.getBeginTime2())) {WHERE("end_time >= #{param.beginTime2}");}
if (StringUtils.isNotBlank(param.getEndTime2())) {WHERE("end_time <= #{param.endTime2}");}
ORDER_BY("create_time desc");
}}.toString();
}
}
......@@ -3,10 +3,14 @@ package com.clx.performance.sqlProvider.collect;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.jdbc.SQL;
import java.util.Objects;
public class CollectTruckLocationSqlProvider {
public String pageLocation(@Param("page") Page<CollectTruckLocationVO> page, @Param("param") PageCollectTruckLocationParam param) {
......@@ -14,7 +18,7 @@ public class CollectTruckLocationSqlProvider {
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, " +
" province, city, county, town, street, address, longitude, latitude, " +
" truck_order_status as truckOrderStatus, " +
" truck_order_status, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
"date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
......@@ -22,7 +26,33 @@ public class CollectTruckLocationSqlProvider {
FROM("collect_truck_location ");
WHERE("user_no = #{param.userNo} ");
ORDER_BY("create_time desc");
ORDER_BY("report_time desc");
}}.toString();
}
public String carrierPageLocation(@Param("page") Page<CollectTruckLocationVO> page, @Param("param") CarrierPageCollectTruckLocationParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, " +
" province, city, county, town, street, address, full_address longitude, latitude, " +
" truck_order_status, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
"date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM("collect_truck_location ");
if (StringUtils.isNotBlank(param.getAddress())) {WHERE("full_address like CONCAT(#{param.sendAddress},'%')");}
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
if (param.getTruckOrderStatus() != null) {WHERE("truck_order_status = #{param.truckOrderStatus}");}
if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("report_time >= #{param.beginTime}");}
if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("report_time <= #{param.endTime}");}
ORDER_BY("report_time desc");
}}.toString();
}
......
......@@ -3,7 +3,9 @@ package com.clx.performance.sqlProvider.collect;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.jdbc.SQL;
......@@ -23,7 +25,34 @@ public class CollectTruckRefuelSqlProvider {
FROM("collect_truck_refuel ");
WHERE("user_no = #{param.userNo} ");
ORDER_BY("create_time desc");
ORDER_BY("report_time desc");
}}.toString();
}
public String carrierPageRefuel(@Param("page") Page<CollectTruckRefuelVO> page, @Param("param") CarrierPageCollectTruckRefuelParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, " +
" truck_no as truckNo, child_no as childNo, " +
" send_address_id, send_address, receive_address_id, receive_address, " +
" load_image as loadImage, load_oil as loadOil, " +
" unload_image as unloadImage, unload_oil as unloadOil, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM("collect_truck_refuel ");
if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT(#{param.sendAddress},'%')");}
if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveRddress},'%')");}
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("report_time >= #{param.beginTime}");}
if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("report_time <= #{param.endTime}");}
ORDER_BY("report_time desc");
}}.toString();
}
......
......@@ -3,7 +3,9 @@ package com.clx.performance.sqlProvider.collect;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.jdbc.SQL;
......@@ -14,13 +16,43 @@ public class CollectTruckWaitSqlProvider {
SELECT(" id, user_no as userNo, name, mobile, truck_no as truckNo, child_no as childNo, address_id as addressId, " +
" address, report_type as reportType, wait_type as waitType, station_in_time as stationInTime, " +
" station_in_image as stationInImage, station_out_time as stationOutTime, station_out_image as stationOutImage, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" audit_time, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM(" collect_truck_wait ");
WHERE("user_no = #{param.userNo} ");
ORDER_BY("create_time desc");
ORDER_BY("report_time desc");
}}.toString();
}
public String carrierPageWaitReport(@Param("page") Page<CollectTruckWaitVO> page, @Param("param") CarrierPageCollectTruckWaitParam param) {
return new SQL(){{
SELECT(" id, user_no as userNo, name, mobile, truck_no as truckNo, child_no as childNo, address_id as addressId, " +
" address, report_type as reportType, wait_type as waitType, station_in_time as stationInTime, " +
" station_in_image as stationInImage, station_out_time as stationOutTime, station_out_image as stationOutImage, " +
" date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
" audit_time, " +
" date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
" date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
);
FROM(" collect_truck_wait ");
if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
if (StringUtils.isNotBlank(param.getAddress())) {WHERE("address like CONCAT(#{param.address},'%')");}
if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
if (param.getReportType() != null) {WHERE("report_type = #{param.reportType}");}
if (param.getWaitType() != null) {WHERE("wait_type = #{param.waitType}");}
if (param.getAuditStatus() != null) {WHERE("audit_status = #{param.auditStatus}");}
if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("report_time >= #{param.beginTime}");}
if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("report_time <= #{param.endTime}");}
ORDER_BY("report_time desc");
}}.toString();
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论