1

src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/LeaveInfo.java

@@ -1,100 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.entity;
-
-import java.util.Date;
-import com.baomidou.mybatisplus.activerecord.Model;
-import BaseModel;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotations.Version;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 记录请假信息
- * </p>
- *
- * @author Gdc
- * @since 2022-06-22
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class LeaveInfo extends BaseModel<LeaveInfo> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    private String id;
-    /**
-     * 公司id
-     */
-    private String compId;
-    /**
-     * 打卡id
-     */
-    private String clockId;
-    /**
-     * 用户id
-     */
-    private String commonId;
-    /**
-     * 请假编号
-     */
-    private String leaveNo;
-    /**
-     * 员工姓名
-     */
-    private String empName;
-    /**
-     * 请假事由
-     */
-    private String reasonForLeave;
-    /**
-     * 请假开始时间
-     */
-    private Date startDate;
-    /**
-     * 请假结束时间
-     */
-    private Date endDate;
-    /**
-     * 请假类型
-     */
-    private String leaveType;
-    /**
-     * 请假类型key(1事假3病假)
-     */
-    private String leaveTypeKey;
-    /**
-     * 请假时长
-     */
-    private String leaveDuration;
-    /**
-     * 状态
-     */
-    private String status;
-    /**
-     * 状态标识
-     */
-    private String statusFlag;
-    /**
-     * 审核状态
-     */
-    private String approveStatus;
-    /**
-     * 工作流ID
-     */
-    private String workflowId;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/LeaveInfoMapper.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.mapper;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.LeaveInfo;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-
-/**
- * <p>
- * 记录请假信息 Mapper 接口
- * </p>
- *
- * @author Gdc
- * @since 2022-06-22
- */
-public interface LeaveInfoMapper extends BaseMapper<LeaveInfo> {
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ILeaveInfoService.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.service;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.LeaveInfo;
-import com.baomidou.mybatisplus.service.IService;
-
-/**
- * <p>
- * 记录请假信息 服务类
- * </p>
- *
- * @author Gdc
- * @since 2022-06-22
- */
-public interface ILeaveInfoService extends IService<LeaveInfo> {
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/LeaveInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.yh.saas.plugin.yiliangyiyun.service.impl;
-
-import com.yh.saas.plugin.yiliangyiyun.entity.LeaveInfo;
-import com.yh.saas.plugin.yiliangyiyun.mapper.LeaveInfoMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.ILeaveInfoService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 记录请假信息 服务实现类
- * </p>
- *
- * @author Gdc
- * @since 2022-06-22
- */
-@Service
-public class LeaveInfoServiceImpl extends ServiceImpl<LeaveInfoMapper, LeaveInfo> implements ILeaveInfoService {
-
-}

src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/LeaveInfoController.java → winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/FuelFillingInfoController.java

@@ -7,15 +7,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 记录请假信息 前端控制器
+ * 记录加油信息 前端控制器
  * </p>
  *
  * @author Gdc
- * @since 2022-06-22
+ * @since 2022-06-24
  */
 @RestController
-@RequestMapping("/leaveInfo")
-public class LeaveInfoController {
+@RequestMapping("/fuelFillingInfo")
+public class FuelFillingInfoController {
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FuelFillingInfo.java

@@ -0,0 +1,171 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 记录加油信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("fuel_filling_info")
+public class FuelFillingInfo extends BaseModel<FuelFillingInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 用户id
+     */
+    private String commonId;
+    /**
+     * 申请编号
+     */
+    private String fillingNo;
+    /**
+     * 行程类型(1长途3短途)
+     */
+    private String strokeType;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+    /**
+     * 发货库
+     */
+    private String sendWarehouse;
+    /**
+     * 收货库
+     */
+    private String receiveWarehouse;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 司机姓名
+     */
+    private String dirverName;
+    /**
+     * 车牌号
+     */
+    private String carNo;
+    /**
+     * 里程(公里)
+     */
+    private Double mileage;
+    /**
+     * 总里程(公里)
+     */
+    private Double totalMileage;
+    /**
+     * 请款金额（元）
+     */
+    private Double amountRequested;
+    /**
+     * 始发地省
+     */
+    private String originProvince;
+    /**
+     * 始发地市
+     */
+    private String originCity;
+    /**
+     * 始发地区
+     */
+    private String originArea;
+    /**
+     * 始发地详细地址
+     */
+    private String originAddress;
+    /**
+     * 始发地经度
+     */
+    private String originLongitude;
+    /**
+     * 始发地纬度
+     */
+    private String originLatitude;
+    /**
+     * 终到地省
+     */
+    private String destinationProvince;
+    /**
+     * 终到地市
+     */
+    private String destinationCity;
+    /**
+     * 终到地区
+     */
+    private String destinationArea;
+    /**
+     * 终到地详细地址
+     */
+    private String destinationAddress;
+    /**
+     * 终到地经度
+     */
+    private String destinationLongitude;
+    /**
+     * 终到地纬度
+     */
+    private String destinationLatitude;
+    /**
+     * 请款日期
+     */
+    private Date amountDeadline;
+    /**
+     * 总金额
+     */
+    private Double totalCost;
+    /**
+     * 总油耗(L)
+     */
+    private Double tfc;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 审核状态
+     */
+    private String approveStatus;
+    /**
+     * 工作流ID
+     */
+    private String workflowId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/FuelFillingInfoMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.FuelFillingInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录加油信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-06-24
+ */
+public interface FuelFillingInfoMapper extends BaseMapper<FuelFillingInfo> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IFuelFillingInfoService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.FuelFillingInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录加油信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-06-24
+ */
+public interface IFuelFillingInfoService extends IService<FuelFillingInfo> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FuelFillingInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.FuelFillingInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.FuelFillingInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IFuelFillingInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录加油信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-06-24
+ */
+@Service
+public class FuelFillingInfoServiceImpl extends ServiceImpl<FuelFillingInfoMapper, FuelFillingInfo> implements IFuelFillingInfoService {
+
+}

src/main/resources/mapper/LeaveInfoMapper.xml → winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/FuelFillingInfoMapper.xml

@@ -1,5 +1,5 @@
 <?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.yh.saas.plugin.yiliangyiyun.mapper.LeaveInfoMapper">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.FuelFillingInfoMapper">
 
 </mapper>