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

代码合并

Browse Source
pull/90/MERGE^2
dxfeng 3 years ago
parent eb9c77b2d0
commit 3ba19c1b8d
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File

17
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
Unescape Escape View File

@ -32,7 +32,6 @@ import weaver.workflow.field.BrowserComInfo;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* @Author weaver_cl * @Author weaver_cl
@ -237,16 +236,16 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
String customValue = extendInfoPO.getCustomValue(); String customValue = extendInfoPO.getCustomValue();
String fieldStrLength = SelectOptionParam.getTextLength(customValue); String fieldStrLength = SelectOptionParam.getTextLength(customValue);
//自定义字段排序 标识rowKey //自定义字段排序 标识rowKey
String fieldidrowKey; String fieldIdRowKey;
int dsporder = extendInfoPO.getShowOrder(); int showOrder = extendInfoPO.getShowOrder();
boolean isUsed = false; boolean isUsed = false;
// TODO 去除脏数据后调整为extendInfoPO.getId() > 0 // TODO 去除脏数据后调整为extendInfoPO.getId() > 0
// 系统字段id<0 // 系统字段id<0
boolean isSysField = extendInfoPO.getExtendGroupId() < 0; boolean isSysField = extendInfoPO.getExtendGroupId() < 0;
if (isSysField) { if (isSysField) {
fieldidrowKey = fieldId + "_hrm"; fieldIdRowKey = fieldId + "_hrm";
} else { } else {
fieldidrowKey = fieldId + "_cus"; fieldIdRowKey = fieldId + "_cus";
} }
if (!isSysField) { if (!isSysField) {
isUsed = ExtendInfoBO.fieldIsUsed(extendInfoPO.getTableName(), extendInfoPO.getFieldName()); isUsed = ExtendInfoBO.fieldIsUsed(extendInfoPO.getTableName(), extendInfoPO.getFieldName());
@ -339,8 +338,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
recordInfo.put("required", extendInfoPO.getIsrequired() + ""); recordInfo.put("required", extendInfoPO.getIsrequired() + "");
recordInfo.put("isModify", extendInfoPO.getEditShow() + ""); recordInfo.put("isModify", extendInfoPO.getEditShow() + "");
recordInfo.put("viewAttr", isUsed || isSysField ? 1 : 2); recordInfo.put("viewAttr", isUsed || isSysField ? 1 : 2);
recordInfo.put("key", "" + dsporder); recordInfo.put("key", "" + showOrder);
recordInfo.put("fieldidrowKey", fieldidrowKey); recordInfo.put("fieldidrowKey", fieldIdRowKey);
fieldInfo.put("record", recordInfo); fieldInfo.put("record", recordInfo);
@ -463,8 +462,6 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
}); });
} }
private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO, Integer max) { private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO, Integer max) {
@ -480,7 +477,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
} }
private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam, Integer max) {
return ExtendGroupPO.builder() return ExtendGroupPO.builder()
.extendType(moduleTypeEnum.getValue()) .extendType(moduleTypeEnum.getValue())
.groupName(fieldTypeTreeParam.getName()) .groupName(fieldTypeTreeParam.getName())

Write Preview
Loading…
Cancel
Save