add 教务端乐团巡查日程管理

mec-biz/src/main/java/com/ym/mec/biz/service/InspectionItemPlanConclusionService.java

@@ -18,7 +18,7 @@ public interface InspectionItemPlanConclusionService extends BaseService<Long, I
     InspectionItemPlanConclusionDto add(InspectionItemPlanConclusionDto inspectionItemPlanConclusionDto);
 
     /**
-     * 获取
+     * 获取巡查检查结果(以检查项分组)
      * @param planId
      * @param checkItem
      * @return
@@ -31,6 +31,14 @@ public interface InspectionItemPlanConclusionService extends BaseService<Long, I
      * @return
      */
     List<CourseSchedule> getPlanCourses(Long planId);
+
+
+    /**
+     * 获取巡查检查结果(以课程id分组)
+     * @param planId
+     * @return
+     */
+    Map<Long,List<InspectionItemPlanConclusion>> getPlanConclusion(Long planId);
 }
 
 

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

@@ -18,6 +18,7 @@ import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
 import com.ym.mec.biz.service.InspectionItemPlanConclusionService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -115,13 +116,23 @@ public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Lon
     @Override
     public List<CourseSchedule> getPlanCourses(Long planId) {
         InspectionItemPlan plan = inspectionItemPlanDao.get(planId);
-        List<CourseSchedule> courseSchedules = inspectionItemPlanConclusionDao.getPlanConclusionCourses(planId);
+        List<CourseSchedule> courseSchedules = new ArrayList<CourseSchedule>();
+        if (plan == null) {
+            return courseSchedules;
+        }
+        courseSchedules = inspectionItemPlanConclusionDao.getPlanConclusionCourses(planId);
         if (courseSchedules.size() > 0) {
             return courseSchedules;
         }
         courseSchedules = courseScheduleDao.getMusicGroupCourseInfo(plan.getMusicGroupId(), plan.getPlanStart(), plan.getPlanEnd());
         return courseSchedules;
     }
+
+    @Override
+    public Map<Long, List<InspectionItemPlanConclusion>> getPlanConclusion(Long planId) {
+        List<InspectionItemPlanConclusion> conclusions = inspectionItemPlanConclusionDao.getInspectionItemPlanConclusion(planId, null);
+        return conclusions.stream().collect(Collectors.groupingBy(InspectionItemPlanConclusion::getCourseScheduleId));
+    }
 }
 
 

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

@@ -17,14 +17,14 @@
         <!--@mbg.generated-->
         id_, plan_id_,course_schedule_id_, teacher_id_, check_item_, check_conclusion_, create_time_, update_time_
     </sql>
-    <select id="get" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <select id="get" resultMap="BaseResultMap">
         <!--@mbg.generated-->
         select
         <include refid="Base_Column_List"/>
         from inspection_item_plan_conclusion
         where id_ = #{id}
     </select>
-    <delete id="delete" parameterType="java.lang.Integer">
+    <delete id="delete">
         <!--@mbg.generated-->
         delete from inspection_item_plan_conclusion
         where id_ = #{id}

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

@@ -31,14 +31,14 @@
         music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_, create_time_,
         update_time_
     </sql>
-    <select id="get" parameterType="java.lang.Integer" resultMap="InspectionItemPlan">
+    <select id="get" parameterType="java.lang.Long" resultMap="InspectionItemPlan" >
         <!--@mbg.generated-->
         select
         <include refid="Base_Column_List"/>
         from inspection_item_plan
         where id_ = #{id}
     </select>
-    <delete id="delete" parameterType="java.lang.Integer">
+    <delete id="delete" parameterType="java.lang.Long">
         <!--@mbg.generated-->
         delete from inspection_item_plan
         where id_ = #{id}

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

@@ -23,12 +23,11 @@ public class InspectionItemPlanConclusionController extends BaseController {
     private InspectionItemPlanConclusionService InspectionItemPlanConclusionService;
 
     @ApiOperation(value = "获取日程的巡查结果")
-    @GetMapping("/getInfo")
-    @PreAuthorize("@pcs.hasPermissions('inspectionItemPlanConclusion/getInfo')")
-    @ApiImplicitParams({@ApiImplicitParam(name = "planId", value = "日程id", required = true, dataType = "int"),
-            @ApiImplicitParam(name = "checkItem", value = "巡查结果项", required = false, dataType = "int")})
-    public HttpResponseResult<Map<Integer, List<InspectionItemPlanConclusion>>> getInfo(Long planId, Integer checkItem) {
-        return succeed(InspectionItemPlanConclusionService.getInfo(planId, checkItem));
+    @GetMapping("/getPlanConclusion")
+    @PreAuthorize("@pcs.hasPermissions('inspectionItemPlanConclusion/getPlanConclusion')")
+    @ApiImplicitParams({@ApiImplicitParam(name = "planId", value = "日程id", required = true, dataType = "int")})
+    public HttpResponseResult<Map<Long, List<InspectionItemPlanConclusion>>> getInfo(Long planId, Integer checkItem) {
+        return succeed(InspectionItemPlanConclusionService.getPlanConclusion(planId));
     }
     
 }