浏览代码

经营报表问题处理

zouxuan 2 年之前
父节点
当前提交
3783c65229

+ 4 - 15
mec-biz/src/main/java/com/ym/mec/biz/dal/page/ClassGroupQueryInfo.java

@@ -23,25 +23,14 @@ public class ClassGroupQueryInfo extends EducationBaseQueryInfo {
 
     private Integer delFlag;
 
-    @ApiModelProperty(value = "少于3人的线上基础技能班,大于0")
-    private Integer lessThenThreeHighOnline;
+    @ApiModelProperty(value = "少于3人的线上基础技能班,大于0。异常传true、提醒传false")
+    private Boolean lessThenThreeHighOnline;
 
-    @ApiModelProperty(value = "是否有班级备注(用于线上基础技能班事项提醒),事项提醒传true,异常提醒传false")
-    private Boolean hasDesc = false;
-
-	public Boolean getHasDesc() {
-		return hasDesc;
-	}
-
-	public void setHasDesc(Boolean hasDesc) {
-		this.hasDesc = hasDesc;
-	}
-
-	public Integer getLessThenThreeHighOnline() {
+	public Boolean getLessThenThreeHighOnline() {
 		return lessThenThreeHighOnline;
 	}
 
-	public void setLessThenThreeHighOnline(Integer lessThenThreeHighOnline) {
+	public void setLessThenThreeHighOnline(Boolean lessThenThreeHighOnline) {
 		this.lessThenThreeHighOnline = lessThenThreeHighOnline;
 	}
 

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -3638,7 +3638,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<ClassGroupTeachersDto> dataList = null;
         int count;
         if (Objects.nonNull(queryInfo.getLessThenThreeHighOnline())) {
-            List<Long> lessThenThreeClassGroupIds = classGroupStudentMapperDao.getLessThenThreeClassGroupIds(queryInfo.getOrganIds(),queryInfo.getHasDesc());
+            List<Long> lessThenThreeClassGroupIds = classGroupStudentMapperDao.getLessThenThreeClassGroupIds(queryInfo.getOrganIds(),queryInfo.getLessThenThreeHighOnline());
             params.put("classGroupIds", lessThenThreeClassGroupIds);
             if (CollectionUtils.isEmpty(lessThenThreeClassGroupIds)) {
                 count = 0;