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

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

@@ -6,7 +6,6 @@ import com.ym.mec.common.constant.CommonConstants;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -27,6 +26,16 @@ public class IndexBaseDto {
 
     private List<IndexBaseMonthData> indexMonthDataDetail;
 
+    private List<IndexBaseMonthData> organIndexMonthData;
+
+    public List<IndexBaseMonthData> getOrganIndexMonthData() {
+        return organIndexMonthData;
+    }
+
+    public void setOrganIndexMonthData(List<IndexBaseMonthData> organIndexMonthData) {
+        this.organIndexMonthData = organIndexMonthData;
+    }
+
     public List<IndexBaseMonthData> getIndexMonthDataDetail() {
         return indexMonthDataDetail;
     }
@@ -103,7 +112,8 @@ public class IndexBaseDto {
                     this.percent = total;
                 }
             }else{
-                this.percent = indexMonthData.stream().filter(i->currentMonth.compareTo(i.getMonth())>=0).max(Comparator.comparing(IndexBaseMonthData::getMonth)).get().getPercent();
+                this.percent = indexMonthData.stream().filter(i->currentMonth.compareTo(i.getMonth())>=0).
+                        max(Comparator.comparing(IndexBaseMonthData::getMonth)).get().getPercent();
             }
         }
     }

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

@@ -24,6 +24,8 @@ public class IndexBaseMonthData extends BaseEntity {
 	
 	/** 分部编号 */
 	private Integer organId;
+
+	private String organName;
 	
 	/** 总数量 */
 	private BigDecimal totalNum = BigDecimal.ZERO;
@@ -44,6 +46,14 @@ public class IndexBaseMonthData extends BaseEntity {
 
 	private Date updateTime;
 
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	public String getOrderType() {
 		return orderType;
 	}
@@ -63,6 +73,14 @@ public class IndexBaseMonthData extends BaseEntity {
 	public IndexBaseMonthData() {
 	}
 
+	public IndexBaseMonthData(Integer organId, String organName,IndexDataType indexDataType, BigDecimal percent) {
+		this.dataType = indexDataType;
+		this.title = indexDataType.getMsg();
+		this.organId = organId;
+		this.organName = organName;
+		this.percent = percent;
+	}
+
 	public IndexBaseMonthData(Date month, Integer organId, Integer tenantId) {
 		this.month = month;
 		this.organId = organId;

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

@@ -168,7 +168,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			throw new BizException("作业不存在");
 		}
 		Date now=new Date();
-		if (DateUtil.daysBetween(extracurricularExercises.getCreateTime(), now) >= 7){
+		if (DateUtil.daysBetween(extracurricularExercises.getCreateTime(), now) > 7){
 			throw new BizException("该作业已超出可提交时间范围，无法提交作业。");
 		}
 		existExtra.setAttachments(extracurricularExercisesReply.getAttachments());

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

@@ -29,6 +29,7 @@ import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.ym.mec.biz.dal.enums.IndexDataType.*;
@@ -299,6 +300,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 					VIP_AMOUNT.equals(typeDateMapEntry.getKey()) ||
 					PRACTICE_AMOUNT.equals(typeDateMapEntry.getKey()) ||
 					OTHER_AMOUNT.equals(typeDateMapEntry.getKey())){
+				indexBaseData.setOrganIndexMonthData(this.getOrganIndexMonthData(value,typeDateMapEntry.getKey()));
 				indexBaseData.setPercent(value.stream().map(IndexBaseMonthData::getPercent).reduce(BigDecimal.ZERO, BigDecimal::add));
 			}
 			if(IndexDataType.VIP_GROUP_COURSE.equals(typeDateMapEntry.getKey()) || VIP_GROUP_ONLINE_COURSE.equals(typeDateMapEntry.getKey()) ||
@@ -324,6 +326,22 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		return result;
 	}
 
+	public List<IndexBaseMonthData> getOrganIndexMonthData(List<IndexBaseMonthData> organIndexMonthData,IndexDataType indexDataType) {
+		if (!CollectionUtils.isEmpty(organIndexMonthData)){
+			List<IndexBaseMonthData> collect = organIndexMonthData.stream().filter(e -> e.getOrganId() != null && e.getOrganId() != 0).collect(Collectors.toList());
+			if(!CollectionUtils.isEmpty(collect)){
+				Map<Integer, List<IndexBaseMonthData>> listMap = collect.stream().collect(Collectors.groupingBy(IndexBaseMonthData::getOrganId));
+				Set<Integer> organIds = listMap.keySet();
+				Map<Integer, String> organMap = organizationService.getMap("organization", "id_", "name_",
+						organIds, TenantContextHolder.getTenantId(), Integer.class, String.class);
+				Function<Integer,IndexBaseMonthData> fun = (organId) -> new IndexBaseMonthData(organId,organMap.get(organId),indexDataType,
+						listMap.get(organId).stream().map(e->e.getPercent()).reduce(BigDecimal.ZERO,BigDecimal::add));
+				return organIds.stream().map(fun::apply).collect(Collectors.toList());
+			}
+		}
+		return new ArrayList<>();
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void indexBaseDataTask(Integer tenantId, String dayStr, Set<IndexDataType> dataTypes) {

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

@@ -141,7 +141,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         }
         Date now = new Date();
 
-        if (DateUtil.daysBetween(existHomework.getCreateTime(), now) >= 7) {
+        if (DateUtil.daysBetween(existHomework.getCreateTime(), now) > 7) {
             throw new BizException("该作业已超出可提交时间范围，无法提交作业。");
         }
         CourseSchedule courseSchedule = courseScheduleDao.get(existHomework.getCourseScheduleId());

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

@@ -133,10 +133,10 @@
 				AND smcr.feature_ = #{featureType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 			<if test="startTime != null and startTime != ''">
-				AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') >= #{startTime}
+				AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') >= CONCAT(#{startTime},' 00:00:00')
 			</if>
 			<if test="endTime != null and endTime != ''">
-				AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') &lt;= #{endTime}
+				AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') &lt;= CONCAT(#{endTime},' 23:59:59')
 			</if>
 		</where>
 	</sql>

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

@@ -265,7 +265,6 @@ public class LiveRoomServiceImpl implements LiveRoomService {
             log.error("获取sessionId失败 roomId : {} returnResult:{}", roomId, resultObject);
             throw new BizException("获取sessionId失败");
         }
-
         return sessionId;
     }