Merge remote-tracking branch 'origin/master'

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

@@ -24,7 +24,6 @@ import com.ym.mec.jiari.JiaRiFeignService;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateConvertor;
 import com.ym.mec.util.date.DateUtil;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -2616,14 +2615,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         ClassGroup classGroup = classGroupDao.get(groupId);
         if(classGroup != null){
             classGroup.setViewGroupName(classGroup.getName());
+            classGroup.setName(StringUtils.isEmpty(classGroup.getGroupName())?classGroup.getName():classGroup.getGroupName());
             if(classGroup.getGroupType() == GroupType.MUSIC){
                 MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
                 if(musicGroup != null){
                     classGroup.setMusicGroupName(musicGroup.getName());
-                    classGroup.setName(musicGroup.getName() + " " + (StringUtils.isEmpty(classGroup.getGroupName())?classGroup.getName():classGroup.getGroupName()));
                 }
-            }else {
-                classGroup.setName(StringUtils.isEmpty(classGroup.getGroupName())?classGroup.getName():classGroup.getGroupName());
             }
         }
         return classGroup;

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

@@ -409,7 +409,7 @@
 
     <select id="findAllClassGroupByMusicGroup" resultMap="ClassGroup">
         SELECT * FROM class_group cg
-        WHERE cg.music_group_id_=#{musicGroupId} AND del_flag_='0'
+        WHERE cg.music_group_id_=#{musicGroupId} AND del_flag_ = '0'
         <if test="classGroupType != null">
             AND cg.type_ = #{classGroupType}
         </if>

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

@@ -627,7 +627,7 @@
 		LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_ = vga.id_
 		LEFT JOIN organization vgo ON vgo.id_ = vg.organ_id_
 		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1
-		AND cs.group_type_ = 'VIP' AND ts.settlement_time_ IS NOT NULL AND vg.organ_id_ != 43
+		AND cs.group_type_ = 'VIP' AND ts.settlement_time_ IS NOT NULL AND vg.organ_id_ != 41
 		GROUP BY ts.id_,ta.id_
 	</select>
 	<select id="querySettlementScheduleId" resultType="java.lang.Long">

mec-student/src/main/java/com/ym/mec/student/interceptor/MDCInterceptor.java

@@ -6,10 +6,12 @@ import javax.servlet.http.HttpServletResponse;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -23,6 +25,7 @@ public class MDCInterceptor extends HandlerInterceptorAdapter {
 
 	private static final String USERNAME = "username";
 	@Autowired
+	@Lazy
 	private SysUserFeignService sysUserFeignService;
 	@Value("${auth.sysconfig.tenantId}")
 	private Integer tenantClientId;

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/MDCInterceptor.java

@@ -5,8 +5,10 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -16,6 +18,7 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class MDCInterceptor extends HandlerInterceptorAdapter {
 	@Autowired
+	@Lazy
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private TeacherDao teacherDao;

mec-web/src/main/java/com/ym/mec/web/controller/SysSuggestionController.java

@@ -0,0 +1,47 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.entity.ChargeType;
+import com.ym.mec.biz.dal.entity.SysSuggestion;
+import com.ym.mec.biz.service.ChargeTypeService;
+import com.ym.mec.biz.service.SysSuggestionService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("sysSuggestion")
+@Api(tags = "意见反馈")
+@RestController
+public class SysSuggestionController extends BaseController {
+
+    @Autowired
+    private SysSuggestionService sysSuggestionService;
+
+    @ApiOperation(value = "新增")
+    @RequestMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestion/add')")
+    public Object add(SysSuggestion sysSuggestion) {
+        sysSuggestionService.insert(sysSuggestion);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @RequestMapping("/del")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestion/del')")
+    public Object del(Long id) {
+        sysSuggestionService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @RequestMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('sysSuggestion/queryPage')")
+    public Object queryPage(QueryInfo queryInfo) {
+        return succeed(sysSuggestionService.queryPage(queryInfo));
+    }
+
+}