add 根据乐团主管获取进行中乐团

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

@@ -17,4 +17,12 @@ public interface InspectionItemPlanDao extends BaseDAO<Long, InspectionItemPlan>
      * @return
      */
     List<InspectionItemPlan> getStartPlan(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    /**
+     * 获取巡查日程详情
+     *
+     * @param id
+     * @return
+     */
+    InspectionItemPlan getPlanInfo(@Param("id") Long id);
 }

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

@@ -98,6 +98,7 @@ public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long, Inspect
         inspectionItemPlan.setSubmitedGps("");
         inspectionItemPlan.setMemo("");
         inspectionItemPlan.setStatus(0);
+        inspectionItemPlan.setConclusionStatus(0);
         inspectionItemPlan.setCreateTime(nowDate);
         inspectionItemPlan.setUpdateTime(nowDate);
         inspectionItemPlanDao.insert(inspectionItemPlan);

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

@@ -52,7 +52,7 @@
         music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_,
         create_time_, update_time_)
         values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
-        #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo}, #{status},
+        #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo},#{conclusionStatus}. #{status},
         #{createTime}, #{updateTime})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan">
@@ -177,6 +177,16 @@
         SELECT *
         FROM inspection_item_plan
         WHERE plan_start_ >= #{startTime}
-        AND plan_start_ <= #{endTime}
+          AND plan_start_ <= #{endTime}
         ]]></select>
+
+    <select id="getPlanInfo" resultMap="InspectionItemPlan">
+        SELECT iip.*, su.real_name_ realName, o.name_ organName, co.name_ cooperationName, mg.name_ musicGroupName
+        FROM inspection_item_plan iip
+                 LEFT JOIN sys_user su ON su.id_ = iip.user_id_
+                 LEFT JOIN organization o ON o.id_ = iip.organ_id_
+                 LEFT JOIN cooperation_organ co ON co.id_ = iip.cooperation_organ_id_
+                 LEFT JOIN music_group mg ON mg.id_ = iip.music_group_id_
+        WHERE iip.id_ = #{id}
+    </select>
 </mapper>