小程序端老人

server-common/src/main/java/com/makeit/utils/data/excel/easyexcel/ConfigConverter.java

@@ -86,7 +86,7 @@ public class ConfigConverter implements Converter<String> {
 
         ConfigFormat dictEnumFormat = contentProperty.getField().getAnnotation(ConfigFormat.class);
 
-        String s = Arrays.stream(value.split(",")).filter(StringUtils::isNotBlank).map(m::get).filter(StringUtils::isNotBlank).collect(Collectors.joining(dictEnumFormat.split()));
+        String s = Arrays.stream(value.split(",")).filter(StringUtils::isNotBlank).map(m::get).filter(StringUtils::isNotBlank).collect(Collectors.joining(dictEnumFormat.split().substring(dictEnumFormat.split().length() - 1)));
 
         if (StringUtils.isBlank(s)) {
             s = "";

server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenController.java

@@ -4,8 +4,10 @@ package com.makeit.module.controller.children.elder;
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.elder.PlatElderQueryDTO;
 import com.makeit.dto.platform.elder.add.PlatElderDTOVO;
 import com.makeit.service.platform.elder.PlatElderService;
+import com.makeit.vo.platform.elder.PlatElderListVO;
 import com.makeit.vo.wechat.elder.PlatElderWechatSimpleVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,6 +35,12 @@ public class PlatElderChildrenController {
     @Autowired
     private PlatElderService platElderService;
 
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public ApiResponseEntity<List<PlatElderListVO>> list(@RequestBody PlatElderQueryDTO dto) {
+        return ApiResponseUtils.success(platElderService.list(dto));
+    }
+
     @ApiOperation("我的家庭")
     @PostMapping("listMy")
     public ApiResponseEntity<List<PlatElderWechatSimpleVO>> listMy() {