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

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

@@ -485,7 +485,7 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
      * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroup>
      */
     List<ClassGroup> getStudentClassGroupWithTeacher(@Param("studentIds") Set<Integer> studentIds,
-                                                     @Param("teacherId") Integer teacherId);
+                                                     @Param("teacherId") Integer teacherId, @Param("musicGroupId") String musicGroupId);
     
     List<ClassGroupStudentMapperDto> queryByClassGroupType(@Param("musicGroupId") String musicGroupId,@Param("classGroupType") ClassGroupTypeEnum classGroupType,@Param("teacherRole") TeachTypeEnum teacherRole, @Param("studentIdList") List<Integer> studentIdList);
 }

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

@@ -0,0 +1,186 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class OperatingReportNew {
+
+    @ApiModelProperty(value="负责人")
+    private String principal;
+
+    @ApiModelProperty(value="城市")
+    private String organName;
+
+    @ApiModelProperty(value="销售收入")
+    //计算当月分润的销售收入
+    private BigDecimal saleAmount;
+
+    @ApiModelProperty(value="服务收入")
+    private BigDecimal serviceAmount;
+
+    //后台商品退费需要添加到退费列表
+    @ApiModelProperty(value="业务退费")
+    private BigDecimal businessRefund;
+
+    @ApiModelProperty(value="收入合计")
+    private BigDecimal totalIncome;
+
+    @ApiModelProperty(value="销售成本")
+    private BigDecimal saleCost;
+
+    @ApiModelProperty(value="固定费用")
+    private BigDecimal fixedCosts;
+
+    @ApiModelProperty(value="变动费用")
+    private BigDecimal variableCosts;
+
+    @ApiModelProperty(value="内部结算")
+    private BigDecimal internalSettlement;
+
+    @ApiModelProperty(value="成本费用合计")
+    private BigDecimal totalCost;
+
+    @ApiModelProperty(value="准可自由支配利润")
+    private BigDecimal quasiDiscretionaryProfit;
+
+    @ApiModelProperty(value="预收账款")
+    private BigDecimal prepaidFee;
+
+    @ApiModelProperty(value="预付账款")
+    private BigDecimal prepayments;
+
+    @ApiModelProperty(value="应收账款")
+    private BigDecimal receivables;
+
+    @ApiModelProperty(value="应付账款")
+    private BigDecimal payable;
+
+    public String getPrincipal() {
+        return principal;
+    }
+
+    public void setPrincipal(String principal) {
+        this.principal = principal;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public BigDecimal getSaleAmount() {
+        return saleAmount;
+    }
+
+    public void setSaleAmount(BigDecimal saleAmount) {
+        this.saleAmount = saleAmount;
+    }
+
+    public BigDecimal getServiceAmount() {
+        return serviceAmount;
+    }
+
+    public void setServiceAmount(BigDecimal serviceAmount) {
+        this.serviceAmount = serviceAmount;
+    }
+
+    public BigDecimal getBusinessRefund() {
+        return businessRefund;
+    }
+
+    public void setBusinessRefund(BigDecimal businessRefund) {
+        this.businessRefund = businessRefund;
+    }
+
+    public BigDecimal getTotalIncome() {
+        return totalIncome;
+    }
+
+    public void setTotalIncome(BigDecimal totalIncome) {
+        this.totalIncome = totalIncome;
+    }
+
+    public BigDecimal getSaleCost() {
+        return saleCost;
+    }
+
+    public void setSaleCost(BigDecimal saleCost) {
+        this.saleCost = saleCost;
+    }
+
+    public BigDecimal getFixedCosts() {
+        return fixedCosts;
+    }
+
+    public void setFixedCosts(BigDecimal fixedCosts) {
+        this.fixedCosts = fixedCosts;
+    }
+
+    public BigDecimal getVariableCosts() {
+        return variableCosts;
+    }
+
+    public void setVariableCosts(BigDecimal variableCosts) {
+        this.variableCosts = variableCosts;
+    }
+
+    public BigDecimal getInternalSettlement() {
+        return internalSettlement;
+    }
+
+    public void setInternalSettlement(BigDecimal internalSettlement) {
+        this.internalSettlement = internalSettlement;
+    }
+
+    public BigDecimal getTotalCost() {
+        return totalCost;
+    }
+
+    public void setTotalCost(BigDecimal totalCost) {
+        this.totalCost = totalCost;
+    }
+
+    public BigDecimal getQuasiDiscretionaryProfit() {
+        return quasiDiscretionaryProfit;
+    }
+
+    public void setQuasiDiscretionaryProfit(BigDecimal quasiDiscretionaryProfit) {
+        this.quasiDiscretionaryProfit = quasiDiscretionaryProfit;
+    }
+
+    public BigDecimal getPrepaidFee() {
+        return prepaidFee;
+    }
+
+    public void setPrepaidFee(BigDecimal prepaidFee) {
+        this.prepaidFee = prepaidFee;
+    }
+
+    public BigDecimal getPrepayments() {
+        return prepayments;
+    }
+
+    public void setPrepayments(BigDecimal prepayments) {
+        this.prepayments = prepayments;
+    }
+
+    public BigDecimal getReceivables() {
+        return receivables;
+    }
+
+    public void setReceivables(BigDecimal receivables) {
+        this.receivables = receivables;
+    }
+
+    public BigDecimal getPayable() {
+        return payable;
+    }
+
+    public void setPayable(BigDecimal payable) {
+        this.payable = payable;
+    }
+}

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

@@ -1,7 +1,5 @@
 package com.ym.mec.biz.dal.page;
 
-import java.util.Date;
-
 import com.ym.mec.common.page.QueryInfo;
 
 public class StudentExerciseMusicGroupQueryInfo extends QueryInfo {
@@ -10,9 +8,9 @@ public class StudentExerciseMusicGroupQueryInfo extends QueryInfo {
 	
 	private String musicGroupName;
 	
-	private Date mondayDate;
+	private String mondayDate;
 	
-	private Date sundayDate;
+	private String sundayDate;
 
 	public Integer getTeacherId() {
 		return teacherId;
@@ -30,19 +28,19 @@ public class StudentExerciseMusicGroupQueryInfo extends QueryInfo {
 		this.musicGroupName = musicGroupName;
 	}
 
-	public Date getMondayDate() {
+	public String getMondayDate() {
 		return mondayDate;
 	}
 
-	public void setMondayDate(Date mondayDate) {
+	public void setMondayDate(String mondayDate) {
 		this.mondayDate = mondayDate;
 	}
 
-	public Date getSundayDate() {
+	public String getSundayDate() {
 		return sundayDate;
 	}
 
-	public void setSundayDate(Date sundayDate) {
+	public void setSundayDate(String sundayDate) {
 		this.sundayDate = sundayDate;
 	}
 }

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

@@ -751,6 +751,8 @@ public class StudentServeServiceImpl implements StudentServeService {
             return;
         }
         
+        weekServiceWithStudents = weekServiceWithStudents.stream().filter(s -> musicGroupId.equals(s.getMusicGroupId())).collect(Collectors.toList());
+        
         List<StudentExtracurricularExercisesSituation> batchUpdateList = new ArrayList<StudentExtracurricularExercisesSituation>();
 
         for (StudentExtracurricularExercisesSituation weekServiceWithStudent : weekServiceWithStudents) {

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

@@ -674,7 +674,7 @@
         WHERE
             cg.del_flag_ = 0
             AND cg.lock_flag_ =0
-            AND cgsm.status_='NORMAL'
+            AND cgsm.status_='NORMAL' and cg.group_type_ = 'MUSIC'
             AND cgsm.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
@@ -682,6 +682,9 @@
             <if test="teacherId!=null">
                 AND cgtm.user_id_ = #{teacherId}
             </if>
+            <if test="musicGroupId != null and musicGroupId != ''">
+                AND cg.music_group_id_ = #{musicGroupId}
+            </if>
             AND cg.id_ IS NOT NULL
         ORDER BY cg.id_ DESC
     </select>

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

@@ -960,7 +960,7 @@
         LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = sees.music_group_id_ AND cssp.user_id_ = sees.student_id_ AND cssp.group_type_ = 'MUSIC'
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
         AND cs.is_lock_ = 0 AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ ) AND cs.class_date_ BETWEEN #{monday} AND #{sunday}
-        LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND sa.user_id_ = cssp.user_id_ AND sa.status_ IN ('NORMAL','LATE')
+        LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.user_id_ = cssp.user_id_ AND sa.status_ IN ('NORMAL','LATE')
         WHERE sees.monday_ >= #{monday} AND sees.sunday_ <= #{sunday}
         GROUP BY sees.student_id_,sees.music_group_id_) cs ON cs.student_id_ = sees.student_id_ AND cs.music_group_id_ = sees.music_group_id_
         <where>

mec-im/src/main/java/com/ym/controller/HereWhiteController.java

@@ -1,28 +1,19 @@
 package com.ym.controller;
 
 import com.ym.mec.common.controller.BaseController;
-import com.ym.pojo.HereWhite;
 import com.ym.service.HereWhiteService;
-import freemarker.cache.StringTemplateLoader;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
 @RestController
 @RequestMapping("/hereWhite")
 public class HereWhiteController  extends BaseController {
 
     @Autowired
     private HereWhiteService hereWhiteService;
-    @Autowired
-    private RedisTemplate<String,String> redisTemplate;
 
     /**
      * 创建白板，默认全部采用零时白板

mec-im/src/main/java/com/ym/pojo/RoomResult.java

@@ -33,7 +33,7 @@ public class RoomResult {
     private @Getter @Setter String display;
     private @Getter @Setter List<WhiteboardResult> whiteboards = new ArrayList<>();
     private @Getter @Setter MemberResult userInfo;
-    private @Getter @Setter String randomNumeric;
+    private @Getter @Setter String randomNumeric = "0";
 
     @Data
     public static class MemberResult {

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.service.Impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.ym.common.ApiException;
@@ -306,7 +307,10 @@ public class RoomServiceImpl implements RoomService {
             roomResult.setSoundVolume(room.getSoundVolume());
         }
         //是否使用自定义白板
-        roomResult.setRandomNumeric(sysConfigDao.findConfigValue("rongyun_here_white_flag"));
+        if(courseSchedule.getOrganId().equals(1) && (courseSchedule.getStudentNum() == null || courseSchedule.getStudentNum() == 1)){
+            roomResult.setRandomNumeric("1");
+        }
+//        roomResult.setRandomNumeric(sysConfigDao.findConfigValue("rongyun_here_white_flag"));
         log.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId, userName, roleEnum);
         return new BaseResponse(roomResult);
     }

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

@@ -190,7 +190,7 @@ public class ExtracurricularExercisesController extends BaseController {
         List<MusicGroup> studentNormalMusicGroups = studentRegistrationDao.getStudentNormalMusicGroups(studentIds);
         result.put("musicGroups", studentNormalMusicGroups);
 
-        List<ClassGroup> classGroups = classGroupStudentMapperDao.getStudentClassGroupWithTeacher(studentIds, sysUser.getId());
+        List<ClassGroup> classGroups = classGroupStudentMapperDao.getStudentClassGroupWithTeacher(studentIds, sysUser.getId(), musicGroupId);
         result.put("classGroups", classGroups);
 
         List<Subject> studentSubjects = studentDao.getStudentSubjects(studentIds);

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

@@ -1,10 +1,14 @@
 package com.ym.mec.teacher.controller;
 
-import java.util.Objects;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.Objects;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +24,7 @@ import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.util.date.DateUtil;
 
 @RequestMapping("studentExtracurricularExercisesSituation")
 @Api(tags = "课外训练统计服务")
@@ -44,6 +49,19 @@ public class StudentExtracurricularExercisesSituationController extends BaseCont
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
         queryInfo.setTeacherId(sysUser.getId());
+
+        Date date = new Date();
+        LocalDate nowDate = LocalDateTime.ofInstant(date.toInstant(), DateUtil.zoneId).toLocalDate();
+        if(Objects.isNull(date)){
+            nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
+        }
+
+        LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+        LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
+        
+        queryInfo.setMondayDate(monDayDate.toString());
+        queryInfo.setSundayDate(sunDayDate.toString());
+        
         return succeed(studentExtracurricularExercisesSituationService.queryStudentExerciseMusicGroupList(queryInfo));
     }