|
|
|
@ -128,7 +128,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
|
|
|
|
|
datas.add(workTr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
columns.add(PersonnelResumeTd.builder().colspans(1).value("工作经历(在盛虹工作经历)").rowspans(workInfos.size()+1).build());
|
|
|
|
|
columns.add(PersonnelResumeTd.builder().colspans(1).value("工作经历").rowspans(workInfos.size()+1).build());
|
|
|
|
|
columns.add(PersonnelResumeTd.builder().colspans(1).value("开始日期").rowspans(1).build());
|
|
|
|
|
columns.add(PersonnelResumeTd.builder().colspans(1).value("结束日期").rowspans(1).build());
|
|
|
|
|
columns.add(PersonnelResumeTd.builder().colspans(3).value("公司").rowspans(1).build());
|
|
|
|
@ -209,7 +209,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
|
|
|
|
|
List<TrainingInfo> trainingInfoList = new ArrayList<>();
|
|
|
|
|
rs.executeQuery("select ksrq,jsrq,pxnr,pxdw,shzs from uf_pxjlsh where xm = ?",resourceId);
|
|
|
|
|
while (rs.next()) {
|
|
|
|
|
String date = Util.null2String(rs.getString("ksrq")) +" 至 " + Util.null2String(rs.getString("jsrq"));
|
|
|
|
|
String date = Util.null2String(rs.getString("ksrq")) +" " + Util.null2String(rs.getString("jsrq"));
|
|
|
|
|
trainingInfoList.add(TrainingInfo.builder()
|
|
|
|
|
.startAndEndDate(date)
|
|
|
|
|
.trainingContent(Util.null2String(rs.getString("pxnr")))
|
|
|
|
|