Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_activity_buy

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentDao.java

@@ -426,4 +426,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
     List<BaseMapDto> queryStuSubjectId(@Param("organIds") String organIds);
 
     List<BaseMapDto> queryStuSubjectIdByTeacherId(@Param("userId") Integer userId);
+
+    void updateRepairFlag(@Param("userIdList") List<Integer> userIdList, @Param("repairFlag") boolean repairFlag);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/BasicUserDto.java

@@ -40,6 +40,17 @@ public class BasicUserDto {
 
     private Integer tenantId;
 
+    @ApiModelProperty(value = "是否需要乐器维修")
+    private Boolean repairFlag = false;
+
+    public Boolean getRepairFlag() {
+        return repairFlag;
+    }
+
+    public void setRepairFlag(Boolean repairFlag) {
+        this.repairFlag = repairFlag;
+    }
+
     public Integer getTenantId() {
         return tenantId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageListDto.java

@@ -125,6 +125,16 @@ public class StudentManageListDto {
 	
 	private String extSubjectIds;
 
+	private Boolean repairFlag;
+
+    public Boolean getRepairFlag() {
+        return repairFlag;
+    }
+
+    public void setRepairFlag(Boolean repairFlag) {
+        this.repairFlag = repairFlag;
+    }
+
     public String getAvatar() {
         return avatar;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentStandardDto.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 //学员学习是否达标
 public class StudentStandardDto {
 
@@ -23,6 +25,17 @@ public class StudentStandardDto {
 
     private Long studentAttendanceId;
 
+    @ApiModelProperty(value = "学员维修标识",required = false)
+    private Boolean repairFlag = false;
+
+    public Boolean getRepairFlag() {
+        return repairFlag;
+    }
+
+    public void setRepairFlag(Boolean repairFlag) {
+        this.repairFlag = repairFlag;
+    }
+
     public Long getCourseScheduleId() {
         return courseScheduleId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -88,6 +88,16 @@ public class Student extends SysUser {
 	@ApiModelProperty(value = "家长姓名")
 	private String parentName;
 
+	@ApiModelProperty(value = "学员是否需要维修乐器")
+	private Boolean repairFlag = false;
+
+	public Boolean getRepairFlag() {
+		return repairFlag;
+	}
+
+	public void setRepairFlag(Boolean repairFlag) {
+		this.repairFlag = repairFlag;
+	}
 
 	public Student(Integer userId, String subjectIdList) {
 		this.userId = userId;

mec-biz/src/main/java/com/ym/mec/biz/dal/page/RepairStudentQueryInfo.java

@@ -37,6 +37,16 @@ public class RepairStudentQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否有减免金额0-否 1-是",required = false)
     private Integer hasExemptionAmount;
 
+    @ApiModelProperty(value = "是否乐器维修",required = false)
+    private Boolean repairFlag;
+
+    public Boolean getRepairFlag() {
+        return repairFlag;
+    }
+
+    public void setRepairFlag(Boolean repairFlag) {
+        this.repairFlag = repairFlag;
+    }
 
     public Integer getSubjectId() {
         return subjectId;

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentManageQueryInfo.java

@@ -55,6 +55,16 @@ public class StudentManageQueryInfo extends QueryInfo {
     //是否使用过云教练
     private Integer isRecord;
 
+    private Boolean repairFlag;
+
+    public Boolean getRepairFlag() {
+        return repairFlag;
+    }
+
+    public void setRepairFlag(Boolean repairFlag) {
+        this.repairFlag = repairFlag;
+    }
+
     public Integer getIsRecord() {
         return isRecord;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.StudentDao;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
@@ -16,6 +17,8 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface StudentService extends BaseService<Integer, Student> {
+
+    StudentDao getDao();
 	
 	boolean register(StudentPreRegistration studentPreRegistration);
 
@@ -180,4 +183,24 @@ public interface StudentService extends BaseService<Integer, Student> {
     * @date 2022/7/19 15:21
     */
     List<BaseMapDto> queryStuSubjectId(String organIds);
+
+    /**
+    * @description: 更新学员维修标记
+     * @param userIdList
+ * @param repairFlag
+    * @return void
+    * @author zx
+    * @date 2022/10/11 11:03
+    */
+    void updateRepairFlag(List<Integer> userIdList, boolean repairFlag);
+
+    /**
+    * @description: 更新学员维修标记
+     * @param userId
+ * @param repairFlag
+    * @return void
+    * @author zx
+    * @date 2022/10/11 11:03
+    */
+    void updateRepairFlag(Integer userId, boolean repairFlag);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -88,7 +88,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
     @Autowired
     private SysMessageService sysMessageService;
     @Autowired
-    private StudentDao studentDao;
+    private StudentService studentService;
     @Autowired
     private StudentPaymentRouteOrderService studentPaymentRouteOrderService;
     @Autowired
@@ -262,8 +262,8 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
             throw new BizException("请指定学员");
         }
 
-        studentDao.lockUser(studentId);
-        SysUser student = studentDao.getUser(studentId);
+        studentService.getDao().lockUser(studentId);
+        SysUser student = studentService.getDao().getUser(studentId);
         //如果教务老师为空，代表学员自己创建的订单
         if (studentGoodsSell.getTeacherId() == null) {
             //获取学生关联的所有教务老师列表
@@ -475,7 +475,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
     public Map studentPaymentGoodsOrder(Integer goodsSellId) throws Exception {
         StudentGoodsSell studentGoodsSell = studentGoodsSellDao.get(goodsSellId);
         Integer studentId = studentGoodsSell.getUserId();
-        studentDao.lockUser(studentId);
+        studentService.getDao().lockUser(studentId);
         List<GoodsSellDto> goodsSellDtos = JSONObject.parseArray(studentGoodsSell.getGoodsJson(), GoodsSellDto.class);
         List<Integer> goodsIds = goodsSellDtos.stream().map(e -> e.getGoodsId()).collect(Collectors.toList());
         Map<Integer, String> integerStringMap = getMap("goods", "id_", "type_", goodsIds, studentGoodsSell.getTenantId(), Integer.class, String.class);
@@ -592,7 +592,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map addRepair(StudentRepair repairInfo) throws Exception {
-        studentDao.lockUser(repairInfo.getEmployeeId());
+        studentService.getDao().lockUser(repairInfo.getEmployeeId());
         if (repairInfo.getSendType() != null && repairInfo.getSendType().equals(1) &&
                 (repairInfo.getContactName() == null || repairInfo.getContactName().isEmpty()) &&
                 (repairInfo.getContactMobile() == null || repairInfo.getContactMobile().isEmpty()) &&
@@ -614,7 +614,9 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         if (studentInstrument != null && studentInstrument.getEndTime() != null && studentInstrument.getEndTime().compareTo(date) > 0) {
             repairInfo.setMaintenanceStatus(1);
         }
-        SysUser student = studentDao.getUser(repairInfo.getStudentId());
+        //修改维修标记
+        studentService.updateRepairFlag(repairInfo.getStudentId(),false);
+        SysUser student = studentService.getDao().getUser(repairInfo.getStudentId());
         repairInfo.setOrganId(student.getOrganId());
 
         BigDecimal amount = repairInfo.getAmount();
@@ -816,7 +818,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        studentDao.lockUser(sysUser.getId());
+        studentService.getDao().lockUser(sysUser.getId());
         StudentRepair studentRepair = studentRepairDao.getRepairInfo(id);
         if (studentRepair == null) {
             throw new BizException("维修信息不存在");
@@ -882,7 +884,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         List<RepairGoodsDto> repairGoodsDtos = null;
         Date date = new Date();
         StudentRepair studentRepair = studentRepairDao.get(repairInfo.getId());
-        studentDao.lockUser(studentRepair.getStudentId());
+        studentService.getDao().lockUser(studentRepair.getStudentId());
         BigDecimal amount = studentRepair.getAmount();
         String goodsJson = studentRepair.getGoodsJson();
         if (StringUtils.isNotEmpty(goodsJson)) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -112,6 +112,11 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     }
 
     @Override
+    public StudentDao getDao() {
+        return studentDao;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
 	public boolean register(StudentPreRegistration studentPreRegistration) {
         TenantContextHolder.setTenantId(studentPreRegistration.getTenantId());
@@ -1341,6 +1346,22 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         return studentDao.queryStuSubjectId(organIds);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateRepairFlag(List<Integer> userIdList, boolean repairFlag) {
+        if(!CollectionUtils.isEmpty(userIdList)){
+            studentDao.updateRepairFlag(userIdList,repairFlag);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateRepairFlag(Integer userId, boolean repairFlag) {
+        List<Integer> userIdList = new ArrayList<>(1);
+        userIdList.add(userId);
+        studentDao.updateRepairFlag(userIdList,repairFlag);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public  <T extends BaseStudentDto> void insertStudent(T baseStudent){
         Student student = new Student();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -74,6 +74,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	private StudentServeService studentServeService;
 	@Autowired
 	private SysTenantConfigService sysTenantConfigService;
+	@Autowired
+	private StudentService studentService;
 
 	@Override
 	public BaseDAO<Long, TeacherAttendance> getDAO() {
@@ -106,6 +108,11 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			studentAttendanceDao.updateQualified(courseScheduleId,studentIds,1);
 			this.sendMessage(studentIds,type,courseDate,MessageTypeEnum.SMS_STANDARD_QUALIFIED);
 		}
+		//记录学员是否需要维修
+		List<Integer> repairUser = studentStandardDtos.stream().filter(e -> e.getRepairFlag()).map(e -> e.getUserId()).collect(Collectors.toList());
+		List<Integer> notRepairUser = studentStandardDtos.stream().filter(e -> !e.getRepairFlag()).map(e -> e.getUserId()).collect(Collectors.toList());
+		studentService.updateRepairFlag(repairUser,true);
+		studentService.updateRepairFlag(notRepairUser,false);
 		//标记当前课程为已评价
 		courseScheduleDao.updateEvaluate(courseScheduleId);
 	}

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -4020,9 +4020,10 @@
         <result property="courseScheduleReviewId" column="course_schedule_review_id_"/>
         <result property="classDate" column="class_date_"/>
         <result property="studentAttendanceId" column="student_attendance_id_"/>
+        <result property="repairFlag" column="repair_flag_"/>
     </resultMap>
     <select id="queryStudyStandard" resultMap="StudentStandardDto">
-        SELECT su.avatar_,su.username_,sa.user_id_,sb.name_ subject_name_,sa.qualified_flag_
+        SELECT su.avatar_,su.username_,sa.user_id_,sb.name_ subject_name_,sa.qualified_flag_,s.repair_flag_
         FROM student_attendance sa
         LEFT JOIN student s ON s.user_id_ = sa.user_id_
         LEFT JOIN `subject` sb ON sb.id_ = s.subject_id_list_

mec-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -820,7 +820,9 @@
 			su.organ_id_
 	</select>
     <select id="getCourseStudents" resultType="com.ym.mec.biz.dal.dto.BasicUserDto">
-		SELECT cssp.user_id_ userId,st.member_rank_setting_id_ memberRankSettingId,s.name_ subjectName,su.avatar_ headUrl,su.username_ name,st.subject_id_list_ subjectIdList
+		SELECT cssp.user_id_ userId,st.member_rank_setting_id_ memberRankSettingId,
+		       s.name_ subjectName,su.avatar_ headUrl,su.username_ name,
+		       st.subject_id_list_ subjectIdList,st.repair_flag_ repairFlag
 		FROM course_schedule_student_payment cssp
 		LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
 		LEFT JOIN student st ON st.user_id_ = cssp.user_id_

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -80,6 +80,7 @@
         <result column="experience_membership_end_time_" property="experienceMembershipEndTime"/>
         <result column="record_user_id_" property="recordUserId"/>
         <result column="ext_subject_ids_" property="extSubjectIds"/>
+        <result column="repair_flag_" property="repairFlag"/>
     </resultMap>
 
     <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
@@ -147,7 +148,7 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,s.ext_subject_ids_,
+        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_`,s.repair_flag_ ,su.`username_` ,su.`phone_` parents_phone_,s.ext_subject_ids_,
         sut.name_ real_name_,su.`gender_` , su.organ_id_,su.avatar_,
 		tu.`real_name_` teacher_name_,CASE s.service_tag_ WHEN 2 THEN 0 ELSE s.service_tag_ END service_tag_ ,s.`operating_tag_` ,
         s.care_package_, s.come_on_package_, suca.`course_balance_` ,suca.balance_,
@@ -198,6 +199,9 @@
             <if test="isActive != null and isActive == true">
                 AND su.password_ is not null
             </if>
+            <if test="repairFlag != null">
+                AND s.repair_flag_ = #{repairFlag}
+            </if>
             <if test="isActive != null and isActive == false">
                 AND su.password_ is null
             </if>

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -1372,6 +1372,12 @@
         AND sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ != 2 AND mg.`status_` = 'PROGRESS'
         GROUP BY sr.user_id_)t)
     </update>
+    <update id="updateRepairFlag">
+        update student set repair_flag_ = #{repairFlag} where user_id_ IN
+        <foreach collection="userIdList" open="(" close=")" item="id" separator=",">
+            #{id}
+        </foreach>
+    </update>
 
     <select id="queryStudent" resultMap="Student">
         SELECT s.*,su.username_,su.phone_,o.name_ organ_name_,sb.name_ subject_name_ FROM student s

mec-biz/src/main/resources/config/mybatis/StudentRepairMapper.xml

@@ -151,23 +151,29 @@
         SELECT su.username_ ,su.id_ user_id_,su.avatar_ head_url_,su.gender_,su.phone_,s.care_package_,s.come_on_package_,su.organ_id_
         FROM sys_user su
         LEFT JOIN student s ON su.id_=s.user_id_
-        WHERE FIND_IN_SET(organ_id_,#{organIdList})
-        AND user_type_ LIKE '%STUDENT%'
+        WHERE FIND_IN_SET(su.organ_id_,#{organIdList})
+        AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0
         <if test="search">
-            AND (username_ LIKE CONCAT(#{search},'%') OR phone_ LIKE CONCAT(#{search},'%'))
+            AND (su.username_ LIKE CONCAT(#{search},'%') OR su.phone_ LIKE CONCAT(#{search},'%'))
+        </if>
+        <if test="repairFlag != null">
+            AND s.repair_flag_ = #{repairFlag}
         </if>
-        AND del_flag_ = 0
         <include refid="global.limit"/>
     </select>
 
     <select id="getStudentsCount" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM sys_user
-        WHERE FIND_IN_SET(organ_id_,#{organIdList})
-        AND user_type_ LIKE '%STUDENT%'
+        SELECT COUNT(su.id_) FROM sys_user su
+        <if test="repairFlag != null">
+            LEFT JOIN student s ON su.id_=s.user_id_
+        </if>
+        WHERE FIND_IN_SET(su.organ_id_,#{organIdList}) AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0
         <if test="search">
-            AND (username_ LIKE CONCAT(#{search},'%') OR phone_ LIKE CONCAT(#{search},'%'))
+            AND (su.username_ LIKE CONCAT(#{search},'%') OR su.phone_ LIKE CONCAT(#{search},'%'))
+        </if>
+        <if test="repairFlag != null">
+            AND s.repair_flag_ = #{repairFlag}
         </if>
-        AND del_flag_ = 0
     </select>
 
     <select id="queryPage" resultMap="StudentRepair">

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ClassGroupController.java

@@ -3,6 +3,7 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.CourseScheduleStudentPaymentDao;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.CourseScheduleEvaluate;
 import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -60,7 +62,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "获取课程学员列表")
     @GetMapping("/getCourseStudents")
-    public HttpResponseResult getCourseStudents(Long courseScheduleId){
+    public HttpResponseResult<List<BasicUserDto>> getCourseStudents(Long courseScheduleId){
         return succeed(courseScheduleStudentPaymentDao.getCourseStudents(courseScheduleId));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -1,7 +1,6 @@
 package com.ym.mec.web.controller.education;
 
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dao.StudentInstrumentDao;
@@ -14,7 +13,6 @@ import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.date.DateUtil;
@@ -36,7 +34,7 @@ import java.util.Objects;
 public class EduRepairController extends BaseController {
 
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private EmployeeDao employeeDao;
     @Autowired
@@ -59,15 +57,12 @@ public class EduRepairController extends BaseController {
     @ApiOperation("获取学生列表")
     @GetMapping(value = "/getStudents")
     public HttpResponseResult<PageInfo<BasicUserDto>> getStudents(RepairStudentQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        Employee employee = employeeDao.get(sysUser.getId());
+        Integer userId = sysUserService.getUserId();
+        Employee employee = employeeDao.get(userId);
         if (Objects.isNull(employee)) {
             return failed(HttpStatus.NOT_ACCEPTABLE, "员工信息不存在");
         }
-        queryInfo.setEmployeeId(sysUser.getId());
+        queryInfo.setEmployeeId(userId);
         queryInfo.setOrganIdList(employee.getOrganIdList());
         return succeed(studentRepairService.getStudents(queryInfo));
     }
@@ -81,10 +76,6 @@ public class EduRepairController extends BaseController {
     @ApiOperation("添加商品销售订单")
     @PostMapping(value = "/addGoodsSellOrder")
     public HttpResponseResult addGoodsSellOrder(@RequestBody StudentGoodsSell studentGoodsSell) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            throw new BizException("请登录");
-        }
         if (studentGoodsSell.getIsRepeatPay() == false) {
             List<StudentPaymentOrder> list = studentPaymentOrderService.queryByCondition(GroupType.GOODS_SELL, null,studentGoodsSell.getUserId(), DealStatusEnum.ING,
                     OrderTypeEnum.RENEW);
@@ -92,8 +83,9 @@ public class EduRepairController extends BaseController {
                 return failed(HttpStatus.CONTINUE, "该学员有待支付的订单");
             }
         }
-        studentGoodsSell.setTeacherId(sysUser.getId());
-        studentGoodsSell.setAuthorUser(sysUser.getId());
+        Integer userId = sysUserService.getUserId();
+        studentGoodsSell.setTeacherId(userId);
+        studentGoodsSell.setAuthorUser(userId);
         Map map = studentRepairService.addGoodsSellOrder(studentGoodsSell);
         if(map.containsKey("tradeState")){
             return failed(HttpStatus.CREATED, map,"恭喜您,购买成功!");
@@ -104,10 +96,7 @@ public class EduRepairController extends BaseController {
     @ApiOperation("添加维修单")
     @PostMapping(value = "/addRepair")
     public HttpResponseResult addRepair(@RequestBody StudentRepair repairInfo) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
+        SysUser sysUser = sysUserService.getUser();
         repairInfo.setEmployeeId(sysUser.getId());
         repairInfo.setEmployeeName(sysUser.getRealName());
 //        if(repairInfo.getSendType().equals(1)){
@@ -122,11 +111,7 @@ public class EduRepairController extends BaseController {
     @ApiOperation("获取学生的维修记录")
     @GetMapping(value = "/getStudentRepairList")
     public HttpResponseResult getStudentRepairList(RepairStudentQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        queryInfo.setEmployeeId(sysUser.getId());
+        queryInfo.setEmployeeId(sysUserService.getUserId());
         queryInfo.setPayStatus(2);
         return succeed(studentRepairService.queryPage(queryInfo));
     }
@@ -134,30 +119,18 @@ public class EduRepairController extends BaseController {
     @ApiOperation("获取乐器种类")
     @GetMapping(value = "/findSubSubjects")
     public HttpResponseResult findSubSubjects() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
         return succeed(subjectService.findSubSubjects( null));
     }
 
     @ApiOperation("获取学生信息")
     @GetMapping(value = "/getStudentInfo")
     public HttpResponseResult getStudentInfo(Integer studentId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
         return succeed(studentRepairService.getStudentInfo(studentId));
     }
 
     @ApiOperation("获取维修记录详情")
     @GetMapping(value = "/getRepairInfo")
     public HttpResponseResult getRepairInfo(Integer id) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
         return succeed(studentRepairService.getRepairInfo(id));
     }
 
@@ -165,11 +138,7 @@ public class EduRepairController extends BaseController {
     @ApiOperation("获取维修列表")
     @GetMapping(value = "/queryPage")
     public HttpResponseResult queryPage(RepairStudentQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        queryInfo.setEmployeeId(sysUser.getId());
+        queryInfo.setEmployeeId(sysUserService.getUserId());
         Date endTime = queryInfo.getEndTime();
         if(endTime != null){
             queryInfo.setEndTime(DateUtil.addDays(endTime, 1));
@@ -190,11 +159,7 @@ public class EduRepairController extends BaseController {
     @GetMapping("/queryGoodsPage")
     public Object queryPage(GoodsQueryInfo queryInfo){
         queryInfo.setOrganId(null);
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        Employee employee = employeeDao.get(sysUser.getId());
+        Employee employee = employeeDao.get(sysUserService.getUserId());
         if (queryInfo.getStudentShowOrganId() == null &&
                 queryInfo.getEducationShowOrganId() == null &&
                 queryInfo.getCourseFeeShowOrganId() == null &&
@@ -216,11 +181,7 @@ public class EduRepairController extends BaseController {
     @ApiOperation(value = "分页查询教务老师关联的学员商品订单")
     @GetMapping("/queryStudentGoodsOrders")
     public Object queryStudentGoodsOrders(GoodsSellQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        queryInfo.setTeacherId(sysUser.getId());
+        queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(studentGoodsSellService.queryStudentGoodsOrders(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduStudentController.java

@@ -4,7 +4,6 @@ import com.ym.mec.biz.dal.dto.BaseMapDto;
 import com.ym.mec.biz.dal.dto.EduOrganStudentDataDto;
 import com.ym.mec.biz.dal.dto.StatDto;
 import com.ym.mec.biz.dal.entity.Organization;
-import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.page.StudentQueryInfo;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.StudentManageService;
@@ -15,7 +14,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -69,4 +67,11 @@ public class EduStudentController extends BaseController {
     public HttpResponseResult<List<BaseMapDto>> queryStuSubjectId(){
         return succeed(studentService.queryStuSubjectId(organizationService.getEmployeeOrgan(null)));
     }
+
+    @ApiOperation(value = "修改学员维修标记")
+    @GetMapping("/updateRepairFlag")
+    public HttpResponseResult updateRepairFlag(Integer userId,Boolean repairFlag){
+        studentService.updateRepairFlag(userId,repairFlag);
+        return succeed();
+    }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduStudentStudentController.java

@@ -118,5 +118,4 @@ public class EduStudentStudentController extends BaseController {
         queryInfo.setIsExport(false);
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }
-
 }