소스 검색

delete old file

wangweiyu 4 년 전
부모
커밋
a4fe63b68b
80개의 변경된 파일0개의 추가작업 그리고 2884개의 파일을 삭제
  1. 0 55
      src/main/java/com/aoyang/tms/entity/vo/DriverListAll.java
  2. 0 57
      src/main/java/com/aoyang/tms/entity/vo/GasOrderVo.java
  3. 0 92
      src/main/java/com/aoyang/tms/entity/vo/GasstationAppVO.java
  4. 0 48
      src/main/java/com/aoyang/tms/entity/vo/GasstationStoreListVO.java
  5. 0 112
      src/main/java/com/aoyang/tms/entity/vo/GasstationVO.java
  6. 0 108
      src/main/java/com/aoyang/tms/entity/vo/GctOrder.java
  7. 0 16
      src/main/java/com/aoyang/tms/entity/vo/StockLogReq.java
  8. 0 20
      src/main/java/com/aoyang/tms/entity/vo/StockLogVO.java
  9. BIN
      src/main/resources/exceltpl/Lng_tpl.xlsx
  10. BIN
      src/main/resources/exceltpl/download_stock_log_tpl.xlsx
  11. BIN
      src/main/resources/exceltpl/stock_log_list_tpl.xlsx
  12. BIN
      src/main/resources/exceltpl/store_list_tpl.xlsx
  13. BIN
      src/main/resources/exceltpl/truck_tpl.xlsx
  14. 0 24
      src/main/resources/mapper/AreaBenefitLogMapper.xml
  15. 0 22
      src/main/resources/mapper/AreaBenefitMapper.xml
  16. 0 25
      src/main/resources/mapper/BannerMapper.xml
  17. 0 20
      src/main/resources/mapper/CarriageLogDetailMapper.xml
  18. 0 20
      src/main/resources/mapper/CarriageLogMapper.xml
  19. 0 21
      src/main/resources/mapper/CarriagePriceMapper.xml
  20. 0 27
      src/main/resources/mapper/CarrierGasstationRebateMapper.xml
  21. 0 34
      src/main/resources/mapper/CarrierLogMapper.xml
  22. 0 56
      src/main/resources/mapper/CarrierMapper.xml
  23. 0 30
      src/main/resources/mapper/CarrierRebateLogMapper.xml
  24. 0 24
      src/main/resources/mapper/CarrierRebateMapper.xml
  25. 0 18
      src/main/resources/mapper/CashbackConfigMapper.xml
  26. 0 19
      src/main/resources/mapper/CashbackLogDetailMapper.xml
  27. 0 18
      src/main/resources/mapper/CashbackLogMapper.xml
  28. 0 21
      src/main/resources/mapper/CashierClockInMapper.xml
  29. 0 48
      src/main/resources/mapper/DirectGasstationFeeConfigMapper.xml
  30. 0 19
      src/main/resources/mapper/DirectSalesTruckLogMapper.xml
  31. 0 23
      src/main/resources/mapper/DirectSalesTruckMapper.xml
  32. 0 25
      src/main/resources/mapper/DriverLimitLogMapper.xml
  33. 0 53
      src/main/resources/mapper/DriverMapper.xml
  34. 0 27
      src/main/resources/mapper/FreightConfigLogMapper.xml
  35. 0 122
      src/main/resources/mapper/FreightConfigMapper.xml
  36. 0 24
      src/main/resources/mapper/GasLimitConfigDetailMapper.xml
  37. 0 21
      src/main/resources/mapper/GasLimitConfigLogMapper.xml
  38. 0 44
      src/main/resources/mapper/GasOrderMapper.xml
  39. 0 18
      src/main/resources/mapper/GasstaionLngfromMapper.xml
  40. 0 21
      src/main/resources/mapper/GasstationLimitStatusLogMapper.xml
  41. 0 209
      src/main/resources/mapper/GasstationMapper.xml
  42. 0 21
      src/main/resources/mapper/GasstationPresentMapper.xml
  43. 0 22
      src/main/resources/mapper/GasstationQrcodeLogMapper.xml
  44. 0 23
      src/main/resources/mapper/GasstationTagMapper.xml
  45. 0 23
      src/main/resources/mapper/GctConfigMapper.xml
  46. 0 30
      src/main/resources/mapper/GwayCostLogMapper.xml
  47. 0 22
      src/main/resources/mapper/GwayCostMapper.xml
  48. 0 19
      src/main/resources/mapper/GwayGaspriceLogMapper.xml
  49. 0 21
      src/main/resources/mapper/HarbourPriceLogMapper.xml
  50. 0 20
      src/main/resources/mapper/HarbourPriceMapper.xml
  51. 0 21
      src/main/resources/mapper/ListPriceLogMapper.xml
  52. 0 24
      src/main/resources/mapper/LngFromLogMapper.xml
  53. 0 24
      src/main/resources/mapper/LngFromMapper.xml
  54. 0 18
      src/main/resources/mapper/NewstationMapper.xml
  55. 0 20
      src/main/resources/mapper/PlatformPriceLogMapper.xml
  56. 0 20
      src/main/resources/mapper/PlatformPriceMapper.xml
  57. 0 26
      src/main/resources/mapper/PriceConfigLogMapper.xml
  58. 0 30
      src/main/resources/mapper/PriceConfigMapper.xml
  59. 0 22
      src/main/resources/mapper/ProfitQuotaLogMapper.xml
  60. 0 38
      src/main/resources/mapper/PurchaseDuplicateMapper.xml
  61. 0 28
      src/main/resources/mapper/PurchaseExceptionMapper.xml
  62. 0 23
      src/main/resources/mapper/PurchaseLimitConfigLogMapper.xml
  63. 0 22
      src/main/resources/mapper/PurchaseLimitConfigMapper.xml
  64. 0 70
      src/main/resources/mapper/PurchaseMapper.xml
  65. 0 34
      src/main/resources/mapper/PurchaseOperateMapper.xml
  66. 0 27
      src/main/resources/mapper/PurchaseProposeDetailMapper.xml
  67. 0 19
      src/main/resources/mapper/RebateConfigMapper.xml
  68. 0 20
      src/main/resources/mapper/RebateLogDetailMapper.xml
  69. 0 18
      src/main/resources/mapper/RebateLogMapper.xml
  70. 0 69
      src/main/resources/mapper/ReleaseDetailMapper.xml
  71. 0 23
      src/main/resources/mapper/ReleaseManageMapper.xml
  72. 0 53
      src/main/resources/mapper/StockLogMapper.xml
  73. 0 24
      src/main/resources/mapper/SystemConfigLogMapper.xml
  74. 0 28
      src/main/resources/mapper/SystemConfigMapper.xml
  75. 0 19
      src/main/resources/mapper/TagMapper.xml
  76. 0 20
      src/main/resources/mapper/TruckComContractMapper.xml
  77. 0 28
      src/main/resources/mapper/TruckDriverLogMapper.xml
  78. 0 49
      src/main/resources/mapper/TruckDriverMapper.xml
  79. 0 28
      src/main/resources/mapper/TruckLogMapper.xml
  80. 0 297
      src/main/resources/mapper/TruckMapper.xml

+ 0 - 55
src/main/java/com/aoyang/tms/entity/vo/DriverListAll.java

@@ -1,55 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author xumingrui
- * @since 2020-02-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("driver")
-@ApiModel(value="Driver对象", description="")
-public class DriverListAll implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "司机id(user.user.user_id)")
-    @JsonFormat(shape = Shape.STRING)
-    @TableId(value="driver_id",type = IdType.INPUT)
-    private Long driverId;
-
-    @ApiModelProperty(value = "司机名称(user.user.user_name)")
-    @TableField("driver_name")
-    private String driverName;
-
-
-    @ApiModelProperty(value = "手机号")
-    @TableField("mobile")
-    @Pattern(regexp = "[0-9]\\d{10}",message = "请填写正确的手机号")
-    @NotNull(message = "请填写11位手机号")
-    private String mobile;
-
-    @TableField(exist = false)
-    private  Integer flag;
-
-}

+ 0 - 57
src/main/java/com/aoyang/tms/entity/vo/GasOrderVo.java

@@ -1,57 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import lombok.Data;
-
-@Data
-public class GasOrderVo implements Serializable {
-
-    private Long orderId;
-    private Long gasstationId;
-    private String gasstationName;
-    private String nickName;
-    private Long cashierId;
-    private String cashierName;
-    private Long carrierOrgId;
-    private String carrierOrgName;
-    private Long truckId;
-    private String carNumber;
-    private Long driverId;
-    private String driverName;
-    private BigDecimal gasQty;
-    private BigDecimal listPrice;
-    private BigDecimal platformPrice;
-    private BigDecimal actualPrice;
-    private BigDecimal discountAmount;
-    private BigDecimal amount;
-    private BigDecimal gasstationFee;
-    private BigDecimal directGasstationFee;
-    private BigDecimal platformFee;
-    private BigDecimal serviceFee;
-    private Integer payType;
-    private Integer orderStatus;
-    private String createRole;
-    private Long canceler;
-    private String cancelerName;
-    private LocalDateTime cancelDate;
-    private Long creater;
-    private String createrName;
-    private LocalDateTime createDate;
-    private LocalDateTime updateDate;
-    private BigDecimal harbourPrice;
-    private BigDecimal benefit;
-    private BigDecimal carrierRebate;
-    private BigDecimal freight;
-    private BigDecimal rebate;
-    private BigDecimal gasprice;
-    private BigDecimal preGasprice;
-    private BigDecimal gasamount;
-    private BigDecimal gwayprice;
-    private BigDecimal gwayamount;
-    private BigDecimal comAmount;
-    private String payChannelId;
-    private Integer tradeType;
-}

+ 0 - 92
src/main/java/com/aoyang/tms/entity/vo/GasstationAppVO.java

@@ -1,92 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @description:
- * @author: xumingrui
- * @create: 2020 -02 -15 -22:07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "GasstationVO对象", description = "")
-public class GasstationAppVO {
-
-    @ApiModelProperty(value = "加气站id(调用API生成)")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long gasstationId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String gasstationName;
-
-    @ApiModelProperty(value = "加气站名称")
-    private String nickName;
-
-    @ApiModelProperty(value = "收款码类别(0-未设置,1-加气站,2-收银员),默认1")
-    private Integer qrcode;
-
-    @ApiModelProperty(value = "省份")
-    private String province;
-
-    @ApiModelProperty(value = "城市")
-    private String city;
-
-    @ApiModelProperty(value = "地区")
-    private String region;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "头像")
-    private String url;
-
-    @ApiModelProperty(value = "平台挂牌价")
-    private BigDecimal platformPrice;
-
-    @ApiModelProperty(value = "两个经纬度之间的直线距离(公里)")
-    private BigDecimal distance;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    private List<String> tagList;
-
-    private String presentContent;
-
-    @ApiModelProperty(value = "最高优惠")
-    private String discount;
-
-    @ApiModelProperty(value = "加气站宣传文案")
-    private String introduce;
-
-    @ApiModelProperty(value = "加注机数量")
-    private Integer fillingMachineNum;
-
-    @ApiModelProperty(value = "收银员数量")
-    private Integer cashierNum;
-
-    @ApiModelProperty(value = "加气站形象图列表")
-    private List orgPics;
-
-    @ApiModelProperty(value = "手机号")
-    private String mobile;
-
-    @ApiModelProperty(value = "最高优惠")
-    private BigDecimal maxDiscount;
-
-    @ApiModelProperty(value = "优惠后的价格")
-    private BigDecimal discountPrice;
-
-}

+ 0 - 48
src/main/java/com/aoyang/tms/entity/vo/GasstationStoreListVO.java

@@ -1,48 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @description:
- * @author: xumingrui
- * @create: 2020 -02 -15 -22:07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "GasstationVO对象", description = "")
-public class GasstationStoreListVO {
-
-    @ApiModelProperty(value = "加气站id(调用API生成)")
-    @JsonFormat(shape = Shape.STRING)
-    private Long gasstationId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String gasstationName;
-
-    @ApiModelProperty(value = "加气站名称")
-    private String nickName;
-
-    @ApiModelProperty(value = "库存状态")
-    private String statusStock;
-
-    @ApiModelProperty(value = "库存量")
-    private BigDecimal stock;
-
-    @ApiModelProperty(value = "限制提报计划状态(0开启1关闭)")
-    private Integer purchaseLimitStatus;
-
-    @ApiModelProperty(value = "加气限制状态(0关闭1开启)")
-    private Integer gasLimitStatus;
-
-    @ApiModelProperty(value = "加气限制库存")
-    private BigDecimal gasLimitStock;
-}

+ 0 - 112
src/main/java/com/aoyang/tms/entity/vo/GasstationVO.java

@@ -1,112 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @description:
- * @author: xumingrui
- * @create: 2020 -02 -15 -22:07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("gasstation")
-@ApiModel(value = "GasstationVO对象", description = "")
-public class GasstationVO {
-
-    @ApiModelProperty(value = "加气站id(调用API生成)")
-    @TableId(value = "gasstation_id", type = IdType.INPUT)
-    @JsonFormat(shape = Shape.STRING)
-    private Long gasstationId;
-
-    @ApiModelProperty(value = "企业名称")
-    @TableField("gasstation_name")
-    private String gasstationName;
-
-    @ApiModelProperty(value = "加气站名称")
-    @TableField("nick_name")
-    private String nickName;
-
-    @ApiModelProperty(value = "交易模式(1经销模式;2直销模式,默认经销模式1)")
-    @TableField("trade_type")
-    private String tradeType;
-
-    @ApiModelProperty(value = "收款码类别(0-未设置,1-加气站,2-收银员),默认1")
-    @TableField("qrcode")
-    private Integer qrcode;
-
-    @ApiModelProperty(value = "省份")
-    @TableField("province")
-    private String province;
-
-    @ApiModelProperty(value = "城市")
-    @TableField("city")
-    private String city;
-
-    @ApiModelProperty(value = "地区")
-    @TableField("region")
-    private String region;
-
-    @ApiModelProperty(value = "地址")
-    @TableField("address")
-    private String address;
-
-    @ApiModelProperty(value = "头像")
-    @TableField("url")
-    private String url;
-
-    @ApiModelProperty(value = "平台挂牌价")
-    @TableField("platform_price")
-    private BigDecimal platformPrice;
-
-    @ApiModelProperty(value = "平台挂牌价")
-    @TableField("direct_sales_price")
-    private BigDecimal directSalesPrice;
-
-    public BigDecimal getDistance() {
-        return distance;
-    }
-
-    public void setDistance(BigDecimal distance) {
-        this.distance = distance.setScale(2, BigDecimal.ROUND_HALF_UP);
-    }
-
-    @ApiModelProperty(value = "两个经纬度之间的直线距离(公里)")
-    @TableField(exist = false)
-    private BigDecimal distance;
-
-    @ApiModelProperty(value = "经度")
-    @TableField("longitude")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    @TableField("latitude")
-    private String latitude;
-
-
-    @ApiModelProperty(value = "加气限制状态(0关闭1开启)默认值关闭0")
-    @TableField("gas_limit_status")
-    private Integer gasLimitStatus;
-
-    @ApiModelProperty(value = "加气限制库存量")
-    @TableField("gas_limit_stock")
-    private BigDecimal gasLimitStock;
-
-    @ApiModelProperty(value = "库存量")
-    @TableField("stock")
-    private BigDecimal stock;
-
-}

+ 0 - 108
src/main/java/com/aoyang/tms/entity/vo/GctOrder.java

@@ -1,108 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * <p>
-    * 
-    * </p>
- *
- * @author zhuangxl
- * @since 2021-10-16
- */
-@Data
-@ApiModel(value="GctOrder对象", description="")
-public class GctOrder implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "订单id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orderId;
-
-    @ApiModelProperty(value = "加气站id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long gasstationId;
-
-    @ApiModelProperty(value = "加气站名称")
-    private String gasstationName;
-
-    @ApiModelProperty(value = "加气站简称")
-    private String gasstationShortName;
-
-    @ApiModelProperty(value = "物流公司id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long carrierId;
-
-    @ApiModelProperty(value = "物流公司名称")
-    private String carrierName;
-
-    @ApiModelProperty(value = "车辆id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "车牌号")
-    private String carNumber;
-
-    @ApiModelProperty(value = "气瓶编号")
-    private String gasCylinderNumber;
-
-    @ApiModelProperty(value = "订单状态:1=已预约 2=已支付 3=已取消,默认1")
-    private Integer status;
-
-    @ApiModelProperty(value = "预约开始时间:yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime appointDateStart;
-
-    @ApiModelProperty(value = "预约结束时间:yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime appointDateEnd;
-
-    @ApiModelProperty(value = "支付时间:yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime payDate;
-
-    @ApiModelProperty(value = "支付金额")
-    private BigDecimal payAmount;
-
-    @ApiModelProperty(value = "司机id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverId;
-
-    @ApiModelProperty(value = "司机姓名")
-    private String driverName;
-
-    @ApiModelProperty(value = "司机联系方式")
-    private String driverMobile;
-
-    @ApiModelProperty(value = "创建人")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creatorId;
-
-    @ApiModelProperty(value = "创建人姓名")
-    private String creatorName;
-
-    @ApiModelProperty(value = "创建时间[预约下单时间]")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "取消原因")
-    private String note;
-
-    @ApiModelProperty(value = "取消人")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long cancelerId;
-
-    @ApiModelProperty(value = "取消人姓名")
-    private String cancelerName;
-
-    @ApiModelProperty(value = "取消日期")
-    private LocalDateTime cancelDate;
-
-    @ApiModelProperty(value = "资料签收返还状态:0=未签收,1=已签收,2=已返还,默认0")
-    private Integer materialStatus;
-
-}

+ 0 - 16
src/main/java/com/aoyang/tms/entity/vo/StockLogReq.java

@@ -1,16 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import com.aoyang.tms.controller.param.DateParam;
-import com.aoyang.tms.entity.StockLog;
-import lombok.Data;
-
-/**
- * @author xumingrui
- * @date 2020/10/22 11:25 上午
- * @Description:<描述> TODO
- */
-@Data
-public class StockLogReq  extends StockLog {
-    private DateParam dateParam;
-
-}

+ 0 - 20
src/main/java/com/aoyang/tms/entity/vo/StockLogVO.java

@@ -1,20 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author xumingrui
- * @date 2020/10/22 11:28 上午
- * @Description:<描述> TODO
- */
-@Data
-public class StockLogVO{
-    @ApiModelProperty(value = "1=入库 2=加气 3=手工调整")
-    private Integer stockType;
-    @ApiModelProperty(value = "汇总量")
-    private BigDecimal sumQuantity;
-
-}

BIN
src/main/resources/exceltpl/Lng_tpl.xlsx


BIN
src/main/resources/exceltpl/download_stock_log_tpl.xlsx


BIN
src/main/resources/exceltpl/stock_log_list_tpl.xlsx


BIN
src/main/resources/exceltpl/store_list_tpl.xlsx


BIN
src/main/resources/exceltpl/truck_tpl.xlsx


+ 0 - 24
src/main/resources/mapper/AreaBenefitLogMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.AreaBenefitLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.AreaBenefitLog">
-        <id column="id" property="id" />
-        <result column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="province" property="province" />
-        <result column="city" property="city" />
-        <result column="benefit" property="benefit" />
-        <result column="type" property="type" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, lng_from_id, lng_from_name, province, city, benefit, type, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 22
src/main/resources/mapper/AreaBenefitMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.AreaBenefitMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.AreaBenefit">
-        <id column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="province" property="province" />
-        <result column="city" property="city" />
-        <result column="benefit" property="benefit" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        lng_from_id, lng_from_name, province, city, benefit, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 25
src/main/resources/mapper/BannerMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.BannerMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.Banner">
-        <id column="id" property="id" />
-        <result column="title" property="title" />
-        <result column="comment" property="comment" />
-        <result column="imgage_url" property="imgageUrl" />
-        <result column="jump_url" property="jumpUrl" />
-        <result column="type" property="type" />
-        <result column="status" property="status" />
-        <result column="sort" property="sort" />
-        <result column="creater_id" property="createrId" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, title, comment, imgage_url, jump_url, type, status, sort, creater_id, creater_name, create_time
-    </sql>
-
-</mapper>

+ 0 - 20
src/main/resources/mapper/CarriageLogDetailMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CarriageLogDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CarriageLogDetail">
-        <id column="id" property="id" />
-        <result column="carriage_id" property="carriageId" />
-        <result column="begin_range" property="beginRange" />
-        <result column="end_range" property="endRange" />
-        <result column="start_price" property="startPrice" />
-        <result column="rate" property="rate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, carriage_id, begin_range, end_range, start_price, rate
-    </sql>
-
-</mapper>

+ 0 - 20
src/main/resources/mapper/CarriageLogMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CarriageLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CarriageLog">
-        <id column="id" property="id" />
-        <result column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, lng_from_id, lng_from_name, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 21
src/main/resources/mapper/CarriagePriceMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CarriagePriceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CarriagePrice">
-        <id column="id" property="id" />
-        <result column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="begin_range" property="beginRange" />
-        <result column="end_range" property="endRange" />
-        <result column="start_price" property="startPrice" />
-        <result column="rate" property="rate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, lng_from_id, lng_from_name, begin_range, end_range, start_price, rate
-    </sql>
-
-</mapper>

+ 0 - 27
src/main/resources/mapper/CarrierGasstationRebateMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CarrierGasstationRebateMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CarrierGasstationRebate">
-        <id column="id" property="id" />
-        <result column="carrier_org_id" property="carrierOrgId" />
-        <result column="carrier_org_name" property="carrierOrgName" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_short_name" property="gasstationShortName" />
-        <result column="rebate" property="rebate" />
-        <result column="truck_type" property="truckType" />
-        <result column="updater" property="updater" />
-        <result column="updater_name" property="updaterName" />
-        <result column="update_date" property="updateDate" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, carrier_org_id, carrier_org_name, gasstation_id, gasstation_short_name, rebate, truck_type, updater, updater_name, update_date, creater, creater_name, create_date
-    </sql>
-
-</mapper>

+ 0 - 34
src/main/resources/mapper/CarrierLogMapper.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CarrierLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CarrierLog">
-        <id column="id" property="id"/>
-        <result column="org_id" property="orgId"/>
-        <result column="org_name" property="orgName"/>
-        <result column="org_short_name" property="orgShortName"/>
-        <result column="address" property="address"/>
-        <result column="status" property="status"/>
-        <result column="warn_value" property="warnValue"/>
-        <result column="warn_object" property="warnObject"/>
-        <result column="notify_phone" property="notifyPhone"/>
-        <result column="amount" property="amount"/>
-        <result column="total" property="total"/>
-        <result column="creater" property="creater"/>
-        <result column="creater_name" property="createrName"/>
-        <result column="create_date" property="createDate"/>
-        <result column="com_status" property="comStatus"/>
-        <result column="com_scale" property="comScale"/>
-        <result column="com_tag" property="comTag"/>
-        <result column="com_contact" property="comContact"/>
-        <result column="com_mobile" property="comMobile"/>
-        <result column="type" property="type"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, org_id, org_name, org_short_name, address, status, warn_value,warn_object, notify_phone, amount, total, creater, creater_name, create_date, com_status, com_scale, com_tag, com_contact, com_mobile, type
-    </sql>
-
-</mapper>

+ 0 - 56
src/main/resources/mapper/CarrierMapper.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CarrierMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.Carrier">
-        <id column="org_id" property="orgId" />
-        <result column="org_name" property="orgName" />
-        <result column="address" property="address" />
-        <result column="status" property="status" />
-        <result column="warn_value" property="warnValue" />
-        <result column="warn_object" property="warnObject" />
-        <result column="notify_phone" property="notifyPhone" />
-        <result column="amount" property="amount" />
-        <result column="total" property="total" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-        <result column="com_status" property="comStatus" />
-        <result column="com_scale" property="comScale" />
-        <result column="com_tag" property="comTag" />
-        <result column="com_contact" property="comContact" />
-        <result column="com_mobile" property="comMobile" />
-        <result column="update_date" property="updateDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        org_id, org_name, address, status, warn_value,warn_object, notify_phone, amount, total, creater, creater_name, create_date, com_status, com_scale, com_tag, com_contact, com_mobile,update_date
-    </sql>
-
-    <update id="increase">
-            update carrier set total = ifnull(0, total) + #{quantity}
-            where org_id = #{orgId}
-    </update>
-
-    <update id="clearTotal">
-        UPDATE carrier
-        SET total = 0
-        WHERE
-        total > 0
-    </update>
-
-    <select id="warnList" resultType="com.aoyang.tms.controller.vo.WarnVo">
-        select distinct * from carrier where warn_value is not null and warn_value is not null
-        <if test="param!=null ">
-            and (
-                org_name like concat('%',#{param},'%')
-                or
-                warn_object like concat('%',#{param},'%')
-            )
-        </if>
-        order by update_date desc
-    </select>
-
-</mapper>

+ 0 - 30
src/main/resources/mapper/CarrierRebateLogMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CarrierRebateLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CarrierRebateLog">
-        <id column="id" property="id" />
-        <result column="config_type" property="configType" />
-        <result column="carrier_org_id" property="carrierOrgId" />
-        <result column="carrier_org_name" property="carrierOrgName" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_short_name" property="gasstationShortName" />
-        <result column="old_rebate" property="oldRebate" />
-        <result column="new_rebate" property="newRebate" />
-        <result column="old_truck_type" property="oldTruckType" />
-        <result column="new_truck_type" property="newTruckType" />
-        <result column="updater" property="updater" />
-        <result column="updater_name" property="updaterName" />
-        <result column="update_date" property="updateDate" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, config_type, carrier_org_id, carrier_org_name, gasstation_id, gasstation_short_name, old_rebate, new_rebate, old_truck_type, new_truck_type, updater, updater_name, update_date, creater, creater_name, create_date
-    </sql>
-
-</mapper>

+ 0 - 24
src/main/resources/mapper/CarrierRebateMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CarrierRebateMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CarrierRebate">
-        <id column="id" property="id" />
-        <result column="carrier_org_id" property="carrierOrgId" />
-        <result column="carrier_org_name" property="carrierOrgName" />
-        <result column="status" property="status" />
-        <result column="updater" property="updater" />
-        <result column="updater_name" property="updaterName" />
-        <result column="update_date" property="updateDate" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, carrier_org_id, carrier_org_name, gasstation_id, gasstation_short_name, status, updater, updater_name, update_date, creater, creater_name, create_date
-    </sql>
-
-</mapper>

+ 0 - 18
src/main/resources/mapper/CashbackConfigMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CashbackConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CashbackConfig">
-        <id column="id" property="id" />
-        <result column="begin_range" property="beginRange" />
-        <result column="end_range" property="endRange" />
-        <result column="amount" property="amount" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, begin_range, end_range, amount
-    </sql>
-
-</mapper>

+ 0 - 19
src/main/resources/mapper/CashbackLogDetailMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CashbackLogDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CashbackLogDetail">
-        <id column="id" property="id" />
-        <result column="log_id" property="logId" />
-        <result column="begin_range" property="beginRange" />
-        <result column="end_range" property="endRange" />
-        <result column="amount" property="amount" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, log_id, begin_range, end_range, amount
-    </sql>
-
-</mapper>

+ 0 - 18
src/main/resources/mapper/CashbackLogMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CashbackLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CashbackLog">
-        <id column="id" property="id" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 21
src/main/resources/mapper/CashierClockInMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.CashierClockInMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.CashierClockIn">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="location" property="location" />
-        <result column="creater_id" property="createrId" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, gasstation_name, location, creater_id, creater_name, create_time
-    </sql>
-
-</mapper>

+ 0 - 48
src/main/resources/mapper/DirectGasstationFeeConfigMapper.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.DirectGasstationFeeConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.DirectGasstationFeeConfig">
-        <id column="id" property="id" />
-        <result column="carrier_org_id" property="carrierOrgId" />
-        <result column="carrier_org_name" property="carrierOrgName" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="nick_name" property="nickName" />
-        <result column="gasstation_fee" property="gasstationDirectFee" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, carrier_org_id, carrier_org_name, gasstation_id, gasstation_name, operator, operator_name, operator_date
-    </sql>
-
-    <!--查询一站一客一价列表-->
-    <select id="listWithPrice" resultType="com.aoyang.tms.controller.vo.DirectGasstationFeeConfigVO">
-        select
-          a.id, a.carrier_org_id as carrierOrgId, a.carrier_org_name as carrierOrgName,
-          a.gasstation_id as gasstationId, a.gasstation_name as gasstationName, a.nick_name as nickName,
-          a.url, a.operator_name as operatorName, a.operator_date as operatorDate,
-          a.gasstation_direct_fee as gasstationDirectFee, b.platform_price - b.profit + a.gasstation_direct_fee as gasstationDirectPrice,
-          b.platform_price as platformPrice, b.profit as gasstationFee
-        from direct_gasstation_fee_config a left join gasstation b on a.gasstation_id = b.gasstation_id
-        where 1=1
-        <if test="entity.carrierOrgId != null">
-            and a.carrier_org_id like #{entity.carrierOrgId}
-        </if>
-        <if test="entity.gasstationId != null">
-            and a.gasstation_id = #{entity.gasstationId}
-        </if>
-        <if test="entity.carrierOrgName != null and entity.carrierOrgName !=''">
-            and a.carrier_org_name like CONCAT('%',#{entity.carrierOrgName},'%')
-        </if>
-        <if test="entity.nickName != null and entity.nickName !=''">
-            and a.nick_name like CONCAT('%',#{entity.nickName},'%')
-        </if>
-    </select>
-
-</mapper>

+ 0 - 19
src/main/resources/mapper/DirectSalesTruckLogMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.DirectSalesTruckLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.DirectSalesTruckLog">
-        <id column="id" property="id" />
-        <result column="truck_id" property="truckId" />
-        <result column="carrier_org_id" property="carrierOrgId" />
-        <result column="carrier_org_name" property="carrierOrgName" />
-        <result column="car_number" property="carNumber" />
-        <result column="nick_name" property="nickName" />
-        <result column="content" property="content" />
-        <result column="operator" property="operator"/>
-        <result column="operator_name" property="operatorName"/>
-        <result column="operator_date" property="operatorDate"/>
-    </resultMap>
-
-</mapper>

+ 0 - 23
src/main/resources/mapper/DirectSalesTruckMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.DirectSalesTruckMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.DirectSalesTruck">
-        <id column="truck_id" property="truckId" />
-        <result column="carrier_org_id" property="carrierOrgId" />
-        <result column="carrier_org_name" property="carrierOrgName" />
-        <result column="car_number" property="carNumber" />
-        <result column="driver_name" property="driverName" />
-        <result column="nick_name" property="nickName" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createName" />
-        <result column="create_date" property="createDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, auth_type, type, linked, org_id, org_name, truck_id, car_number,driver_name, creater, creater_name, create_date,note
-    </sql>
-
-</mapper>

+ 0 - 25
src/main/resources/mapper/DriverLimitLogMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.DriverLimitLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.DriverLimitLog">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="nick_name" property="nickName" />
-        <result column="carrier_org_id" property="carrierOrgId" />
-        <result column="carrier_org_name" property="carrierOrgName" />
-        <result column="car_number" property="carNumber" />
-        <result column="mobile" property="mobile" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operate_time" property="operateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, gasstation_name, nick_name, carrier_org_id, carrier_org_name, car_number, mobile, operator, operator_name, operate_time
-    </sql>
-
-</mapper>

+ 0 - 53
src/main/resources/mapper/DriverMapper.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.DriverMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.Driver">
-        <id column="driver_id" property="driverId" />
-        <result column="org_id" property="orgId" />
-        <result column="org_name" property="orgName" />
-        <result column="driver_name" property="driverName" />
-        <result column="driver_no" property="driverNo" />
-        <result column="driver_date" property="driverDate" />
-        <result column="mobile" property="mobile" />
-        <result column="creater" property="creater" />
-        <result column="create_date" property="createDate" />
-        <result column="updater" property="updater" />
-        <result column="update_date" property="updateDate" />
-        <result column="status" property="status" />
-    </resultMap>
-
-    <resultMap id="listAllResult" type="com.aoyang.tms.entity.vo.DriverListAll">
-        <id column="driver_id" property="driverId" />
-        <result column="driver_name" property="driverName" />
-        <result column="mobile" property="mobile" />
-        <result column="flag" property="flag"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        driver_id, org_id, org_name, driver_name, driver_no, driver_date, mobile, creater, create_date, updater, update_date,status
-    </sql>
-
-
-    <!--查询待绑定司机-->
-    <select id="listAll"  resultMap="listAllResult">
-        select e.driver_id, e.driver_name, e.mobile,  flag from(
-        select a.driver_id,a.driver_name,a.mobile,1 flag from driver a,truck_driver b
-        where a.driver_id=b.driver_id and truck_id=#{map.truckId}
-
-        union all
-        select a.driver_id,a.driver_name,a.mobile,0 flag from driver a where a.org_id=#{map.orgId}
-        and a.driver_id not in(select driver_id from truck_driver where org_id=#{map.orgId})
-        )e where 1=1
-        <if test="map.driverName!=null  and map.driverName!=''">
-            and e.driver_name like  CONCAT('%',#{map.driverName},'%')
-        </if>
-        <if test="map.mobile!=null  and map.mobile!=''">
-            and e.mobile like  CONCAT('%',#{map.mobile},'%')
-        </if>
-
-    </select>
-
-</mapper>

+ 0 - 27
src/main/resources/mapper/FreightConfigLogMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.FreightConfigLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.FreightConfigLog">
-        <id column="id" property="id" />
-        <result column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="freight" property="freight" />
-        <result column="cal_freight" property="calFreight" />
-        <result column="mileage" property="mileage" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-        <result column="operator_type" property="operatorType" />
-
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, lng_from_id, lng_from_name, gasstation_id, gasstation_name, freight, cal_freight, mileage, operator, operator_name, operator_date,operator_type
-    </sql>
-
-</mapper>

+ 0 - 122
src/main/resources/mapper/FreightConfigMapper.xml

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.FreightConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.FreightConfig">
-        <result column="lng_from_id" property="lngFromId"/>
-        <result column="lng_from_name" property="lngFromName"/>
-        <result column="gasstation_id" property="gasstationId"/>
-        <result column="gasstation_name" property="gasstationName"/>
-        <result column="freight" property="freight"/>
-        <result column="cal_freight" property="calFreight"/>
-        <result column="mileage" property="mileage"/>
-        <result column="operator" property="operator"/>
-        <result column="operator_name" property="operatorName"/>
-        <result column="operator_date" property="operatorDate"/>
-    </resultMap>
-
-
-    <resultMap id="AllListConfigMap" type="com.aoyang.tms.entity.FreightConfigList">
-        <result column="lng_from_id" property="lngFromId"/>
-        <result column="lng_from_name" property="lngFromName"/>
-        <result column="gasstation_id" property="gasstationId"/>
-        <result column="gasstation_name" property="gasstationName"/>
-        <result column="address" property="address"/>
-        <result column="freight" property="freight"/>
-        <result column="cal_freight" property="calFreight"/>
-        <result column="mileage" property="mileage"/>
-        <result column="freight" property="freight"/>
-        <result column="cal_freight" property="calFreight"/>
-        <result column="mileage" property="mileage"/>
-        <result column="gasstation_fee" property="gasstationFee"/>
-        <result column="operator" property="operator"/>
-        <result column="operator_name" property="operatorName"/>
-        <result column="operator_date" property="operatorDate"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        lng_from_id
-        , lng_from_name, gasstation_id, gasstation_name, freight, cal_freight, mileage, operator, operator_name, operator_date
-    </sql>
-
-
-    <!--查询出所有加气站与运费的配置信息-->
-    <!--    <select id="selectAllConfig" parameterType="com.aoyang.strategy.entity.FreightConfigList" resultMap="AllListConfigMap">-->
-    <!--        select a.gasstation_id,a.gasstation_name,a.address,b.lng_from_id,b.lng_from_name,b.freight,b.cal_freight,b.mileage-->
-    <!--        from gasstation a left join (select lng_from_id,lng_from_name,gasstation_id,freight, cal_freight, mileage from freight_config where lng_from_id=#{freightConfigList.lngFromId}) b-->
-    <!--        on a.gasstation_id=b.gasstation_id-->
-    <!--        <where>-->
-    <!--            <trim prefixOverrides="AND">-->
-    <!--                <if test="freightConfigList.keyWord != null ">-->
-    <!--                    AND (a.gasstation_name like concat('%',#{freightConfigList.keyWord},'%')-->
-    <!--                        or a.address like concat('%',#{freightConfigList.keyWord},'%')-->
-    <!--                    )-->
-    <!--                </if>-->
-    <!--            </trim>-->
-    <!--        </where>-->
-    <!--        order by a.gasstation_id-->
-
-    <!--    </select>-->
-
-
-    <select id="selectAllConfig" parameterType="com.aoyang.tms.entity.FreightConfigList"
-            resultMap="AllListConfigMap">
-        select a.gasstation_id,a.gasstation_name,a.nick_name,a.address,a.profit,a.code lng_from_id,a.name lng_from_name,
-        b.freight,b.cal_freight,b.mileage,b.operator_name,b.operator_date from
-        (select a.gasstation_id,a.gasstation_name,a.nick_name,a.address,a.profit,b.code,b.name from gasstation a JOIN
-        lng_from b
-        <where>
-            <trim prefixOverrides="AND">
-                <if test="freightConfigList.lngFromId != null">
-                    AND b.code = #{freightConfigList.lngFromId}
-                </if>
-            </trim>
-        </where>
-        )a
-        left join freight_config b on a.gasstation_id=b.gasstation_id and a.code = b.lng_from_id
-        <where>
-            <trim prefixOverrides="OR" prefix="(" suffix=")">
-                <if test="freightConfigList.keyWord != null">
-                    OR a.gasstation_name like concat('%',#{freightConfigList.keyWord},'%')
-                    OR a.nick_name like concat('%',#{freightConfigList.keyWord},'%')
-                    OR a.address like concat('%',#{freightConfigList.keyWord},'%')
-                </if>
-            </trim>
-        </where>
-        order by a.gasstation_name,a.code
-    </select>
-
-    <select id="selectConditionConfig" parameterType="com.aoyang.tms.entity.FreightConfigList"
-            resultMap="AllListConfigMap">
-        select * from (
-        select a.gasstation_id,a.gasstation_name,a.nick_name,a.address,a.profit,a.code lng_from_id,a.name lng_from_name,
-        b.freight,b.cal_freight,b.mileage,b.operator_name,b.operator_date from
-        (select a.gasstation_id,a.gasstation_name,a.nick_name,a.address,a.profit,b.code,b.name from gasstation a JOIN
-        lng_from b
-        <where>
-            <trim prefixOverrides="AND">
-                <if test="freightConfigList.lngFromId != null">
-                    AND b.code = #{freightConfigList.lngFromId}
-                </if>
-            </trim>
-        </where>
-        )a
-        left join freight_config b on a.gasstation_id=b.gasstation_id and a.code = b.lng_from_id
-        <where>
-            <trim prefixOverrides="OR" prefix="(" suffix=")">
-                <if test="freightConfigList.keyWord != null">
-                    OR a.gasstation_name like concat('%',#{freightConfigList.keyWord},'%')
-                    OR a.nick_name like concat('%',#{freightConfigList.keyWord},'%')
-                    OR a.address like concat('%',#{freightConfigList.keyWord},'%')
-                </if>
-            </trim>
-        </where>
-        order by a.gasstation_name,a.code
-        )x where gasstation_id in
-        <foreach item="item" collection="orgList" separator="," open="(" close=")" index="">
-            #{item}
-        </foreach>
-    </select>
-</mapper>

+ 0 - 24
src/main/resources/mapper/GasLimitConfigDetailMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GasLimitConfigDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GasLimitConfigDetail">
-        <id column="id" property="id" />
-        <result column="log_id" property="logId" />
-        <result column="type" property="type" />
-        <result column="limit_stock" property="limitStock" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="nick_name" property="nickName" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operate_time" property="operateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, log_id, type, limit_stock, gasstation_id, gasstation_name, nick_name, operator, operator_name, operate_time
-    </sql>
-
-</mapper>

+ 0 - 21
src/main/resources/mapper/GasLimitConfigLogMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GasLimitConfigLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GasLimitConfigLog">
-        <id column="id" property="id" />
-        <result column="type" property="type" />
-        <result column="limit_stock" property="limitStock" />
-        <result column="gasstation_number" property="gasstationNumber" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operate_time" property="operateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, type, limit_stock, gasstation_number, operator, operator_name, operate_time
-    </sql>
-
-</mapper>

+ 0 - 44
src/main/resources/mapper/GasOrderMapper.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GasOrderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GasOrder">
-        <id column="order_id" property="orderId" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="cashier_id" property="cashierId" />
-        <result column="cashier_name" property="cashierName" />
-        <result column="carrier_org_id" property="carrierOrgId" />
-        <result column="carrier_org_name" property="carrierOrgName" />
-        <result column="truck_id" property="truckId" />
-        <result column="car_number" property="carNumber" />
-        <result column="driver_id" property="driverId" />
-        <result column="driver_name" property="driverName" />
-        <result column="gas_qty" property="gasQty" />
-        <result column="list_price" property="listPrice" />
-        <result column="platform_price" property="platformPrice" />
-        <result column="actual_price" property="actualPrice" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="amount" property="amount" />
-        <result column="gasstation_fee" property="gasstationFee" />
-        <result column="platform_fee" property="platformFee" />
-        <result column="service_fee" property="serviceFee" />
-        <result column="pay_type" property="payType" />
-        <result column="order_status" property="orderStatus" />
-        <result column="create_role" property="createRole" />
-        <result column="canceler" property="canceler" />
-        <result column="canceler_name" property="cancelerName" />
-        <result column="cancel_date" property="cancelDate" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-        <result column="update_date" property="updateDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        order_id, gasstation_id, gasstation_name, cashier_id, cashier_name, carrier_org_id, carrier_org_name, truck_id, car_number, driver_id, driver_name, gas_qty, list_price, platform_price, actual_price, discount_amount, amount, gasstation_fee, platform_fee, service_fee, pay_type, order_status, create_role, canceler, canceler_name, cancel_date, creater, creater_name, create_date, update_date
-    </sql>
-
-</mapper>

+ 0 - 18
src/main/resources/mapper/GasstaionLngfromMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GasstaionLngfromMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GasstaionLngfrom">
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        gasstation_id, gasstation_name, lng_from_id, lng_from_name
-    </sql>
-
-</mapper>

+ 0 - 21
src/main/resources/mapper/GasstationLimitStatusLogMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GasstationLimitStatusLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GasstationLimitStatusLog">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="status" property="status" />
-        <result column="note" property="note" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operate_time" property="operateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, status, note, operator, operator_name, operate_time
-    </sql>
-
-</mapper>

+ 0 - 209
src/main/resources/mapper/GasstationMapper.xml

@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GasstationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.Gasstation">
-        <id column="gasstation_id" property="gasstationId"/>
-        <result column="trade_type" property="tradeType"/>
-        <result column="gasstation_name" property="gasstationName"/>
-        <result column="qrcode" property="qrcode"/>
-        <result column="url" property="url"/>
-        <result column="list_price" property="listPrice"/>
-        <result column="province" property="province"/>
-        <result column="city" property="city"/>
-        <result column="region" property="region"/>
-        <result column="address" property="address"/>
-        <result column="longitude" property="longitude"/>
-        <result column="latitude" property="latitude"/>
-        <result column="status" property="status"/>
-        <result column="creater" property="creater"/>
-        <result column="creater_name" property="createrName"/>
-        <result column="create_date" property="createDate"/>
-        <result column="nick_name" property="nickName"/>
-        <result column="manager_id" property="managerId"/>
-        <result column="manager_name" property="managerName"/>
-        <result column="manager_phone" property="managerPhone"/>
-        <result column="notify_phone" property="notifyPhone"/>
-        <result column="stock" property="stock"/>
-        <result column="platform_price" property="platformPrice"/>
-        <result column="amount" property="amount"/>
-        <result column="lng_from_id" property="lngFromId"/>
-        <result column="lng_from_name" property="lngFromName"/>
-        <result column="harbour_price" property="harbourPrice"/>
-        <result column="benefit" property="benefit"/>
-        <result column="freight" property="freight"/>
-        <result column="profit" property="profit"/>
-        <result column="profit_quota" property="profitQuota"/>
-        <result column="gasprice" property="gasprice"/>
-        <result column="pre_gasprice" property="preGasprice"/>
-        <result column="updater" property="updater"/>
-        <result column="updater_name" property="updaterName"/>
-        <result column="update_date" property="updateDate"/>
-        <result column="purchase_limit_status" property="purchaseLimitStatus"/>
-        <result column="gas_limit_status" property="gasLimitStatus"/>
-        <result column="gas_limit_stock" property="gasLimitStock"/>
-        <result column="status_stock" property="statusStock"/>
-    </resultMap>
-
-    <resultMap id="listMap" type="com.aoyang.tms.entity.vo.GasstationVO">
-        <id column="gasstation_id" property="gasstationId"/>
-        <result column="trade_type" property="tradeType"/>
-        <result column="gasstation_name" property="gasstationName"/>
-        <result column="nick_name" property="nickName"/>
-        <result column="platform_price" property="platformPrice"/>
-        <result column="direct_sales_price" property="directSalesPrice"/>
-        <result column="qrcode" property="qrcode"/>
-        <result column="city" property="city"/>
-        <result column="address" property="address"/>
-        <result column="distance" property="distance"/>
-        <result column="longitude" property="longitude"/>
-        <result column="latitude" property="latitude"/>
-        <result column="province" property="province"/>
-        <result column="url" property="url"/>
-        <result column="region" property="region"/>
-        <result column="address" property="address"/>
-        <result column="gas_limit_status" property="gasLimitStatus"/>
-        <result column="gas_limit_stock" property="gasLimitStock"/>
-        <result column="stock" property="stock"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        gasstation_id
-        ,trade_type,
-        gasstation_id
-        , gasstation_name,qrcode, url, list_price, province, city, region, address, longitude, latitude, status, creater, creater_name, create_date, nick_name, manager_id, manager_name, manager_phone, notify_phone, stock, platform_price,gasprice,pre_gasprice amount, lng_from_id, lng_from_name, harbour_price, benefit, freight, profit, profit_quota, updater, updater_name, update_date, purchase_limit_status,gas_limit_status,gas_limit_stock,status_stock
-    </sql>
-
-    <update id="editStock">
-        update gasstation
-        set stock = stock + #{quantity}
-        where gasstation_id = #{gasstationId}
-    </update>
-    <update id="outStock">
-        update gasstation
-        set stock = stock - #{quantity}
-        where gasstation_id = #{gasstationId}
-    </update>
-
-    <resultMap id="allList" type="map">
-        <result column="id" property="id" javaType="Integer"/>
-        <result property="text" column="province"/>
-        <collection property="children" select="cityList" column="province" ofType="string" javaType="arrayList">
-        </collection>
-    </resultMap>
-    <resultMap id="cityList" type="map">
-        <result property="id" column="id" javaType="Integer"/>
-        <result property="text" column="city"/>
-    </resultMap>
-    <select id="provinceList" resultMap="allList">
-        SELECT (@i:= @i+1) as id, province
-        from (select distinct province from gasstation where status = 0 and province is not null) a,
-             (SELECT @i:=0) as i
-    </select>
-    <select id="cityList" parameterType="string" resultMap="cityList">
-        SELECT (@i:= @i+1) as id, city
-        from (select distinct city from gasstation where province = #{province} and status = 0 and city is not null) a,
-             (SELECT @i:=0) as i
-    </select>
-
-
-    <select id="gasstationList" resultMap="listMap">
-        select
-        gasstation_id,trade_type,gasstation_name,nick_name,qrcode,platform_price,longitude,latitude,url,distance,province,city,region,address,stock,gas_limit_status,gas_limit_stock
-        from (
-        select
-        gasstation_id,trade_type,gasstation_name,nick_name,qrcode,platform_price,longitude,latitude,url,province,city,region,address,stock,gas_limit_status,gas_limit_stock,
-        case when #{gasstation.latitude}=null then null
-        when #{gasstation.longitude}=null then null else
-        (6371.004*ACOS(SIN(#{gasstation.latitude}/180*PI())*SIN(latitude/180*PI())+COS(#{gasstation.latitude}/180*PI())*COS(latitude/180*PI())*COS((#{gasstation.longitude}-longitude)/180*PI())))
-        end distance
-        from gasstation where status=0
-        <if test="gasstation.city != null and gasstation.city !=''">
-            and city=#{gasstation.city}
-        </if>
-        order by distance
-        )m
-    </select>
-
-    <!--直销模式加气站-->
-    <select id="gasstationDirectSalesList" resultMap="listMap">
-        select
-          m.gasstation_id,m.trade_type,m.gasstation_name,m.nick_name,m.qrcode,m.platform_price,
-          case when ds.gasstation_direct_fee is null then m.platform_price ELSE m.platform_price - m.profit + ds.gasstation_direct_fee end as direct_sales_price,
-          longitude,latitude,m.url,distance,province,city,region,address,stock,gas_limit_status,gas_limit_stock
-        from (
-            select
-            gas.gasstation_id,gas.trade_type,gas.gasstation_name,gas.nick_name,gas.qrcode,gas.platform_price,gas.profit,
-            gas.longitude,gas.latitude,gas.url,gas.province,gas.city,gas.region,gas.address,gas.stock,gas.gas_limit_status,gas.gas_limit_stock,
-            case when #{gasstation.latitude} = null then null
-            when #{gasstation.longitude} = null then null else
-            (6371.004*ACOS(SIN(#{gasstation.latitude}/180*PI())*SIN(latitude/180*PI())+COS(#{gasstation.latitude}/180*PI())*COS(latitude/180*PI())*COS((#{gasstation.longitude}-longitude)/180*PI())))
-            end distance
-            from gasstation gas
-            where gas.status=0 and gas.trade_type = 2
-            <if test="gasstation.city != null and gasstation.city !=''">
-                and city=#{gasstation.city}
-            </if>
-            order by distance
-        )m left join direct_gasstation_fee_config ds on m.gasstation_id = ds.gasstation_id and ds.carrier_org_id = #{gasstation.carrierOrgId}
-        order by gasstation_direct_fee is null, distance
-    </select>
-
-    <select id="gasstationAppList" resultMap="listMap">
-        select
-        gasstation_id,trade_type,gasstation_name,nick_name,qrcode,platform_price,longitude,latitude,url,distance,province,city,region,address
-        from (
-        select
-        gasstation_id,trade_type,gasstation_name,nick_name,qrcode,platform_price,longitude,latitude,url,province,city,region,address,
-        case when #{gasstation.latitude}=null then null
-        when #{gasstation.longitude}=null then null else
-        (6371.004*ACOS(SIN(#{gasstation.latitude}/180*PI())*SIN(latitude/180*PI())+COS(#{gasstation.latitude}/180*PI())*COS(latitude/180*PI())*COS((#{gasstation.longitude}-longitude)/180*PI())))
-        end distance
-        from gasstation where status=0
-        <if test="gasstation.province != null and gasstation.province !=''">
-            and province=#{gasstation.province}
-        </if>
-        <if test="gasstation.city != null and gasstation.city !=''">
-            and city=#{gasstation.city}
-        </if>
-        <if test="gasstation.region != null and gasstation.region !=''">
-            and region=#{gasstation.region}
-        </if>
-        <if test="gasstation.nickName != null and gasstation.nickName !=''">
-            and nick_name like "%"#{gasstation.nickName}"%"
-        </if>
-        <if test="gasstation.orderOfGasStation != null and gasstation.orderOfGasStation == 1">
-            order by platform_price
-        </if>
-        <if test="gasstation.orderOfGasStation != null and gasstation.orderOfGasStation == 2">
-            order by distance
-        </if>
-        )m
-        <if test="gasstation.tagId != null and gasstation.tagId !=''">
-            where gasstation_id IN(SELECT gasstation_id FROM gasstation_tag WHERE tag_id = #{gasstation.tagId})
-        </if>
-    </select>
-
-    <select id="getGasstationByIds" resultMap="listMap">
-        select
-        gasstation_id,trade_type,gasstation_name,nick_name,qrcode,platform_price,longitude,latitude,url,distance,province,city,region,address,stock,gas_limit_status,gas_limit_stock
-        from (
-        select
-        gasstation_id,trade_type,gasstation_name,nick_name,qrcode,platform_price,longitude,latitude,url,province,city,region,address,stock,gas_limit_status,gas_limit_stock,
-        case when #{latitude}=null then null
-        when #{longitude}=null then null else
-        (6371.004*ACOS(SIN(#{latitude}/180*PI())*SIN(latitude/180*PI())+COS(#{latitude}/180*PI())*COS(latitude/180*PI())*COS((#{longitude}-longitude)/180*PI())))
-        end distance
-        from gasstation where status=0
-        <if test="idList != null">
-            and gasstation_id in
-            <foreach item="gasstationId" index="index" collection="idList" open="(" separator="," close=")">
-                #{gasstationId}
-            </foreach>
-        </if>
-        order by distance
-        )m
-    </select>
-</mapper>

+ 0 - 21
src/main/resources/mapper/GasstationPresentMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GasstationPresentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GasstationPresent">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="present_content" property="presentContent" />
-        <result column="creater_id" property="createrId" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, gasstation_name, present_content, creater_id, creater_name, create_time
-    </sql>
-
-</mapper>

+ 0 - 22
src/main/resources/mapper/GasstationQrcodeLogMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GasstationQrcodeLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GasstationQrcodeLog">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="qrcode_type" property="qrcodeType" />
-        <result column="note" property="note" />
-        <result column="updater" property="updater" />
-        <result column="updater_name" property="updaterName" />
-        <result column="update_date" property="updateDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, gasstation_name, qrcode_type, note, updater, updater_name, update_date
-    </sql>
-
-</mapper>

+ 0 - 23
src/main/resources/mapper/GasstationTagMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GasstationTagMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GasstationTag">
-        <id column="id" property="id" />
-        <result column="tag_id" property="tagId" />
-        <result column="tag_name" property="tagName" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="nick_name" property="nickName" />
-        <result column="creater_id" property="createrId" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, tag_id, tag_name, gasstation_id, gasstation_name, nick_name, creater_id, creater_name, create_time
-    </sql>
-
-</mapper>

+ 0 - 23
src/main/resources/mapper/GctConfigMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GctConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GctConfig">
-        <id column="org_id" property="orgId" />
-        <result column="org_name" property="orgName" />
-        <result column="org_short_name" property="orgShortName" />
-        <result column="open_status" property="openStatus" />
-        <result column="bussiness_status" property="bussinessStatus" />
-        <result column="business_date" property="businessDate" />
-        <result column="time_start" property="timeStart" />
-        <result column="time_end" property="timeEnd" />
-        <result column="service_price" property="servicePrice" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        org_id, org_name, org_short_name, open_status, bussiness_status, business_date, time_start, time_end, service_price
-    </sql>
-
-</mapper>

+ 0 - 30
src/main/resources/mapper/GwayCostLogMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GwayCostLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GwayCostLog">
-        <id column="id" property="id"/>
-        <result column="operation" property="operation"/>
-        <result column="platform" property="platform"/>
-        <result column="market" property="market"/>
-        <result column="amount" property="amount"/>
-        <result column="operator" property="operator"/>
-        <result column="operator_name" property="operatorName"/>
-        <result column="operator_date" property="operatorDate"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id
-        ,
-        operation,
-        platform,
-        market,
-        amount,
-        operator,
-        operator_name,
-        operator_date
-    </sql>
-
-</mapper>

+ 0 - 22
src/main/resources/mapper/GwayCostMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GwayCostMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GwayCost">
-        <id column="id" property="id" />
-        <result column="operation" property="operation" />
-        <result column="platform" property="platform" />
-        <result column="market" property="market" />
-        <result column="amount" property="amount" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, operation, platform, market, amount,  operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 19
src/main/resources/mapper/GwayGaspriceLogMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.GwayGaspriceLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.GwayGaspriceLog">
-        <id column="id" property="id" />
-        <result column="gasprice" property="gasprice" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasprice, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 21
src/main/resources/mapper/HarbourPriceLogMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.HarbourPriceLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.HarbourPriceLog">
-        <id column="id" property="id" />
-        <result column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="harbour_price" property="harbourPrice" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, lng_from_id, lng_from_name, harbour_price, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 20
src/main/resources/mapper/HarbourPriceMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.HarbourPriceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.HarbourPrice">
-        <id column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="harbour_price" property="harbourPrice" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        lng_from_id, lng_from_name, harbour_price, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 21
src/main/resources/mapper/ListPriceLogMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.ListPriceLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.ListPriceLog">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="list_price" property="listPrice" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, gasstation_name, list_price, creater, creater_name, create_date
-    </sql>
-
-</mapper>

+ 0 - 24
src/main/resources/mapper/LngFromLogMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.LngFromLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.LngFromLog">
-        <id column="id" property="id" />
-        <result column="code" property="code" />
-        <result column="name" property="name" />
-        <result column="price" property="price" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="address" property="address" />
-        <result column="operator_id" property="operatorId" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_time" property="operatorTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, code, name, price, longitude, latitude, address, operator_id, operator_name, operator_time
-    </sql>
-
-</mapper>

+ 0 - 24
src/main/resources/mapper/LngFromMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.LngFromMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.LngFrom">
-        <id column="code" property="code" />
-        <result column="name" property="name" />
-        <result column="operator_id" property="operatorId" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_time" property="operatorTime" />
-        <result column="latitude" property="latitude" />
-        <result column="longitude" property="longitude" />
-        <result column="address" property="address" />
-        <result column="default_port" property="defaultPort"/>
-
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        code, name, price, operator_id, operator_name, operator_time, latitude, longitude, address,default_port
-    </sql>
-
-</mapper>

+ 0 - 18
src/main/resources/mapper/NewstationMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.NewstationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.Newstation">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="switch_time" property="switchTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, gasstation_name, switch_time
-    </sql>
-
-</mapper>

+ 0 - 20
src/main/resources/mapper/PlatformPriceLogMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PlatformPriceLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PlatformPriceLog">
-        <id column="id" property="id" />
-        <result column="org_id" property="orgId" />
-        <result column="platform_price" property="platformPrice" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, org_id, platform_price, creater, creater_name, create_date
-    </sql>
-
-</mapper>

+ 0 - 20
src/main/resources/mapper/PlatformPriceMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PlatformPriceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PlatformPrice">
-        <id column="org_id" property="orgId" />
-        <result column="org_name" property="orgName" />
-        <result column="platform_price" property="platformPrice" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        org_id, org_name, platform_price, creater, creater_name, create_date
-    </sql>
-
-</mapper>

+ 0 - 26
src/main/resources/mapper/PriceConfigLogMapper.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PriceConfigLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PriceConfigLog">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="platform_price" property="platformPrice" />
-        <result column="harbour_price" property="harbourPrice" />
-        <result column="benefit" property="benefit" />
-        <result column="freight" property="freight" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, gasstation_name, lng_from_id, lng_from_name, platform_price, harbour_price, benefit, freight, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 30
src/main/resources/mapper/PriceConfigMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PriceConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PriceConfig">
-        <id column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="address" property="address"/>
-        <result column="province" property="province" />
-        <result column="city" property="city" />
-        <result column="lng_from_id" property="lngFromId" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="platform_price" property="platformPrice" />
-        <result column="harbour_price" property="harbourPrice" />
-        <result column="benefit" property="benefit" />
-        <result column="freight" property="freight" />
-        <result column="gasprice" property="gasprice" />
-        <result column="profit" property="profit" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        gasstation_id, gasstation_name,address, province, city, lng_from_id, lng_from_name, platform_price, harbour_price, benefit, freight, profit,gasprice, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 22
src/main/resources/mapper/ProfitQuotaLogMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.ProfitQuotaLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.ProfitQuotaLog">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="profit" property="profit" />
-        <result column="profit_quota" property="profitQuota" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, gasstation_name, profit, profit_quota, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 38
src/main/resources/mapper/PurchaseDuplicateMapper.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PurchaseDuplicateMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PurchaseDuplicate">
-        <id column="id" property="id" />
-        <result column="status" property="status" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="plan_time" property="planTime" />
-        <result column="download_contact_name" property="downloadContactName" />
-        <result column="download_contact_phone" property="downloadContactPhone" />
-        <result column="quantity" property="quantity" />
-        <result column="create_note" property="createNote" />
-        <result column="modify_apply_type" property="modifyApplyType" />
-        <result column="lng_from_code" property="lngFromCode" />
-        <result column="lng_from_name" property="lngFromName" />
-        <result column="upload_weight" property="uploadWeight" />
-        <result column="check_weight" property="checkWeight" />
-        <result column="driver_name" property="driverName" />
-        <result column="driver_phone" property="driverPhone" />
-        <result column="car_number" property="carNumber" />
-        <result column="trailer_number" property="trailerNumber" />
-        <result column="upload_url" property="uploadUrl" />
-        <result column="upload_time" property="uploadTime" />
-        <result column="download_url" property="downloadUrl" />
-        <result column="creater_id" property="createrId" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, status, gasstation_id, gasstation_name, plan_time, download_contact_name, download_contact_phone, quantity, create_note, modify_apply_type, lng_from_code, lng_from_name, upload_weight, check_weight, driver_name, driver_phone, car_number, trailer_number, upload_url, upload_time, download_url, creater_id, creater_name, create_time
-    </sql>
-
-</mapper>

+ 0 - 28
src/main/resources/mapper/PurchaseExceptionMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PurchaseExceptionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PurchaseException">
-        <id column="id" property="id" />
-        <result column="purchase_id" property="purchaseId" />
-        <result column="exception_apply_time" property="exceptionApplyTime" />
-        <result column="exception_apply_note" property="exceptionApplyNote" />
-        <result column="exception_handle_url" property="exceptionHandleUrl" />
-        <result column="bear_type" property="bearType" />
-        <result column="check_weight" property="checkWeight" />
-        <result column="check_note" property="checkNote" />
-        <result column="creater_id" property="createrId" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_time" property="createTime" />
-        <result column="handler_id" property="handlerId" />
-        <result column="handler_name" property="handlerName" />
-        <result column="handle_time" property="handleTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, purchase_id, exception_apply_time, exception_apply_note, exception_handle_url, bear_type, check_weight, check_note, creater_id, creater_name, create_time, handler_id, handler_name, handle_time
-    </sql>
-
-</mapper>

+ 0 - 23
src/main/resources/mapper/PurchaseLimitConfigLogMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PurchaseLimitConfigLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PurchaseLimitConfigLog">
-        <id column="id" property="id" />
-        <result column="time_stamp" property="timeStamp" />
-        <result column="qty_avg_begin" property="qtyAvgBegin" />
-        <result column="qty_avg_end" property="qtyAvgEnd" />
-        <result column="rate" property="rate" />
-        <result column="min_stock" property="minStock" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operate_time" property="operateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, time_stamp, qty_avg_begin, qty_avg_end, rate, min_stock, operator, operator_name, operate_time
-    </sql>
-
-</mapper>

+ 0 - 22
src/main/resources/mapper/PurchaseLimitConfigMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PurchaseLimitConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PurchaseLimitConfig">
-        <id column="id" property="id" />
-        <result column="qty_avg_begin" property="qtyAvgBegin" />
-        <result column="qty_avg_end" property="qtyAvgEnd" />
-        <result column="rate" property="rate" />
-        <result column="min_stock" property="minStock" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operate_time" property="operateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, qty_avg_begin, qty_avg_end, rate, min_stock, operator, operator_name, operate_time
-    </sql>
-
-</mapper>

+ 0 - 70
src/main/resources/mapper/PurchaseMapper.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PurchaseMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.Purchase">
-        <id column="id" property="id"/>
-        <result column="status" property="status"/>
-        <result column="gasstation_id" property="gasstationId"/>
-        <result column="gasstation_name" property="gasstationName"/>
-        <result column="plan_time" property="planTime"/>
-        <result column="download_contact_name" property="downloadContactName"/>
-        <result column="download_contact_phone" property="downloadContactPhone"/>
-        <result column="quantity" property="quantity"/>
-        <result column="create_note" property="createNote"/>
-        <result column="modify_apply_type" property="modifyApplyType"/>
-        <result column="lng_from_code" property="lngFromCode"/>
-        <result column="lng_from_name" property="lngFromName"/>
-        <result column="upload_weight" property="uploadWeight"/>
-        <result column="check_weight" property="checkWeight"/>
-        <result column="driver_name" property="driverName"/>
-        <result column="driver_phone" property="driverPhone"/>
-        <result column="car_number" property="carNumber"/>
-        <result column="trailer_number" property="trailerNumber"/>
-        <result column="leave_time" property="leaveTime"/>
-        <result column="upload_url" property="uploadUrl"/>
-        <result column="download_url" property="downloadUrl"/>
-        <result column="creater_id" property="createrId"/>
-        <result column="creater_name" property="createrName"/>
-        <result column="create_time" property="createTime"/>
-        <result column="complete_time" property="completeTime"/>
-        <result column="confirm_time" property="confirmTime"/>
-        <result column="reach_time" property="reachTime"/>
-        <result column="propose_type" property="proposeType"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id
-        ,
-        status,
-        gasstation_id,
-        gasstation_name,
-        plan_time,
-        download_contact_name,
-        download_contact_phone,
-        quantity,
-        create_note,
-        modify_apply_type,
-        lng_from_code,
-        lng_from_name,
-        upload_weight,
-        check_weight,
-        driver_name,
-        driver_phone,
-        car_number,
-        trailer_number,
-        leave_time,
-        upload_url,
-        download_url,
-        creater_id,
-        creater_name,
-        create_time,
-        complete_time,
-        confirm_time,
-        reach_time,
-        propose_type
-    </sql>
-
-</mapper>

+ 0 - 34
src/main/resources/mapper/PurchaseOperateMapper.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PurchaseOperateMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PurchaseOperate">
-        <id column="id" property="id"/>
-        <result column="purchase_id" property="purchaseId"/>
-        <result column="type" property="type"/>
-        <result column="type_name" property="typeName"/>
-        <result column="note" property="note"/>
-        <result column="content" property="content"/>
-        <result column="operate_time_name" property="operateTimeName"/>
-        <result column="operator_id" property="operatorId"/>
-        <result column="operator_name" property="operatorName"/>
-        <result column="operator_time" property="operatorTime"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id
-        ,
-        purchase_id,
-        type,
-        type_name,
-        note,
-        content,
-        operate_time_name,
-        operator_id,
-        operator_name,
-        operator_time
-    </sql>
-
-</mapper>

+ 0 - 27
src/main/resources/mapper/PurchaseProposeDetailMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.PurchaseProposeDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.PurchaseProposeDetail">
-        <id column="id" property="id" />
-        <result column="purchase_id" property="purchaseId" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="nick_name" property="nickName" />
-        <result column="week_average_qty" property="weekAverageQty" />
-        <result column="stock" property="stock" />
-        <result column="stock_max" property="stockMax" />
-        <result column="stock_min" property="stockMin" />
-        <result column="propose_type" property="proposeType" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operate_time" property="operateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, purchase_id, gasstation_id, gasstation_name, nick_name, week_average_qty, stock, stock_max, stock_min, propose_type, operator, operator_name, operate_time
-    </sql>
-
-</mapper>

+ 0 - 19
src/main/resources/mapper/RebateConfigMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.RebateConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.RebateConfig">
-        <id column="id" property="id" />
-        <result column="begin_range" property="beginRange" />
-        <result column="end_range" property="endRange" />
-        <result column="rebate" property="rebate" />
-        <result column="level" property="level" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, begin_range, end_range, rebate, level
-    </sql>
-
-</mapper>

+ 0 - 20
src/main/resources/mapper/RebateLogDetailMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.RebateLogDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.RebateLogDetail">
-        <id column="id" property="id" />
-        <result column="rebate_id" property="rebateId" />
-        <result column="begin_range" property="beginRange" />
-        <result column="end_range" property="endRange" />
-        <result column="rebate" property="rebate" />
-        <result column="level" property="level" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, rebate_id, begin_range, end_range, rebate, level
-    </sql>
-
-</mapper>

+ 0 - 18
src/main/resources/mapper/RebateLogMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.RebateLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.RebateLog">
-        <id column="id" property="id" />
-        <result column="operator" property="operator" />
-        <result column="operator_name" property="operatorName" />
-        <result column="operator_date" property="operatorDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, operator, operator_name, operator_date
-    </sql>
-
-</mapper>

+ 0 - 69
src/main/resources/mapper/ReleaseDetailMapper.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.ReleaseDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.ReleaseDetail">
-        <id column="id" property="id"/>
-        <result column="release_id" property="releaseId"/>
-        <result column="gasstation_id" property="gasstationId"/>
-        <result column="gasstation_name" property="gasstationName"/>
-        <result column="nick_name" property="nickName"/>
-        <result column="province" property="province"/>
-        <result column="city" property="city"/>
-        <result column="lng_from_id" property="lngFromId"/>
-        <result column="lng_from_name" property="lngFromName"/>
-        <result column="platform_price" property="platformPrice"/>
-        <result column="harbour_price" property="harbourPrice"/>
-        <result column="benefit" property="benefit"/>
-        <result column="freight" property="freight"/>
-        <result column="profit" property="profit"/>
-        <result column="gasprice" property="gasprice"/>
-    </resultMap>
-
-    <resultMap id="ReleaseResult" type="com.aoyang.tms.entity.ReleaseLogRsp">
-        <result column="gasstation_id" property="gasstationId"/>
-        <result column="gasstation_name" property="gasstationName"/>
-        <result column="nick_name" property="nickName"/>
-        <result column="lng_from_id" property="lngFromId"/>
-        <result column="lng_from_name" property="lngFromName"/>
-        <result column="platform_price" property="platformPrice"/>
-        <result column="harbour_price" property="harbourPrice"/>
-        <result column="benefit" property="benefit"/>
-        <result column="freight" property="freight"/>
-        <result column="gasprice" property="gasprice"/>
-        <result column="apply_id" property="applyId"/>
-        <result column="apply_name" property="applyName"/>
-        <result column="apply_date" property="applyDate"/>
-
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id
-        , release_id, gasstation_id, gasstation_name, nick_name, province, city, lng_from_id, lng_from_name, platform_price, harbour_price, benefit, freight, profit, gasprice
-    </sql>
-
-    <select id="selectReleaseLog" parameterType="long" resultMap="ReleaseResult">
-        select a.gasstation_id,
-               a.gasstation_name,
-               a.nick_name,
-               a.platform_price,
-               a.harbour_price,
-               a.benefit,
-               a.freight,
-               a.gasprice,
-               a.lng_from_id,
-               a.lng_from_name,
-               b.apply_id,
-               b.apply_name,
-               b.apply_date
-        from release_detail a,
-             release_manage b
-        where a.release_id = b.id
-          and b.status = 4
-          and a.gasstation_id = #{gasstationId}
-        order by b.apply_date desc
-    </select>
-
-</mapper>

+ 0 - 23
src/main/resources/mapper/ReleaseManageMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.ReleaseManageMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.ReleaseManage">
-        <id column="id" property="id" />
-        <result column="status" property="status" />
-        <result column="release_time" property="releaseTime" />
-        <result column="apply_id" property="applyId" />
-        <result column="apply_name" property="applyName" />
-        <result column="apply_date" property="applyDate" />
-        <result column="audit_id" property="auditId" />
-        <result column="audit_name" property="auditName" />
-        <result column="audit_date" property="auditDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, status, release_time, apply_id, apply_name, apply_date, audit_id, audit_name, audit_date
-    </sql>
-
-</mapper>

+ 0 - 53
src/main/resources/mapper/StockLogMapper.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.StockLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.StockLog">
-        <id column="id" property="id" />
-        <result column="gasstation_id" property="gasstationId" />
-        <result column="gasstation_name" property="gasstationName" />
-        <result column="stock_type" property="stockType" />
-        <result column="quantity" property="quantity" />
-        <result column="stock" property="stock" />
-        <result column="note" property="note" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-        <result column="gas_order_id" property="gasOrderId" />
-    </resultMap>
-
-    <resultMap id="SumResultMap" type="com.aoyang.tms.entity.vo.StockLogVO">
-        <result column="stock_type" property="stockType" />
-        <result column="quantity" property="quantity" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, gasstation_id, gasstation_name, stock_type, quantity, stock, note, creater, creater_name, create_date, gas_order_id
-    </sql>
-
-    <!--按照日期和分类进行汇总查询-->
-    <select id="sumQuantity" parameterType="com.aoyang.tms.entity.vo.StockLogReq" resultMap="SumResultMap">
-        select stock_type,sum(ifnull(quantity,0)) sumQuantity from stock_log
-        <where>
-            <trim prefixOverrides="AND">
-                <if test="gasstationId != null">
-                    AND gasstation_id = #{gasstationId}
-                </if>
-                <if test="dateParam.createDateFrom != null and dateParam.createDateFrom != ''">
-                    AND create_date &gt;= #{dateParam.createDateFrom}
-                </if>
-                <if test="dateParam.createDateTo != null and dateParam.createDateTo != ''">
-                    AND create_date &lt;= #{dateParam.createDateTo}
-                </if>
-                <if test="stockType != null">
-                    AND stock_type = #{stockType}
-                </if>
-
-            </trim>
-        </where>
-        group by stock_type
-    </select>
-
-</mapper>

+ 0 - 24
src/main/resources/mapper/SystemConfigLogMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.SystemConfigLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.SystemConfigLog">
-        <id column="id" property="id"/>
-        <result column="content" property="content"/>
-        <result column="operator" property="operator"/>
-        <result column="operator_name" property="operatorName"/>
-        <result column="operate_date" property="operateDate"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id
-        ,
-        content,
-        operator,
-        operator_name,
-        operate_date
-    </sql>
-
-</mapper>

+ 0 - 28
src/main/resources/mapper/SystemConfigMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.SystemConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.SystemConfig">
-        <id column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="value" property="value"/>
-        <result column="remark" property="remark"/>
-        <result column="operator" property="operator"/>
-        <result column="operator_name" property="operatorName"/>
-        <result column="operate_date" property="operateDate"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id
-        ,
-        name,
-        value,
-        remark,
-        operator,
-        operator_name,
-        operate_date
-    </sql>
-
-</mapper>

+ 0 - 19
src/main/resources/mapper/TagMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.TagMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.Tag">
-        <id column="tag_id" property="tagId" />
-        <result column="tag_name" property="tagName" />
-        <result column="creater_id" property="createrId" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        tag_id, tag_name, creater_id, creater_name, create_time
-    </sql>
-
-</mapper>

+ 0 - 20
src/main/resources/mapper/TruckComContractMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.TruckComContractMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckComContract">
-        <id column="id" property="id" />
-        <result column="truck_id" property="truckId" />
-        <result column="car_number" property="carNumber" />
-        <result column="org_id" property="orgId" />
-        <result column="org_name" property="orgName" />
-        <result column="contract_url" property="contractUrl" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, truck_id, car_number, org_id, org_name, contract_url
-    </sql>
-
-</mapper>

+ 0 - 28
src/main/resources/mapper/TruckDriverLogMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.TruckDriverLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckDriverLog">
-        <id column="id" property="id" />
-        <result column="auth_type" property="authType" />
-        <result column="type" property="type" />
-        <result column="linked" property="linked" />
-        <result column="org_id" property="orgId" />
-        <result column="org_name" property="orgName" />
-        <result column="truck_id" property="truckId" />
-        <result column="car_number" property="carNumber" />
-        <result column="driver_id" property="driverId" />
-        <result column="driver_name" property="driverName" />
-        <result column="creater" property="creater" />
-        <result column="create_name" property="createName" />
-        <result column="create_date" property="createDate" />
-        <result column="note" property="note" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, auth_type, type, linked, org_id, org_name, truck_id, car_number, driver_id, driver_name, creater, create_name, create_date,note
-    </sql>
-
-</mapper>

+ 0 - 49
src/main/resources/mapper/TruckDriverMapper.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.TruckDriverMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckDriver">
-        <id column="id" property="id" />
-        <result column="org_id" property="orgId" />
-        <result column="truck_id" property="truckId" />
-        <result column="driver_id" property="driverId" />
-        <result column="driver_name" property="driverName" />
-        <result column="creater" property="creater" />
-        <result column="creater_name" property="createrName" />
-        <result column="create_date" property="createDate" />
-
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, org_id, truck_id, driver_id, driver_name, creater, creater_name, create_date
-    </sql>
-
-    <resultMap id="truckDriverDetail" type="com.aoyang.tms.entity.vo.TruckDriverVO">
-        <id column="id"  property="id"></id>
-        <association property="truck" column="truck_id" javaType="java.util.Map">
-            <id column="truck_id" property="truckId" />
-            <result column="org_id" property="orgId" />
-            <result column="org_name"  property="orgName" />
-            <result column="truck_name" property="truckName"/>
-            <result column="car_number" property="carNumber" />
-        </association>
-        <association property="driver" column="driver_id" javaType="java.util.Map">
-            <id column="driver_id" property="driverId" />
-            <result column="driver_name" property="driverName" />
-        </association>
-    </resultMap>
-
-    <!--查询物流公司下,卡车列表-->
-    <select id="truckDriverDetail" parameterType="com.aoyang.tms.entity.TruckDriver" resultMap="truckDriverDetail">
-    select id,b.truck_id,b.truck_name,b.org_id,b.org_name,c.driver_id,c.driver_name,b.car_number from truck_driver a,(select * from truck where status=0) b,driver c
-      where a.driver_id=#{driverId} and a.truck_id=#{truckId}
-      and a.truck_id=b.truck_id and a.driver_id=c.driver_id
-    </select>
-
-    <select id="driverList" parameterType="long" resultType="Long">
-        select distinct driver_id from truck_driver where truck_id=#{truckId}
-    </select>
-
-</mapper>

+ 0 - 28
src/main/resources/mapper/TruckLogMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.TruckLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckLog">
-        <id column="id" property="id"/>
-        <result column="type" property="type"/>
-        <result column="truck_id" property="truckId"/>
-        <result column="car_number" property="carNumber"/>
-        <result column="client_id" property="clientId"/>
-        <result column="from_ip" property="fromIP"/>
-        <result column="role_id" property="roleId"/>
-        <result column="org_id" property="orgId"/>
-        <result column="org_name" property="orgName"/>
-        <result column="content" property="content"/>
-        <result column="operator_id" property="operatorId"/>
-        <result column="operator_name" property="operatorName"/>
-        <result column="operator_time" property="operatorTime"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id
-        , type, truck_id, car_number, client_id, from_ip, role_id, org_id, org_name, content, operator_id, operator_name, operator_time
-    </sql>
-
-</mapper>

+ 0 - 297
src/main/resources/mapper/TruckMapper.xml

@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.TruckMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.Truck">
-        <id column="truck_id" property="truckId"/>
-        <result column="trade_type" property="tradeType"/>
-        <result column="org_id" property="orgId"/>
-        <result column="org_name" property="orgName"/>
-        <result column="truck_name" property="truckName"/>
-        <result column="car_number" property="carNumber"/>
-        <result column="purchase_date" property="purchaseDate"/>
-        <result column="color" property="color"/>
-        <result column="dead_weight" property="deadWeight"/>
-        <result column="capacity" property="capacity"/>
-        <result column="manufacturer" property="manufacturer"/>
-        <result column="status" property="status"/>
-        <result column="creater" property="creater"/>
-        <result column="create_date" property="createDate"/>
-        <result column="updater" property="updater"/>
-        <result column="update_date" property="updateDate"/>
-        <result column="frame_number" property="frameNumber"/>
-        <result column="trailer_number" property="trailerNumber"/>
-        <result column="auto_account" property="autoAccount"/>
-        <result column="linked" property="linked"/>
-        <result column="level" property="level"/>
-        <result column="type_name" property="typeName"/>
-        <result column="owner" property="owner"/>
-        <result column="address" property="address"/>
-        <result column="use_nature" property="useNature"/>
-        <result column="vehicle_id_code" property="vehicleIdCode"/>
-        <result column="register_date" property="registerDate"/>
-        <result column="issue_date" property="issueDate"/>
-        <result column="file_no" property="fileNo"/>
-        <result column="energy_type" property="energyType"/>
-        <result column="face_url" property="faceUrl"/>
-        <result column="back_url" property="backUrl"/>
-        <result column="auth_status" property="authStatus"/>
-        <result column="auth_date" property="auth_date"/>
-        <result column="com_status" property="comStatus"/>
-        <result column="com_contract_status" property="comContractStatus"/>
-    </resultMap>
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="AllResultMap" type="com.aoyang.tms.entity.vo.TruckVO">
-        <id column="truck_id" property="truckId"/>
-        <result column="trade_type" property="tradeType"/>
-        <result column="org_id" property="orgId"/>
-        <result column="org_name" property="orgName"/>
-        <result column="truck_name" property="truckName"/>
-        <result column="car_number" property="carNumber"/>
-        <result column="purchase_date" property="purchaseDate"/>
-        <result column="color" property="color"/>
-        <result column="dead_weight" property="deadWeight"/>
-        <result column="capacity" property="capacity"/>
-        <result column="manufacturer" property="manufacturer"/>
-        <result column="status" property="status"/>
-        <result column="creater" property="creater"/>
-        <result column="create_date" property="createDate"/>
-        <result column="updater" property="updater"/>
-        <result column="update_date" property="updateDate"/>
-        <result column="frame_number" property="frameNumber"/>
-        <result column="trailer_number" property="trailerNumber"/>
-        <result column="auto_account" property="autoAccount"/>
-        <result column="linked" property="linked"/>
-        <collection property="driverList" ofType="java.util.Map" column="truckId">
-            <id column="driver_id" property="driverId"/>
-            <result column="driver_name" property="driverName"/>
-            <result column="driver_no" property="driverNo"/>
-            <result column="driver_date" property="driverDate"/>
-            <result column="mobile" property="mobile"/>
-        </collection>
-    </resultMap>
-
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="AllTruckResultMap" type="com.aoyang.tms.entity.vo.TruckVO">
-        <id column="truck_id" property="truckId"/>
-        <result column="trade_type" property="tradeType"/>
-        <result column="org_id" property="orgId"/>
-        <result column="org_name" property="orgName"/>
-        <result column="truck_name" property="truckName"/>
-        <result column="car_number" property="carNumber"/>
-        <result column="purchase_date" property="purchaseDate"/>
-        <result column="color" property="color"/>
-        <result column="dead_weight" property="deadWeight"/>
-        <result column="capacity" property="capacity"/>
-        <result column="manufacturer" property="manufacturer"/>
-        <result column="status" property="status"/>
-        <result column="creater" property="creater"/>
-        <result column="create_date" property="createDate"/>
-        <result column="updater" property="updater"/>
-        <result column="update_date" property="updateDate"/>
-        <result column="frame_number" property="frameNumber"/>
-        <result column="trailer_number" property="trailerNumber"/>
-        <result column="auto_account" property="autoAccount"/>
-        <result column="linked" property="linked"/>
-        <collection property="driverList" ofType="com.aoyang.tms.entity.feignEntity.User"
-                    javaType="ArrayList" column="truck_id" select="driverList">
-        </collection>
-    </resultMap>
-
-    <resultMap id="driverResult" type="com.aoyang.tms.entity.feignEntity.User">
-        <id column="driver_id" property="userId"/>
-        <result column="driver_name" property="userName"/>
-    </resultMap>
-
-
-    <resultMap id="carNumResult" type="com.aoyang.tms.entity.Truck">
-        <id column="truck_id" property="truckId"/>
-        <result column="car_number" property="carNumber"/>
-        <result column="trade_type" property="tradeType"/>
-    </resultMap>
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        truck_id,
-        trade_type, org_id, org_name, truck_name, car_number, purchase_date, color, dead_weight, capacity, manufacturer, status, creater, create_date, updater, update_date,frame_number,trailer_number,creater_name,updater_name,auto_account,linked,type_name,owner,address,use_nature,vehicle_id_code,register_date,issue_date,file_no,energy_type,face_url,back_url,auth_status,auth_date,level,com_status,com_contract_url
-    </sql>
-    <sql id="Truck_Column_List">
-        b.truck_id ,b.trade_type,
-        b.org_id,b.org_name,b.truck_name,b.car_number,b.purchase_date,b.color,b.dead_weight,b.capacity,b.manufacturer,b.status,b.creater,b.create_date,b.updater,b.update_date,b.frame_number,b.trailer_number,b.creater_name,b.updater_name,b.auto_account,b.linked
-
-    </sql>
-
-    <sql id="Truck_Column_List2">
-        b.truck_id,b.trade_type,
-        b.org_id,b.org_name,b.truck_name,b.car_number,b.purchase_date,b.color,b.dead_weight,b.capacity,b.manufacturer,b.status,b.creater,b.create_date,b.updater,b.update_date,b.frame_number,
-        b.trailer_number,b.creater_name,b.updater_name,b.auto_account,b.linked,b.status,b.level,b.com_status,b.com_contract_status
-
-    </sql>
-
-    <sql id="carNumber_Column_List">
-        b.truck_id
-        ,b.car_number,b.linked,b.auto_account,b.frame_number,b.trade_type
-
-    </sql>
-    <sql id="driver_Column_List">
-        a.driver_id
-        , a.driver_name, a.driver_no, a.driver_date, a.mobile
-    </sql>
-    <!--根据司机id,查询司机所挂的车牌号-->
-    <select id="getCarNumber" parameterType="java.lang.Long" resultMap="carNumResult">
-        select
-        <include refid="carNumber_Column_List"/>
-        from truck_driver a,truck b where a.truck_id=b.truck_id and a.driver_id=#{driverId}
-    </select>
-
-
-    <!--卡车信息,包含旗下的司机信息-->
-    <select id="truckDetail" parameterType="java.lang.Long" resultMap="AllResultMap">
-        select<include refid="driver_Column_List"/>,
-        <include refid="Truck_Column_List"/>
-        from truck b left join truck_driver c on b.truck_id=c.truck_id
-        left join driver a on c.driver_id=a.driver_id
-        where b.status=0 and b.truck_id=#{truckId}
-
-    </select>
-
-    <!--绑定管理,根据物流公司id,查询该企业所有的卡车,并支持通过 车牌号+司机姓名 模糊查询 -->
-    <select id="bindingManager" resultMap="AllTruckResultMap">
-        select
-        truck_id,trade_type,truck_name,car_number,org_id,frame_number,dead_weight,capacity,purchase_date,trailer_number,color,manufacturer,status,auto_account,linked,create_date
-        from(
-        select
-        truck_id,trade_type,truck_name,car_number,org_id,frame_number,dead_weight,capacity,purchase_date,trailer_number,color,manufacturer,status,auto_account,linked,create_date
-        from truck where 1=1
-        <if test="bindingManager.orgId != null">
-            and org_id = #{bindingManager.orgId}
-        </if>
-        <if test="bindingManager.linked != null">
-            and linked = #{bindingManager.linked}
-        </if>
-        <if test='bindingManager.keyWord != null and bindingManager.keyWord !="" '>
-            and car_number like concat('%',#{bindingManager.keyWord},'%')
-        </if>
-        union
-        select
-        a.truck_id,a.trade_type,a.truck_name,a.car_number,a.org_id,a.frame_number,a.dead_weight,a.capacity,a.purchase_date,a.trailer_number,a.color,a.manufacturer,a.status,a.auto_account,a.linked,a.create_date
-        from truck a,truck_driver b
-        where a.truck_id=b.truck_id
-        <if test="bindingManager.orgId != null">
-            and b.org_id=#{bindingManager.orgId}
-        </if>
-
-        <if test="bindingManager.linked != null">
-            and a.linked = #{bindingManager.linked}
-        </if>
-        <if test='bindingManager.keyWord != null and bindingManager.keyWord !="" '>
-            and b.driver_name like concat('%',#{bindingManager.keyWord},'%')
-        </if>
-        )m order by create_date desc,m.truck_id desc
-
-    </select>
-
-    <!--根据卡车,查询绑定的司机列表-->
-    <select id="driverList" parameterType="java.lang.Long" resultMap="driverResult">
-        select driver_id, driver_name
-        from truck_driver
-        where truck_id = #{truckId}
-    </select>
-
-
-    <update id="bashEditTruckStart" parameterType="com.aoyang.tms.entity.Truck">
-        update truck
-        set status=case when status > 0 then status - 1 else 0 end,
-            updater=#{truck.updater},
-            updater_name=#{truck.updaterName}
-        where org_id = #{truck.orgId}
-    </update>
-
-    <update id="bashEditTruckStop" parameterType="com.aoyang.tms.entity.Truck">
-        update truck
-        set status=status + 1,
-            updater=#{truck.updater},
-            updater_name=#{truck.updaterName}
-        where org_id = #{truck.orgId}
-    </update>
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="truckListForWebMap" type="com.aoyang.tms.entity.vo.TruckVO">
-        <id column="truck_id" property="truckId"/>
-        <result column="trade_type" property="tradeType"/>
-        <result column="org_id" property="orgId"/>
-        <result column="org_name" property="orgName"/>
-        <result column="truck_name" property="truckName"/>
-        <result column="car_number" property="carNumber"/>
-        <result column="purchase_date" property="purchaseDate"/>
-        <result column="color" property="color"/>
-        <result column="dead_weight" property="deadWeight"/>
-        <result column="capacity" property="capacity"/>
-        <result column="manufacturer" property="manufacturer"/>
-        <result column="status" property="status"/>
-        <result column="creater" property="creater"/>
-        <result column="create_date" property="createDate"/>
-        <result column="updater" property="updater"/>
-        <result column="update_date" property="updateDate"/>
-        <result column="frame_number" property="frameNumber"/>
-        <result column="trailer_number" property="trailerNumber"/>
-        <result column="auto_account" property="autoAccount"/>
-        <result column="linked" property="linked"/>
-        <result column="level" property="level"/>
-        <result column="com_status" property="comStatus"/>
-        <result column="com_contract_status" property="comContractStatus"/>
-        <collection property="driversList" select="driverList" column="truck_id">
-
-        </collection>
-    </resultMap>
-    <!--根据关键字(车牌号+司机姓名)进行查询卡车列表,及卡车下的司机列表-->
-    <select id="truckListForWeb" resultMap="truckListForWebMap">
-        select
-        <include refid="Truck_Column_List2"/>
-        from truck b where 1=1
-        <if test="truck!=null and truck.orgId != null">
-            and b.org_id=#{truck.orgId}
-        </if>
-        <if test="truck.keyword != null and truck.keyword !=''">
-            and (b.car_number like concat('%',#{truck.keyword},'%')
-            or truck_id in(select truck_id from truck_driver where driver_name like concat('%',#{truck.keyword},'%')))
-        </if>
-        <if test="truck.status !=null">
-            and b.status=#{truck.status}
-        </if>
-        <if test="truck.tradeType !=null">
-            and b.trade_type=#{truck.tradeType}
-        </if>
-        <if test="truck.linked != null">
-            and b.linked = #{truck.linked}
-        </if>
-        order by b.update_date desc
-    </select>
-
-
-    <select id="truckListForWeb_old" resultMap="truckListForWebMap">
-        select
-        <include refid="Truck_Column_List2"/>
-        from truck b
-        left join truck_driver a on a.truck_id=b.truck_id
-        where 1=1
-        <if test="truck.orgId != null">
-            and b.org_id=#{truck.orgId}
-        </if>
-        <if test="truck.keyword != null and truck.keyword !=''">
-            and (b.car_number like concat('%',#{truck.keyword},'%') or a.driver_name like
-            concat('%',#{truck.keyword},'%'))
-        </if>
-        <if test="truck.status !=null">
-            and b.status=#{truck.status}
-        </if>
-        <if test="truck.linked != null">
-            and b.linked = #{truck.linked}
-        </if>
-        order by b.create_date desc
-    </select>
-
-
-</mapper>