liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

版本查询接口二版

This commit is contained in:
Mlin 2022-12-15 19:51:04 +08:00
parent 95d53a6d8c
commit 184a9e375f
3 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/mapper/version/CompanyVersionMapper.java
View File

@ -81,6 +81,6 @@ public interface CompanyVersionMapper {
/**
* 获取人员版本记录
*/
List<HrmResourceVersion> getResourceVersionList(@Param("departmentid") String departmentid,@Param("version") String version);
List<HrmResourceVersion> getResourceVersionList(@Param("resourceid") String resourceid,@Param("version") String version);
}

2
src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
View File

@ -299,7 +299,7 @@
jobtitle,jobactivitydesc,joblevel,seclevel,departmentid,subcompanyid1,costcenterid,managerid,assistantid,
bankid1,accountid1,resourceimageid,certificatenum,nativeplace,educationlevel,bememberdate,bepartydate,
workcode,regresidentplace,healthinfo,residentplace,policy,degree,height,classification,description,
operator,version,operate_time as operateTime as operateTime from HRMRESOURCE_VERSION
operator,version,operate_time as operateTime from HRMRESOURCE_VERSION
<where>
<if test="resourceid !=null">
and resourceid = #{resourceid}

93
src/com/engine/organization/service/impl/VersionManageServiceImpl.java
View File

@ -24,6 +24,7 @@ import weaver.hrm.User;
import java.sql.Date;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@ -74,50 +75,57 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
String operateName = user.getUsername();
String id = (String) params.get("id");
String version = (String) params.get("version");
String operateTime = null;
Map<String,Object> resultMap = new HashMap<>();
String operateTime = "";
Map<String, Object> resultMap = new HashMap<>();
List versions = new ArrayList<>();
List<VersionData> datas = new ArrayList<>();
switch (moduleTypeEnum.getValue()){
switch (moduleTypeEnum.getValue()) {
case 1:
List<HrmSubCompanyVersion> list = getCompanyVersionMapper().getSubComVersionList(id,null);
List<HrmSubCompanyVersion> list = getCompanyVersionMapper().getSubComVersionList(id, null);
int size = list.size();
for (HrmSubCompanyVersion hrmSubCompanyVersion:list){
Map<String,String> map = new HashMap<>();
map.put("value", String.format("%.1f", hrmSubCompanyVersion.getVersion()));
if (size < 1) {
break;
}
for (HrmSubCompanyVersion hrmSubCompanyVersion : list) {
Map<String, String> map = new HashMap<>();
map.put("value", String.format("%.1f", hrmSubCompanyVersion.getVersion()));
versions.add(map);
}
if (StringUtils.isBlank(version)){
size = size>1 ? size-1:size;
version = String.format("%.1f",list.get(size-1).getVersion());
if (StringUtils.isBlank(version)) {
size = size > 1 ? size - 1 : size;
version = String.format("%.1f", list.get(size - 1).getVersion());
}
list = getCompanyVersionMapper().getSubComVersionList(id,version);
for (HrmSubCompanyVersion hrmSubCompanyVersion:list){
list = getCompanyVersionMapper().getSubComVersionList(id, version);
for (HrmSubCompanyVersion hrmSubCompanyVersion : list) {
datas.add(VersionData.builder().fieldId("分部简称").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyName())).build());
datas.add(VersionData.builder().fieldId("分部描述").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyDesc())).build());
datas.add(VersionData.builder().fieldId("上级分部id").fieldValue(Util.null2String(hrmSubCompanyVersion.getSupSubComId())).build());
datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f",hrmSubCompanyVersion.getVersion()))).build());
datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmSubCompanyVersion.getVersion()))).build());
datas.add(VersionData.builder().fieldId("分部编码").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyCode())).build());
datas.add(VersionData.builder().fieldId("排序").fieldValue(Util.null2String(hrmSubCompanyVersion.getShowOrder())).build());
operateName = hrmSubCompanyVersion.getOperator();
operateTime = OrganizationDateUtil.getFormatLocalDate(hrmSubCompanyVersion.getOperateTime());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
operateTime = sdf.format(hrmSubCompanyVersion.getOperateTime());
}
break;
case 2:
List<HrmDepartmentVersion> deptVersionList = getCompanyVersionMapper().getDeptVersionList(id,null);
List<HrmDepartmentVersion> deptVersionList = getCompanyVersionMapper().getDeptVersionList(id, null);
int deptSize = deptVersionList.size();
for (HrmDepartmentVersion hrmDepartmentVersion:deptVersionList){
Map<String,String> map = new HashMap<>();
map.put("value", String.format("%.1f", hrmDepartmentVersion.getVersion()));
if (deptSize < 1) {
break;
}
for (HrmDepartmentVersion hrmDepartmentVersion : deptVersionList) {
Map<String, String> map = new HashMap<>();
map.put("value", String.format("%.1f", hrmDepartmentVersion.getVersion()));
versions.add(map);
}
if (StringUtils.isBlank(version)){
deptSize = deptSize>1 ? deptSize-1:deptSize;
version = String.format("%.1f",deptVersionList.get(deptSize).getVersion());
if (StringUtils.isBlank(version)) {
deptSize = deptSize > 1 ? deptSize - 1 : deptSize;
version = String.format("%.1f", deptVersionList.get(deptSize).getVersion());
}
deptVersionList = getCompanyVersionMapper().getDeptVersionList(id,version);
for (HrmDepartmentVersion hrmDepartmentVersion:deptVersionList){
deptVersionList = getCompanyVersionMapper().getDeptVersionList(id, version);
for (HrmDepartmentVersion hrmDepartmentVersion : deptVersionList) {
datas.add(VersionData.builder().fieldId("部门编号").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentCode())).build());
datas.add(VersionData.builder().fieldId("部门简称").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentName())).build());
datas.add(VersionData.builder().fieldId("部门标识").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentMark())).build());
@ -125,38 +133,47 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
datas.add(VersionData.builder().fieldId("上级部门").fieldValue(Util.null2String(hrmDepartmentVersion.getSupDepId())).build());
datas.add(VersionData.builder().fieldId("上级部门").fieldValue(Util.null2String(hrmDepartmentVersion.getSupDepId())).build());
datas.add(VersionData.builder().fieldId("部门负责人").fieldValue(Util.null2String(hrmDepartmentVersion.getBmfzr())).build());
datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f",hrmDepartmentVersion.getVersion()))).build());
datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmDepartmentVersion.getVersion()))).build());
datas.add(VersionData.builder().fieldId("排序").fieldValue(Util.null2String(hrmDepartmentVersion.getShowOrder())).build());
operateName = hrmDepartmentVersion.getOperator();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
operateTime = sdf.format(hrmDepartmentVersion.getOperateTime());
}
break;
case 4:
List<HrmResourceVersion> resVersionList = getCompanyVersionMapper().getResourceVersionList(id,null);
List<HrmResourceVersion> resVersionList = getCompanyVersionMapper().getResourceVersionList(id, null);
int resSize = resVersionList.size();
for (HrmResourceVersion hrmResourceVersion:resVersionList){
Map<String,String> map = new HashMap<>();
map.put("value", String.format("%.1f", hrmResourceVersion.getVersion()));
if (resSize < 1) {
break;
}
for (HrmResourceVersion hrmResourceVersion : resVersionList) {
Map<String, String> map = new HashMap<>();
map.put("value", String.format("%.1f", hrmResourceVersion.getVersion()));
versions.add(map);
}
if (StringUtils.isBlank(version)){
deptSize = resSize>1 ? resSize-1:resSize;
version = String.format("%.1f",resVersionList.get(deptSize).getVersion());
if (StringUtils.isBlank(version)) {
deptSize = resSize > 1 ? resSize - 1 : resSize;
version = String.format("%.1f", resVersionList.get(deptSize).getVersion());
}
resVersionList = getCompanyVersionMapper().getResourceVersionList(id,version);
for (HrmResourceVersion hrmResourceVersion:resVersionList){
resVersionList = getCompanyVersionMapper().getResourceVersionList(id, version);
for (HrmResourceVersion hrmResourceVersion : resVersionList) {
datas.add(VersionData.builder().fieldId("姓名").fieldValue(Util.null2String(hrmResourceVersion.getLastname())).build());
datas.add(VersionData.builder().fieldId("部门").fieldValue(Util.null2String(hrmResourceVersion.getDepartmentid())).build());
datas.add(VersionData.builder().fieldId("岗位").fieldValue(Util.null2String(hrmResourceVersion.getJobtitle())).build());
datas.add(VersionData.builder().fieldId("分部").fieldValue(Util.null2String(hrmResourceVersion.getSubcompanyid1())).build());
datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f",hrmResourceVersion.getVersion()))).build());
datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmResourceVersion.getVersion()))).build());
operateName = hrmResourceVersion.getOperator();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
operateTime = sdf.format(hrmResourceVersion.getOperateTime());
}
break;
default:
break;
}
resultMap.put("operateName",operateName);
resultMap.put("operateTime",operateTime);
resultMap.put("versions",versions);
resultMap.put("datas",datas);
resultMap.put("operateName", operateName);
resultMap.put("operateTime", operateTime);
resultMap.put("versions", versions);
resultMap.put("datas", datas);
return resultMap;
}