From 3ba19c1b8df39c39476c7d1d2d86a3413f2daedf Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 16 Jun 2022 18:08:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FieldDefinedServiceImpl.java | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index f097bb65..1e843b77 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -32,7 +32,6 @@ import weaver.workflow.field.BrowserComInfo; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Author weaver_cl @@ -198,12 +197,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ if (fieldTypeTreeParam.getId() == null) { List extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listGroupByPid(fieldTypeTreeParam.getParentId()); ExtendGroupPO extendGroup = extendGroupPOList.stream().max(Comparator.comparing(ExtendGroupPO::getShowOrder)).get(); - ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam,extendGroup.getShowOrder()); + ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam, extendGroup.getShowOrder()); MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO); //默认新增title List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(extendGroup.getId()); ExtendTitlePO extendTitle = titlesByGroupID.stream().max(Comparator.comparing(ExtendTitlePO::getShowOrder)).get(); - ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO,extendTitle.getShowOrder()); + ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO, extendTitle.getShowOrder()); MapperProxyFactory.getProxy(ExtendTitleMapper.class).insertIgnoreNull(extendTitlePO); } else { MapperProxyFactory.getProxy(ExtendGroupMapper.class).update(fieldTypeTreeParam.getId(), fieldTypeTreeParam.getName()); @@ -237,16 +236,16 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ String customValue = extendInfoPO.getCustomValue(); String fieldStrLength = SelectOptionParam.getTextLength(customValue); //自定义字段排序 标识rowKey - String fieldidrowKey; - int dsporder = extendInfoPO.getShowOrder(); + String fieldIdRowKey; + int showOrder = extendInfoPO.getShowOrder(); boolean isUsed = false; // TODO 去除脏数据后调整为extendInfoPO.getId() > 0 // 系统字段id<0 boolean isSysField = extendInfoPO.getExtendGroupId() < 0; if (isSysField) { - fieldidrowKey = fieldId + "_hrm"; + fieldIdRowKey = fieldId + "_hrm"; } else { - fieldidrowKey = fieldId + "_cus"; + fieldIdRowKey = fieldId + "_cus"; } if (!isSysField) { 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("isModify", extendInfoPO.getEditShow() + ""); recordInfo.put("viewAttr", isUsed || isSysField ? 1 : 2); - recordInfo.put("key", "" + dsporder); - recordInfo.put("fieldidrowKey", fieldidrowKey); + recordInfo.put("key", "" + showOrder); + recordInfo.put("fieldidrowKey", fieldIdRowKey); fieldInfo.put("record", recordInfo); @@ -433,12 +432,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ List collect = MapperProxyFactory.getProxy(ExtendGroupMapper.class) .listGroupByPid(fieldTypeTreeParam.getParentId()).stream().map(ExtendGroupPO::getId).collect(Collectors.toList()); Integer extendType = moduleTypeEnum.getValue(); - List extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(),ExtendGroupPO.class); + List extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(), ExtendGroupPO.class); List collect1 = extendGroupPOS.stream().map(ExtendGroupPO::getId).collect(Collectors.toList()); Set removeSet = new HashSet<>(); - collect1.forEach(e->{ - if(!collect.contains(e)){ + collect1.forEach(e -> { + if (!collect.contains(e)) { removeSet.add(e); } }); @@ -449,25 +448,23 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ e.setExtendType(extendType); e.setPid(fieldTypeTreeParam.getParentId()); e.setIsShow(fieldTypeTreeParam.getIsShow()); - e.setShowOrder(showOrder+1); - e.setCreator((long)user.getUID()); + e.setShowOrder(showOrder + 1); + e.setCreator((long) user.getUID()); e.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); e.setCreateTime(new Date()); e.setUpdateTime(new Date()); - if (e.getId() == null){//新增 + if (e.getId() == null) {//新增 MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(e); - }else { //更新 - MapperProxyFactory.getProxy(ExtendGroupMapper.class).updateNameAndOrder(e.getId(),e.getGroupName(),e.getShowOrder()); + } else { //更新 + MapperProxyFactory.getProxy(ExtendGroupMapper.class).updateNameAndOrder(e.getId(), e.getGroupName(), e.getShowOrder()); } }); - - } - private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO,Integer max) { + private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO, Integer max) { return ExtendTitlePO.builder() .groupId(extendGroupPO.getId()) .title(extendGroupPO.getGroupName()) @@ -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() .extendType(moduleTypeEnum.getValue()) .groupName(fieldTypeTreeParam.getName())