Merge branch 'master' into Joburgess

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -2,11 +2,14 @@ package com.ym.mec.cms.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -17,9 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.cms.controller.queryinfo.NewsInformationQueryInfo;
+import com.ym.mec.cms.dal.dao.SysNewsInformationDao;
 import com.ym.mec.cms.dal.entity.SysNewsInformation;
 import com.ym.mec.cms.service.SysNewsInformationService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.util.collection.MapUtil;
 
 @RestController
 @RequestMapping("news")
@@ -30,6 +35,9 @@ public class NewsController extends BaseController {
 	private SysNewsInformationService sysNewsInformationService;
 	
 	@Autowired
+	private SysNewsInformationDao sysNewsInformationDao;
+	
+	@Autowired
 	private SysUserFeignService sysUserFeignService;
 
 	@ApiOperation("资讯列表分页查询")
@@ -38,6 +46,13 @@ public class NewsController extends BaseController {
 		if(queryInfo.getTenantId() == null){
 			queryInfo.setTenantId(1);
 		}
+		
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+		int count = sysNewsInformationDao.queryCount(params);
+		if(count == 0){
+			queryInfo.setMemo(null);
+		}
 		return succeed(sysNewsInformationService.queryPage(queryInfo));
 	}
 

cms/src/main/java/com/ym/mec/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -27,6 +27,8 @@ public class NewsInformationQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "租客编号", required = false)
 	private Integer tenantId;
 	
+	private String clientName;
+	
 	private Date date;
 
 	public Integer getType() {
@@ -84,4 +86,12 @@ public class NewsInformationQueryInfo extends QueryInfo {
 	public void setTenantId(Integer tenantId) {
 		this.tenantId = tenantId;
 	}
+
+	public String getClientName() {
+		return clientName;
+	}
+
+	public void setClientName(String clientName) {
+		this.clientName = clientName;
+	}
 }

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -72,9 +72,9 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		String memo = queryInfo.getMemo();
 		
 		Map<String, Object> params = new HashMap<String, Object>();
-		MapUtil.populateMap(params, queryInfo);
 
-		queryInfo.setType(3); 
+		queryInfo.setType(3);
+		MapUtil.populateMap(params, queryInfo);
 		int count = sysNewsInformationDao.queryHomeCount(params);
 		if(count == 0){
 			queryInfo.setMemo(null);
@@ -113,6 +113,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		
 		queryInfo.setMemo(memo);
 		queryInfo.setType(6);
+		MapUtil.populateMap(params, queryInfo);
 		count = sysNewsInformationDao.queryHomeCount(params);
 		if(count == 0){
 			queryInfo.setMemo(null);

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -48,6 +48,16 @@
 			<if test="search != null">
 				and title_ like '%' #{search} '%'
 			</if>
+			<if test="clientName != 'manage'">
+				<choose>
+					<when test="memo != null and memo != ''">
+						and memo_ = #{memo}
+					</when>
+					<otherwise>
+						and (memo_ is null or memo_ = '')
+					</otherwise>
+				</choose>
+			</if>
 		</where>
 	</sql>
 	
@@ -179,14 +189,16 @@
 		<if test="tenantId != null">
 			and tenant_id_ = #{tenantId}
 		</if>
-		<choose>
-			<when test="memo != null and memo != ''">
-				and memo_ = #{memo}
-			</when>
-			<otherwise>
-				and (memo_ is null or memo_ = '')
-			</otherwise>
-		</choose>
+		<if test="clientName != 'manage'">
+			<choose>
+				<when test="memo != null and memo != ''">
+					and memo_ = #{memo}
+				</when>
+				<otherwise>
+					and (memo_ is null or memo_ = '')
+				</otherwise>
+			</choose>
+		</if>
 		order by status_ desc,order_ desc,update_time_ desc
 		<include refid="global.limit" />
 	</select>
@@ -213,13 +225,15 @@
 		<if test="tenantId != null">
 			and tenant_id_ = #{tenantId}
 		</if>
-		<choose>
-			<when test="memo != null and memo != ''">
-				and memo_ = #{memo}
-			</when>
-			<otherwise>
-				and (memo_ is null or memo_ = '')
-			</otherwise>
-		</choose>
+		<if test="clientName != 'manage'">
+			<choose>
+				<when test="memo != null and memo != ''">
+					and memo_ = #{memo}
+				</when>
+				<otherwise>
+					and (memo_ is null or memo_ = '')
+				</otherwise>
+			</choose>
+		</if>
 	</select>
 </mapper>

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

@@ -43,11 +43,17 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "教师名称")
     private String teacherName;
 
-    @ApiModelProperty(value = "开始时间")
+    @ApiModelProperty(value = "上课开始时间")
     private Date startTime;
 
-    @ApiModelProperty(value = "结束时间")
+    @ApiModelProperty(value = "上课结束时间")
     private Date endTime;
+    
+    @ApiModelProperty(value = "课程创建开始时间")
+    private Date createStartDate;
+    
+    @ApiModelProperty(value = "课程创建结束时间")
+    private Date createEndDate;
 
     @ApiModelProperty(value = "课程状态")
     private CourseStatusEnum courseStatus;
@@ -201,4 +207,20 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
     public void setClassGroupId(Integer classGroupId) {
         this.classGroupId = classGroupId;
     }
+
+	public Date getCreateStartDate() {
+		return createStartDate;
+	}
+
+	public void setCreateStartDate(Date createStartDate) {
+		this.createStartDate = createStartDate;
+	}
+
+	public Date getCreateEndDate() {
+		return createEndDate;
+	}
+
+	public void setCreateEndDate(Date createEndDate) {
+		this.createEndDate = createEndDate;
+	}
 }

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

@@ -857,6 +857,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("请指定vip课程");
 		}
 		VipGroupManageDetailDto vipGroupBaseInfo = vipGroupDao.getVipGroupBaseInfo(vipGroupId);
+		if(Objects.nonNull(vipGroupBaseInfo.getEducationalTeacherId())){
+			SysUser eduUser = sysUserFeignService.queryUserById(vipGroupBaseInfo.getEducationalTeacherId());
+			if(Objects.nonNull(eduUser)){
+				vipGroupBaseInfo.setEducationalTeacherName(eduUser.getRealName());
+			}
+		}
 		vipGroupBaseInfo.setSubjectName(StringUtils.join(subjectDao.findBySubIds(vipGroupBaseInfo.getSubjectIdList()),","));
 		ClassGroupTeacherSalary byVipGoupAndTeacher = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupBaseInfo.getUserId());
 		Integer onlineNum = courseScheduleDao.countCourseNum(vipGroupId,"ONLINE");

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

@@ -2417,21 +2417,27 @@
         <if test="isCallNames != null and isCallNames == 0">
             AND sa.id_ IS NULL
         </if>
-        <if test="startTime!=null and endTime==null">
-            AND cs.class_date_ &gt; DATE_FORMAT(#{startTime},"%Y-%m-%d")
+        <if test="startTime!=null">
+            AND cs.class_date_ &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
         </if>
-        <if test="startTime==null and endTime!=null">
-            AND cs.class_date_ &lt; DATE_FORMAT(#{endTime},"%Y-%m-%d")
-        </if>
-        <if test="startTime!=null and endTime!=null">
-            AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},"%Y-%m-%d") AND DATE_FORMAT(#{endTime},"%Y-%m-%d")
+        <if test="endTime!=null">
+            AND cs.class_date_ &lt;= DATE_FORMAT(#{endTime},"%Y-%m-%d")
         </if>
         <if test="courseStatus!=null">
             AND cs.status_ = #{courseStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
+        <if test="createStartDate!=null">
+            AND date(cs.create_time_) &gt;= date(#{createStartDate})
+        </if>
+        <if test="createEndDate!=null">
+            AND date(cs.create_time_) &lt;= date(#{createEndDate})
+        </if>
         <if test="courseType!=null">
             AND cs.type_ = #{courseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
+        <if test="groupType!=null">
+            AND cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        </if>
         <if test="schoolId!=null">
             AND cs.schoole_id_ = #{schoolId}
         </if>

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

@@ -1,6 +1,8 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.biz.service.ImGroupNoticeService;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.service.*;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.QueryInfo;
 
 import io.swagger.annotations.Api;
@@ -28,9 +30,6 @@ import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherMusicClassQueryInfo;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.controller.BaseController;
 
 @RequestMapping("teacher")
@@ -50,6 +49,8 @@ public class TeacherController extends BaseController {
     private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private SubjectDao subjectDao;
+	@Autowired
+    private EmployeeService employeeService;
 
     @ApiOperation(value = "修改教师个人中心信息")
     @PostMapping("/update")
@@ -182,4 +183,24 @@ public class TeacherController extends BaseController {
 		teacherService.realNameAuthentication(user.getId(), realName, idcardNo, idcardFrontImg, idcardBackImg, idcardHandImg);
 		return succeed();
 	}
+
+    @ApiOperation(value = "获取教务人员")
+    @GetMapping("/findEducationUsers")
+    public HttpResponseResult findEducationUsers(Integer userId){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        String organIds = new String();
+        if (!sysUser.getIsSuperAdmin()) {
+            Teacher teacher = teacherService.get(sysUser.getId());
+            if (StringUtils.isEmpty(organIds)) {
+                organIds = teacher.getTeacherOrganId() + "";
+            }
+            if(StringUtils.isNotBlank(teacher.getFlowOrganRange())){
+                organIds = organIds + "," + teacher.getFlowOrganRange();
+            }
+        }
+        return succeed(employeeService.findByRole("4,5",organIds));
+    }
 }