Compare commits
No commits in common. "8d96e1b0ba42938fb8ffa9123361f2d8b43a117f" and "906acef4530a845a0ad154bc2d9026f1dabdbf82" have entirely different histories.
8d96e1b0ba
...
906acef453
|
|
@ -1,11 +1,15 @@
|
||||||
/weaver-develop.iml
|
/weaver-develop.iml
|
||||||
/out/
|
/out/
|
||||||
.idea/
|
.idea/
|
||||||
/target/
|
|
||||||
|
HELP.md
|
||||||
|
target/
|
||||||
|
|
||||||
|
.idea
|
||||||
|
|
||||||
/test
|
/test
|
||||||
/src/rebel.xml
|
/src/rebel.xml
|
||||||
/src/META-INF
|
/src/META-INF
|
||||||
/WEB-INF/config
|
/WEB-INF/config
|
||||||
/log
|
|
||||||
/src/META-INF/
|
/log
|
||||||
/src/test/
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<component name="ArtifactManager">
|
||||||
|
<artifact type="jar" name="weaver-develop:jar">
|
||||||
|
<output-path>$PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib</output-path>
|
||||||
|
<root id="archive" name="weaver-develop.jar">
|
||||||
|
<element id="module-output" name="weaver-develop" />
|
||||||
|
</root>
|
||||||
|
</artifact>
|
||||||
|
</component>
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CompilerConfiguration">
|
||||||
|
<annotationProcessing>
|
||||||
|
<profile default="true" name="Default" enabled="true" />
|
||||||
|
</annotationProcessing>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<component name="libraryTable">
|
||||||
|
<library name="classbean">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="file://$PROJECT_DIR$/../../../../weaver/ecology/classbean" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES />
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
<component name="libraryTable">
|
||||||
|
<library name="lib">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="file://$PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES>
|
||||||
|
<root url="file://$PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib" />
|
||||||
|
</SOURCES>
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib" recursive="false" />
|
||||||
|
<jarDirectory url="file://$PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib" recursive="false" type="SOURCES" />
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
## 户口
|
|
||||||
residence=field31
|
|
||||||
|
|
||||||
##政治面貌
|
|
||||||
politicsStatus=field28
|
|
||||||
|
|
||||||
##民族
|
|
||||||
nation=field44
|
|
||||||
|
|
||||||
##毕业院校
|
|
||||||
graduateSchool=field23
|
|
||||||
|
|
||||||
##专业
|
|
||||||
major=field22
|
|
||||||
|
|
||||||
##家庭地址
|
|
||||||
address=field43
|
|
||||||
|
|
||||||
##职业资格证书/职称
|
|
||||||
jobcall=field35
|
|
||||||
|
|
||||||
##应急联系人(基本信息)
|
|
||||||
emergencyContact=field0
|
|
||||||
|
|
||||||
##关系(基本信息)
|
|
||||||
relationship=field1
|
|
||||||
|
|
||||||
##应急联系人电话(基本信息)
|
|
||||||
eContactMobile=field2
|
|
||||||
|
|
||||||
#
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
Manifest-Version: 1.0
|
||||||
|
Main-Class: test.MainTest
|
||||||
|
|
||||||
|
|
@ -22,7 +22,9 @@ public class EducationInfo {
|
||||||
|
|
||||||
private String school;
|
private String school;
|
||||||
|
|
||||||
private String educationalAndDegree;
|
private String educational;
|
||||||
|
|
||||||
|
private String degree;
|
||||||
|
|
||||||
private String major;
|
private String major;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,9 @@ public class FamilyInfo {
|
||||||
|
|
||||||
private String age;
|
private String age;
|
||||||
|
|
||||||
private String workUnitAndPostion;
|
private String workUnit;
|
||||||
|
|
||||||
|
private String position;
|
||||||
|
|
||||||
private String mobile;
|
private String mobile;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ public class PersonnelResumePo {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Thumbnails.of(inputStream).forceSize(140, 160).toFile(f);
|
Thumbnails.of(inputStream).forceSize(100, 120).toFile(f);
|
||||||
InputStream fileInputStream = Files.newInputStream(f.toPath());
|
InputStream fileInputStream = Files.newInputStream(f.toPath());
|
||||||
imageStr = "data:image/" + manager.getImageFileType() + ";base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(fileInputStream));
|
imageStr = "data:image/" + manager.getImageFileType() + ";base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(fileInputStream));
|
||||||
// 删除文件
|
// 删除文件
|
||||||
|
|
|
||||||
|
|
@ -20,16 +20,11 @@ public class WorkInfo {
|
||||||
|
|
||||||
private String startAndEndDate;
|
private String startAndEndDate;
|
||||||
|
|
||||||
private String startDate;
|
private String company;
|
||||||
|
|
||||||
private String endDate;
|
|
||||||
|
|
||||||
private String subCompany;
|
|
||||||
|
|
||||||
private String department;
|
private String department;
|
||||||
|
|
||||||
private String position;
|
private String position;
|
||||||
|
|
||||||
private String peopleAndMobile;
|
private String mobile;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
package com.engine.shkjsecond.service;
|
package com.engine.shkjsecond.service;
|
||||||
|
|
||||||
import com.engine.shkjsecond.entity.PersonnelResumePo;
|
import com.engine.shkjsecond.entity.PersonnelResumePo;
|
||||||
import com.engine.shkjsecond.entity.PersonnelResumeTable;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -33,11 +31,4 @@ public interface PersonnelResumeService {
|
||||||
* @return: com.engine.shkjsecond.entity.PersonnelResumePo
|
* @return: com.engine.shkjsecond.entity.PersonnelResumePo
|
||||||
*/
|
*/
|
||||||
PersonnelResumePo peopleMainInfo(String resourceId);
|
PersonnelResumePo peopleMainInfo(String resourceId);
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据人员id获取明细表信息
|
|
||||||
* @param resourceId
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
List<PersonnelResumeTable> peopleDetailInfo(String resourceId);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,12 @@
|
||||||
package com.engine.shkjsecond.service.impl;
|
package com.engine.shkjsecond.service.impl;
|
||||||
|
|
||||||
|
|
||||||
import com.engine.core.impl.Service;
|
import com.engine.core.impl.Service;
|
||||||
import com.engine.shkjsecond.entity.*;
|
import com.engine.shkjsecond.entity.PersonnelResumePo;
|
||||||
import com.engine.shkjsecond.service.PersonnelResumeService;
|
import com.engine.shkjsecond.service.PersonnelResumeService;
|
||||||
import lombok.SneakyThrows;
|
|
||||||
import weaver.conn.RecordSet;
|
import weaver.conn.RecordSet;
|
||||||
import weaver.general.Util;
|
import weaver.general.Util;
|
||||||
import weaver.hrm.company.DepartmentComInfo;
|
|
||||||
import weaver.hrm.company.SubCompanyComInfo;
|
|
||||||
import weaver.hrm.job.EducationLevelComInfo;
|
|
||||||
import weaver.hrm.job.JobTitlesComInfo;
|
|
||||||
import weaver.hrm.resource.ResourceComInfo;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -28,266 +20,20 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<String, Object> getResumeList(String resourceId) {
|
public Map<String, Object> getResumeList(String resourceId) {
|
||||||
Map<String, Object> resultMap = new HashMap<>(8);
|
return null;
|
||||||
PersonnelResumePo personnelResumePo = peopleMainInfo(resourceId);
|
|
||||||
resultMap.put("lastName",personnelResumePo.getLastName());
|
|
||||||
resultMap.put("sex",personnelResumePo.getSex());
|
|
||||||
resultMap.put("birthday",personnelResumePo.getBirthday());
|
|
||||||
resultMap.put("resourceImageId",personnelResumePo.getImage());
|
|
||||||
resultMap.put("certificatenum",personnelResumePo.getCertificatenum());
|
|
||||||
resultMap.put("residence",personnelResumePo.getResidence());
|
|
||||||
resultMap.put("politicsStatus",personnelResumePo.getPoliticsStatus());
|
|
||||||
resultMap.put("nation",personnelResumePo.getNation());
|
|
||||||
resultMap.put("nativePlace",personnelResumePo.getNativePlace());
|
|
||||||
|
|
||||||
resultMap.put("height",personnelResumePo.getHeight());
|
|
||||||
resultMap.put("weight",personnelResumePo.getWeight());
|
|
||||||
resultMap.put("maritalStatus",personnelResumePo.getMarriage());
|
|
||||||
resultMap.put("companyStartDate",personnelResumePo.getCompanyStartDate());
|
|
||||||
resultMap.put("jobTitle",personnelResumePo.getJobTitle());
|
|
||||||
resultMap.put("department",personnelResumePo.getDepartment());
|
|
||||||
resultMap.put("educationlevel",personnelResumePo.getEducationlevel());
|
|
||||||
resultMap.put("graduateSchool",personnelResumePo.getGraduateSchool());
|
|
||||||
resultMap.put("major",personnelResumePo.getMajor());
|
|
||||||
resultMap.put("jobcall",personnelResumePo.getJobcall());
|
|
||||||
resultMap.put("address",personnelResumePo.getAddress());
|
|
||||||
resultMap.put("mobile",personnelResumePo.getMobile());
|
|
||||||
resultMap.put("email",personnelResumePo.getEmail());
|
|
||||||
resultMap.put("emergencyContact",personnelResumePo.getEmergencyContact());
|
|
||||||
resultMap.put("relationship",personnelResumePo.getRelationship());
|
|
||||||
resultMap.put("eContactMobile",personnelResumePo.getEContactMobile());
|
|
||||||
|
|
||||||
//表格拓展
|
|
||||||
resultMap.put("tables", peopleDetailInfo(resourceId));
|
|
||||||
return resultMap;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<PersonnelResumeTable> peopleDetailInfo(String resourceId) {
|
|
||||||
List<PersonnelResumeTable> tables = new ArrayList<>();
|
|
||||||
|
|
||||||
List<PersonnelResumeTd> columns = new ArrayList<>();
|
|
||||||
List<List<PersonnelResumeTd>> datas = new ArrayList<>();
|
|
||||||
|
|
||||||
//1.教育经历
|
|
||||||
List<EducationInfo> educationInfos = selectEducInfo(resourceId);
|
|
||||||
//增加空行
|
|
||||||
educationInfos.add(EducationInfo.builder().build());
|
|
||||||
for (EducationInfo educationInfo : educationInfos) {
|
|
||||||
List<PersonnelResumeTd> educTr = new ArrayList<>();
|
|
||||||
educTr.add(PersonnelResumeTd.builder().colspans(1).value(educationInfo.getStartAndEndDate()).rowspans(1).build());
|
|
||||||
educTr.add(PersonnelResumeTd.builder().colspans(2).value(educationInfo.getSchool()).rowspans(1).build());
|
|
||||||
educTr.add(PersonnelResumeTd.builder().colspans(1).value(educationInfo.getEducationalAndDegree()).rowspans(1).build());
|
|
||||||
educTr.add(PersonnelResumeTd.builder().colspans(3).value(educationInfo.getMajor()).rowspans(1).build());
|
|
||||||
datas.add(educTr);
|
|
||||||
}
|
|
||||||
|
|
||||||
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(3).value("专业").rowspans(1).build());
|
|
||||||
|
|
||||||
tables.add(PersonnelResumeTable.builder().columns(columns).datas(datas).build());
|
|
||||||
|
|
||||||
//2.培训简历
|
|
||||||
columns = new ArrayList<>();
|
|
||||||
datas = new ArrayList<>();
|
|
||||||
List<TrainingInfo> trainingInfos = selectTainInfo(resourceId);
|
|
||||||
trainingInfos.add(TrainingInfo.builder().build());
|
|
||||||
for (TrainingInfo trainingInfo : trainingInfos ) {
|
|
||||||
List<PersonnelResumeTd> trainTr = new ArrayList<>();
|
|
||||||
trainTr.add(PersonnelResumeTd.builder().colspans(1).value(trainingInfo.getStartAndEndDate()).rowspans(1).build());
|
|
||||||
trainTr.add(PersonnelResumeTd.builder().colspans(2).value(trainingInfo.getTrainingContent()).rowspans(1).build());
|
|
||||||
trainTr.add(PersonnelResumeTd.builder().colspans(2).value(trainingInfo.getTrainingCompany()).rowspans(1).build());
|
|
||||||
trainTr.add(PersonnelResumeTd.builder().colspans(2).value(trainingInfo.getCertifications()).rowspans(1).build());
|
|
||||||
datas.add(trainTr);
|
|
||||||
}
|
|
||||||
|
|
||||||
columns.add(PersonnelResumeTd.builder().colspans(1).value("培训经历").rowspans(trainingInfos.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(2).value("培训单位").rowspans(1).build());
|
|
||||||
columns.add(PersonnelResumeTd.builder().colspans(2).value("所获证书").rowspans(1).build());
|
|
||||||
|
|
||||||
tables.add(PersonnelResumeTable.builder().columns(columns).datas(datas).build());
|
|
||||||
|
|
||||||
//3.工作经历(在盛虹工作经历)
|
|
||||||
columns = new ArrayList<>();
|
|
||||||
datas = new ArrayList<>();
|
|
||||||
List<WorkInfo> workInfos = selectWorkInfo(resourceId);
|
|
||||||
workInfos.add(WorkInfo.builder().build());
|
|
||||||
|
|
||||||
for (WorkInfo workInfo : workInfos){
|
|
||||||
List<PersonnelResumeTd> workTr = new ArrayList<>();
|
|
||||||
workTr.add(PersonnelResumeTd.builder().colspans(1).value(workInfo.getStartDate()).rowspans(1).build());
|
|
||||||
workTr.add(PersonnelResumeTd.builder().colspans(1).value(workInfo.getEndDate()).rowspans(1).build());
|
|
||||||
workTr.add(PersonnelResumeTd.builder().colspans(3).value(workInfo.getSubCompany()).rowspans(1).build());
|
|
||||||
workTr.add(PersonnelResumeTd.builder().colspans(1).value(workInfo.getDepartment()).rowspans(1).build());
|
|
||||||
workTr.add(PersonnelResumeTd.builder().colspans(1).value(workInfo.getPosition()).rowspans(1).build());
|
|
||||||
datas.add(workTr);
|
|
||||||
}
|
|
||||||
|
|
||||||
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());
|
|
||||||
columns.add(PersonnelResumeTd.builder().colspans(1).value("部门").rowspans(1).build());
|
|
||||||
columns.add(PersonnelResumeTd.builder().colspans(1).value("岗位").rowspans(1).build());
|
|
||||||
|
|
||||||
tables.add(PersonnelResumeTable.builder().columns(columns).datas(datas).build());
|
|
||||||
|
|
||||||
//4.家庭状况
|
|
||||||
columns = new ArrayList<>();
|
|
||||||
datas = new ArrayList<>();
|
|
||||||
List<FamilyInfo> familyInfos = selectFamilyInfo(resourceId);
|
|
||||||
familyInfos.add(FamilyInfo.builder().build());
|
|
||||||
for (FamilyInfo familyInfo : familyInfos) {
|
|
||||||
List<PersonnelResumeTd> familyTr = new ArrayList<>();
|
|
||||||
familyTr.add(PersonnelResumeTd.builder().colspans(1).value(familyInfo.getLastName()).rowspans(1).build());
|
|
||||||
familyTr.add(PersonnelResumeTd.builder().colspans(1).value(familyInfo.getRelationship()).rowspans(1).build());
|
|
||||||
familyTr.add(PersonnelResumeTd.builder().colspans(1).value(familyInfo.getAge()).rowspans(1).build());
|
|
||||||
familyTr.add(PersonnelResumeTd.builder().colspans(3).value(familyInfo.getWorkUnitAndPostion()).rowspans(1).build());
|
|
||||||
familyTr.add(PersonnelResumeTd.builder().colspans(1).value(familyInfo.getMobile()).rowspans(1).build());
|
|
||||||
datas.add(familyTr);
|
|
||||||
}
|
|
||||||
columns.add(PersonnelResumeTd.builder().colspans(1).value("家庭情况").rowspans(familyInfos.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(1).value("年龄").rowspans(1).build());
|
|
||||||
columns.add(PersonnelResumeTd.builder().colspans(3).value("工作单位/职位").rowspans(1).build());
|
|
||||||
columns.add(PersonnelResumeTd.builder().colspans(1).value("联系电话").rowspans(1).build());
|
|
||||||
tables.add(PersonnelResumeTable.builder().columns(columns).datas(datas).build());
|
|
||||||
|
|
||||||
return tables;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<FamilyInfo> selectFamilyInfo(String resourceId) {
|
|
||||||
RecordSet rs = new RecordSet();
|
|
||||||
List<FamilyInfo> familyInfoList = new ArrayList<>();
|
|
||||||
rs.executeQuery("select jtcyxm,gx,nl,gzdw,zw,lxdh from uf_jtqk where xm1 = ?",resourceId);
|
|
||||||
while (rs.next()) {
|
|
||||||
familyInfoList.add(FamilyInfo.builder()
|
|
||||||
.lastName(Util.null2String(rs.getString("jtcyxm")))
|
|
||||||
.relationship(selectWorkflowItem("gx","uf_jtqk",Util.getIntValue(rs.getString("gx")),String.valueOf(user.getLanguage())))
|
|
||||||
.age(Util.null2String(rs.getString("nl")))
|
|
||||||
.workUnitAndPostion(Util.null2String(rs.getString("gzdw")) +" / "+Util.null2String(rs.getString("zw")))
|
|
||||||
.mobile(Util.null2String(rs.getString("lxdh")))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
return familyInfoList;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SneakyThrows
|
|
||||||
private List<WorkInfo> selectWorkInfo(String resourceId) {
|
|
||||||
RecordSet rs = new RecordSet();
|
|
||||||
List<WorkInfo> workInfoList = new ArrayList<>();
|
|
||||||
rs.executeQuery("select ksrq,jsrq,gsmc,bm,zw from uf_gzjlsh where xm = ?",resourceId);
|
|
||||||
DepartmentComInfo deptComInfo = new DepartmentComInfo();
|
|
||||||
SubCompanyComInfo subComInfo = new SubCompanyComInfo();
|
|
||||||
ResourceComInfo rInfo = new ResourceComInfo();
|
|
||||||
JobTitlesComInfo jobTitlesComInfo = new JobTitlesComInfo();
|
|
||||||
while (rs.next()) {
|
|
||||||
//String date = Util.null2String(rs.getString("ksrq")) +" 至 " + Util.null2String(rs.getString("jsrq"));
|
|
||||||
String departmentName = deptComInfo.getDepartmentName(Util.null2String(rs.getString("bm")));
|
|
||||||
String subCompanyname = subComInfo.getSubCompanyname(Util.null2String(rs.getString("gsmc")));
|
|
||||||
String startDate = Util.null2String(rs.getString("ksrq"));
|
|
||||||
String endDate = Util.null2String(rs.getString("jsrq"));
|
|
||||||
workInfoList.add(WorkInfo.builder()
|
|
||||||
.startDate("".equals(startDate) ? startDate : startDate.substring(0,7))
|
|
||||||
.endDate("".equals(endDate) ? endDate : endDate.substring(0,7))
|
|
||||||
.subCompany(subCompanyname)
|
|
||||||
.department(departmentName)
|
|
||||||
.position(jobTitlesComInfo.getJobTitlesname(Util.null2String(rs.getString("zw"))))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
|
|
||||||
workInfoList.sort((w1, w2) -> {
|
|
||||||
String s1 = w1.getStartDate();
|
|
||||||
String s2 = w2.getStartDate();
|
|
||||||
if (s1.isEmpty() && s2.isEmpty()) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (s1.isEmpty()) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (s2.isEmpty()) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
return s1.compareTo(s2);
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
return workInfoList;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<TrainingInfo> selectTainInfo(String resourceId) {
|
|
||||||
RecordSet rs = new RecordSet();
|
|
||||||
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"));
|
|
||||||
trainingInfoList.add(TrainingInfo.builder()
|
|
||||||
.startAndEndDate(date)
|
|
||||||
.trainingContent(Util.null2String(rs.getString("pxnr")))
|
|
||||||
.trainingCompany(Util.null2String(rs.getString("pxdw")))
|
|
||||||
.certifications(Util.null2String(rs.getString("shzs")))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
return trainingInfoList;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SneakyThrows
|
|
||||||
private List<EducationInfo> selectEducInfo(String resourceId) {
|
|
||||||
RecordSet rs = new RecordSet();
|
|
||||||
EducationLevelComInfo eduComInfo = new EducationLevelComInfo();
|
|
||||||
ResourceComInfo resourceComInfo = new ResourceComInfo();
|
|
||||||
//String workcode = resourceComInfo.getWorkcode(resourceId);
|
|
||||||
|
|
||||||
List<EducationInfo> educationInfoList = new ArrayList<>();
|
|
||||||
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"))) +" / "
|
|
||||||
// + 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")))
|
|
||||||
.educationalAndDegree(educationalAndDegree)
|
|
||||||
.major(Util.null2String(rs.getString("zy")))
|
|
||||||
.build());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return educationInfoList;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PersonnelResumePo peopleMainInfo(String resourceId) {
|
public PersonnelResumePo peopleMainInfo(String resourceId) {
|
||||||
RecordSet rs = new RecordSet();
|
RecordSet rs = new RecordSet();
|
||||||
|
rs.executeQuery("SELECT h.id, lastname, sex, birthday, resourceimageid, certificatenum, e.field43 as residence, " +
|
||||||
String residence = rs.getPropValue("shkjsecond", "residence");
|
" e.field44 as politicsStatus, e.field48 as nation, nativeplace, height, weight, maritalstatus, companystartdate, " +
|
||||||
String politicsStatus = rs.getPropValue("shkjsecond", "politicsStatus");
|
" b.jobtitlename AS jobTitle, a.departmentname as department, c.name as educationlevel, e.field38 as graduateSchool, " +
|
||||||
String nation = rs.getPropValue("shkjsecond", "nation");
|
" e.field39 as major, d.name as jobcall, e.field40 as address, mobile, email, e.field41 as emergencyContact, " +
|
||||||
String graduateSchool = rs.getPropValue("shkjsecond", "graduateSchool");
|
" e.field45 as relationship, e.field46 as eContactMobile FROM hrmresource h " +
|
||||||
String major = rs.getPropValue("shkjsecond", "major");
|
|
||||||
String address = rs.getPropValue("shkjsecond", "address");
|
|
||||||
String jobcall = rs.getPropValue("shkjsecond", "jobcall");
|
|
||||||
String emergencyContact = rs.getPropValue("shkjsecond", "emergencyContact");
|
|
||||||
String relationship = rs.getPropValue("shkjsecond", "relationship");
|
|
||||||
String eContactMobile = rs.getPropValue("shkjsecond", "eContactMobile");
|
|
||||||
|
|
||||||
|
|
||||||
rs.executeQuery("SELECT h.id, lastname, sex, birthday, resourceimageid, certificatenum, e."+residence+" as residence, " +
|
|
||||||
" e."+politicsStatus+" as politicsStatus, e."+nation+" as nation, nativeplace, height, weight, maritalstatus, companystartdate, " +
|
|
||||||
" b.jobtitlename AS jobTitle, a.departmentname as department, c.name as educationlevel, e."+graduateSchool+" as graduateSchool, " +
|
|
||||||
" e."+major+" as major, e."+jobcall+" as jobcall, e."+address+" as address, mobile, email, d."+emergencyContact+" as emergencyContact, " +
|
|
||||||
" d."+relationship+" as relationship, d."+eContactMobile+" as eContactMobile FROM hrmresource h " +
|
|
||||||
" LEFT JOIN hrmdepartment a ON a.id = h.departmentid LEFT JOIN hrmjobtitles b ON b.id = h.jobtitle " +
|
" LEFT JOIN hrmdepartment a ON a.id = h.departmentid LEFT JOIN hrmjobtitles b ON b.id = h.jobtitle " +
|
||||||
" LEFT JOIN hrmeducationlevel c on c.id = h.educationlevel " +
|
" LEFT JOIN hrmeducationlevel c on c.id = h.educationlevel LEFT JOIN hrmjobcall d on d.id = h.jobcall " +
|
||||||
" LEFT JOIN cus_fielddata d on d.id = h.id and d.scopeid = -1 and d.scope = 'HrmCustomFieldByInfoType' " +
|
" LEFT JOIN cus_fielddata e on e.id = h.id and scopeid = 1 and scope = 'HrmCustomFieldByInfoType' where h.id = ?",resourceId);
|
||||||
" LEFT JOIN cus_fielddata e on e.id = h.id and e.scopeid = 1 and e.scope = 'HrmCustomFieldByInfoType' where h.id = ?",resourceId);
|
|
||||||
PersonnelResumePo personnelResumePo = PersonnelResumePo.builder().build();
|
PersonnelResumePo personnelResumePo = PersonnelResumePo.builder().build();
|
||||||
if (rs.next()) {
|
if (rs.next()) {
|
||||||
personnelResumePo.setLastName(Util.null2String(rs.getString("lastname")));
|
personnelResumePo.setLastName(Util.null2String(rs.getString("lastname")));
|
||||||
|
|
@ -295,62 +41,30 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
|
||||||
personnelResumePo.setBirthday(Util.null2String(rs.getString("birthday")));
|
personnelResumePo.setBirthday(Util.null2String(rs.getString("birthday")));
|
||||||
personnelResumePo.setResourceImageId(Util.null2String(rs.getString("resourceimageid")));
|
personnelResumePo.setResourceImageId(Util.null2String(rs.getString("resourceimageid")));
|
||||||
personnelResumePo.setCertificatenum(Util.null2String(rs.getString("certificatenum")));
|
personnelResumePo.setCertificatenum(Util.null2String(rs.getString("certificatenum")));
|
||||||
personnelResumePo.setResidence(selectItemValue(residence,Util.getIntValue(rs.getString("residence")),String.valueOf(user.getLanguage())));
|
personnelResumePo.setResidence(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setPoliticsStatus(selectItemValue(politicsStatus,Util.getIntValue(rs.getString("politicsStatus")),String.valueOf(user.getLanguage())));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setNation(selectNationName(Util.null2String(rs.getString("nation"))));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setNativePlace(Util.null2String(rs.getString("nativeplace")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setHeight(Util.null2String(rs.getString("height")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setWeight(Util.null2String(rs.getString("weight")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setMaritalStatus(Util.null2String(rs.getString("maritalstatus")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setCompanyStartDate(Util.null2String(rs.getString("companystartdate")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setJobTitle(Util.null2String(rs.getString("jobTitle")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setDepartment(Util.null2String(rs.getString("department")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setEducationlevel(Util.formatMultiLang(rs.getString("educationlevel"),String.valueOf(user.getLanguage())));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setGraduateSchool(Util.null2String(rs.getString("graduateSchool")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setMajor(Util.null2String(rs.getString("major")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setJobcall(Util.null2String(rs.getString("jobcall")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setAddress(Util.null2String(rs.getString("address")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setMobile(Util.null2String(rs.getString("mobile")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setEmail(Util.null2String(rs.getString("email")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setEmergencyContact(Util.null2String(rs.getString("emergencyContact")));
|
personnelResumePo.setSex(Util.null2String(rs.getString("sex")));
|
||||||
personnelResumePo.setRelationship(Util.null2String(rs.getString("relationship")));
|
|
||||||
personnelResumePo.setEContactMobile(Util.null2String(rs.getString("eContactMobile")));
|
|
||||||
|
|
||||||
|
|
||||||
|
//personnelResumePo.setLastName(Util.formatMultiLang());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return personnelResumePo;
|
return personnelResumePo;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String selectItemValue(String field, Integer selectValue,String language) {
|
|
||||||
field = field.substring("field".length());
|
|
||||||
RecordSet rs = new RecordSet();
|
|
||||||
|
|
||||||
rs.executeQuery("select selectname from cus_selectitem where fieldid = ? and selectvalue = ?",field,selectValue);
|
|
||||||
rs.next();
|
|
||||||
return Util.formatMultiLang(Util.null2String(rs.getString("selectname")),language);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private String selectWorkflowItem(String fieldName, String tableName,Integer selectValue,String language) {
|
|
||||||
RecordSet rs = new RecordSet();
|
|
||||||
Integer fieldId = null;
|
|
||||||
rs.executeQuery("select id from workflow_billfield where billid = (select id from workflow_bill where tablename = '"+tableName+"') \n" +
|
|
||||||
" and fieldname = '"+fieldName+"'");
|
|
||||||
if (rs.next()) {
|
|
||||||
fieldId = Util.getIntValue(rs.getString("id"));
|
|
||||||
}
|
|
||||||
rs.executeQuery("select selectname from workflow_selectitem where fieldid = ? and selectvalue = ?",fieldId,selectValue);
|
|
||||||
rs.next();
|
|
||||||
return Util.formatMultiLang(Util.null2String(rs.getString("selectname")),language);
|
|
||||||
}
|
|
||||||
|
|
||||||
private String selectNationName(String value) {
|
|
||||||
RecordSet rs = new RecordSet();
|
|
||||||
rs.executeQuery("select mz from uf_mzb where id = ?",value);
|
|
||||||
rs.next();
|
|
||||||
return Util.null2String(rs.getString("mz"));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package com.engine.shkjsecond.web;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.alibaba.fastjson.serializer.SerializerFeature;
|
import com.alibaba.fastjson.serializer.SerializerFeature;
|
||||||
|
import com.azure.core.annotation.QueryParam;
|
||||||
import com.engine.common.util.ServiceUtil;
|
import com.engine.common.util.ServiceUtil;
|
||||||
import com.engine.shkjsecond.service.PersonnelResumeService;
|
import com.engine.shkjsecond.service.PersonnelResumeService;
|
||||||
import com.engine.shkjsecond.service.impl.PersonnelResumeServiceImpl;
|
import com.engine.shkjsecond.service.impl.PersonnelResumeServiceImpl;
|
||||||
|
|
@ -13,7 +14,6 @@ import javax.servlet.http.HttpServletResponse;
|
||||||
import javax.ws.rs.GET;
|
import javax.ws.rs.GET;
|
||||||
import javax.ws.rs.Path;
|
import javax.ws.rs.Path;
|
||||||
import javax.ws.rs.Produces;
|
import javax.ws.rs.Produces;
|
||||||
import javax.ws.rs.QueryParam;
|
|
||||||
import javax.ws.rs.core.Context;
|
import javax.ws.rs.core.Context;
|
||||||
import javax.ws.rs.core.MediaType;
|
import javax.ws.rs.core.MediaType;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
package test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author weaver_cl
|
||||||
|
* @Description:
|
||||||
|
* @Date 2022/10/9
|
||||||
|
* @Version V1.0
|
||||||
|
**/
|
||||||
|
public class MainTest {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue