add 乐团巡查任务事项日程管理

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

@@ -22,94 +22,16 @@ public class InspectionItemPlanConclusion {
     private Integer teacherId;
 
     /**
-     * 老师是否提前准备板书（本课内容、作业）
+     * 检查事项
      */
-    @ApiModelProperty(value = "老师是否提前准备板书（本课内容、作业）")
-    private Integer checkItem1;
+    @ApiModelProperty(value = "检查事项")
+    private Integer checkItem;
 
     /**
      * 老师是否佩戴工牌
      */
-    @ApiModelProperty(value = "老师是否佩戴工牌")
-    private Integer checkItem2;
-
-    /**
-     * 老师是否仪容仪表整洁
-     */
-    @ApiModelProperty(value = "老师是否仪容仪表整洁")
-    private Integer checkItem3;
-
-    /**
-     * 老师是否携带乐器
-     */
-    @ApiModelProperty(value = "老师是否携带乐器")
-    private Integer checkItem4;
-
-    /**
-     * 老师是否携带教学资料、设备
-     */
-    @ApiModelProperty(value = "老师是否携带教学资料、设备")
-    private Integer checkItem5;
-
-    /**
-     * 老师是否合理安排学员座位
-     */
-    @ApiModelProperty(value = "老师是否合理安排学员座位")
-    private Integer checkItem6;
-
-    /**
-     * 乐器箱包、书包是否摆放整齐
-     */
-    @ApiModelProperty(value = "乐器箱包、书包是否摆放整齐")
-    private Integer checkItem7;
-
-    /**
-     * 课堂纪律是否保持良好
-     */
-    @ApiModelProperty(value = "课堂纪律是否保持良好")
-    private Integer checkItem8;
-
-    /**
-     * 老师是否全程站立教学
-     */
-    @ApiModelProperty(value = "老师是否全程站立教学")
-    private Integer checkItem9;
-
-    /**
-     * 老师是否全程使用节拍器或教学音频
-     */
-    @ApiModelProperty(value = "老师是否全程使用节拍器或教学音频")
-    private Integer checkItem10;
-
-    /**
-     * 是否发现学员需要更换新乐器
-     */
-    @ApiModelProperty(value = "是否发现学员需要更换新乐器")
-    private Integer checkItem11;
-
-    /**
-     * 老师是否将上课照片/视频发送到声部群
-     */
-    @ApiModelProperty(value = "老师是否将上课照片/视频发送到声部群")
-    private Integer checkItem12;
-
-    /**
-     * 老师是否保持教室环境卫生
-     */
-    @ApiModelProperty(value = "老师是否保持教室环境卫生")
-    private Integer checkItem13;
-
-    /**
-     * 老师是否关好所有电源、门窗
-     */
-    @ApiModelProperty(value = "老师是否关好所有电源、门窗")
-    private Integer checkItem14;
-
-    /**
-     * 老师是否有序组织学员放学
-     */
-    @ApiModelProperty(value = "老师是否有序组织学员放学")
-    private Integer checkItem15;
+    @ApiModelProperty(value = "检查结果")
+    private Integer checkConclusion;
 
     /**
      * 创建时间
@@ -147,124 +69,20 @@ public class InspectionItemPlanConclusion {
         this.teacherId = teacherId;
     }
 
-    public Integer getCheckItem1() {
-        return checkItem1;
-    }
-
-    public void setCheckItem1(Integer checkItem1) {
-        this.checkItem1 = checkItem1;
-    }
-
-    public Integer getCheckItem2() {
-        return checkItem2;
-    }
-
-    public void setCheckItem2(Integer checkItem2) {
-        this.checkItem2 = checkItem2;
-    }
-
-    public Integer getCheckItem3() {
-        return checkItem3;
-    }
-
-    public void setCheckItem3(Integer checkItem3) {
-        this.checkItem3 = checkItem3;
-    }
-
-    public Integer getCheckItem4() {
-        return checkItem4;
-    }
-
-    public void setCheckItem4(Integer checkItem4) {
-        this.checkItem4 = checkItem4;
-    }
-
-    public Integer getCheckItem5() {
-        return checkItem5;
-    }
-
-    public void setCheckItem5(Integer checkItem5) {
-        this.checkItem5 = checkItem5;
-    }
-
-    public Integer getCheckItem6() {
-        return checkItem6;
-    }
-
-    public void setCheckItem6(Integer checkItem6) {
-        this.checkItem6 = checkItem6;
-    }
-
-    public Integer getCheckItem7() {
-        return checkItem7;
-    }
-
-    public void setCheckItem7(Integer checkItem7) {
-        this.checkItem7 = checkItem7;
-    }
-
-    public Integer getCheckItem8() {
-        return checkItem8;
-    }
-
-    public void setCheckItem8(Integer checkItem8) {
-        this.checkItem8 = checkItem8;
-    }
-
-    public Integer getCheckItem9() {
-        return checkItem9;
-    }
-
-    public void setCheckItem9(Integer checkItem9) {
-        this.checkItem9 = checkItem9;
-    }
-
-    public Integer getCheckItem10() {
-        return checkItem10;
-    }
-
-    public void setCheckItem10(Integer checkItem10) {
-        this.checkItem10 = checkItem10;
-    }
-
-    public Integer getCheckItem11() {
-        return checkItem11;
-    }
-
-    public void setCheckItem11(Integer checkItem11) {
-        this.checkItem11 = checkItem11;
-    }
-
-    public Integer getCheckItem12() {
-        return checkItem12;
-    }
-
-    public void setCheckItem12(Integer checkItem12) {
-        this.checkItem12 = checkItem12;
-    }
-
-    public Integer getCheckItem13() {
-        return checkItem13;
-    }
-
-    public void setCheckItem13(Integer checkItem13) {
-        this.checkItem13 = checkItem13;
-    }
-
-    public Integer getCheckItem14() {
-        return checkItem14;
+    public Integer getCheckItem() {
+        return checkItem;
     }
 
-    public void setCheckItem14(Integer checkItem14) {
-        this.checkItem14 = checkItem14;
+    public void setCheckItem(Integer checkItem) {
+        this.checkItem = checkItem;
     }
 
-    public Integer getCheckItem15() {
-        return checkItem15;
+    public Integer getCheckConclusion() {
+        return checkConclusion;
     }
 
-    public void setCheckItem15(Integer checkItem15) {
-        this.checkItem15 = checkItem15;
+    public void setCheckConclusion(Integer checkConclusion) {
+        this.checkConclusion = checkConclusion;
     }
 
     public Date getCreateTime() {

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

@@ -13,6 +13,12 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐团主管id",required = false)
     private Integer userId;
 
+    @ApiModelProperty(value = "是否已提交 0-未提交 1-已提交 ",required = false)
+    private Integer hasSubmit;
+
+    @ApiModelProperty(value = "月份",required = false)
+    private Date month;
+
     private Date startTime;
 
     private Date endTime;
@@ -48,4 +54,20 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     public void setUserId(Integer userId) {
         this.userId = userId;
     }
+
+    public Integer getHasSubmit() {
+        return hasSubmit;
+    }
+
+    public void setHasSubmit(Integer hasSubmit) {
+        this.hasSubmit = hasSubmit;
+    }
+
+    public Date getMonth() {
+        return month;
+    }
+
+    public void setMonth(Date month) {
+        this.month = month;
+    }
 }

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

@@ -7,30 +7,14 @@
     <id column="id_" property="id" />
     <result column="plan_id_" property="planId" />
     <result column="teacher_id_" property="teacherId" />
-    <result column="check item1" property="checkItem1" />
-    <result column="check item2" property="checkItem2" />
-    <result column="check item3" property="checkItem3" />
-    <result column="check item4" property="checkItem4" />
-    <result column="check item5" property="checkItem5" />
-    <result column="check item6" property="checkItem6" />
-    <result column="check item7" property="checkItem7" />
-    <result column="check item8" property="checkItem8" />
-    <result column="check item9" property="checkItem9" />
-    <result column="check item10" property="checkItem10" />
-    <result column="check item11" property="checkItem11" />
-    <result column="check item12" property="checkItem12" />
-    <result column="check item13" property="checkItem13" />
-    <result column="check item14" property="checkItem14" />
-    <result column="check item15" property="checkItem15" />
+    <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 item1`, `check item2`, `check item3`, `check item4`, 
-    `check item5`, `check item6`, `check item7`, `check item8`, `check item9`, `check item10`, 
-    `check item11`, `check item12`, `check item13`, `check item14`, `check item15`, create_time_, 
-    update_time_
+    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-->
@@ -46,14 +30,8 @@
   </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 item1`, `check item2`, `check item3`, `check item4`, 
-      `check item5`, `check item6`, `check item7`, `check item8`, `check item9`, `check item10`, 
-      `check item11`, `check item12`, `check item13`, `check item14`, `check item15`, 
-      create_time_, update_time_)
-    values (#{planId}, #{teacherId}, #{checkItem1}, #{checkItem2}, #{checkItem3}, #{checkItem4}, 
-      #{checkItem5}, #{checkItem6}, #{checkItem7}, #{checkItem8}, #{checkItem9}, #{checkItem10}, 
-      #{checkItem11}, #{checkItem12}, #{checkItem13}, #{checkItem14}, #{checkItem15}, 
-      #{createTime}, #{updateTime})
+    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-->
@@ -65,50 +43,11 @@
       <if test="teacherId != null">
         teacher_id_ = #{teacherId},
       </if>
-      <if test="checkItem1 != null">
-        `check item1` = #{checkItem1},
+      <if test="checkItem != null">
+        check_item_ = #{checkItem},
       </if>
-      <if test="checkItem2 != null">
-        `check item2` = #{checkItem2},
-      </if>
-      <if test="checkItem3 != null">
-        `check item3` = #{checkItem3},
-      </if>
-      <if test="checkItem4 != null">
-        `check item4` = #{checkItem4},
-      </if>
-      <if test="checkItem5 != null">
-        `check item5` = #{checkItem5},
-      </if>
-      <if test="checkItem6 != null">
-        `check item6` = #{checkItem6},
-      </if>
-      <if test="checkItem7 != null">
-        `check item7` = #{checkItem7},
-      </if>
-      <if test="checkItem8 != null">
-        `check item8` = #{checkItem8},
-      </if>
-      <if test="checkItem9 != null">
-        `check item9` = #{checkItem9},
-      </if>
-      <if test="checkItem10 != null">
-        `check item10` = #{checkItem10},
-      </if>
-      <if test="checkItem11 != null">
-        `check item11` = #{checkItem11},
-      </if>
-      <if test="checkItem12 != null">
-        `check item12` = #{checkItem12},
-      </if>
-      <if test="checkItem13 != null">
-        `check item13` = #{checkItem13},
-      </if>
-      <if test="checkItem14 != null">
-        `check item14` = #{checkItem14},
-      </if>
-      <if test="checkItem15 != null">
-        `check item15` = #{checkItem15},
+      <if test="checkConclusion != null">
+        check_conclusion_ = #{checkConclusion},
       </if>
       <if test="createTime != null">
         create_time_ = #{createTime},

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

@@ -1,134 +1,146 @@
 <?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.InspectionItemPlanDao">
-  <resultMap id="InspectionItemPlan" type="com.ym.mec.biz.dal.entity.InspectionItemPlan">
-    <!--@mbg.generated-->
-    <!--@Table inspection_item_plan-->
-    <id column="id_" property="id" />
-    <result column="inspection_id_" property="inspectionId" />
-    <result column="item_id_" property="itemId" />
-    <result column="user_id_" property="userId" />
-    <result column="plan_start_" property="planStart" />
-    <result column="plan_end_" property="planEnd" />
-    <result column="cooperation_organ_id_" property="cooperationOrganId" />
-    <result column="music_group_id_" property="musicGroupId" />
-    <result column="school_gps_" property="schoolGps" />
-    <result column="submited_gps_" property="submitedGps" />
-    <result column="submited_time_" property="submitedTime" />
-    <result column="memo_" property="memo" />
-    <result column="status_" property="status" />
-    <result column="create_time_" property="createTime" />
-    <result column="update_time_" property="updateTime" />
-    <result column="cooperationName" property="cooperationName" />
-    <result column="musicGroupName" property="musicGroupName" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id_, inspection_id_, item_id_, user_id_, plan_start_, plan_end_, cooperation_organ_id_, 
-    music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_, create_time_, 
-    update_time_
-  </sql>
-  <select id="get" parameterType="java.lang.Integer" 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">
-    <!--@mbg.generated-->
-    delete from inspection_item_plan
-    where id_ = #{id}
-  </delete>
-  <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inspection_item_plan (inspection_id_, item_id_, user_id_, plan_start_, plan_end_, cooperation_organ_id_, 
-      music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_, 
-      create_time_, update_time_)
-    values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{cooperationOrganId}, 
-      #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo}, #{status}, 
-      #{createTime}, #{updateTime})
-  </insert>
-  <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan">
-    <!--@mbg.generated-->
-    update inspection_item_plan
-    <set>
-      <if test="inspectionId != null">
-        inspection_id_ = #{inspectionId},
-      </if>
-      <if test="itemId != null">
-        item_id_ = #{itemId},
-      </if>
-      <if test="userId != null">
-        user_id_ = #{userId},
-      </if>
-      <if test="planStart != null">
-        plan_start_ = #{planStart},
-      </if>
-      <if test="planEnd != null">
-        plan_end_ = #{planEnd},
-      </if>
-      <if test="cooperationOrganId != null">
-        cooperation_organ_id_ = #{cooperationOrganId},
-      </if>
-      <if test="musicGroupId != null">
-        music_group_id_ = #{musicGroupId},
-      </if>
-      <if test="schoolGps != null">
-        school_gps_ = #{schoolGps},
-      </if>
-      <if test="submitedGps != null">
-        submited_gps_ = #{submitedGps},
-      </if>
-      <if test="submitedTime != null">
-        submited_time_ = #{submitedTime},
-      </if>
-      <if test="memo != null">
-        memo_ = #{memo},
-      </if>
-      <if test="status != null">
-        status_ = #{status},
-      </if>
-      <if test="createTime != null">
-        create_time_ = #{createTime},
-      </if>
-      <if test="updateTime != null">
-        update_time_ = #{updateTime},
-      </if>
-    </set>
-    where id_ = #{id}
-  </update>
+    <resultMap id="InspectionItemPlan" type="com.ym.mec.biz.dal.entity.InspectionItemPlan">
+        <!--@mbg.generated-->
+        <!--@Table inspection_item_plan-->
+        <id column="id_" property="id"/>
+        <result column="inspection_id_" property="inspectionId"/>
+        <result column="item_id_" property="itemId"/>
+        <result column="user_id_" property="userId"/>
+        <result column="plan_start_" property="planStart"/>
+        <result column="plan_end_" property="planEnd"/>
+        <result column="cooperation_organ_id_" property="cooperationOrganId"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="school_gps_" property="schoolGps"/>
+        <result column="submited_gps_" property="submitedGps"/>
+        <result column="submited_time_" property="submitedTime"/>
+        <result column="memo_" property="memo"/>
+        <result column="status_" property="status"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="cooperationName" property="cooperationName"/>
+        <result column="musicGroupName" property="musicGroupName"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id_, inspection_id_, item_id_, user_id_, plan_start_, plan_end_, cooperation_organ_id_,
+        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_, create_time_,
+        update_time_
+    </sql>
+    <select id="get" parameterType="java.lang.Integer" 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">
+        <!--@mbg.generated-->
+        delete from inspection_item_plan
+        where id_ = #{id}
+    </delete>
+    <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan"
+            useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inspection_item_plan (inspection_id_, item_id_, user_id_, plan_start_, plan_end_,
+        cooperation_organ_id_,
+        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_,
+        create_time_, update_time_)
+        values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{cooperationOrganId},
+        #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo}, #{status},
+        #{createTime}, #{updateTime})
+    </insert>
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan">
+        <!--@mbg.generated-->
+        update inspection_item_plan
+        <set>
+            <if test="inspectionId != null">
+                inspection_id_ = #{inspectionId},
+            </if>
+            <if test="itemId != null">
+                item_id_ = #{itemId},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="planStart != null">
+                plan_start_ = #{planStart},
+            </if>
+            <if test="planEnd != null">
+                plan_end_ = #{planEnd},
+            </if>
+            <if test="cooperationOrganId != null">
+                cooperation_organ_id_ = #{cooperationOrganId},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+            <if test="schoolGps != null">
+                school_gps_ = #{schoolGps},
+            </if>
+            <if test="submitedGps != null">
+                submited_gps_ = #{submitedGps},
+            </if>
+            <if test="submitedTime != null">
+                submited_time_ = #{submitedTime},
+            </if>
+            <if test="memo != null">
+                memo_ = #{memo},
+            </if>
+            <if test="status != null">
+                status_ = #{status},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
 
-  <!-- 分页查询 -->
-  <select id="queryPage" resultMap="InspectionItemPlan" parameterType="map">
-    SELECT iip.*,co.name_ cooperationName,mg.name_ musicGroupName FROM inspection_item_plan iip
-    LEFT JOIN cooperation_organ co ON co.id_=iip.cooperation_organ_id_
-    LEFT JOIN music_group mg ON mg.id_ = iip.music_group_id_
-    <include refid="queryPageSql"/>
-    ORDER BY iip.plan_start_ ASC
-    <include refid="global.limit"/>
-  </select>
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="InspectionItemPlan" parameterType="map">
+        SELECT iip.*,co.name_ cooperationName,mg.name_ musicGroupName FROM inspection_item_plan iip
+        LEFT JOIN cooperation_organ co ON co.id_=iip.cooperation_organ_id_
+        LEFT JOIN music_group mg ON mg.id_ = iip.music_group_id_
+        <include refid="queryPageSql"/>
+        ORDER BY iip.plan_start_ ASC
+        <include refid="global.limit"/>
+    </select>
 
-  <!-- 查询当前表的总记录数 -->
-  <select id="queryCount" resultType="int">
-    SELECT COUNT(*) FROM inspection_item_plan iip
-    <include refid="queryPageSql"/>
-  </select>
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+        SELECT COUNT(*) FROM inspection_item_plan iip
+        LEFT JOIN music_group mg ON mg.id_ = iip.music_group_id_
+        <include refid="queryPageSql"/>
+    </select>
 
-  <sql id="queryPageSql">
-    <where>
-      <if test="itemId != null">
-        AND iip.item_id_ = #{itemId}
-      </if>
-      <if test="userId != null">
-        AND iip.user_id_ = #{userId}
-      </if>
-      <if test="startTime != null">
-        AND iip.plan_start_ >= #{startTime}
-      </if>
-      <if test="endTime != null">
-        <![CDATA[AND iip.plan_start_ <= #{endTime}]]>
-      </if>
-    </where>
-  </sql>
+    <sql id="queryPageSql">
+        <where>
+            <if test="itemId != null">
+                AND iip.item_id_ = #{itemId}
+            </if>
+            <if test="userId != null">
+                AND iip.user_id_ = #{userId}
+            </if>
+            <if test='hasSubmit != null and hasSubmit.toString()=="1".toString()'>
+                AND iip.status_ > 0
+            </if>
+            <if test='hasSubmit != null and hasSubmit.toString()=="0".toString()'>
+                AND iip.status_ = 0
+            </if>
+            <if test="startTime != null">
+                AND iip.plan_start_ >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                <![CDATA[AND iip.plan_start_ <= #{endTime}]]>
+            </if>
+            <if test="search != null">
+                AND mg.name LIKE CONCAT('%', #{search}, '%')
+            </if>
+        </where>
+    </sql>
 </mapper>

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

@@ -0,0 +1,46 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.InspectionItemPlan;
+import com.ym.mec.biz.dal.page.InspectionItemPlanQueryInfo;
+import com.ym.mec.biz.service.InspectionItemPlanService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.util.date.DateUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags = "教务巡查事项日程")
+@RequestMapping("eduInspectionItemPlan")
+@RestController
+public class EduInspectionItemPlanController extends BaseController {
+    @Autowired
+    private InspectionItemPlanService inspectionItemPlanService;
+    @Resource
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "巡查任务事项日程列表")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('inspectionItemPlan/queryPage')")
+    public HttpResponseResult<PageInfo<InspectionItemPlan>> queryPage(InspectionItemPlanQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        queryInfo.setUserId(sysUser.getId());
+        if (queryInfo.getMonth() != null) {
+            queryInfo.setStartTime(DateUtil.getFirstDayOfMonth(queryInfo.getMonth()));
+            queryInfo.setEndTime(DateUtil.getLastTimeWithDay(DateUtil.getLastDayOfMonth(queryInfo.getMonth())));
+        }
+        return succeed(inspectionItemPlanService.queryPage(queryInfo));
+    }
+}