Merge branch 'feature/0427-school' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DailySummaryOfClassesForTheCurrentSemesterWrapper.java

@@ -50,6 +50,8 @@ public class DailySummaryOfClassesForTheCurrentSemesterWrapper {
 
         private String week;
 
+        private String weekTime;
+
         @ApiModelProperty(value = "课程状态NOT_START,ING,END",required = false)
         private String courseStatus;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/SchoolIndexStatWrapper.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 public class SchoolIndexStatWrapper {
 
     @Data
@@ -105,7 +107,7 @@ public class SchoolIndexStatWrapper {
         private Integer totalNum = 0;
 
         @ApiModelProperty("出勤率")
-        private Integer attendanceRate = 0;
+        private BigDecimal attendanceRate = BigDecimal.ZERO;
     }
 
     @Data
@@ -113,18 +115,30 @@ public class SchoolIndexStatWrapper {
     public static class StudentLesson {
 
         @ApiModelProperty("应交人数")
-        private Integer expectNum;
+        private Integer expectNum = 0;
 
         @ApiModelProperty("实际提交人数")
-        private Integer actualNum;
+        private Integer actualNum = 0;
 
         @ApiModelProperty("合格提交人数")
-        private Integer passNum;
+        private Integer passNum = 0;
 
         @ApiModelProperty("提交率")
-        private Integer commitRate;
+        private BigDecimal commitRate = BigDecimal.ZERO;
 
         @ApiModelProperty("合格率")
-        private Integer passRate;
+        private BigDecimal passRate = BigDecimal.ZERO;
+    }
+
+
+    @Data
+    @ApiModel(" SchoolData-学校信息")
+    public static class SchoolData {
+
+        @ApiModelProperty("合作单位编号")
+        private Integer coopId;
+
+        @ApiModelProperty("logo")
+        private String logo;
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/SchoolStaffWrapper.java

@@ -16,6 +16,7 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -62,6 +63,9 @@ public class SchoolStaffWrapper {
         @ApiModelProperty("合作单位禁用")
         private Boolean coopStatus;
 
+        @ApiModelProperty("学校员工ID")
+        private Long staffId;
+
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
         }
@@ -122,7 +126,7 @@ public class SchoolStaffWrapper {
         @ApiModelProperty("用户头像")
         private String avatar;
 
-        @ApiModelProperty("帐号状态(注销 -1，冻结 9，激活 0)")
+        @ApiModelProperty("帐号状态(注销 -1，冻结 9，激活 1)")
         private String status;
 
         @ApiModelProperty("注册时间")
@@ -130,7 +134,10 @@ public class SchoolStaffWrapper {
 
         @ApiModelProperty("验证码")
         private String smsCode;
-        
+
+
+        @ApiModelProperty("是否验证验证码")
+        private Boolean checkSmsCode;
         public String jsonString() {
             return JSON.toJSONString(this);
         }
@@ -382,4 +389,28 @@ public class SchoolStaffWrapper {
             return this;
         }
     }
+
+
+    @Data
+    @ApiModel("SchoolStaffUpdate-后台修改账户")
+    public static class SchoolStaffUpdate {
+
+        // 修改用户手机号，合作单位，账号类型
+        @ApiModelProperty("用户ID")
+        @NotNull(message = "用户ID不能为空")
+        private Long staffId;
+
+        @ApiModelProperty("手机号")
+//        @NotNull(message = "手机号不能为空")
+        private String phone;
+
+        @ApiModelProperty("合作单位ID")
+//        @NotNull(message = "合作单位ID不能为空")
+        private Long coopId;
+
+        @ApiModelProperty("用户类型")
+//        @NotNull(message = "用户类型不能为空")
+        private ESchoolStaffType userType;
+
+    }
 }

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

@@ -131,7 +131,7 @@ public interface ImGroupService extends BaseService<String, ImGroup> {
      * @param user          用户信息
      * @param userType
      */
-    void addImGroup(List<String> musicGroupIds, SysUser user, ESchoolStaffType userType);
+    void addImGroup(List<String> musicGroupIds, SysUser user, String roleType);
 
     /**
      * 查询群组
@@ -140,4 +140,12 @@ public interface ImGroupService extends BaseService<String, ImGroup> {
      * @return 群组列表
      */
     List<ImGroup> queryByUserId(ImGroupWrapper.ImQuery query);
+
+    /**
+     * 退出群组
+     *
+     * @param imGroupIds 群组ID
+     * @param userId    用户ID
+     */
+    void quitGroup(List<String> imGroupIds, Integer userId);
 }

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

@@ -19,7 +19,7 @@ public interface SchoolStaffService extends IService<SchoolStaff>  {
      * @param id 详情ID
      * @return SchoolStaff
      */
-	SchoolStaff detail(Long id);
+    SchoolStaffWrapper.SchoolStaff detail(Long id);
 
     /**
      * 分页查询
@@ -91,4 +91,11 @@ public interface SchoolStaffService extends IService<SchoolStaff>  {
      * @return SchoolStaff
      */
     SchoolStaff getByUserId(Integer userId);
+
+    /**
+     * 更新账号信息
+     *
+     * @param schoolStaffUpdate SchoolStaffWrapper.SchoolStaffUpdate
+     */
+    void updateAccount(SchoolStaffWrapper.SchoolStaffUpdate schoolStaffUpdate);
 }

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

@@ -7,6 +7,8 @@ public interface SysUserService {
 
     SysUser getUser();
 
+    SysUser queryUserByPhone(String phone);
+
     SysUser queryUserById(Integer userId);
 
     Boolean updateSysUser(SysUser user);

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

@@ -6023,15 +6023,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		LocalDate currentWeekStart = startDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
 		DateTimeFormatter format = DateTimeFormatter.ofPattern("MM月dd日");
 		StringBuffer sb;
+		StringBuffer sb1;
 		int week = 0;
 		while (!currentWeekStart.isAfter(endDate)) {
 			DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterMapDto vo =
 					new DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterMapDto();
 			String weekStart = currentWeekStart.format(format);
-			sb = new StringBuffer("第").append(toChineseNumber(week)).append("周 (").append(weekStart).append("-");
+			sb = new StringBuffer("第").append(toChineseNumber(week)).append("周");
 			LocalDate currentWeekEnd = currentWeekStart.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
 			String endStart = currentWeekEnd.format(format);
-			sb.append(endStart).append(")");
+			sb1 = new StringBuffer("(").append(weekStart).append("-").append(endStart).append(")");
 			// 判断课程状态
 			String courseStatus;
 			if (currentWeekEnd.isBefore(now)) {
@@ -6051,6 +6052,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			week++;
 			currentWeekStart = currentWeekEnd.plusDays(1);
 			vo.setWeek(sb.toString());
+			vo.setWeekTime(sb1.toString());
 			vo.setDailySummaryOfClassesForTheCurrentSemesterDtos(currentWeekDates);
 			result.add(vo);
 		}

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

@@ -19,6 +19,7 @@ import com.ym.mec.biz.dal.enums.school.ESchoolStaffType;
 import com.ym.mec.biz.dal.wrapper.ImGroupWrapper;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
@@ -426,7 +427,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void addImGroup(List<String> imGroupIds, SysUser user, ESchoolStaffType userType) {
+    public void addImGroup(List<String> imGroupIds, SysUser user, String roleType) {
         if (CollectionUtils.isEmpty(imGroupIds)) {
             return;
         }
@@ -455,7 +456,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 imGroupMember.setImGroupId(imGroup.getId());
                 imGroupMember.setUserId(user.getId());
                 imGroupMember.setIsAdmin(false);
-                imGroupMember.setRoleType(userType.getDescribe());
+                imGroupMember.setRoleType(roleType);
                 imGroupMember.setTenantId(imGroup.getTenantId());
                 imGroupMemberDao.insert(imGroupMember);
             } catch (Exception e) {
@@ -480,4 +481,38 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         }
         return imGroupDao.getByUserId(query);
     }
+
+    /**
+     * 退出群组
+     *
+     * @param imGroupIds 群组ID
+     * @param userId     用户ID
+     */
+    @Override
+    public void quitGroup(List<String> imGroupIds, Integer userId) {
+        if (CollectionUtils.isEmpty(imGroupIds)) {
+            return;
+        }
+
+        String serviceProvider = sysConfigService.findByParamName(SysConfigService.IM_SERVICE_PROVIDER).getParanValue();
+
+        ImPluginService imPluginService =imPluginContext.getPluginService(serviceProvider);
+
+        List<ImGroup> groupList = imGroupDao.getByIds(imGroupIds);
+
+        List<com.ym.mec.biz.dal.entity.ImGroupMember> imGroupMemberList = new ArrayList<>();
+        for (ImGroup imGroup : groupList) {
+            try {
+                imPluginService.groupQuit(imGroup.getId(),  ImGroupMemberWrapper.ImGroupMember.builder().userId(userId.longValue()).build());
+            } catch (Exception e) {
+                log.error("退出群聊失败",e);
+            }
+            com.ym.mec.biz.dal.entity.ImGroupMember imGroupMember = new com.ym.mec.biz.dal.entity.ImGroupMember();
+            imGroupMember.setImGroupId(imGroup.getId());
+            imGroupMember.setUserId(userId);
+            imGroupMemberList.add(imGroupMember);
+        }
+
+        imGroupMemberService.batchDeleteByGroupIdAndUserId(imGroupMemberList);
+    }
 }

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

@@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.Collator;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -175,9 +176,10 @@ public class SchoolIndexStatServiceImpl implements SchoolIndexStatService {
         //获取学员考勤数据
         SchoolIndexStatWrapper.StudentAttendance studentAttendance = studentAttendanceDao.statCoopAttendance(musicGroupIds,queryDto);
         if(Objects.nonNull(studentAttendance)){
-            int num = studentAttendance.getNormalNum() + studentAttendance.getLateNum();
+            Integer num = studentAttendance.getNormalNum() + studentAttendance.getLateNum();
             if(num > 0){
-                studentAttendance.setAttendanceRate(num / studentAttendance.getTotalNum());
+                studentAttendance.setAttendanceRate(new BigDecimal(num).
+                        divide(new BigDecimal(studentAttendance.getTotalNum()),4,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(2));
             }
         }
         return studentAttendance;
@@ -195,7 +197,18 @@ public class SchoolIndexStatServiceImpl implements SchoolIndexStatService {
             return new SchoolIndexStatWrapper.StudentLesson();
         }
         this.setTime(queryDto);
-        return lessonExaminationDao.schoolLessonStat(musicGroupIds,queryDto);
+        SchoolIndexStatWrapper.StudentLesson studentLesson = lessonExaminationDao.schoolLessonStat(musicGroupIds, queryDto);
+        if(Objects.nonNull(studentLesson)){
+            if(studentLesson.getActualNum() > 0){
+                studentLesson.setCommitRate(new BigDecimal(studentLesson.getActualNum()).
+                        divide(new BigDecimal(studentLesson.getExpectNum()),4,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(2));
+            }
+            if(studentLesson.getPassNum() > 0){
+                studentLesson.setPassRate(new BigDecimal(studentLesson.getPassNum()).
+                        divide(new BigDecimal(studentLesson.getExpectNum()),4,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(2));
+            }
+        }
+        return studentLesson;
     }
 
     private void setTime(SchoolIndexStatWrapper.QueryDto queryDto){

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

@@ -93,15 +93,23 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
     @Autowired
     private ClassGroupService classGroupService;
 
+    @Autowired
+    private SysUserService sysUserService;
+
     /**
      * 查询详情
      * @param id 详情ID
      * @return SchoolStaff
      */
     @Override
-    public SchoolStaff detail(Long id) {
-        
-        return baseMapper.selectById(id);
+    public SchoolStaffWrapper.SchoolStaff detail(Long id) {
+
+        IPage<SchoolStaffWrapper.SchoolStaff> page = selectPage(new Page<>(1, 1), SchoolStaffWrapper.SchoolStaffQuery.builder().staffId(id).build());
+
+        if (CollectionUtils.isEmpty(page.getRecords())) {
+            return null;
+        }
+        return page.getRecords().get(0);
     }
     
     /**
@@ -158,8 +166,15 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         }
 
         // 验证码合法性校验
+        if (schoolStaff.getCheckSmsCode() == null || schoolStaff.getCheckSmsCode()) {
+            if(smsCodeService.verifyValidCode(schoolStaff.getMobile(), schoolStaff.getSmsCode())
+                    && !debugMode ) {
+
+                throw new BizException("验证码错误");
+            }
+        }
         if(smsCodeService.verifyValidCode(schoolStaff.getMobile(), schoolStaff.getSmsCode())
-                && !debugMode) {
+                && !debugMode ) {
 
             throw new BizException("验证码错误");
         }
@@ -237,28 +252,9 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
 
              // 创建学校im好友
              imUserFriendService.refreshSchoolStaffFriend(schoolStaff.getSchoolId().intValue());
-             if (schoolStaff.getUserType().equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
-
-                 // 乐团领队添加到所有乐团群
-                 List<MusicGroup> musicGroups = cooperationOrganService.musicGroupPage(schoolStaff.getSchoolId().intValue());
-                 // 创建班级im好友
-                 for (MusicGroup musicGroup : musicGroups) {
-                     imUserFriendService.refreshGroupImUserFriend(musicGroup.getId(),null);
-                 }
-
-                 // id 集合
-                 List<String> musicGroupIds = musicGroups.stream().map(MusicGroup::getId).collect(Collectors.toList());
 
-                 // 班级群
-                 List<ClassGroup> classGroups = classGroupService.getClassGroupByMusicIds(musicGroupIds);
-
-                 // ID集合
-                 List<String> classGroupIds = classGroups.stream().map(o -> o.getId().toString()).collect(Collectors.toList());
-                 List<String> imGroupIds = new ArrayList<>();
-                 imGroupIds.addAll(classGroupIds);
-        //        imGroupIds.addAll(musicGroupIds);
-
-                 imGroupService.addImGroup(imGroupIds,user,schoolStaff.getUserType());
+             if (schoolStaff.getUserType().equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
+                 addMusicGroup(schoolStaff, user);
              }
          });
 
@@ -306,6 +302,75 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         return true;
     }
 
+    private void addMusicGroup(SchoolStaffWrapper.SchoolStaff schoolStaff, SysUser user) {
+
+        CompletableFuture.runAsync( () -> {
+            // 乐团领队添加到所有班级群
+            List<MusicGroup> musicGroups = cooperationOrganService.musicGroupPage(schoolStaff.getSchoolId().intValue());
+            if (CollectionUtils.isEmpty(musicGroups)) {
+                return;
+            }
+            // 创建班级im好友
+            for (MusicGroup musicGroup : musicGroups) {
+                imUserFriendService.refreshGroupImUserFriend(musicGroup.getId(),null);
+            }
+
+            // id 集合
+            List<String> musicGroupIds = musicGroups.stream().map(MusicGroup::getId).collect(Collectors.toList());
+
+            // 班级群
+            List<ClassGroup> classGroups = classGroupService.getClassGroupByMusicIds(musicGroupIds);
+
+            if (CollectionUtils.isEmpty(classGroups)) {
+                return;
+            }
+            // ID集合
+            List<String> classGroupIds = classGroups.stream().map(o -> o.getId().toString()).collect(Collectors.toList());
+            List<String> imGroupIds = new ArrayList<>();
+            imGroupIds.addAll(classGroupIds);
+    //        imGroupIds.addAll(musicGroupIds);
+
+            imGroupService.addImGroup(imGroupIds, user, schoolStaff.getUserType().getDescribe());
+
+        });
+
+
+    }
+
+    private void delMusicGroup(SchoolStaffWrapper.SchoolStaff schoolStaff, SysUser user) {
+
+        // 乐团领队添加到所有班级群
+        List<MusicGroup> musicGroups = cooperationOrganService.musicGroupPage(schoolStaff.getSchoolId().intValue());
+
+        if (CollectionUtils.isEmpty(musicGroups)) {
+            return;
+        }
+        // id 集合
+        List<String> musicGroupIds = musicGroups.stream().map(MusicGroup::getId).collect(Collectors.toList());
+
+        // 班级群
+        List<ClassGroup> classGroups = classGroupService.getClassGroupByMusicIds(musicGroupIds);
+
+        if (CollectionUtils.isEmpty(classGroups)) {
+            return;
+        }
+
+
+        // 解除im好友关联
+        imUserFriendDao.deleteByUserIdAndFriendId(schoolStaff.getUserId());
+
+        // 创建学校im好友
+        imUserFriendService.refreshSchoolStaffFriend(schoolStaff.getSchoolId().intValue());
+        // ID集合
+        List<String> classGroupIds = classGroups.stream().map(o -> o.getId().toString()).collect(Collectors.toList());
+        List<String> imGroupIds = new ArrayList<>();
+        imGroupIds.addAll(classGroupIds);
+        //        imGroupIds.addAll(musicGroupIds);
+
+        imGroupService.quitGroup(imGroupIds, user.getId());
+
+    }
+
     /**
      * 系统用户信息
      * @param schoolStaff SchoolStaffWrapper.SchoolStaff
@@ -581,5 +646,86 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
                 .one();
     }
 
+    /**
+     * 更新账号信息
+     *
+     * @param schoolStaffUpdate SchoolStaffWrapper.SchoolStaffUpdate
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateAccount(SchoolStaffWrapper.SchoolStaffUpdate schoolStaffUpdate) {
+
+        SchoolStaff schoolStaff = schoolStaffService.getById(schoolStaffUpdate.getStaffId());
+        if (schoolStaff == null) {
+            throw new BizException("用户信息不存在");
+        }
+
+        // 用户信息
+        SysUser sysUser = sysUserService.queryUserById(schoolStaff.getUserId().intValue());
+        if (sysUser == null) {
+            throw new BizException("用户信息不存在");
+        }
+
+        // 检测手机号是否修改
+        if (StringUtils.isNotBlank(schoolStaffUpdate.getPhone()) && !sysUser.getPhone().equals(schoolStaffUpdate.getPhone())) {
+
+            // 检测手机号是否已被使用
+
+            // 用户帐号信息
+            SysUser user = teacherDao.getUserWithPhone(schoolStaffUpdate.getPhone());
+
+            if (Objects.nonNull(user)) {
+                throw new BizException("手机号已存在");
+            }
+            sysUser.setPhone(schoolStaffUpdate.getPhone());
+            teacherDao.updateUser(sysUser);
+        }
+
+        // 检测学校是否修改
+        if (schoolStaffUpdate.getCoopId() != null && !schoolStaff.getSchoolId().equals(schoolStaffUpdate.getCoopId())){
+            // 删除学校账户
+            del(schoolStaff.getId());
+            schoolStaff.setSchoolId(schoolStaffUpdate.getCoopId());
+
+            // 创建新学校账户
+            SchoolStaffWrapper.SchoolStaff staff = new SchoolStaffWrapper.SchoolStaff();
+            staff.setSchoolId(schoolStaffUpdate.getCoopId());
+            if (schoolStaffUpdate.getUserType() != null) {
+                staff.setUserType(schoolStaffUpdate.getUserType());
+            } else {
+                staff.setUserType(schoolStaff.getUserType());
+            }
+            staff.setUsername(sysUser.getUsername());
+            staff.setMobile(sysUser.getPhone());
+            staff.setCheckSmsCode(false);
+            add(staff);
+        } else
+        // 检测账号类型是否修改
+        if (schoolStaffUpdate.getUserType() != null && !schoolStaff.getUserType().equals(schoolStaffUpdate.getUserType())) {
+
+
+            if (schoolStaffUpdate.getUserType().equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
+                addMusicGroup(SchoolStaffWrapper.SchoolStaff.builder()
+                        .schoolId(schoolStaff.getSchoolId())
+                        .userId(schoolStaff.getUserId())
+                        .userType(schoolStaff.getUserType())
+                        .build()
+                        , sysUser);
+            } else if (schoolStaff.getUserType().equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
+                delMusicGroup(SchoolStaffWrapper.SchoolStaff.builder()
+                        .schoolId(schoolStaff.getSchoolId())
+                        .userId(schoolStaff.getUserId())
+                        .userType(schoolStaff.getUserType())
+                        .build()
+                        , sysUser);
+            }
+
+            schoolStaff.setUserType(schoolStaffUpdate.getUserType());
+            this.updateById(schoolStaff);
+        }
+
+
+    }
+
 
 }

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

@@ -32,6 +32,14 @@ public class SysUserServiceImpl implements SysUserService {
     }
 
     @Override
+    public SysUser queryUserByPhone(String phone) {
+        SysUser user = sysUserFeignService.queryUserByMobile(phone);
+        Optional.ofNullable(user)
+                .map(SysUser::getId)
+                .orElseThrow(() -> new BizException("用户信息获取失败"));
+        return user;
+    }
+    @Override
     public SysUser queryUserById(Integer userId) {
         SysUser user = sysUserFeignService.queryUserById(userId);
         Optional.ofNullable(user)

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

@@ -162,9 +162,7 @@
         group by s.id_
     </select>
     <select id="schoolLessonStat" resultType="com.ym.mec.biz.dal.wrapper.SchoolIndexStatWrapper$StudentLesson">
-        select SUM(cs.expectNum) expectNum,SUM(cs.actualNum) actualNum,SUM(cs.passNum) passNum,
-        TRUNCATE(SUM(cs.actualNum)/SUM(cs.expectNum),1) commitRate,
-        TRUNCATE(SUM(cs.passNum)/SUM(cs.expectNum),1) passRate
+        select SUM(cs.expectNum) expectNum,SUM(cs.actualNum) actualNum,SUM(cs.passNum) passNum
         from (
         select ch.expect_num_ expectNum,ch.completed_num_ actualNum,ch.completed_num_ passNum from
         course_homework ch

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

@@ -45,6 +45,9 @@
             <if test="param.coopStatus != null">
                 and co.is_enable_ = #{param.coopStatus}
             </if>
+            <if test="param.staffId != null">
+                and t1.id_ = #{param.staffId}
+            </if>
         </where>
         ORDER BY id_ DESC
     </select>

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -314,6 +314,6 @@ public class MusicGroupController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
     public HttpResponseResult<Map<Integer, String>> getGradeList(String musicGroupId) {
         MusicGroup musicGroup = Optional.ofNullable(musicGroupService.get(musicGroupId)).orElseThrow(()->new BizException("乐团信息不存在"));
-        return succeed(organizationService.getGradeList(musicGroup.getOrganId()));
+        return succeed(organizationService.getGradeList(musicGroup.getOrganId(),musicGroup.getGradeType()));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/CooperationOrganController.java

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.page.CooperationOrganQueryInfo;
+import com.ym.mec.biz.dal.wrapper.SchoolIndexStatWrapper;
 import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
@@ -94,4 +95,17 @@ public class CooperationOrganController extends BaseController {
         return succeed(cooperationOrganService.musicGroupPage(coopId));
     }
 
+
+    @ApiOperation(value = "修改学校logo")
+    @PostMapping("/updateLogo")
+    public HttpResponseResult<Boolean> updateLogo(@RequestBody SchoolIndexStatWrapper.SchoolData schoolData,@RequestHeader Integer coopId) {
+        if (coopId == null) {
+            return succeed();
+        }
+        CooperationOrgan cooperationOrgan = new CooperationOrgan();
+        cooperationOrgan.setId(coopId);
+        cooperationOrgan.setLogo(schoolData.getLogo());
+        return succeed(cooperationOrganService.update(cooperationOrgan) > 0);
+    }
+
 }

mec-web/src/main/java/com/ym/mec/web/controller/SchoolMessageController.java

@@ -17,10 +17,7 @@ import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @Api(tags = "消息服务")
@@ -37,8 +34,8 @@ public class SchoolMessageController extends BaseController {
     private AppVersionInfoDao appVersionInfoDao;
 
     @ApiOperation("获取所有消息列表")
-    @GetMapping(value = "list")
-    public Object list(@ApiParam SysMessageQueryInfo queryInfo){
+    @PostMapping(value = "list")
+    public Object list(@RequestBody SysMessageQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolStaffController.java

@@ -64,11 +64,10 @@ public class SchoolStaffController extends BaseController {
 	@ApiOperation(value = "详情", notes = "学校员工-根据详情ID查询单条, 传入id")
     @PreAuthorize("@pcs.hasPermissions('schoolStaff/detail')")
     @GetMapping("/detail/{id}")
-    public HttpResponseResult<SchoolStaff> detail(@PathVariable("id") Long id) {
+    public HttpResponseResult<SchoolStaffWrapper.SchoolStaff> detail(@PathVariable("id") Long id) {
     
-    	SchoolStaff wrapper = schoolStaffService.detail(id);
-        
-        return succeed(wrapper);
+
+        return succeed(schoolStaffService.detail(id));
 	}
     
     @ApiOperation(value = "查询分页", notes = "学校员工- 传入 SchoolStaffWrapper.SchoolStaffQuery") 
@@ -260,4 +259,13 @@ public class SchoolStaffController extends BaseController {
         employeeService.resetPassword(userId);
         return succeed();
     }
+
+
+
+    @ApiOperation(value = "账户修改")
+    @PostMapping("/updateAccount")
+    public HttpResponseResult updateAccount(@Validated @RequestBody SchoolStaffWrapper.SchoolStaffUpdate schoolStaffUpdate){
+        schoolStaffService.updateAccount(schoolStaffUpdate);
+        return succeed();
+    }
 }