Merge remote-tracking branch 'origin/master'

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

@@ -22,6 +22,9 @@ public class ClassGroup4MixDto implements Cloneable{
     @ApiModelProperty(value = "班级名称", required = true)
     private String classGroupName;
 
+    @ApiModelProperty(value = "是否只生成班级")
+    private Boolean onlyCreateClassGroup;
+
     @ApiModelProperty(value = "学生ids", required = true)
     private List<Integer> students;
 
@@ -64,6 +67,14 @@ public class ClassGroup4MixDto implements Cloneable{
     @ApiModelProperty(value = "班级", required = true)
     private ClassGroup classGroup;
 
+    public Boolean getOnlyCreateClassGroup() {
+        return onlyCreateClassGroup;
+    }
+
+    public void setOnlyCreateClassGroup(Boolean onlyCreateClassGroup) {
+        this.onlyCreateClassGroup = onlyCreateClassGroup;
+    }
+
     public ClassGroup getClassGroup() {
         return classGroup;
     }

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

@@ -72,12 +72,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		nowDate = nowDate.withDayOfMonth(1);
 		Date currentMonth = Date.from(nowDate.atStartOfDay(DateUtil.zoneId).toInstant());
 
-		LocalDate startDate = LocalDate.now();
+		LocalDate startDate = nowDate.plusDays(-30);
 		if(Objects.nonNull(queryInfo.getStartDate())){
 			startDate = LocalDateTime.ofInstant(queryInfo.getStartDate().toInstant(), DateUtil.zoneId).toLocalDate();
 		}
 
-		LocalDate endDate = startDate.withMonth(12);
+		LocalDate endDate = nowDate.plusDays(-1);
 		if(Objects.nonNull(queryInfo.getEndDate())){
 			endDate = LocalDateTime.ofInstant(queryInfo.getEndDate().toInstant(), DateUtil.zoneId).toLocalDate();
 		}
@@ -148,7 +148,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 
 		if(StringUtils.isBlank(dayStr)){
-			dayStr = nowDate.toString();
+			dayStr = nowDate.plusDays(-1).toString();
 		}
 
 		//运营数据

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

@@ -73,6 +73,7 @@ public class InspectionServiceImpl extends BaseServiceImpl<Long, Inspection> imp
                 inspectionItem.setInspectionId(inspection.getId());
                 inspectionItem.setOrganId(inspection.getOrganId());
                 inspectionItem.setUserId(inspection.getUserId());
+                inspectionItem.setMemo("");
                 inspectionItem.setOperation(operationUserId);
                 inspectionItem.setCreateTime(nowDate);
                 inspectionItem.setUpdateTime(nowDate);
@@ -128,6 +129,7 @@ public class InspectionServiceImpl extends BaseServiceImpl<Long, Inspection> imp
             addItem.setInspectionId(oldInspection.getId());
             addItem.setOrganId(oldInspection.getOrganId());
             addItem.setUserId(oldInspection.getUserId());
+            addItem.setMemo("");
             addItem.setOperation(operationUserId);
             addItem.setCreateTime(nowDate);
             addItem.setUpdateTime(nowDate);

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

@@ -618,24 +618,24 @@
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})
 		</if>
-	</select>
+	</select>K
 	<select id="queryInspectionItem" resultType="java.lang.Long">
 		SELECT DISTINCT ii.id_ FROM inspection_item ii
-		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ IS NULL
+		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ =''
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(ii.organ_id_,#{organIdsStr})
 		</if>
 	</select>
 	<select id="queryInspectionItemPlan" resultType="java.lang.Long">
 		SELECT DISTINCT iip.id_ FROM inspection_item_plan iip
-		WHERE iip.status_ = 0 AND iip.memo_ IS NULL
+		WHERE iip.status_ = 0 AND iip.memo_ =''
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(iip.organ_id_,#{organIdsStr})
 		</if>
 	</select>
 	<select id="queryStudentVisit" resultType="java.lang.Long">
 		SELECT DISTINCT ii.id_ FROM inspection_item ii
-		WHERE ii.item_ = 'VISIT' AND ii.memo_ IS NULL
+		WHERE ii.item_ = 'VISIT' AND ii.memo_ =''
 		AND ii.times_ > (SELECT COUNT(DISTINCT sv.id_) FROM student_visit sv
 		WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(ii.create_time_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m'))
 		<if test="organIdsStr != null and organIdsStr != ''">
@@ -649,7 +649,7 @@
 		FROM
 			inspection_item_plan
 		WHERE
-			conclusion_status_ = 1
+			conclusion_status_ = 1 AND memo_=''
 		<if test="organIds!=null and organIds.size()>0">
 			AND organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">

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

@@ -925,7 +925,7 @@
     <select id="queryRequiredOverList" resultMap="VipGroup">
         select vg.*
         from vip_group vg
-                 left join class_group cg on vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
+            left join class_group cg on vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
         where vg.group_status_ = 2
           and cg.total_class_times_ = cg.current_class_times_
           and cg.total_class_times_ &gt; 0