提交首页查询Bug

Alan

2021-02-21 6cfb6f557c4b74e6031aea7899d1b3fa58255da0

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java

@@ -1,228 +1,280 @@
package cc.mrbird.febs.server.hr.entity;

    import java.util.Date;
    import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.math.BigDecimal;

import com.wuwenze.poi.annotation.Excel;
import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
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.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpOccupational
* package:cc.mrbird.febs.server.hr.controller
* description:员工工伤案件数据表映射实体
*
* @author luoyibo
* @date 2021-01-24 20:35:24
* @since JDK1.8
*/
 * name:EmpOccupational
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工工伤案件数据表映射实体
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:32
 * @since JDK1.8
 */
@Data
@TableName("t_emp_occupational")
public class EmpOccupational {
@Excel("员工工伤案件")
public class EmpOccupational implements Serializable {

        /**
        * 员工Id
        */
            @TableField("empId")
            private Long empId;
    private static final long serialVersionUID = 5704201515491620531L;
    @FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
    @TableId("occupationalId")
    private Long occupationalId = 0L;

        /**
        * 案件Id
        */
            @TableField("occupationalId")
            private Long occupationalId;
    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
    @TableField("empId")
    private Long empId = 0L;

        /**
        * 
        */
            @TableField("injuredTime")
            private Date injuredTime;
    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
    @TableField("empNumb")
    @ExcelField(value = "员工编号")
    private String empNumb = "";

        /**
        * 受伤地点
        */
            @TableField("injuredAddress")
            private String injuredAddress;
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    @ExcelField(value = "员工姓名")
    private String empName = "";
    
    @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
    @TableField("empStatus")
    @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
    private String empStatus = "";

        /**
        * 受伤部位
        */
            @TableField("injuredPart")
            private String injuredPart;
    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
    @TableField("sex")
    @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
    private String sex = "";

        /**
        * 
        */
            @TableField("injuredDiacrisis")
            private String injuredDiacrisis;
    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
    @TableField("certificateNumb")
    @ExcelField(value = "证件号码")
    private String certificateNumb = "";

        /**
        * 受伤经过描述
        */
            @TableField("injuredDescribe")
            private String injuredDescribe;
    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
    @TableField("deptId")
    private Long deptId = 0L;

        /**
        * 就诊医院
        */
            @TableField("hospitalName")
            private String hospitalName;
    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
    @TableField("deptName")
    @ExcelField(value = "部门名称")
    private String deptName = "";

        /**
        * 就诊科室
        */
            @TableField("treatmentName")
            private String treatmentName;
    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
    @TableField("JobId")
    private Long jobId = 0L;

        /**
        * 是否住院
        */
            @TableField("hospitalizatioFlag")
            private Integer hospitalizatioFlag;
    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
    @TableField("jobName")
    @ExcelField(value = "岗位名称")
    private String jobName = "";

        /**
        * 床号
        */
            @TableField("bedNumb")
            private Byte bedNumb;
    @FieldInfo(name = "injuredTime", type = "datetime", explain = "受伤时间")
    @TableField("injuredTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelField(value = "受伤时间", writeConverter = TimeConverter.class)
    private Date injuredTime;

        /**
        * 报案时间
        */
            @TableField("reprotTime")
            private Date reprotTime;
    @FieldInfo(name = "injuredAddress", type = "varchar", explain = "受伤地点")
    @TableField("injuredAddress")
    @ExcelField(value = "受伤地点")
    private String injuredAddress = "";

        /**
        * 
        */
            @TableField("submitTime")
            private Date submitTime;
    @FieldInfo(name = "injuredPart", type = "varchar", explain = "受伤部位")
    @TableField("injuredPart")
    @ExcelField(value = "受伤部位")
    private String injuredPart = "";

        /**
        * 递交人
        */
            @TableField("sbumitBy")
            private String sbumitBy;
    @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "受伤诊断")
    @TableField("injuredDiacrisis")
    @ExcelField(value = "受伤诊断")
    private String injuredDiacrisis = "";

        /**
        * 人事处理时间
        */
            @TableField("hrDoDate")
            private Date hrDoDate;
    @FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
    @TableField("injuredDescribe")
    @ExcelField(value = "受伤经过描述")
    private String injuredDescribe = "";

        /**
        * 医疗总费用
        */
            @TableField("expensesFee")
            private BigDecimal expensesFee;
        /**
        * 剔除总额
        */
            @TableField("eliminate")
            private BigDecimal eliminate;
        /**
        * 一次性伤残补助金
        */
            @TableField("socialDisability")
            private BigDecimal socialDisability;
        /**
        * 住院伙食补贴
        */
            @TableField("socialAllowance")
            private BigDecimal socialAllowance;
        /**
        * 一次性医疗补助金
        */
            @TableField("socialSubsidy")
            private BigDecimal socialSubsidy;
        /**
        * 社保赔偿总费用
        */
            @TableField("socialCompensation")
            private BigDecimal socialCompensation;
        /**
        * 已赔付医药费用
        */
            @TableField("compensated")
            private BigDecimal compensated;
        /**
        * 其他赔偿报销
        */
            @TableField("otherCompensated")
            private BigDecimal otherCompensated;
        /**
        * 
        */
            @TableField("companylDisability")
            private BigDecimal companylDisability;
        /**
        * 工伤生活补贴
        */
            @TableField("companyAllowance")
            private BigDecimal companyAllowance;
        /**
        * 公司一次性医疗补助金
        */
            @TableField("companySubsidy")
            private BigDecimal companySubsidy;
        /**
        * 公司赔偿总费用
        */
            @TableField("companyCompensation")
            private BigDecimal companyCompensation;
        /**
        * 公司一次性就业补助金
        */
            @TableField("jobSubsidy")
            private BigDecimal jobSubsidy;
        /**
        * 结案状态 0-未结案 1-已结案
        */
            @TableField("settleStatus")
            private Integer settleStatus;
    @FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
    @TableField("hospitalName")
    @ExcelField(value = "就诊医院")
    private String hospitalName = "";

        /**
        * 记录创建时间
        */
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "treatmentName", type = "varchar", explain = "就诊科室")
    @TableField("treatmentName")
    @ExcelField(value = "就诊科室")
    private String treatmentName = "";

        /**
        * 记录创建人
        */
            @TableField("creator")
            private String creator;
    @FieldInfo(name = "hospitalizatioFlag", type = "bit", explain = "是否住院")
    @TableField("hospitalizatioFlag")
    @ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
    private Integer hospitalizatioFlag = 0;

        /**
        * 记录最后更新时间
        */
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
    @TableField("bedNumb")
    @ExcelField(value = "床号")
    private Integer bedNumb = 0;

        /**
        * 记录最后更新人
        */
            @TableField("modifier")
            private String modifier;
    @FieldInfo(name = "reportTime", type = "datetime", explain = "报案时间")
    @TableField("reportTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelField(value = "报案时间", writeConverter = TimeConverter.class)
    private Date reportTime;

        /**
        * 记录删除标志。0-未删除 1-已删除，默认0
        */
            @TableField("delFlag")
            private Integer delFlag;
    @FieldInfo(name = "submitTime", type = "datetime", explain = "资料递交日期")
    @TableField("submitTime")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ExcelField(value = "资料递交日期", writeConverter = TimeConverter.class)
    private Date submitTime;

        /**
        * 记录版本号，用来进行乐观锁控制
        */
            @TableField("version")
            private Integer version;
    @FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
    @TableField("sbumitBy")
    @ExcelField(value = "递交人")
    private String sbumitBy = "";

        /**
        * 备注
        */
            @TableField("remark")
            private String remark;
    @FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
    @TableField("hrDoDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ExcelField(value = "人事处理时间", writeConverter = TimeConverter.class)
    private Date hrDoDate;

    @FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
    @TableField("expensesFee")
    @ExcelField(value = "医疗总费用")
    private BigDecimal expensesFee = BigDecimal.ZERO;

    @FieldInfo(name = "eliminate", type = "decimal", explain = "剔除总额")
    @TableField("eliminate")
    @ExcelField(value = "剔除总额")
    private BigDecimal eliminate = BigDecimal.ZERO;

    @FieldInfo(name = "socialDisability", type = "decimal", explain = "一次性伤残补助金")
    @TableField("socialDisability")
    @ExcelField(value = "一次性伤残补助金")
    private BigDecimal socialDisability = BigDecimal.ZERO;

    @FieldInfo(name = "socialAllowance", type = "decimal", explain = "住院伙食补贴")
    @TableField("socialAllowance")
    @ExcelField(value = "住院伙食补贴")
    private BigDecimal socialAllowance = BigDecimal.ZERO;

    @FieldInfo(name = "socialSubsidy", type = "decimal", explain = "一次性医疗补助金")
    @TableField("socialSubsidy")
    @ExcelField(value = "一次性医疗补助金")
    private BigDecimal socialSubsidy = BigDecimal.ZERO;

    @FieldInfo(name = "socialCompensation", type = "decimal", explain = "社保赔偿总费用")
    @TableField("socialCompensation")
    @ExcelField(value = "社保赔偿总费用")
    private BigDecimal socialCompensation = BigDecimal.ZERO;

    @FieldInfo(name = "compensated", type = "decimal", explain = "已赔付医药费用")
    @TableField("compensated")
    @ExcelField(value = "已赔付医药费用")
    private BigDecimal compensated = BigDecimal.ZERO;

    @FieldInfo(name = "otherCompensated", type = "decimal", explain = "其他赔偿报销")
    @TableField("otherCompensated")
    @ExcelField(value = "其他赔偿报销")
    private BigDecimal otherCompensated = BigDecimal.ZERO;

    @FieldInfo(name = "companylDisability", type = "decimal", explain = "公司一次性伤残补助金")
    @TableField("companylDisability")
    @ExcelField(value = "公司一次性伤残补助金")
    private BigDecimal companylDisability = BigDecimal.ZERO;

    @FieldInfo(name = "companyAllowance", type = "decimal", explain = "工伤生活补贴")
    @TableField("companyAllowance")
    @ExcelField(value = "工伤生活补贴")
    private BigDecimal companyAllowance = BigDecimal.ZERO;

    @FieldInfo(name = "companySubsidy", type = "decimal", explain = "公司一次性医疗补助金")
    @TableField("companySubsidy")
    @ExcelField(value = "公司一次性医疗补助金")
    private BigDecimal companySubsidy = BigDecimal.ZERO;

    @FieldInfo(name = "companyCompensation", type = "decimal", explain = "公司赔偿总费用")
    @TableField("companyCompensation")
    @ExcelField(value = "公司赔偿总费用")
    private BigDecimal companyCompensation = BigDecimal.ZERO;

    @FieldInfo(name = "jobSubsidy", type = "decimal", explain = "公司一次性就业补助金")
    @TableField("jobSubsidy")
    @ExcelField(value = "公司一次性就业补助金")
    private BigDecimal jobSubsidy = BigDecimal.ZERO;

    @FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
    @TableField("settleStatus")
    @ExcelField(value = "是否已报告", writeConverterExp = "0=未结案,1=已结案")
    private Integer settleStatus = 0;

    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    @JsonSerialize(using = DateTimeSerializer.class)
    @JsonDeserialize(using = DateTimeDeserializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modifyTime;

    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

    @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
    @TableField("version")
    @Version
    private Integer version = 0;

    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";
    
    @TableField(exist = false)
   private String hrDoDateStr= "";
    
    @TableField(exist = false)
   private String injuredTimeStr= "";

}