Merge remote-tracking branch 'origin/master'

doum

8 天以前 60e49d600834344ae1b18357e76df74fbe160527

 server/services/src/main/java/com/doumee/dao/business/dto/CasesImport.java

@@ -3,6 +3,11 @@
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import org.apache.poi.xssf.usermodel.XSSFPicture;
import org.apache.poi.xssf.usermodel.XSSFPictureData;

import java.util.Date;
import java.util.List;

/**
 * 员工信息导入表
@@ -13,24 +18,31 @@
@ApiModel("员工信息导入")
public class CasesImport {

//    @ExcelColumn(name="序号",value = "sn")
    private Integer sn;

    @ExcelColumn(name="姓名",value = "name",index = 1)
    @ExcelColumn(name="案例主题",value = "name",index = 1)
    private String name;
    @ExcelColumn(name="手机号",value = "phone",index = 2)
    private String phone;
    @ExcelColumn(name="开始日期",value = "startDate",index = 2)
    private String startDate;

    @ExcelColumn(name="身份证号",value = "idcardNo",index = 3)
    private String idcardNo;
    @ExcelColumn(name="结束日期",value = "endDate",index = 3)
    private String endDate;

    @ExcelColumn(name="组织名称" , value = "companyName" ,index = 4)
    private String companyName;
    @ExcelColumn(name="服务老师" , value = "memberCode" ,index = 4)
    private String memberCode;
    @ExcelColumn(name="服务老师姓名" , value = "memberName" ,index = 5)
    private String memberName;

    @ExcelColumn(name="工号" , value = "code")
    private String code;

    @ExcelColumn(name="岗位" , value = "code")
    private String positionName;

    @ExcelColumn(name="案例说明" , value = "detail",index = 6)
    private String detail;
    @ExcelColumn(name="案例图1" , value = "imageList",fieldType = XSSFPictureData.class,index = 7)
    private List<XSSFPictureData> imageList;
    @ExcelColumn(name="案例图2" , value = "imageList1",fieldType = XSSFPictureData.class,index = 8)
    private List<XSSFPictureData> imageList1;
    @ExcelColumn(name="案例图3" , value = "imageList2",fieldType = XSSFPictureData.class,index = 9)
    private List<XSSFPictureData> imageList2;
    @ExcelColumn(name="案例图4" , value = "imageList3",fieldType = XSSFPictureData.class,index = 10)
    private List<XSSFPictureData> imageList3;
    @ExcelColumn(name="案例图5" , value = "imageList4",fieldType = XSSFPictureData.class,index = 11)
    private List<XSSFPictureData> imageList4;
    @ExcelColumn(name="案例图6" , value = "imageList5",fieldType = XSSFPictureData.class,index = 12)
    private List<XSSFPictureData> imageList5;
}