diff --git a/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java b/src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java similarity index 90% rename from src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java rename to src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java index 26181f1d..902d4bbb 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor -public class ExtendFieldSearchParam { +public class ExtendFieldInfoParam { private String groupId; private String groupType; } diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java new file mode 100644 index 00000000..26c54672 --- /dev/null +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java @@ -0,0 +1,23 @@ +package com.engine.organization.entity.extend.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/16 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExtendInfoChangeParam { + private String fieldids; + private String fieldnames; + private Long groupid; + private Long scopeid; +} diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index f91cb020..23598c8f 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -1,7 +1,8 @@ package com.engine.organization.service; -import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; +import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; +import com.engine.organization.entity.extend.param.ExtendInfoChangeParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; @@ -21,6 +22,7 @@ public interface FieldDefinedService { /** * 获取左侧树 + * * @param moduleTypeEnum * @return */ @@ -61,11 +63,13 @@ public interface FieldDefinedService { /** * 新增或编辑类型树 + * * @param moduleTypeEnum * @param fieldTypeTreeParam * @return */ void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam); + /** * 删除标题信息 * @@ -80,18 +84,34 @@ public interface FieldDefinedService { * @param param * @return */ - Map getFieldDefinedInfo(ExtendFieldSearchParam param); + Map getFieldDefinedInfo(ExtendFieldInfoParam param); /** * 删除树类型 + * * @param id */ void deleteTree(Long id); /** * 子信息维护 + * * @param moduleTypeEnum * @param fieldTypeTreeParam */ void saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam); + + /** + * 删除自定义字段 + * + * @param param + */ + void deleteFieldDefined(ExtendFieldInfoParam param); + + /** + * 移动分组 + * + * @param param + */ + void changeGroup(ExtendInfoChangeParam param); } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 1e843b77..3d34496f 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -8,7 +8,8 @@ import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.SelectOptionParam; import com.engine.organization.entity.extend.bo.ExtendGroupBO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; -import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; +import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; +import com.engine.organization.entity.extend.param.ExtendInfoChangeParam; import com.engine.organization.entity.extend.param.ExtendInfoFieldParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.extend.po.ExtendGroupPO; @@ -216,7 +217,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } @Override - public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { + public Map getFieldDefinedInfo(ExtendFieldInfoParam param) { Map returnMap = new HashMap<>(); List> lsFieldInfo = new ArrayList<>(); Map fieldInfo; @@ -462,6 +463,16 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ }); + } + + @Override + public void deleteFieldDefined(ExtendFieldInfoParam param) { + + } + + @Override + public void changeGroup(ExtendInfoChangeParam param) { + } private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO, Integer max) { diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 71c35751..dde930a9 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -3,7 +3,7 @@ package com.engine.organization.web; import com.alibaba.fastjson.JSON; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; +import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.enums.ModuleTypeEnum; @@ -176,7 +176,7 @@ public class FieldDefinedController { String groupType = (String) map.get("groupType"); String groupId = (String) map.get("groupId"); // return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); - return JSON.toJSONString(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); + return JSON.toJSONString(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldInfoParam.builder().groupType(groupType).groupId(groupId).build())); //} catch (Exception e) { // return ReturnResult.exceptionHandle(e.getMessage()); //} diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 7d3cf7f4..f279f008 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -2,7 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; +import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; @@ -88,7 +88,7 @@ public class FieldDefinedWrapper extends Service { return getFieldDefinedService(user).saveFields(data); } - public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { + public Map getFieldDefinedInfo(ExtendFieldInfoParam param) { return getFieldDefinedService(user).getFieldDefinedInfo(param); } }