员工管理新增字段和家庭成员信息查询优化

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

@@ -31,6 +31,8 @@ public class AppFamilyMembersController {
     @GetMapping("/findFamilyMembers")
     @Operation(summary = "分页查询家庭成员")
     public Result<IPage<FamilyMembers>> findFamilyMembers(FindFamilyMembersDTO findFamilyMembersDTO){
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        findFamilyMembersDTO.setUserId(loginUser.getId());
         return iFamilyMembersService.findFamilyMembers(findFamilyMembersDTO);
     }
 

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

@@ -5,8 +5,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * 家庭成员
  */
@@ -17,7 +15,6 @@ import javax.validation.constraints.NotNull;
 public class FindFamilyMembersDTO {
 
     @Schema(description = "用户编号")
-    @NotNull(message = "用户编号不允许为空")
     private String userId;
 
     @Schema(description = "页码")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/coach/AppCoachDetailsVO.java

@@ -20,6 +20,8 @@ public class AppCoachDetailsVO {
     private String realname;
     @Schema(description = "教练头像")
     private String avatar;
+    @Schema(description = "教练头像")
+    private String backgroundImg;
     @Schema(description = "所教项目编号使用,分割")
     private String trainingPrograms;
     @Schema(description = "所教项目使用,分割")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/stadium/StadiumConcertsVO.java

@@ -22,6 +22,8 @@ public class StadiumConcertsVO {
     /**事件类型（0: 网页链接, 1: 内部页面跳转）*/
     @Schema(description = "日期加星期")
     private String weekDayAndDate;
+    @Schema(description = "日期")
+    private String weekDayDate;
 //    /**当天场次总数*/
 //    @Schema(description = "当天场次总数")
 //    private String dayConcertsTotal;

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

@@ -301,6 +301,20 @@ public class AppInstructorController extends JeecgController<AppInstructor, IApp
 		return Result.OK(staffVO);
 	}
 
+	/**
+	 * 修改状态
+	 *
+	 * @param sysUser
+	 * @return
+	 */
+	//@AutoLog(value = "教练表-通过id查询")
+	@Operation(summary="员工信息-修改状态")
+	@PutMapping(value = "/updateStatus")
+	public Result<String> updateStatus(SysUser sysUser) {
+		sysUserService.updateById(sysUser);
+		return Result.OK("修改状态成功");
+	}
+
     /**
     * 导出excel
     *

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

@@ -61,7 +61,7 @@
             left join  sys_user b on a.user_id = b.id
     </select>
     <select id="findById" resultType="org.jeecg.modules.app.vo.coach.AppCoachDetailsVO">
-        select a.user_id as id,b.realname,a.training_programs,a.good_rate,a.teaching_philosophy,a.excel_msg,b.avatar,
+        select a.user_id as id,b.realname,a.training_programs,a.good_rate,a.teaching_philosophy,a.excel_msg,b.avatar,a.background_img,
                b.certificate_innocence,b.healthy,b.honor  from nm_instructor a left join  sys_user b on a.user_id = b.id where a.user_id = #{id}
 
     </select>
@@ -93,7 +93,7 @@
         </if>
     </select>
     <select id="findByStaffId" resultType="org.jeecg.modules.system.app.vo.staff.StaffVO">
-        select a.id as staffId,b.id as instructorId,a.username,b.realname,a.status,a.password,b.training_programs,b.teaching_philosophy,b.excel_msg,a.certificate_innocence,a.healthy,a.honor from from sys_user a
+        select a.id as staffId,b.id as instructorId,a.username,b.realname,a.status,a.password,b.training_programs,b.teaching_philosophy,b.excel_msg,a.certificate_innocence,a.healthy,a.honor,b.background_img from from sys_user a
         left join nm_instructor b on a.id =b.user_id and b.del_flag=0
         where a.id=#{id} and a.del_flag=0
     </select>

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/utils/TimeRangeFinder.java

@@ -109,6 +109,7 @@ public class TimeRangeFinder {
                     String weekday = dayOfWeek.getDisplayName(TextStyle.SHORT, locale);
                     display = weekday + "(" + format + ")";
             }
+            nextSevenDayVo.setWeekDayDate(format);
             nextSevenDayVo.setWeekDay(dayOfWeekNum);
             nextSevenDayVo.setWeekDayAndDate(display);
             dates.add(nextSevenDayVo);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/staff/StaffSaveVO.java

@@ -26,6 +26,10 @@ public class StaffSaveVO {
     /**名称*/
     @Schema(description = "登录账号")
     private String username;
+
+    /**名称*/
+    @Schema(description = "背景图")
+    private String backgroundImg;
     /**地址*/
     @Schema(description = "用户名称(真实姓名)")
     private String realname;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/staff/StaffVO.java

@@ -30,6 +30,9 @@ public class StaffVO {
 
     @Schema(description = "教练id")
     private String instructorId;
+
+    @Schema(description = "背景图")
+    private String backgroundImg;
     /**名称*/
     @Schema(description = "登录账号")
     private String username;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/time/NextSevenDayVo.java

@@ -24,4 +24,6 @@ public class NextSevenDayVo {
     private Integer weekDay;
     @Schema(description ="星期配合日期")
     private String weekDayAndDate;
+    @Schema(description ="日期")
+    private String weekDayDate;
 }