Merge remote-tracking branch 'origin/master'

yz

2021-02-22 cf637bd648a40c4cc00d738785c947f27728f843

Merge remote-tracking branch 'origin/master'

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

@@ -132,10 +132,10 @@
    @ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
    private Integer hospitalizatioFlag = 0;

    @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
    @FieldInfo(name = "bedNumb", type = "varchar", explain = "床号")
    @TableField("bedNumb")
    @ExcelField(value = "床号")
    private Integer bedNumb = 0;
    private String bedNumb = "";

    @FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
    @TableField("reprotTime")

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

@@ -132,10 +132,10 @@
    @ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
    private Integer hospitalizatioFlag = 0;

    @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
    @FieldInfo(name = "bedNumb", type = "varchar", explain = "床号")
    @TableField("bedNumb")
    @ExcelField(value = "床号")
    private Integer bedNumb = 0;
    private String bedNumb = "";

    @FieldInfo(name = "reportTime", type = "datetime", explain = "报案时间")
    @TableField("reportTime")

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java

@@ -183,7 +183,7 @@
                empAccidentcases.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
            }
            if (StringUtils.isNotBlank(list.get(13).toString())) {
                empAccidentcases.setBedNumb(Integer.valueOf(list.get(14).toString()));
                empAccidentcases.setBedNumb(list.get(14).toString());
            }
            if (StringUtils.isNotBlank(list.get(14).toString())) {
                empAccidentcases.setReprotTime(DateUtil.parseDate(list.get(14).toString()));

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java

@@ -184,7 +184,7 @@
                empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
            }
            if (StringUtils.isNotBlank(list.get(13).toString())) {
                empOccupational.setBedNumb(Integer.valueOf(list.get(14).toString()));
                empOccupational.setBedNumb(list.get(14).toString());
            }
            if (StringUtils.isNotBlank(list.get(14).toString())) {
                empOccupational.setReportTime(DateUtil.parseDate(list.get(14).toString()));