修改家庭成员问题

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/my/AppFamilyMembersController.java

@@ -1,11 +1,14 @@
 package org.jeecg.modules.app.controller.my;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.app.dto.AddFamilyMembersDTO;
+import org.jeecg.modules.app.dto.FindFamilyMembersDTO;
+import org.jeecg.modules.system.app.entity.FamilyMembers;
 import org.jeecg.modules.system.app.service.IFamilyMembersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -22,12 +25,26 @@ public class AppFamilyMembersController {
     @Autowired
     IFamilyMembersService iFamilyMembersService;
 
+
+    @GetMapping("/findFamilyMembers")
+    @Operation(summary = "分页查询家庭成员")
+    public Result<IPage<FamilyMembers>> findFamilyMembers(FindFamilyMembersDTO findFamilyMembersDTO){
+        return iFamilyMembersService.findFamilyMembers(findFamilyMembersDTO);
+    }
+
+
     @PostMapping("/addFamilyMembers")
     @Operation(summary = "添加家庭成员")
     public Result<String> addFamilyMembers(@RequestBody AddFamilyMembersDTO addFamilyMembersDTO){
         return iFamilyMembersService.addFamilyMembers(addFamilyMembersDTO);
     }
 
+    @GetMapping("/FindByIdFamilyMembers")
+    @Operation(summary = "根据id查询家庭成员")
+    public Result<FamilyMembers> addFamilyMembers(@RequestParam("id") String id){
+        return Result.ok(iFamilyMembersService.getById(id));
+    }
+
     @PostMapping("/editFamilyMembers")
     @Operation(summary = "修改家庭成员")
     public Result<String> editFamilyMembers(@RequestBody AddFamilyMembersDTO addFamilyMembersDTO){

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AddFamilyMembersDTO.java

@@ -3,9 +3,10 @@ package org.jeecg.modules.app.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NonNull;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 家庭成员
  */
@@ -19,34 +20,28 @@ public class AddFamilyMembersDTO {
     @Schema(description = "id")
     private String id;
     /**姓名*/
-    @NonNull
     @Schema(description = "姓名")
     private String fullName;
     /**用户编号*/
     @Schema(description = "用户编号")
-    @NonNull
+    @NotNull(message = "用户编号不允许为空")
     private String userId;
     /**身份证号*/
     @Schema(description = "身份证号")
-    @NonNull
     private String identityCard;
     /**身份证正面照*/
-    @NonNull
     @Schema(description = "身份证正面照")
     private String idCardFrontImg;
     /**身份证反面照*/
-    @NonNull
     @Schema(description = "身份证反面照")
     private String idCardBackImg;
     /**手机号*/
-    @NonNull
     @Schema(description = "手机号")
     private String phone;
     /**实名状态 0-未实名 ；1-已实名*/
     @Schema(description = "实名状态 0-未实名 ；1-已实名，默认未实名")
     private Integer realNameStatus;
     /**身份证反面照*/
-    @NonNull
     @Schema(description = "实名认证照片")
     private String realNameImg;
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppSubmitFeedbackRequestDTO.java

@@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NonNull;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -20,15 +20,15 @@ import java.util.Date;
 public class AppSubmitFeedbackRequestDTO {
 
     /**用户id*/
-    @NonNull
+    @NotNull(message = "用户编号不允许为空")
     @Schema(description = "用户id")
     private String userId;
     /**反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他*/
-    @NonNull
+    @NotNull(message = "反馈类型不允许为空")
     @Schema(description = "反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他")
     private Integer feedbackType;
     /**反馈描述*/
-    @NonNull
+    @NotNull(message = "反馈描述不允许为空")
     @Schema(description = "反馈描述")
     private String feedbackDescribed;
     /**反馈图片地址，使用；进行隔开*/

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppFeedback.java

@@ -61,9 +61,6 @@ public class AppFeedback implements Serializable {
 	@Excel(name = "回复人id", width = 15)
     @Schema(description = "回复人id")
     private String replyUserId;
-	/**创建人*/
-    @Schema(description = "创建人")
-    private String createBy;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/FamilyMembersMapper.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.system.app.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.system.app.dto.FindResponseDTO;
 import org.jeecg.modules.system.app.entity.FamilyMembers;
 
 import java.util.List;
@@ -18,5 +21,6 @@ public interface FamilyMembersMapper extends BaseMapper<FamilyMembers> {
     @Select("select  * from nm_family_members where  user_id = #{userId} order by user_type asc,create_time desc")
     List<FamilyMembers> findByUserId(@Param("userId") String userId);
 
-
+    @Select("select  * from nm_family_members where  user_id = #{userId} order by user_type asc,create_time desc")
+   IPage<FamilyMembers> findByPage(@Param("page") Page<FindResponseDTO> page, @Param("userId") String userId);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IFamilyMembersService.java

@@ -1,9 +1,11 @@
 package org.jeecg.modules.system.app.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.app.dto.AddFamilyMembersDTO;
+import org.jeecg.modules.app.dto.FindFamilyMembersDTO;
 import org.jeecg.modules.system.app.dto.FindFamilyMembersResponseDTO;
 import org.jeecg.modules.system.app.entity.FamilyMembers;
 
@@ -22,4 +24,7 @@ public interface IFamilyMembersService extends IService<FamilyMembers> {
     Result<String> editFamilyMembers(AddFamilyMembersDTO addFamilyMembersDTO);
 
     Result<String> deleteFamilyMembers(String id);
+
+
+    Result<IPage<FamilyMembers>> findFamilyMembers(FindFamilyMembersDTO findFamilyMembersDTO);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/FamilyMembersServiceImpl.java

@@ -1,12 +1,16 @@
 package org.jeecg.modules.system.app.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import me.zhyd.oauth.utils.UuidUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.app.dto.AddFamilyMembersDTO;
+import org.jeecg.modules.app.dto.FindFamilyMembersDTO;
 import org.jeecg.modules.system.app.dto.FindFamilyMembersResponseDTO;
+import org.jeecg.modules.system.app.dto.FindResponseDTO;
 import org.jeecg.modules.system.app.entity.FamilyMembers;
 import org.jeecg.modules.system.app.enums.DelFlagEnum;
 import org.jeecg.modules.system.app.mapper.FamilyMembersMapper;
@@ -97,4 +101,10 @@ public class FamilyMembersServiceImpl extends ServiceImpl<FamilyMembersMapper, F
         }
         return Result.ok("删除成功");
     }
+
+    @Override
+    public Result<IPage<FamilyMembers>> findFamilyMembers(FindFamilyMembersDTO findFamilyMembersDTO) {
+        Page<FindResponseDTO> page = new Page<FindResponseDTO>(findFamilyMembersDTO.getPageNo(), findFamilyMembersDTO.getPageSize());
+        return Result.ok(familyMembersMapper.findByPage(page,findFamilyMembersDTO.getUserId()));
+    }
 }