字段删除 移动分组

pull/91/MERGE^2
dxfeng 3 years ago
parent 3ba19c1b8d
commit 9aebfbcecc

@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ExtendFieldSearchParam {
public class ExtendFieldInfoParam {
private String groupId;
private String groupType;
}

@ -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;
}

@ -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<String, Object> getFieldDefinedInfo(ExtendFieldSearchParam param);
Map<String, Object> 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);
}

@ -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<String, Object> getFieldDefinedInfo(ExtendFieldSearchParam param) {
public Map<String, Object> getFieldDefinedInfo(ExtendFieldInfoParam param) {
Map<String, Object> returnMap = new HashMap<>();
List<Map<String, Object>> lsFieldInfo = new ArrayList<>();
Map<String, Object> 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) {

@ -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());
//}

@ -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<String, Object> getFieldDefinedInfo(ExtendFieldSearchParam param) {
public Map<String, Object> getFieldDefinedInfo(ExtendFieldInfoParam param) {
return getFieldDefinedService(user).getFieldDefinedInfo(param);
}
}

Loading…
Cancel
Save