Skip to content

o2oa
o2oa

ghsby / o2oa
落后 Fork 源项目 2880 个版本

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 1
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 e860b124 编写于 作者: O o2null
浏览文件
操作

Merge branch 'fix/oranization_0713' into 'develop_java8' 

优化人员组织导入导出(保证distinguishedName值相同)

See merge request o2oa/o2oa!4510
上级 dddf50e0 e303fe1e
隐藏空白更改
内联 并排
Showing with 64 addition and 34 deletion
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/export/ActionExportAll.java
浏览文件 @ e860b124
......@@ -251,7 +251,6 @@ public class ActionExportAll extends BaseAction {
}else{
row.createCell(2).setCellValue("");
}
String superior = unit.getSuperior();
if(StringUtils.isEmpty(superior)){
row.createCell(3).setCellValue("");
......@@ -348,7 +347,8 @@ public class ActionExportAll extends BaseAction {
row = sheet.createRow(0);
row.createCell(0).setCellValue("人员唯一编码 *");
row.createCell(1).setCellValue("组织唯一编码 *");
row.createCell(2).setCellValue("主兼职");
row.createCell(2).setCellValue("身份编码");
row.createCell(3).setCellValue("主兼职");
for (int i = 0; i < identityList.size(); i++) {
identity = identityList.get(i);
......@@ -362,17 +362,8 @@ public class ActionExportAll extends BaseAction {
String unitId = "";
unitId = unit.getId();
row.createCell(1).setCellValue(unit.getUnique());
/*List<UnitDuty> unitDutyList = this.listDutyWithIdentity(business,identity.getId());
if(ListTools.isNotEmpty(unitDutyList)){
for(UnitDuty duty :unitDutyList){
//if(unitId.equals(duty.getUnit())){
idutyList.add(duty.getUnique());
//}
}
}
row.createCell(2).setCellValue(StringUtils.join(idutyList.toArray(), "#"));*/
row.createCell(2).setCellValue(String.valueOf(identity.getMajor()));
row.createCell(2).setCellValue(identity.getUnique());
row.createCell(3).setCellValue(String.valueOf(identity.getMajor()));
}
}
......@@ -391,9 +382,10 @@ public class ActionExportAll extends BaseAction {
row = sheet.createRow(0);
row.createCell(0).setCellValue("职务名称 *");
row.createCell(1).setCellValue("职务所在组织唯一编码 *");
row.createCell(2).setCellValue("职务描述");
row.createCell(3).setCellValue("职务所含人员唯一编码");
row.createCell(4).setCellValue("职务所含人员所在组织唯一编码");
row.createCell(2).setCellValue("职务编码");
row.createCell(3).setCellValue("职务描述");
row.createCell(4).setCellValue("职务所含人员唯一编码");
row.createCell(5).setCellValue("职务所含人员所在组织唯一编码");
int currentRow = 0;
for (int i = 0; i < dutyList.size(); i++) {
duty = dutyList.get(i);
......@@ -412,18 +404,19 @@ public class ActionExportAll extends BaseAction {
} else {
row.createCell(1).setCellValue("");
}
row.createCell(2).setCellValue(duty.getDescription());
row.createCell(2).setCellValue(duty.getUnique());
row.createCell(3).setCellValue(duty.getDescription());
Person iperson = emc.flag(identity.getPerson(), Person.class);
Unit iunit = emc.flag(identity.getUnit(), Unit.class);
if (iperson != null) {
row.createCell(3).setCellValue(iperson.getUnique());
row.createCell(4).setCellValue(iperson.getUnique());
} else {
row.createCell(3).setCellValue("");
row.createCell(4).setCellValue("");
}
if (iunit != null) {
row.createCell(4).setCellValue(iunit.getUnique());
row.createCell(5).setCellValue(iunit.getUnique());
} else {
row.createCell(4).setCellValue("");
row.createCell(5).setCellValue("");
}
}
}
......@@ -436,9 +429,10 @@ public class ActionExportAll extends BaseAction {
} else {
row.createCell(1).setCellValue("");
}
row.createCell(2).setCellValue(duty.getDescription());
row.createCell(3).setCellValue("");
row.createCell(2).setCellValue(duty.getUnique());
row.createCell(3).setCellValue(duty.getDescription());
row.createCell(4).setCellValue("");
row.createCell(5).setCellValue("");
}
}
}
......@@ -456,10 +450,10 @@ public class ActionExportAll extends BaseAction {
// 先创建表头
row = sheet.createRow(0);
row.createCell(0).setCellValue("群组名称 *");
row.createCell(1).setCellValue("群组编号 *");
row.createCell(1).setCellValue("群组编码 *");
row.createCell(2).setCellValue("人员唯一编码");
row.createCell(3).setCellValue("组织唯一编码");
row.createCell(4).setCellValue("子群组编号");
row.createCell(4).setCellValue("子群组编码");
row.createCell(5).setCellValue("描述");
for (int i = 0; i < groupList.size(); i++) {
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionInputAll.java
浏览文件 @ e860b124
......@@ -364,12 +364,18 @@ class ActionInputAll extends BaseAction {
if(majorStr.equals("true")){
major = BooleanUtils.toBooleanObject(majorStr);
}
//if (StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(mobile)) {
IdentityItem identityItem = new IdentityItem();
identityItem.setRow(i);
identityItem.setPersonCode(unique);
identityItem.setUnitCode(unitCode);
identityItem.setMajor(major);
if (null != configurator.getIdentityUniqueColumnColumn()) {
String identityUnique = configurator.getCellStringValue(row.getCell(configurator.getIdentityUniqueColumnColumn()));
identityUnique = StringUtils.trimToEmpty(identityUnique);
identityItem.setUnique(identityUnique);
}
EntityManagerContainer emc = business.entityManagerContainer();
Person personobj = null;
......@@ -486,9 +492,15 @@ class ActionInputAll extends BaseAction {
DutyItem dutyItem = new DutyItem();
dutyItem.setRow(i);
dutyItem.setName(dutyNmae);
dutyItem.setUnique(UUID.randomUUID().toString()+unitCode);
//dutyItem.setUnique(UUID.randomUUID().toString()+unitCode);
dutyItem.setDescription(description);
if (null != configurator.getDutyUniqueColumn()) {
String dutyUnique = configurator.getCellStringValue(row.getCell(configurator.getDutyUniqueColumn()));
dutyUnique = StringUtils.trimToEmpty(dutyUnique);
dutyItem.setUnique(dutyUnique);
}
if(StringUtils.isNotEmpty(unitCode)){
Unit iUnit = emc.flag(unitCode, Unit.class);
if(iUnit !=null) {
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionTemplate.java
浏览文件 @ e860b124
......@@ -122,6 +122,8 @@ public class ActionTemplate extends BaseAction {
cell = row.createCell(1);
cell.setCellValue("组织唯一编码 *");
cell = row.createCell(2);
cell.setCellValue("身份编码");
cell = row.createCell(3);
cell.setCellValue("主兼职");
CellStyle cellStyle = workbook.createCellStyle();
cellStyle.setWrapText(true);
......@@ -138,10 +140,12 @@ public class ActionTemplate extends BaseAction {
cell = row.createCell(1);
cell.setCellValue("职务所在组织唯一编码 *");
cell = row.createCell(2);
cell.setCellValue("职务描述");
cell.setCellValue("职务编码");
cell = row.createCell(3);
cell.setCellValue("职务所含人员唯一编码");
cell.setCellValue("职务描述");
cell = row.createCell(4);
cell.setCellValue("职务所含人员唯一编码");
cell = row.createCell(5);
cell.setCellValue("职务所含人员所在组织唯一编码");
CellStyle cellStyle = workbook.createCellStyle();
cellStyle.setWrapText(true);
......@@ -156,13 +160,13 @@ public class ActionTemplate extends BaseAction {
Cell cell = row.createCell(0);
cell.setCellValue("群组名称 *");
cell = row.createCell(1);
cell.setCellValue("群组编号 *");
cell.setCellValue("群组编码 *");
cell = row.createCell(2);
cell.setCellValue("人员唯一编码");
cell = row.createCell(3);
cell.setCellValue("组织唯一编码");
cell = row.createCell(4);
cell.setCellValue("子群组编号");
cell.setCellValue("子群组编码");
cell = row.createCell(5);
cell.setCellValue("描述");
CellStyle cellStyle = workbook.createCellStyle();
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/DutySheetConfigurator.java
浏览文件 @ e860b124
......@@ -30,6 +30,7 @@ public class DutySheetConfigurator extends GsonPropertyObject {
private Integer descriptionColumn;
private Integer unitColumn;
private Integer ipersonColumn;
private Integer dutyUniqueColumn;
private Map<String, Integer> attributes = new HashMap<>();
......@@ -55,6 +56,8 @@ public class DutySheetConfigurator extends GsonPropertyObject {
this.unitColumn = i;
}else if(ipersonItems.contains(str)){
this.ipersonColumn = i;
}else if (dutyUniqueItems.contains(str)) {
this.dutyUniqueColumn = i;
}else {
Matcher matcher = attributePattern.matcher(str);
if (matcher.matches()) {
......@@ -72,6 +75,7 @@ public class DutySheetConfigurator extends GsonPropertyObject {
private static List<String> descriptionItems = Arrays.asList(new String[] { "描述","职务描述", "description" });
private static List<String> ipersonItems = Arrays.asList(new String[] { "职务所含人员唯一编码", "iperson" });
private static List<String> iunitItems = Arrays.asList(new String[] { "职务所含人员所在组织唯一编码", "iunit" });
private static List<String> dutyUniqueItems = Arrays.asList(new String[] { "职务编码", "dutyUnique"});
public String getCellStringValue(Cell cell) {
if (null != cell) {
......@@ -127,6 +131,10 @@ public class DutySheetConfigurator extends GsonPropertyObject {
return descriptionColumn;
}
public Integer getDutyUniqueColumn() {
return dutyUniqueColumn;
}
public Integer getFirstRow() {
return firstRow;
}
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/GroupSheetConfigurator.java
浏览文件 @ e860b124
......@@ -70,11 +70,11 @@ public class GroupSheetConfigurator extends GsonPropertyObject {
}
}
private static List<String> uniqueItems = Arrays.asList(new String[] { "群组编号 *", "unique" });
private static List<String> uniqueItems = Arrays.asList(new String[] { "群组编码 *", "unique" });
private static List<String> nameItems = Arrays.asList(new String[] { "群组名称 *", "name" });
private static List<String> personCodeItems = Arrays.asList(new String[] { "人员编号", "人员唯一编码" });
private static List<String> unitCodeItems = Arrays.asList(new String[] { "组织编号", "组织唯一编码" });
private static List<String> groupCodeItems = Arrays.asList(new String[] { "子群组编号","群组编号", "groupCode" });
private static List<String> groupCodeItems = Arrays.asList(new String[] { "子群组编码", "groupCode" });
private static List<String> descriptionItems = Arrays.asList(new String[] { "描述","群组描述", "description" });
public String getCellStringValue(Cell cell) {
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/IdentityItem.java
浏览文件 @ e860b124
......@@ -14,6 +14,7 @@ public class IdentityItem extends GsonPropertyObject {
private String personCode;
private String unitCode;
private Boolean major;
private String unique;
private Integer row;
......@@ -90,6 +91,10 @@ public class IdentityItem extends GsonPropertyObject {
this.major = major;
}
public String getUnique() { return unique; }
public void setUnique(String unique) { this.unique = unique; }
public Integer getRow() {
return row;
}
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/IdentitySheetConfigurator.java
浏览文件 @ e860b124
......@@ -28,6 +28,7 @@ public class IdentitySheetConfigurator extends GsonPropertyObject {
private Integer uniqueColumn;
private Integer unitCodeColumn;
private Integer majorColumn;
private Integer identityUniqueColumn;
private Map<String, Integer> attributes = new HashMap<>();
......@@ -48,6 +49,8 @@ public class IdentitySheetConfigurator extends GsonPropertyObject {
this.unitCodeColumn = i;
} else if (majorItems.contains(str)) {
this.majorColumn = i;
}else if (identityUniqueItems.contains(str)) {
this.identityUniqueColumn = i;
} else {
Matcher matcher = attributePattern.matcher(str);
if (matcher.matches()) {
......@@ -63,6 +66,7 @@ public class IdentitySheetConfigurator extends GsonPropertyObject {
private static List<String> uniqueItems = Arrays.asList(new String[] { "人员唯一编码 *", "员工账号 *", "unique" });
private static List<String> unitCodeItems = Arrays.asList(new String[] { "组织编号 *", "组织唯一编码 *", "unitCode" });
private static List<String> majorItems = Arrays.asList(new String[] { "主兼职","major" });
private static List<String> identityUniqueItems = Arrays.asList(new String[] { "身份编码", "identityUnique"});
public String getCellStringValue(Cell cell) {
if (null != cell) {
......@@ -110,6 +114,10 @@ public class IdentitySheetConfigurator extends GsonPropertyObject {
return attributes;
}
public Integer getIdentityUniqueColumnColumn() {
return identityUniqueColumn;
}
public Integer getFirstRow() {
return firstRow;
}
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/UnitSheetConfigurator.java
浏览文件 @ e860b124
......@@ -56,7 +56,7 @@ public class UnitSheetConfigurator extends GsonPropertyObject {
} else if (orderNumberItems.contains(str)) {
this.orderNumberColumn = i;
} else if (descriptionItems.contains(str)) {
this.descriptionColumn = i;
this.descriptionColumn = i;
}else {
Matcher matcher = attributePattern.matcher(str);
if (matcher.matches()) {
......@@ -145,5 +145,4 @@ public class UnitSheetConfigurator extends GsonPropertyObject {
public Integer getSheetIndex() {
return sheetIndex;
}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或