Merge remote-tracking branch 'origin/master' into master

@@ -20,4 +20,6 @@ public interface BusinessConstant {
 
     String sumSuffix = "Sum";
 
+    String dictText = "_dictText";
+
 }

+package com.skua.modules.joinclass.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 交接班信息
+ */
+@Data
+@TableName("join_class_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "join_class_info对象", description = "交接班信息 ")
+public class JoinClassInfo {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 值班人员
+     */
+    @Excel(name = "值班人员", width = 15)
+    @ApiModelProperty(value = "值班人员")
+    private String onDutyUser;
+    /**
+     * 时间
+     */
+    @Excel(name = "时间", width = 15)
+    @ApiModelProperty(value = "时间")
+    private String dataTime;
+    /**
+     * 班次类型(白班1;夜班2)
+     */
+    @Excel(name = "班次类型(白班1;夜班2)", width = 15)
+    @ApiModelProperty(value = "班次类型(白班1;夜班2)")
+    private String classType;
+    /**
+     * 值班记录
+     */
+    @Excel(name = "值班记录", width = 15)
+    @ApiModelProperty(value = "值班记录")
+    private String onDutyRecord;
+    /**
+     * 运行异常描述
+     */
+    @Excel(name = "运行异常描述", width = 15)
+    @ApiModelProperty(value = "运行异常描述")
+    private String runExceptionDesc;
+    /**
+     * 交接物品
+     */
+    @Excel(name = "交接物品", width = 15)
+    @ApiModelProperty(value = "交接物品")
+    private String handOverGoods;
+    /**
+     * 注意事项
+     */
+    @Excel(name = "注意事项", width = 15)
+    @ApiModelProperty(value = "注意事项")
+    private String attentionNote;
+    /**
+     * 交班人
+     */
+    @Excel(name = "交班人", width = 15)
+    @ApiModelProperty(value = "交班人")
+    private String handOverUser;
+    /**
+     * 接班人
+     */
+    @Excel(name = "接班人", width = 15)
+    @ApiModelProperty(value = "接班人")
+    private String takeOverUser;
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 排序字段
+     */
+    @Excel(name = "排序字段", width = 15)
+    @ApiModelProperty(value = "排序字段")
+    private Integer orderNum;
+    /**
+     * 删除状态(0正常;1已删除)
+     */
+    @Excel(name = "删除状态(0正常;1已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0正常;1已删除)")
+    private String delFlag;
+
+}

+package com.skua.modules.joinclass.mapper;
+
+import com.skua.modules.joinclass.entity.JoinClassInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 交接班信息
+ */
+public interface JoinClassInfoMapper extends BaseMapper<JoinClassInfo> {
+
+}

+<?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.skua.modules.joinclass.mapper.JoinClassInfoMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.joinclass.service;
+
+import com.skua.modules.joinclass.entity.JoinClassInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 交接班信息 
+ */
+public interface IJoinClassInfoService extends IService<JoinClassInfo> {
+
+}

+package com.skua.modules.joinclass.service.impl;
+
+import com.skua.modules.joinclass.entity.JoinClassInfo;
+import com.skua.modules.joinclass.mapper.JoinClassInfoMapper;
+import com.skua.modules.joinclass.service.IJoinClassInfoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 交接班信息
+ */
+@Service
+public class JoinClassInfoServiceImpl extends ServiceImpl<JoinClassInfoMapper, JoinClassInfo> implements IJoinClassInfoService {
+
+}