完善

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyWishDTO.java

@@ -51,7 +51,7 @@ public class IcPartyWishDTO implements Serializable {
     /**
      * 描述
      */
-	private String describe;
+	private String introduce;
 
     /**
      * 内容

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyWishEntity.java

@@ -51,7 +51,7 @@ public class IcPartyWishEntity extends BaseEpmetEntity {
     /**
      * 描述
      */
-	private String describe;
+	private String introduce;
 
     /**
      * 内容

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyInventoryController.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.partymember.excel.IcPartyInventoryExcel;
 import com.epmet.modules.partymember.service.IcPartyInventoryService;
 import com.epmet.resi.partymember.dto.partymember.IcPartyInventoryDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyInventoryListResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -49,10 +50,16 @@ public class IcPartyInventoryController {
     @Autowired
     private IcPartyInventoryService icPartyInventoryService;
 
-    @GetMapping("page")
+/*    @GetMapping("page")
     public Result<PageData<IcPartyInventoryDTO>> page(@RequestParam Map<String, Object> params){
         PageData<IcPartyInventoryDTO> page = icPartyInventoryService.page(params);
         return new Result<PageData<IcPartyInventoryDTO>>().ok(page);
+    }*/
+
+    @GetMapping("page")
+    public Result<List<IcPartyInventoryListResultDTO>> page(@RequestParam Map<String, Object> params){
+        List<IcPartyInventoryListResultDTO> page = icPartyInventoryService.getPageList(params);
+        return new Result<List<IcPartyInventoryListResultDTO>>().ok(page);
     }
 
     @GetMapping("{id}")

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyInventoryService.java

@@ -96,4 +96,6 @@ public interface IcPartyInventoryService extends BaseService<IcPartyInventoryEnt
     void delete(String[] ids);
 
     List<IcPartyInventoryListResultDTO> selectInventoryList();
+
+    List<IcPartyInventoryListResultDTO> getPageList(Map<String, Object> params);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyInventoryServiceImpl.java

@@ -126,4 +126,27 @@ public class IcPartyInventoryServiceImpl extends BaseServiceImpl<IcPartyInventor
         return resultDTOS;
     }
 
+    @Override
+    public List<IcPartyInventoryListResultDTO> getPageList(Map<String, Object> params) {
+        List<IcPartyInventoryListResultDTO> resultDTOS = new ArrayList<>();
+
+        LambdaQueryWrapper<IcPartyInventoryEntity> queryWrapperP = new LambdaQueryWrapper<>();
+        queryWrapperP.eq(IcPartyInventoryEntity::getParentId,0);
+        List<IcPartyInventoryEntity> entityPList = baseDao.selectList(queryWrapperP);
+        if (entityPList.size() > 0){
+            resultDTOS = ConvertUtils.sourceToTarget(entityPList,IcPartyInventoryListResultDTO.class);
+            resultDTOS.forEach(result->{
+
+                LambdaQueryWrapper<IcPartyInventoryEntity> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(IcPartyInventoryEntity::getParentId,result.getId());
+                List<IcPartyInventoryEntity> entityList = baseDao.selectList(queryWrapper);
+                if (entityList.size() > 0){
+                    result.setChildren(ConvertUtils.sourceToTarget(entityList, IcPartyInventoryDTO.class));
+                }
+            });
+        }
+
+        return resultDTOS;
+    }
+
 }