Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexBaseMonthDataDao.java

@@ -150,21 +150,21 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @param organIdsStr
      * @return
      */
-    List<Long> queryInspectionItem(@Param("organIdsStr") String organIdsStr);
+    int queryInspectionItem(@Param("organIdsStr") String organIdsStr);
 
     /**
      * 乐团巡查任务未提交
      * @param organIdsStr
      * @return
      */
-    List<Long> queryInspectionItemPlan(@Param("organIdsStr") String organIdsStr);
+    int queryInspectionItemPlan(@Param("organIdsStr") String organIdsStr);
 
     /**
      * 未完成的回访任务
      * @param organIdsStr
      * @return
      */
-    List<Long> queryStudentVisit(@Param("organIdsStr") String organIdsStr);
+    int queryStudentVisit(@Param("organIdsStr") String organIdsStr);
 
     List<IndexBaseMonthData> getFinancePayData(@Param("dayStr") String dayStr);
 

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

@@ -41,6 +41,17 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "ids",required = false)
     private String ids;
 
+    @ApiModelProperty(value = "乐团巡查任务未提交：INSPECTION_ITEM_PLAN 乐团巡查事项异常：MUSIC_PATROL_ITEM",required = false)
+    private String searchType;
+
+    public String getSearchType() {
+        return searchType;
+    }
+
+    public void setSearchType(String searchType) {
+        this.searchType = searchType;
+    }
+
     public Date getStartTime() {
         return startTime;
     }

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

@@ -26,7 +26,18 @@ public class InspectionQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "ids",required = false)
     private String ids;
 
-	public String getOrganId() {
+    @ApiModelProperty(value = "查询类型 INSPECTION_ITEM 乐团巡查任务未计划,回访任务未完成 STUDENT_VISIT",required = false)
+    private String searchType;
+
+    public String getSearchType() {
+        return searchType;
+    }
+
+    public void setSearchType(String searchType) {
+        this.searchType = searchType;
+    }
+
+    public String getOrganId() {
 		return organId;
 	}
 

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

@@ -7,6 +7,16 @@ public class MusicGroupQuitQueryInfo extends QueryInfo {
 
     private String ids;
 
+    private Boolean visitFlag;
+
+    public Boolean getVisitFlag() {
+        return visitFlag;
+    }
+
+    public void setVisitFlag(Boolean visitFlag) {
+        this.visitFlag = visitFlag;
+    }
+
     public String getOrganId() {
         return organId;
     }

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

@@ -405,14 +405,14 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
 			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
 
-			List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM, IndexErrorType.INSPECTION_ITEM.getMsg(),inspectionItem.size(), inspectionItem));
+			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
+			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM, IndexErrorType.INSPECTION_ITEM.getMsg(),inspectionItem, null));
 
-			List<Long> inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM_PLAN, IndexErrorType.INSPECTION_ITEM_PLAN.getMsg(),inspectionItemPlan.size(), inspectionItemPlan));
+			int inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
+			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM_PLAN, IndexErrorType.INSPECTION_ITEM_PLAN.getMsg(),inspectionItemPlan, null));
 
-			List<Long> studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_VISIT, IndexErrorType.STUDENT_VISIT.getMsg(),studentVisit.size(), studentVisit));
+			int studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
+			threeChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_VISIT, IndexErrorType.STUDENT_VISIT.getMsg(),studentVisit, null));
 
 			three.setNum(threeChild.stream().mapToInt(IndexErrInfoDto::getNum).sum());
 			three.setResult(threeChild);
@@ -528,20 +528,20 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 		}
 		if(!flag3){
-			List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
-			if(inspectionItem.size() > 0){
+			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
+			if(inspectionItem > 0){
 				flag3 = true;
 			}
 		}
 		if(!flag3){
-			List<Long> inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
-			if(inspectionItemPlan.size() > 0){
+			int inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
+			if(inspectionItemPlan > 0){
 				flag3 = true;
 			}
 		}
 		if(!flag3){
-			List<Long> studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
-			if(studentVisit.size() > 0){
+			int studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
+			if(studentVisit > 0){
 				flag3 = true;
 			}
 		}

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

@@ -617,22 +617,22 @@
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})
 		</if>
 	</select>
-	<select id="queryInspectionItem" resultType="java.lang.Long">
-		SELECT DISTINCT ii.id_ FROM inspection_item ii
+	<select id="queryInspectionItem" resultType="int">
+		SELECT COUNT(DISTINCT ii.id_) FROM inspection_item ii
 		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
+	<select id="queryInspectionItemPlan" resultType="int">
+		SELECT COUNT(DISTINCT iip.id_) FROM inspection_item_plan iip
 		WHERE iip.status_ = 0 AND iip.memo_ = '' AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt; DATE_FORMAT(NOW(),'%Y-%m-%d')
 		<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
+	<select id="queryStudentVisit" resultType="int">
+		SELECT COUNT(DISTINCT ii.id_) FROM inspection_item ii
 		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'))

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

@@ -166,6 +166,16 @@
 
     <sql id="queryPageSql">
         <where>
+            <if test="searchType != null and searchType != ''">
+                <if test="searchType == 'INSPECTION_ITEM'">
+                    AND ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ =''
+                </if>
+                <if test="searchType == 'STUDENT_VISIT'">
+                    AND 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>
+            </if>
             <if test="organId != null">
                 AND FIND_IN_SET(ii.organ_id_,#{organId})
             </if>

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

@@ -160,8 +160,13 @@
             <if test='hasSubmit != null and hasSubmit.toString()=="0".toString()'>
                 AND iip.status_ = 0
             </if>
-            <if test="ids != null">
-                AND FIND_IN_SET(iip.id_,#{ids})
+            <if test="searchType != null and searchType != ''">
+                <if test="searchType == 'MUSIC_PATROL_ITEM'">
+                    AND iip.conclusion_status_ = 1 AND iip.memo_=''
+                </if>
+                <if test="searchType == 'INSPECTION_ITEM_PLAN'">
+                    AND iip.status_ = 0 AND iip.memo_ = '' AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt; DATE_FORMAT(NOW(),'%Y-%m-%d')
+                </if>
             </if>
             <if test="startTime != null">
                 AND iip.plan_start_ >= #{startTime}

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

@@ -103,6 +103,11 @@
             <if test="ids != null and ids != ''">
                 FIND_IN_SET(mgq.id_,#{ids})
             </if>
+            <if test="visitFlag != null">
+                <if test="visitFlag == 0">
+                    AND mg.status_='PROGRESS' AND mgq.status_='PROCESSING'
+                </if>
+            </if>
             <if test="organId != null and organId != ''">
                 FIND_IN_SET(mg.organ_id_,#{organId})
             </if>

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

@@ -499,7 +499,7 @@
     <select id="queryMusicGroupStudent" resultMap="MusicGroupStudentsDto">
         SELECT sr.user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,sr.current_grade_,sr.current_grade_date_,
         sr.current_class_,sr.music_group_status_ student_status_,CASE WHEN sr.payment_status_ = 2 THEN 1 ELSE 0 END payment_status_,
-        s.name_ subject_name_,sr.music_group_id_,case when su.password_ is null then 0 else 1 end isActive_,
+        s.name_ subject_name_,sr.music_group_id_,CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
         IF(DATE_FORMAT(sr.create_time_,'%Y-%m-%d') > DATE_FORMAT(mg.payment_expire_date_,'%Y-%m-%d'),1,0) is_new_student_,
         stu.care_package_,stu.come_on_package_
         FROM student_registration sr

mec-student/src/main/java/com/ym/mec/student/StudentApplication.java

@@ -26,7 +26,7 @@ import com.ym.mec.common.filters.EmojiEncodingFilter;
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
 @MapperScan("com.ym.mec.biz.dal.dao")
-@ComponentScan(basePackages = "com.ym.mec")
+@ComponentScan(basePackages = {"com.ym.mec", "com.yonge.log"})
 @Configuration
 @EnableSwagger2Doc
 @EnableAsync

mec-student/src/main/java/com/ym/mec/student/config/WebMvcConfig.java

@@ -3,6 +3,7 @@ package com.ym.mec.student.config;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.ym.mec.student.interceptor.OperationLogInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
@@ -22,6 +23,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	@Autowired
 	private MDCInterceptor mdcInterceptor;
 
+	@Autowired
+	private OperationLogInterceptor operationLogInterceptor;
+
 	/**
 	 * 枚举类的转换器 addConverterFactory
 	 */
@@ -41,6 +45,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		excludePathPatterns.add("/login");
 
 		registry.addInterceptor(mdcInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
+
+		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/**").excludePathPatterns("/login");
 	}
 
 	@Bean

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

@@ -0,0 +1,31 @@
+package com.ym.mec.student.interceptor;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.yonge.log.interceptor.AuditLogInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class OperationLogInterceptor extends AuditLogInterceptor {
+
+	@Autowired
+	@Lazy
+	private SysUserFeignService sysUserFeignService;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser != null) {
+			setUsername(sysUser.getRealName());
+		}
+		return true;
+	}
+
+}

mec-teacher/src/main/java/com/ym/mec/teacher/TeacherApplication.java

@@ -22,7 +22,7 @@ import com.ym.mec.common.filters.EmojiEncodingFilter;
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
 @MapperScan("com.ym.mec.biz.dal.dao")
-@ComponentScan(basePackages = { "com.ym.mec", "org.snaker.engine" })
+@ComponentScan(basePackages = { "com.ym.mec", "org.snaker.engine", "com.yonge.log"})
 @Configuration
 @EnableSwagger2Doc
 @EnableAsync

mec-teacher/src/main/java/com/ym/mec/teacher/config/WebMvcConfig.java

@@ -12,6 +12,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.ym.mec.teacher.interceptor.MDCInterceptor;
+import com.ym.mec.teacher.interceptor.OperationLogInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
@@ -49,6 +50,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	@Autowired
 	private MDCInterceptor mdcInterceptor;
 
+	@Autowired
+	private OperationLogInterceptor operationLogInterceptor;
+
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		List<String> includePathPatterns = new ArrayList<String>();
@@ -56,6 +60,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		List<String> excludePathPatterns = new ArrayList<String>();
 		excludePathPatterns.add("/login");
 		registry.addInterceptor(mdcInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
+
+		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/**").excludePathPatterns("/login");
 	}
 
 	/**

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,7 @@ public class ExtracurricularExercisesController extends BaseController {
 
     @ApiOperation(value = "创建课外训练")
     @PostMapping("/createExtraExercises")
+    @AuditLogAnnotation(operateName = "创建课外训练")
     private HttpResponseResult createExtraExercises(ExtracurricularExercises exercises){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(sysUser)){

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

@@ -10,6 +10,7 @@ import com.ym.mec.biz.service.StudentCourseHomeworkReplyService;
 import com.ym.mec.biz.service.StudentServeService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -51,6 +52,7 @@ public class TeacherCourseHomeworkReplyController extends BaseController {
 
     @ApiOperation(value = "新增回复-公用")
     @PostMapping("/addPublic")
+    @AuditLogAnnotation(operateName = "新增回复-公用")
     public Object addPublic(@RequestBody StudentCourseHomeworkReply studentCourseHomeworkReply) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){

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

@@ -0,0 +1,31 @@
+package com.ym.mec.teacher.interceptor;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.yonge.log.interceptor.AuditLogInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class OperationLogInterceptor extends AuditLogInterceptor {
+
+	@Autowired
+	@Lazy
+	private SysUserFeignService sysUserFeignService;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser != null) {
+			setUsername(sysUser.getRealName());
+		}
+		return true;
+	}
+
+}

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

@@ -65,7 +65,7 @@ public class InspectionItemPlanController extends BaseController {
     }
 
     @ApiOperation(value = "巡查任务事项日程列表")
-    @GetMapping("/queryPage")
+    @RequestMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('inspectionItemPlan/queryPage')")
     public HttpResponseResult<PageInfo<InspectionItemPlan>> queryPage(InspectionItemPlanQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();