1

src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/LeaveInfoController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 记录请假信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-06-22
+ */
+@RestController
+@RequestMapping("/leaveInfo")
+public class LeaveInfoController {
+
+}
+

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

@@ -0,0 +1,100 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,20 @@
+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/resources/mapper/LeaveInfoMapper.xml

@@ -0,0 +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>

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

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","source_relation_info");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","leave_info");
     }
 
     /**

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

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 记录请假信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-06-22
+ */
+@RestController
+@RequestMapping("/leaveInfo")
+public class LeaveInfoController {
+
+}
+

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

@@ -0,0 +1,103 @@
+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-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("leave_info")
+public class LeaveInfo extends BaseModel<LeaveInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.UUID)
+    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;
+    }
+
+}

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

@@ -122,6 +122,14 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      * 盈亏（吨）
      */
     private Float profitAndLoss;
+    /**
+     * 审核中的盈亏值（吨）
+     */
+    private Float plValue;
+    /**
+     * 操作标识
+     */
+    private String operationFlag;
     /**
      * 已付(元)
      */
@@ -235,6 +243,16 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      */
     @TableField(exist = false)
     private List<ExpenseAllocationInfo> expenseAllocationInfoList;
+    /**
+     * 请款合计
+     */
+    @TableField(exist = false)
+    private Double requestFundsTotal;
+    /**
+     * 入库重量合计
+     */
+    @TableField(exist = false)
+    private Float inWarehouseWeightTotal;
 
     @Override
     protected Serializable pkVal() {

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

@@ -0,0 +1,16 @@
+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> {
+
+}

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

@@ -0,0 +1,16 @@
+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> {
+
+}

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

@@ -0,0 +1,20 @@
+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 {
+
+}

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

@@ -0,0 +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>