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

Merge pull request '导入自动编号' (#69) from feature/dxf into develop

Browse Source 
Reviewed-on: #69
pull/70/head^2
dxfeng 3 years ago
parent 347632e301 0404c4b7fd
commit f72f6c08b1
5 changed files with 78 additions and 46 deletions
Show Stats Download Patch File Download Diff File

5
src/com/engine/organization/service/impl/CompServiceImpl.java
Unescape Escape View File

@ -425,9 +425,8 @@ public class CompServiceImpl extends Service implements CompService {
List<CompPO> list = getCompMapper().listByNo(Util.null2String(compNo)); List<CompPO> list = getCompMapper().listByNo(Util.null2String(compNo));
OrganizationAssert.isEmpty(list, "编号不允许重复"); OrganizationAssert.isEmpty(list, "编号不允许重复");
} else { } else {
if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
compNo = autoCreateCompanyNo(); compNo = autoCreateCompanyNo();
}
} }
return compNo; return compNo;
} }

5
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
Unescape Escape View File

@ -875,9 +875,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
List<DepartmentPO> list = getDepartmentMapper().listByNo(Util.null2String(deptNo)); List<DepartmentPO> list = getDepartmentMapper().listByNo(Util.null2String(deptNo));
OrganizationAssert.isEmpty(list, "编号不允许重复"); OrganizationAssert.isEmpty(list, "编号不允许重复");
} else { } else {
if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
deptNo = autoCreateCompanyNo(); deptNo = autoCreateCompanyNo();
}
} }
return deptNo; return deptNo;
} }

5
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
Unescape Escape View File

@ -757,9 +757,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
List<HrmResourcePO> list = getResourceMapper().listByNo(Util.null2String(workCode)); List<HrmResourcePO> list = getResourceMapper().listByNo(Util.null2String(workCode));
OrganizationAssert.isEmpty(list, "编号不允许重复"); OrganizationAssert.isEmpty(list, "编号不允许重复");
} else { } else {
if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
workCode = autoCreateWorkCode(); workCode = autoCreateWorkCode();
}
} }
return workCode; return workCode;
} }

104
src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
Unescape Escape View File

@ -26,6 +26,7 @@ import com.engine.organization.entity.scheme.po.SchemePO;
import com.engine.organization.enums.LogModuleNameEnum; import com.engine.organization.enums.LogModuleNameEnum;
import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.enums.OperateTypeEnum;
import com.engine.organization.enums.OrgImportEnum; import com.engine.organization.enums.OrgImportEnum;
import com.engine.organization.exception.OrganizationRunTimeException;
import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.comp.CompMapper;
import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.department.DepartmentMapper;
import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtMapper;
@ -88,6 +89,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
private static final String HRM_RESOURCE = "hrmresource"; private static final String HRM_RESOURCE = "hrmresource";
static Map<String, ExtendInfoPO> importFieldsMap; static Map<String, ExtendInfoPO> importFieldsMap;
static { static {
importFieldsMap = new HashMap<>(); importFieldsMap = new HashMap<>();
importFieldsMap.put("方案编号", ExtendInfoPO.builder().tableName("jcl_org_scheme").fieldName("scheme_no").fieldNameDesc("方案编号").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build()); importFieldsMap.put("方案编号", ExtendInfoPO.builder().tableName("jcl_org_scheme").fieldName("scheme_no").fieldNameDesc("方案编号").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
@ -101,6 +103,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
importFieldsMap.put("职级说明", ExtendInfoPO.builder().tableName("jcl_org_grade").fieldName("grade_description").fieldNameDesc("职级说明").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build()); importFieldsMap.put("职级说明", ExtendInfoPO.builder().tableName("jcl_org_grade").fieldName("grade_description").fieldNameDesc("职级说明").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
} }
private ExtendInfoMapper getExtendInfoMapper() { private ExtendInfoMapper getExtendInfoMapper() {
return MapperProxyFactory.getProxy(ExtendInfoMapper.class); return MapperProxyFactory.getProxy(ExtendInfoMapper.class);
} }
@ -161,7 +164,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
return returnMaps; return returnMaps;
} }
if("joblevel".equals(importType)){ if ("joblevel".equals(importType)) {
List<FieldTransferParam> fieldDatas = new ArrayList<>(); List<FieldTransferParam> fieldDatas = new ArrayList<>();
fieldDatas.add(FieldTransferParam.builder().id("1").name("职级编号").build()); fieldDatas.add(FieldTransferParam.builder().id("1").name("职级编号").build());
fieldDatas.add(FieldTransferParam.builder().id("2").name("职级名称").build()); fieldDatas.add(FieldTransferParam.builder().id("2").name("职级名称").build());
@ -173,13 +176,13 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
fieldDatas.add(FieldTransferParam.builder().id("8").name("职级说明").build()); fieldDatas.add(FieldTransferParam.builder().id("8").name("职级说明").build());
fieldDatas.add(FieldTransferParam.builder().id("9").name("职等说明").build()); fieldDatas.add(FieldTransferParam.builder().id("9").name("职等说明").build());
List<String> selectedKeys = new ArrayList<>(); List<String> selectedKeys = new ArrayList<>();
for(int i=0;i<fieldDatas.subList(0,6).size();i++){ for (int i = 0; i < fieldDatas.subList(0, 6).size(); i++) {
selectedKeys.add(fieldDatas.get(i).getId()); selectedKeys.add(fieldDatas.get(i).getId());
} }
returnMaps.put("data", fieldDatas); returnMaps.put("data", fieldDatas);
returnMaps.put("selectedKeys", selectedKeys); returnMaps.put("selectedKeys", selectedKeys);
}else{ } else {
List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.LIST.getValue(), "1"); List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.LIST.getValue(), "1");
List<ExtendInfoPO> filterList = infoPOList.stream().filter(item -> !excludeFields.contains(item.getFieldName()) && 6 != item.getControlType()).collect(Collectors.toList()); List<ExtendInfoPO> filterList = infoPOList.stream().filter(item -> !excludeFields.contains(item.getFieldName()) && 6 != item.getControlType()).collect(Collectors.toList());
@ -270,7 +273,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
//} //}
//returnMap.put("pId", importHistoryId); //returnMap.put("pId", importHistoryId);
returnMap.put("pId", hrmResourceImport(operateType, excelFile,keyField)); returnMap.put("pId", hrmResourceImport(operateType, excelFile, keyField));
break; break;
case "joblevel": case "joblevel":
returnMap.put("pId", jobLevelImport(operateType, excelFile)); returnMap.put("pId", jobLevelImport(operateType, excelFile));
@ -512,6 +515,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
lsGroup.add(groupItem); lsGroup.add(groupItem);
return lsGroup; return lsGroup;
} }
private List<Object> getJobLevelImportForm(String templatePath) throws IOException { private List<Object> getJobLevelImportForm(String templatePath) throws IOException {
// 返回导入数据 // 返回导入数据
@ -697,7 +701,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
} else { } else {
ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex); ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex);
// 数据校验 // 数据校验
if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue)) { if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue) && !"comp_no".equalsIgnoreCase(infoPO.getFieldName())) {
historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项"); historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
@ -763,7 +767,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
continue; continue;
} }
// 自动编号 // 自动编号
compNo = CompServiceImpl.repeatDetermine(compNo); try {
compNo = CompServiceImpl.repeatDetermine(compNo);
} catch (OrganizationRunTimeException e) {
historyDetailPO.setOperateDetail(e.getMessage());
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue;
}
map.put("comp_no", compNo); map.put("comp_no", compNo);
map.put("creator", user.getUID()); map.put("creator", user.getUID());
map.put("delete_type", 0); map.put("delete_type", 0);
@ -884,7 +895,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
} else { } else {
ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex); ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex);
// 数据校验 // 数据校验
if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue)) { if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue) && !"dept_no".equalsIgnoreCase(infoPO.getFieldName())) {
historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项"); historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
@ -980,7 +991,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
continue; continue;
} }
// 自动编号 // 自动编号
deptNo = DepartmentServiceImpl.repeatDetermine(deptNo); try {
deptNo = DepartmentServiceImpl.repeatDetermine(deptNo);
} catch (OrganizationRunTimeException e) {
historyDetailPO.setOperateDetail(e.getMessage());
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue;
}
map.put("dept_no", deptNo); map.put("dept_no", deptNo);
map.put("creator", user.getUID()); map.put("creator", user.getUID());
map.put("delete_type", 0); map.put("delete_type", 0);
@ -1101,7 +1119,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
} else { } else {
ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex); ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex);
// 数据校验 // 数据校验
if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue)) { if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue) && !"job_no".equalsIgnoreCase(infoPO.getFieldName())) {
historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项"); historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
@ -1221,7 +1239,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
continue; continue;
} }
// 自动编号 // 自动编号
jobNo = JobServiceImpl.repeatDetermine(jobNo); try {
jobNo = JobServiceImpl.repeatDetermine(jobNo);
} catch (OrganizationRunTimeException e) {
historyDetailPO.setOperateDetail(e.getMessage());
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue;
}
map.put("job_no", jobNo); map.put("job_no", jobNo);
map.put("creator", user.getUID()); map.put("creator", user.getUID());
map.put("delete_type", 0); map.put("delete_type", 0);
@ -1350,7 +1375,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
} else { } else {
ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex); ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex);
// 数据校验 // 数据校验
if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue)) { if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue) && !"work_code".equalsIgnoreCase(infoPO.getFieldName())) {
historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项"); historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
@ -1466,7 +1491,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
} }
String keyFieldValue = Util.null2String(map.get(keyField)); String keyFieldValue = Util.null2String(map.get(keyField));
if(StringUtils.isBlank(keyFieldValue)){ if (StringUtils.isBlank(keyFieldValue)) {
historyDetailPO.setOperateDetail("所选重复验证字段为空"); historyDetailPO.setOperateDetail("所选重复验证字段为空");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
@ -1478,7 +1503,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
Long resourceId = MapperProxyFactory.getProxy(HrmResourceMapper.class).getIdByKeyField(keyField, keyFieldValue); Long resourceId = MapperProxyFactory.getProxy(HrmResourceMapper.class).getIdByKeyField(keyField, keyFieldValue);
if ("add".equals(operateType)) { if ("add".equals(operateType)) {
if (resourceId != null) { if (resourceId != null) {
historyDetailPO.setOperateDetail(keyFieldValue+"已存在"); historyDetailPO.setOperateDetail(keyFieldValue + "已存在");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
continue; continue;
@ -1488,7 +1513,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
String workCode = Util.null2String(map.get("work_code")); String workCode = Util.null2String(map.get("work_code"));
try { try {
// 自动编号 // 自动编号
workCode = HrmResourceServiceImpl.repeatDetermine(workCode); try {
workCode = HrmResourceServiceImpl.repeatDetermine(workCode);
} catch (OrganizationRunTimeException e) {
historyDetailPO.setOperateDetail(e.getMessage());
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue;
}
map.put("work_code", workCode); map.put("work_code", workCode);
} catch (Exception e) { } catch (Exception e) {
historyDetailPO.setOperateDetail(Util.null2String(e.getMessage())); historyDetailPO.setOperateDetail(Util.null2String(e.getMessage()));
@ -1976,12 +2008,12 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
object = Integer.parseInt(cellValue); object = Integer.parseInt(cellValue);
} else if ("float".equals(valueType)) { } else if ("float".equals(valueType)) {
object = Float.parseFloat(cellValue); object = Float.parseFloat(cellValue);
} else if ("text".equals(valueType)){ } else if ("text".equals(valueType)) {
object = cellValue; object = cellValue;
} else { } else {
try { try {
object = new BigDecimal(cellValue).toPlainString(); object = new BigDecimal(cellValue).toPlainString();
}catch (NumberFormatException ignore){ } catch (NumberFormatException ignore) {
object = cellValue; object = cellValue;
} }
} }
@ -2056,7 +2088,11 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
* 日志导入详细信息日志 * 日志导入详细信息日志
*/ */
private void saveImportDetailLog(JclImportHistoryDetailPO historyDetailPO) { private void saveImportDetailLog(JclImportHistoryDetailPO historyDetailPO) {
String detailMsg = "导入第" + historyDetailPO.getRowNums() + "行数据,[" + historyDetailPO.getRelatedName() + "]" + historyDetailPO.getOperateDetail(); String relatedName = historyDetailPO.getRelatedName();
if (StringUtils.isNotBlank(relatedName)) {
relatedName = "[" + relatedName + "]";
}
String detailMsg = "导入第" + historyDetailPO.getRowNums() + "行数据," + relatedName + historyDetailPO.getOperateDetail();
historyDetailPO.setOperateDetail(detailMsg); historyDetailPO.setOperateDetail(detailMsg);
MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(historyDetailPO); MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(historyDetailPO);
} }
@ -2090,34 +2126,34 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
departmentColumn = column; departmentColumn = column;
iterator.remove(); iterator.remove();
} }
if("方案编号".equals(column)){ if ("方案编号".equals(column)) {
schemeList.add(column); schemeList.add(column);
levelList.add(column); levelList.add(column);
gradeList.add(column); gradeList.add(column);
} }
if("方案名称".equals(column)){ if ("方案名称".equals(column)) {
schemeList.add(column); schemeList.add(column);
} }
if("方案说明".equals(column)){ if ("方案说明".equals(column)) {
schemeList.add(column); schemeList.add(column);
} }
if("职等编号".equals(column)){ if ("职等编号".equals(column)) {
levelList.add(0,column); levelList.add(0, column);
gradeList.add(column); gradeList.add(column);
} }
if("职等名称".equals(column)){ if ("职等名称".equals(column)) {
levelList.add(1,column); levelList.add(1, column);
} }
if("职等说明".equals(column)){ if ("职等说明".equals(column)) {
levelList.add(column); levelList.add(column);
} }
if("职级编号".equals(column)){ if ("职级编号".equals(column)) {
gradeList.add(0,column); gradeList.add(0, column);
} }
if("职级名称".equals(column)){ if ("职级名称".equals(column)) {
gradeList.add(1,column); gradeList.add(1, column);
} }
if("职级说明".equals(column)){ if ("职级说明".equals(column)) {
gradeList.add(column); gradeList.add(column);
} }
} }
@ -2136,14 +2172,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
if ("joblevel".equals(importType)) { if ("joblevel".equals(importType)) {
excelSheetData.clear(); excelSheetData.clear();
excelSheetData.add(schemeList); excelSheetData.add(schemeList);
ExcelUtil.genWorkbookV3(sheets,excelSheetData,0, "方案"); ExcelUtil.genWorkbookV3(sheets, excelSheetData, 0, "方案");
excelSheetData.clear(); excelSheetData.clear();
excelSheetData.add(levelList); excelSheetData.add(levelList);
ExcelUtil.genWorkbookV3(sheets,excelSheetData,1, "职等"); ExcelUtil.genWorkbookV3(sheets, excelSheetData, 1, "职等");
excelSheetData.clear(); excelSheetData.clear();
excelSheetData.add(gradeList); excelSheetData.add(gradeList);
ExcelUtil.genWorkbookV3(sheets,excelSheetData,2, "职级"); ExcelUtil.genWorkbookV3(sheets, excelSheetData, 2, "职级");
}else{ } else {
sheets = ExcelUtil.genWorkbookV2(excelSheetData, importType); sheets = ExcelUtil.genWorkbookV2(excelSheetData, importType);
} }
String excelPath = outPutPath + File.separator + importType + ".xls"; String excelPath = outPutPath + File.separator + importType + ".xls";

5
src/com/engine/organization/service/impl/JobServiceImpl.java
Unescape Escape View File

@ -754,9 +754,8 @@ public class JobServiceImpl extends Service implements JobService {
List<JobPO> list = getJobMapper().listByNo(Util.null2String(jobNo)); List<JobPO> list = getJobMapper().listByNo(Util.null2String(jobNo));
OrganizationAssert.isEmpty(list, "编号不允许重复"); OrganizationAssert.isEmpty(list, "编号不允许重复");
} else { } else {
if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
jobNo = autoCreateCompanyNo(); jobNo = autoCreateCompanyNo();
}
} }
return jobNo; return jobNo;
} }

Write Preview
Loading…
Cancel
Save