!92 数据返回格式修改

Merge pull request !92 from dxfeng/feature/dxf

src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java

@@ -1,20 +0,0 @@
-package com.engine.organization.entity.extend.param;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author:dxfeng
- * @createTime: 2022/06/16
- * @version: 1.0
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ExtendFieldInfoParam {
-    private String groupId;
-    private String groupType;
-}

src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java

@@ -0,0 +1,35 @@
+package com.engine.organization.entity.extend.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import weaver.general.StringUtil;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2022/06/16
+ * @version: 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExtendFieldSearchParam {
+    private String id;
+    private Long groupId;
+    private Long groupType;
+
+
+    public Collection<Long> getId() {
+        if (StringUtil.isEmpty(id)) {
+            return new ArrayList<>();
+        }
+        return Arrays.stream(id.split(",")).map(Long::parseLong).collect(Collectors.toList());
+    }
+}

src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
  * @author:dxfeng
  * @createTime: 2022/06/16
  * @version: 1.0

src/com/engine/organization/service/FieldDefinedService.java

@@ -1,7 +1,7 @@
 package com.engine.organization.service;
 
 
-import com.engine.organization.entity.extend.param.ExtendFieldInfoParam;
+import com.engine.organization.entity.extend.param.ExtendFieldSearchParam;
 import com.engine.organization.entity.extend.param.ExtendInfoChangeParam;
 import com.engine.organization.entity.extend.param.ExtendTitleSaveParam;
 import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam;
@@ -84,7 +84,7 @@ public interface FieldDefinedService {
      * @param param
      * @return
      */
-    Map<String, Object> getFieldDefinedInfo(ExtendFieldInfoParam param);
+    Map<String, Object> getFieldDefinedInfo(ExtendFieldSearchParam param);
 
     /**
      * 删除树类型
@@ -106,7 +106,7 @@ public interface FieldDefinedService {
      *
      * @param param
      */
-    void deleteFieldDefined(ExtendFieldInfoParam param);
+    void deleteFieldDefined(ExtendFieldSearchParam param);
 
     /**
      * 移动分组

src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java

@@ -8,7 +8,7 @@ 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.ExtendFieldInfoParam;
+import com.engine.organization.entity.extend.param.ExtendFieldSearchParam;
 import com.engine.organization.entity.extend.param.ExtendInfoChangeParam;
 import com.engine.organization.entity.extend.param.ExtendInfoFieldParam;
 import com.engine.organization.entity.extend.param.ExtendTitleSaveParam;
@@ -217,7 +217,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
     }
 
     @Override
-    public Map<String, Object> getFieldDefinedInfo(ExtendFieldInfoParam param) {
+    public Map<String, Object> getFieldDefinedInfo(ExtendFieldSearchParam param) {
         Map<String, Object> returnMap = new HashMap<>();
         List<Map<String, Object>> lsFieldInfo = new ArrayList<>();
         Map<String, Object> fieldInfo;
@@ -227,7 +227,11 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
         List<Object> fieldTypeInfo;
         List<Object> lsComDetialInfo;
         Map<String, Object> comDetialInfo;
-        List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields("", param.getGroupId(), "", "");
+        // 区分主表明细表
+        Long groupType = param.getGroupType();
+        ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(groupType);
+        String tableName = ExtendGroupBO.getTableNameByGroupPO(extendGroupPO);
+        List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields("", param.getGroupId().toString(), tableName, "");
         for (ExtendInfoPO extendInfoPO : infoPOList) {
             Long fieldId = extendInfoPO.getId();
             String fieldName = extendInfoPO.getFieldName();
@@ -466,7 +470,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
     }
 
     @Override
-    public void deleteFieldDefined(ExtendFieldInfoParam param) {
+    public void deleteFieldDefined(ExtendFieldSearchParam param) {
+        Collection<Long> ids = param.getId();
+        Long groupId = param.getGroupId();
+        Long groupType = param.getGroupType();
+
+
 
     }
 

src/com/engine/organization/web/FieldDefinedController.java

@@ -1,9 +1,8 @@
 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.ExtendFieldInfoParam;
+import com.engine.organization.entity.extend.param.ExtendFieldSearchParam;
 import com.engine.organization.entity.extend.param.ExtendTitleSaveParam;
 import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam;
 import com.engine.organization.enums.ModuleTypeEnum;
@@ -49,10 +48,10 @@ public class FieldDefinedController {
     @Path("/{moduleTypeEnum}/saveTree")
     @Produces(MediaType.APPLICATION_JSON)
     public ReturnResult saveTree(@Context HttpServletRequest request, @Context HttpServletResponse response,
-                                 @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum,@RequestBody FieldTypeTreeParam fieldTypeTreeParam) {
+                                 @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody FieldTypeTreeParam fieldTypeTreeParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return getFieldDefinedWrapper(user).saveTree(moduleTypeEnum,fieldTypeTreeParam);
+            return getFieldDefinedWrapper(user).saveTree(moduleTypeEnum, fieldTypeTreeParam);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e.getMessage());
         }
@@ -85,8 +84,6 @@ public class FieldDefinedController {
     }
 
 
-
-
     @GET
     @Path("/{moduleTypeEnum}/getTabInfo")
     @Produces(MediaType.APPLICATION_JSON)
@@ -147,7 +144,7 @@ public class FieldDefinedController {
     public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-             return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param.getId()));
+            return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param.getId()));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e.getMessage());
         }
@@ -168,17 +165,15 @@ public class FieldDefinedController {
     @GET
     @Path("/{moduleTypeEnum}/getFieldDefinedInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public String getFieldDefinedInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) {
-        // TODO
-        //try {
+    public ReturnResult getFieldDefinedInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) {
+        try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            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(ExtendFieldInfoParam.builder().groupType(groupType).groupId(groupId).build()));
-        //} catch (Exception e) {
-        //    return ReturnResult.exceptionHandle(e.getMessage());
-        //}
+            Long groupType = Long.parseLong((String) map.get("groupType"));
+            Long groupId = Long.parseLong((String) map.get("groupId"));
+            return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build()));
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e.getMessage());
+        }
     }
 }

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.ExtendFieldInfoParam;
+import com.engine.organization.entity.extend.param.ExtendFieldSearchParam;
 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(ExtendFieldInfoParam param) {
+    public Map<String, Object> getFieldDefinedInfo(ExtendFieldSearchParam param) {
         return getFieldDefinedService(user).getFieldDefinedInfo(param);
     }
 }