Forráskód Böngészése

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

周箭河 4 éve
szülő
commit
049f29f746

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

@@ -122,7 +122,7 @@ public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long, Inspect
             throw new BizException("日程时间不能晚于工作周期结束时间");
         }
         //获取乐团教学点的GPS信息
-        if (oldPlan.getStatus() > 0) { //未提交的修改
+        if (oldPlan.getStatus().equals(0)) { //未提交的修改
             School school = musicGroupDao.getMusicGroupSchool(inspectionItemPlan.getMusicGroupId());
             inspectionItemPlan.setInspectionId(inspectionItem.getInspectionId());
             inspectionItemPlan.setSchoolGps(school.getLongitudeLatitude());

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

@@ -108,7 +108,8 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="InspectionItemPlan" parameterType="map">
-        SELECT iip.*,co.name_ cooperationName,mg.name_ musicGroupName FROM inspection_item_plan iip
+        SELECT iip.*,o.name organName,co.name_ cooperationName,mg.name_ musicGroupName FROM inspection_item_plan iip
+        LEFT JOIN organization o ON o.id_=iip.organId
         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"/>