diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
index 20baf30a..e850b3d3 100644
--- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
+++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
@@ -102,8 +102,8 @@ public class ExtendInfoBO {
.extendGroupId(extendGroupId)
.isenable("1".equals(infoFieldParam.getEnable()) ? 1 : 0)
.isrequired("1".equals(infoFieldParam.getRequired()) ? 1 : 0)
+ .isModify("1".equals(infoFieldParam.getIsModify()) ? 1 : 0)
.listShow(1)
- // .editShow("0".equals(infoFieldParam.getIsModify()) ? 0 : 1)
.editShow(1)
.addShow(1)
.browserShow(1)
diff --git a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java
index d2e62151..da0033b1 100644
--- a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java
+++ b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java
@@ -111,10 +111,22 @@ public class ExtendInfoPO {
private Integer isSystemDefault;
+ /**
+ * 允许个人修改
+ */
private Integer isModify;
+ /**
+ * 允许个人修改属性
+ */
+ private Integer modifyProps;
+
+ /**
+ * 启用、必填check框属性
+ */
private Integer checkProps;
+
private Long creator;
private int deleteType;
private Date createTime;
diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
index b396f218..dab93331 100644
--- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
+++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
@@ -22,6 +22,7 @@
+
@@ -53,6 +54,7 @@
, t.show_order
, t.is_system_default
, t.ismodify
+ , t.modify_props
, t.check_props
, t.creator
, t.delete_type
@@ -130,6 +132,11 @@
is_system_default,
+
+ ismodify,
+
+ check_props,
+ modify_props,
@@ -198,6 +205,11 @@
#{isSystemDefault},
+
+ #{isModify},
+
+ 2,
+ 2,
@@ -274,6 +286,11 @@
is_system_default,
+
+ ismodify,
+
+ check_props,
+ modify_props,
@@ -342,6 +359,11 @@
#{isSystemDefault},
+
+ #{isModify},
+
+ 2,
+ 2,
@@ -355,6 +377,7 @@
field_name_desc=#{fieldNameDesc},
isenable=#{isenable},
isrequired=#{isrequired},
+ ismodify=#{isModify},
show_order=#{showOrder},
custom_value=#{customValue},
diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
index d3e80d6b..b81fbbbb 100644
--- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
+++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
@@ -373,13 +373,17 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
if (null == checkProps) {
checkProps = 1;
}
- // TODO
+ // 1:只读，2：可编辑,
+ Integer modifyProps = extendInfoPO.getModifyProps();
+ if (null == modifyProps) {
+ modifyProps = 1;
+ }
// 启用列是否可编辑
- checkPropsEnableInfo.put("viewAttr", checkProps == 3 ? 2 : 1);
+ checkPropsEnableInfo.put("viewAttr", checkProps);
// 必填列是否可编辑
- checkPropsRequiredInfo.put("viewAttr", checkProps == 3 ? 2 : 1);
+ checkPropsRequiredInfo.put("viewAttr", checkProps);
//允许个人修改列是否可编辑
- checkPropsModifyInfo.put("viewAttr", checkProps);
+ checkPropsModifyInfo.put("viewAttr", modifyProps);
checkPropsInfo.put("enable", checkPropsEnableInfo);
checkPropsInfo.put("required", checkPropsRequiredInfo);
diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
index 325d80b4..f27e0f99 100644
--- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
@@ -141,9 +141,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.LIST.getValue(), "1");
List filterList = infoPOList.stream().filter(item -> !excludeFields.contains(item.getFieldName()) && 6 != item.getControlType()).collect(Collectors.toList());
List fieldDatas = filterList.stream().map(item -> FieldTransferParam.builder().id(item.getId().toString()).name(item.getFieldNameDesc()).build()).collect(Collectors.toList());
- //fieldDatas.addAll(0, includeFields);
List selectedKeys = filterList.stream().filter(item -> (0 == item.getIsSystemDefault()) && 1 == item.getIsrequired()).map(item -> item.getId().toString()).collect(Collectors.toList());
- //selectedKeys.addAll(0, selectedList);
returnMaps.put("data", fieldDatas);
returnMaps.put("selectedKeys", selectedKeys);
@@ -203,37 +201,12 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
returnMap.put("pId", jobImport(operateType, excelFile));
break;
case "resource":
- //Long importHistoryId = saveImportLog("resource", operateType);
- //HrmImportAdaptExcelE9 importAdapt = new HrmImportAdaptExcelE9();
- //FileUploadToPath fu = new FileUploadToPath(request);
- //
- //List errorInfo = importAdapt.creatImportMap(fu);
- //
- ////如果读取数据和验证模板没有发生错误
- //if (errorInfo.isEmpty()) {
- // Map hrMap = importAdapt.getHrmImportMap();
- //
- // HrmImportProcessE9 importProcess = new HrmImportProcessE9();
- // importProcess.init(request, importHistoryId);
- //
- //
- // importProcess.processMap(hrMap);
- //} else {
- // for (String s : errorInfo) {
- // MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(JclImportHistoryDetailPO.builder().pid(importHistoryId).operateDetail(Util.null2String(s)).status("0").build());
- // }
- //}
- //returnMap.put("pId", importHistoryId);
-
returnMap.put("pId", hrmResourceImport(operateType, excelFile,keyField));
break;
default:
break;
}
}
-
- // 列表
- // importstatus
return returnMap;
}