盛虹简历明细更新

src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java

@@ -85,7 +85,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         columns.add(PersonnelResumeTd.builder().colspans(1).value("教育经历").rowspans(educationInfos.size()+1).build());
         columns.add(PersonnelResumeTd.builder().colspans(1).value("起止时间").rowspans(1).build());
         columns.add(PersonnelResumeTd.builder().colspans(2).value("学校").rowspans(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());
 
         tables.add(PersonnelResumeTable.builder().columns(columns).datas(datas).build());
@@ -231,8 +231,9 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         rs.executeQuery("select ksrq,jsrq,byyx,xl,xw,zy from uf_jyjl where xm1 = ?",resourceId);
         while (rs.next()) {
             String date = Util.null2String(rs.getString("ksrq")) +" 至 " + Util.null2String(rs.getString("jsrq"));
-            String educationalAndDegree = eduComInfo.getEducationLevelname(Util.null2String(rs.getString("xl"))) +" / "
+//            String educationalAndDegree = eduComInfo.getEducationLevelname(Util.null2String(rs.getString("xl"))) +" / "
-                    + selectWorkflowItem("xw","uf_jyjl",Util.getIntValue(rs.getString("xw")),String.valueOf(user.getLanguage()));
+//                    + selectWorkflowItem("xw","uf_jyjl",Util.getIntValue(rs.getString("xw")),String.valueOf(user.getLanguage()));
+            String educationalAndDegree = eduComInfo.getEducationLevelname(Util.null2String(rs.getString("xl")));
             educationInfoList.add(EducationInfo.builder()
                     .startAndEndDate(date)
                     .school(Util.null2String(rs.getString("byyx")))