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

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

@@ -1,8 +1,44 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.CheckItemDto;
 import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
-public interface InspectionItemPlanConclusionDao extends BaseDAO<Long,InspectionItemPlanConclusion> {
+import java.util.List;
 
+public interface InspectionItemPlanConclusionDao extends BaseDAO<Long, InspectionItemPlanConclusion> {
+
+    /**
+     * 插入巡查结果
+     *
+     * @param inspectionItemPlanConclusions
+     * @return
+     */
+    int batchAdd(@Param("inspectionItemPlanConclusions") List<InspectionItemPlanConclusion> inspectionItemPlanConclusions);
+
+    /**
+     * 根据日程计划id和检查事项id删除检查结果
+     *
+     * @param planId
+     * @param checkItem
+     * @return
+     */
+    int delByPlanIdAndCheckItem(@Param("planId") Long planId, @Param("checkItem") Integer checkItem);
+
+    /**
+     * 获取巡查日程提交的最后结果项
+     *
+     * @param planIds
+     * @return
+     */
+    List<CheckItemDto> getLastCheckItem(@Param("planIds") List<Long> planIds);
+
+    /**
+     * 获取巡查日程的巡查结果
+     * @param planId
+     * @param checkItem
+     * @return
+     */
+    List<InspectionItemPlanConclusion> getInspectionItemPlanConclusion(@Param("planId") Long planId, @Param("checkItem") Integer checkItem);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CheckItemDto.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class CheckItemDto {
+    @ApiModelProperty(value = "巡查日程id", required = false)
+    private Long planId;
+
+    @ApiModelProperty(value = "巡查日程最后提交项", required = false)
+    private Integer checkItem;
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public Integer getCheckItem() {
+        return checkItem;
+    }
+
+    public void setCheckItem(Integer checkItem) {
+        this.checkItem = checkItem;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/InspectionItemPlanConclusionDto.java

@@ -0,0 +1,42 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class InspectionItemPlanConclusionDto {
+
+    @ApiModelProperty(value = "巡查结果记录")
+    private List<InspectionItemPlanConclusion> inspectionItemPlanConclusions;
+
+    @ApiModelProperty(value = "提交巡查结果时的gps信息")
+    private String submitedGps;
+
+    @ApiModelProperty(value = "提交时的状态 1-正常提交 2-异常提交")
+    private Integer status;
+
+    public List<InspectionItemPlanConclusion> getInspectionItemPlanConclusions() {
+        return inspectionItemPlanConclusions;
+    }
+
+    public void setInspectionItemPlanConclusions(List<InspectionItemPlanConclusion> inspectionItemPlanConclusions) {
+        this.inspectionItemPlanConclusions = inspectionItemPlanConclusions;
+    }
+
+    public String getSubmitedGps() {
+        return submitedGps;
+    }
+
+    public void setSubmitedGps(String submitedGps) {
+        this.submitedGps = submitedGps;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlan.java

@@ -105,6 +105,9 @@ public class InspectionItemPlan {
     @ApiModelProperty(value = "乐团名称")
     private String musicGroupName;
 
+    @ApiModelProperty(value = "已提交的最后结果项")
+    private Integer lastCheckItem = 0;
+
     public Long getId() {
         return id;
     }
@@ -240,4 +243,12 @@ public class InspectionItemPlan {
     public void setCooperationName(String cooperationName) {
         this.cooperationName = cooperationName;
     }
+
+    public Integer getLastCheckItem() {
+        return lastCheckItem;
+    }
+
+    public void setLastCheckItem(Integer lastCheckItem) {
+        this.lastCheckItem = lastCheckItem;
+    }
 }

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

@@ -1,10 +1,28 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.InspectionItemPlanConclusionDto;
 import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+import java.util.Map;
+
 public interface InspectionItemPlanConclusionService extends BaseService<Long, InspectionItemPlanConclusion> {
+    /**
+     * 添加巡查结果
+     *
+     * @param inspectionItemPlanConclusionDto
+     * @return
+     */
+    InspectionItemPlanConclusionDto add(InspectionItemPlanConclusionDto inspectionItemPlanConclusionDto);
 
+    /**
+     * 获取
+     * @param planId
+     * @param checkItem
+     * @return
+     */
+   Map<Integer,List<InspectionItemPlanConclusion>> getInfo(Long planId, Integer checkItem);
 }
 
 

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

@@ -1,9 +1,18 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.InspectionItemPlan;
+import com.ym.mec.biz.dal.page.InspectionItemPlanQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface InspectionItemPlanService extends BaseService<Long, InspectionItemPlan> {
+
+    /**
+     * 获取巡查日程列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<InspectionItemPlan> getPageList(InspectionItemPlanQueryInfo queryInfo);
     /**
      * 添加日程
      * @param inspectionItemPlan

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

@@ -1,24 +1,104 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.InspectionItemDao;
 import com.ym.mec.biz.dal.dao.InspectionItemPlanConclusionDao;
+import com.ym.mec.biz.dal.dao.InspectionItemPlanDao;
+import com.ym.mec.biz.dal.dto.InspectionItemPlanConclusionDto;
+import com.ym.mec.biz.dal.entity.InspectionItem;
+import com.ym.mec.biz.dal.entity.InspectionItemPlan;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
 import com.ym.mec.biz.service.InspectionItemPlanConclusionService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Long, InspectionItemPlanConclusion> implements InspectionItemPlanConclusionService {
 
     @Autowired
     private InspectionItemPlanConclusionDao inspectionItemPlanConclusionDao;
+    @Autowired
+    private InspectionItemPlanDao inspectionItemPlanDao;
+    @Autowired
+    private InspectionItemDao inspectionItemDao;
 
     @Override
     public BaseDAO<Long, InspectionItemPlanConclusion> getDAO() {
         return inspectionItemPlanConclusionDao;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public InspectionItemPlanConclusionDto add(InspectionItemPlanConclusionDto inspectionItemPlanConclusionDto) {
+        Date nowDate = new Date();
+        List<InspectionItemPlanConclusion> inspectionItemPlanConclusions = inspectionItemPlanConclusionDto.getInspectionItemPlanConclusions();
+        //删除老的
+        Long planId = inspectionItemPlanConclusions.get(0).getPlanId();
+        Integer checkItem = inspectionItemPlanConclusions.get(0).getCheckItem();
+        //时间早于/晚于计划时间当天，不能提交
+        InspectionItemPlan inspectionItemPlan = inspectionItemPlanDao.get(planId);
+        if (nowDate.before(DateUtil.trunc(inspectionItemPlan.getPlanStart()))) {
+            throw new BizException("提价时间不能早于日程安排当天");
+        }
+
+        if (nowDate.after(DateUtil.getLastTimeWithDay(inspectionItemPlan.getPlanStart()))) {
+            throw new BizException("提价时间不能晚于日程安排当天");
+        }
+
+        inspectionItemPlanConclusionDao.delByPlanIdAndCheckItem(planId, checkItem);
+        for (InspectionItemPlanConclusion inspectionItemPlanConclusion : inspectionItemPlanConclusions) {
+            inspectionItemPlanConclusion.setCreateTime(nowDate);
+            inspectionItemPlanConclusion.setUpdateTime(nowDate);
+        }
+        inspectionItemPlanConclusionDto.setInspectionItemPlanConclusions(inspectionItemPlanConclusions);
+        //插入新的
+        inspectionItemPlanConclusionDao.batchAdd(inspectionItemPlanConclusions);
+        //有状态信息,更新gps信息和提交状态
+        if (inspectionItemPlanConclusionDto.getStatus() == null) {
+            return inspectionItemPlanConclusionDto;
+        }
+
+        //未提交过，更新提交信息
+        if (inspectionItemPlan.getStatus().equals(0)) {
+            inspectionItemPlan.setSubmitedGps(inspectionItemPlanConclusionDto.getSubmitedGps());
+            inspectionItemPlan.setSubmitedTime(nowDate);
+            inspectionItemPlan.setStatus(inspectionItemPlanConclusionDto.getStatus());
+            inspectionItemPlan.setUpdateTime(nowDate);
+            inspectionItemPlanDao.update(inspectionItemPlan);
+            //更新提交次数
+            InspectionItem inspectionItem = inspectionItemDao.get(inspectionItemPlan.getItemId());
+            inspectionItem.setSubmittedTimes(inspectionItem.getSubmittedTimes() + 1);
+            inspectionItem.setUpdateTime(nowDate);
+            inspectionItemDao.update(inspectionItem);
+            return inspectionItemPlanConclusionDto;
+        }
+
+        //提交过，异常变正常，更新提交信息
+        if (inspectionItemPlanConclusionDto.getStatus().equals(1)) {
+            inspectionItemPlan.setSubmitedGps(inspectionItemPlanConclusionDto.getSubmitedGps());
+            inspectionItemPlan.setSubmitedTime(nowDate);
+            inspectionItemPlan.setStatus(inspectionItemPlanConclusionDto.getStatus());
+            inspectionItemPlan.setUpdateTime(nowDate);
+            inspectionItemPlanDao.update(inspectionItemPlan);
+        }
+        return inspectionItemPlanConclusionDto;
+    }
+
+    @Override
+    public Map<Integer, List<InspectionItemPlanConclusion>> getInfo(Long planId, Integer checkItem) {
+        List<InspectionItemPlanConclusion> conclusions = inspectionItemPlanConclusionDao.getInspectionItemPlanConclusion(planId, checkItem);
+        Map<Integer, List<InspectionItemPlanConclusion>> conclusionMap = conclusions.stream().collect(Collectors.groupingBy(InspectionItemPlanConclusion::getCheckItem));
+        return conclusionMap;
+    }
 }
 
 

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

@@ -1,23 +1,25 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.InspectionDao;
-import com.ym.mec.biz.dal.dao.InspectionItemDao;
-import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dto.CheckItemDto;
 import com.ym.mec.biz.dal.entity.Inspection;
 import com.ym.mec.biz.dal.entity.InspectionItem;
 import com.ym.mec.biz.dal.entity.School;
+import com.ym.mec.biz.dal.page.InspectionItemPlanQueryInfo;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ym.mec.biz.dal.dao.InspectionItemPlanDao;
 import com.ym.mec.biz.dal.entity.InspectionItemPlan;
 import com.ym.mec.biz.service.InspectionItemPlanService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long, InspectionItemPlan> implements InspectionItemPlanService {
@@ -30,6 +32,8 @@ public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long, Inspect
     private InspectionDao inspectionDao;
     @Autowired
     private MusicGroupDao musicGroupDao;
+    @Autowired
+    private InspectionItemPlanConclusionDao inspectionItemPlanConclusionDao;
 
     @Override
     public BaseDAO<Long, InspectionItemPlan> getDAO() {
@@ -38,6 +42,22 @@ public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long, Inspect
 
 
     @Override
+    public PageInfo<InspectionItemPlan> getPageList(InspectionItemPlanQueryInfo queryInfo) {
+        PageInfo<InspectionItemPlan> pageInfo = this.queryPage(queryInfo);
+        if (pageInfo.getTotal() > 0) {
+            List<Long> planIds = pageInfo.getRows().stream().map(InspectionItemPlan::getId).collect(Collectors.toList());
+            List<CheckItemDto> lastCheckItems = inspectionItemPlanConclusionDao.getLastCheckItem(planIds);
+            for (InspectionItemPlan row : pageInfo.getRows()) {
+                for (CheckItemDto lastCheckItem : lastCheckItems) {
+                    if (!lastCheckItem.getPlanId().equals(row.getId())) continue;
+                    row.setLastCheckItem(lastCheckItem.getCheckItem());
+                }
+            }
+        }
+        return pageInfo;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public InspectionItemPlan add(InspectionItemPlan inspectionItemPlan) {
         InspectionItem inspectionItem = inspectionItemDao.get(inspectionItemPlan.getItemId());

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

@@ -175,10 +175,10 @@
                 AND ii.operation_ = #{operation}
             </if>
             <if test="startTime != null">
-                AND ii.month_ >= #{startTime}
+                AND i.month_ >= #{startTime}
             </if>
             <if test="endTime != null">
-                <![CDATA[AND ii.month_ <= #{endTime}]]>
+                <![CDATA[AND i.month_ <= #{endTime}]]>
             </if>
         </where>
     </sql>

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

@@ -1,61 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ym.mec.biz.dal.dao.InspectionItemPlanConclusionDao">
-  <resultMap id="BaseResultMap" type="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
-    <!--@mbg.generated-->
-    <!--@Table inspection_item_plan_conclusion-->
-    <id column="id_" property="id" />
-    <result column="plan_id_" property="planId" />
-    <result column="teacher_id_" property="teacherId" />
-    <result column="check_item_" property="checkItem" />
-    <result column="check_conclusion_" property="checkConclusion" />
-    <result column="create_time_" property="createTime" />
-    <result column="update_time_" property="updateTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id_, plan_id_, teacher_id_, check_item_, check_conclusion_, create_time_, update_time_
-  </sql>
-  <select id="get" parameterType="java.lang.Integer" 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">
-    <!--@mbg.generated-->
-    delete from inspection_item_plan_conclusion
-    where id_ = #{id}
-  </delete>
-  <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inspection_item_plan_conclusion (plan_id_, teacher_id_,check_item_, check_conclusion_, create_time_, update_time_)
-    values (#{planId}, #{teacherId}, #{checkItem}, #{checkConclusion},#{createTime}, #{updateTime})
-  </insert>
-  <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
-    <!--@mbg.generated-->
-    update inspection_item_plan_conclusion
-    <set>
-      <if test="planId != null">
-        plan_id_ = #{planId},
-      </if>
-      <if test="teacherId != null">
-        teacher_id_ = #{teacherId},
-      </if>
-      <if test="checkItem != null">
-        check_item_ = #{checkItem},
-      </if>
-      <if test="checkConclusion != null">
-        check_conclusion_ = #{checkConclusion},
-      </if>
-      <if test="createTime != null">
-        create_time_ = #{createTime},
-      </if>
-      <if test="updateTime != null">
-        update_time_ = #{updateTime},
-      </if>
-    </set>
-    where id_ = #{id}
-  </update>
+    <resultMap id="BaseResultMap" type="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
+        <!--@mbg.generated-->
+        <!--@Table inspection_item_plan_conclusion-->
+        <id column="id_" property="id"/>
+        <result column="plan_id_" property="planId"/>
+        <result column="teacher_id_" property="teacherId"/>
+        <result column="check_item_" property="checkItem"/>
+        <result column="check_conclusion_" property="checkConclusion"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id_, plan_id_, teacher_id_, check_item_, check_conclusion_, create_time_, update_time_
+    </sql>
+    <select id="get" parameterType="java.lang.Integer" 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">
+        <!--@mbg.generated-->
+        delete from inspection_item_plan_conclusion
+        where id_ = #{id}
+    </delete>
+    <insert id="insert" keyColumn="id_" keyProperty="id"
+            parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inspection_item_plan_conclusion (plan_id_, teacher_id_,check_item_, check_conclusion_, create_time_,
+        update_time_)
+        values (#{planId}, #{teacherId}, #{checkItem}, #{checkConclusion},#{createTime}, #{updateTime})
+    </insert>
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
+        <!--@mbg.generated-->
+        update inspection_item_plan_conclusion
+        <set>
+            <if test="planId != null">
+                plan_id_ = #{planId},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="checkItem != null">
+                check_item_ = #{checkItem},
+            </if>
+            <if test="checkConclusion != null">
+                check_conclusion_ = #{checkConclusion},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+    <delete id="delByPlanIdAndCheckItem">
+        DELETE
+        FROM inspection_item_plan_conclusion
+        WHERE plan_id_ = #{planId}
+          ANd check_item_ = #{checkItem}
+    </delete>
+    <insert id="batchAdd" keyColumn="id_" keyProperty="id"
+            parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion"
+            useGeneratedKeys="true">
+        INSERT INTO inspection_item_plan_conclusion (plan_id_, teacher_id_, check_item_, check_conclusion_,
+        create_time_,update_time_)
+        VALUE
+        <foreach collection="inspectionItemPlanConclusions" item="inspectionItemPlanConclusion" separator=",">
+            (#{inspectionItemPlanConclusion.planId}, #{inspectionItemPlanConclusion.teacherId},
+            #{inspectionItemPlanConclusion.checkItem},
+            #{inspectionItemPlanConclusion.checkConclusion}, #{inspectionItemPlanConclusion.createTime},
+            #{inspectionItemPlanConclusion.updateTime})
+        </foreach>
+    </insert>
+
+    <select id="getLastCheckItem" resultType="com.ym.mec.biz.dal.dto.CheckItemDto">
+        SELECT plan_id_ planId,MAX(check_item_) checkItem FROM inspection_item_plan_conclusion WHERE plan_id_ IN
+        <foreach collection="planIds" item="planId" open="(" close=")" separator=",">
+            #{planId}
+        </foreach>
+        GROUP BY plan_id_
+    </select>
+    <select id="getInspectionItemPlanConclusion" resultMap="BaseResultMap">
+        SELECT * FROM inspection_item_plan_conclusion WHERE plan_id_=#{planId}
+        <if test="checkItem != null">
+            AND check_item_ = #{checkItem}
+        </if>
+    </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/education/EduInspectionItemPlanConclusionController.java

@@ -0,0 +1,45 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.biz.dal.dto.InspectionItemPlanConclusionDto;
+import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
+import com.ym.mec.biz.service.InspectionItemPlanConclusionService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "教务巡查结果")
+@RequestMapping("inspectionItemPlanConclusion")
+@RestController
+public class EduInspectionItemPlanConclusionController extends BaseController {
+    @Autowired
+    private InspectionItemPlanConclusionService InspectionItemPlanConclusionService;
+
+    @ApiOperation(value = "巡查结果提交")
+    @PostMapping("/add")
+    public HttpResponseResult<InspectionItemPlanConclusionDto> add(@RequestBody InspectionItemPlanConclusionDto inspectionItemPlanConclusionDto) {
+        return succeed(InspectionItemPlanConclusionService.add(inspectionItemPlanConclusionDto));
+    }
+
+    @ApiOperation(value = "获取日程的巡查结果")
+    @GetMapping("/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));
+    }
+
+    @ApiOperation(value = "获取日程时间段内的乐团上课老师")
+    @GetMapping("/getTeacherS")
+    @ApiImplicitParams({@ApiImplicitParam(name = "planId", value = "日程id", required = true, dataType = "int")})
+    public HttpResponseResult<Map<Integer, List<InspectionItemPlanConclusion>>> getTeacherS(Long planId, Integer checkItem) {
+        return succeed(InspectionItemPlanConclusionService.getInfo(planId, checkItem));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduInspectionItemPlanController.java

@@ -30,7 +30,6 @@ public class EduInspectionItemPlanController extends BaseController {
 
     @ApiOperation(value = "巡查任务事项日程列表")
     @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('inspectionItemPlan/queryPage')")
     public HttpResponseResult<PageInfo<InspectionItemPlan>> queryPage(InspectionItemPlanQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -41,6 +40,6 @@ public class EduInspectionItemPlanController extends BaseController {
             queryInfo.setStartTime(DateUtil.getFirstDayOfMonth(queryInfo.getMonth()));
             queryInfo.setEndTime(DateUtil.getLastTimeWithDay(DateUtil.getLastDayOfMonth(queryInfo.getMonth())));
         }
-        return succeed(inspectionItemPlanService.queryPage(queryInfo));
+        return succeed(inspectionItemPlanService.getPageList(queryInfo));
     }
 }