Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -50,4 +50,13 @@ public interface InspectionItemPlanConclusionDao extends BaseDAO<Long, Inspectio
      * @return
      */
     List<CourseSchedule> getPlanConclusionCourses(@Param("planId") Long planId);
+
+    /**
+     * 获取日程检查结果的数量
+     *
+     * @param planId
+     * @param checkConclusion
+     * @return
+     */
+    int getCountByPlanIdAndCheckConclusion(@Param("planId") Long planId, @Param("checkConclusion") Integer checkConclusion);
 }

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

@@ -70,6 +70,9 @@ public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Lon
         if (inspectionItemPlanConclusionDto.getStatus() == null) {
             return inspectionItemPlanConclusionDto;
         }
+        //获取巡查结果的异常数量
+        int eConclusionNum = inspectionItemPlanConclusionDao.getCountByPlanIdAndCheckConclusion(planId, 0);
+        inspectionItemPlan.setConclusionStatus(0);
 
         //未提交过，更新提交信息
         if (inspectionItemPlan.getStatus().equals(0)) {
@@ -77,6 +80,9 @@ public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Lon
             inspectionItemPlan.setSubmitedTime(nowDate);
             inspectionItemPlan.setStatus(inspectionItemPlanConclusionDto.getStatus());
             inspectionItemPlan.setUpdateTime(nowDate);
+            if (eConclusionNum > 0) {
+                inspectionItemPlan.setConclusionStatus(1);
+            }
             inspectionItemPlanDao.update(inspectionItemPlan);
             //更新提交次数
             InspectionItem inspectionItem = inspectionItemDao.get(inspectionItemPlan.getItemId());
@@ -91,9 +97,12 @@ public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Lon
             inspectionItemPlan.setSubmitedGps(inspectionItemPlanConclusionDto.getSubmitedGps());
             inspectionItemPlan.setSubmitedTime(nowDate);
             inspectionItemPlan.setStatus(inspectionItemPlanConclusionDto.getStatus());
-            inspectionItemPlan.setUpdateTime(nowDate);
-            inspectionItemPlanDao.update(inspectionItemPlan);
         }
+        if (eConclusionNum > 0) {
+            inspectionItemPlan.setConclusionStatus(1);
+        }
+        inspectionItemPlan.setUpdateTime(nowDate);
+        inspectionItemPlanDao.update(inspectionItemPlan);
         return inspectionItemPlanConclusionDto;
     }
 

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

@@ -382,6 +382,7 @@
 		WHERE
 			mg.del_flag_ = 0
 			AND mg.organ_id_ IS NOT NULL
+		  	AND mg.status_ = 'PROGRESS'
 			AND DATE_FORMAT( spr.create_time_, '%Y-%m' ) <= #{month}
 		GROUP BY
 			mg.organ_id_

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

@@ -102,10 +102,21 @@
     </select>
 
     <select id="getPlanConclusionCourses" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleDao.CourseSchedule">
-        SELECT iipc.course_schedule_id_ id_, iipc.teacher_id_ actual_teacher_id_,CONCAT(cg.name_,'-',su.real_name_) name_ FROM inspection_item_plan_conclusion iipc
-        LEFT JOIN course_schedule cs ON iipc.course_schedule_id_ = cs.id_
-        LEFT JOIN class_group cg ON cg.id_=cs.class_group_id_
-        LEFT JOIN sys_user su on iipc.teacher_id_ = su.id_
-        WHERE plan_id_ = #{planId} GROUP BY iipc.course_schedule_id_,iipc.teacher_id_
+        SELECT iipc.course_schedule_id_             id_,
+               iipc.teacher_id_                     actual_teacher_id_,
+               CONCAT(cg.name_, '-', su.real_name_) name_
+        FROM inspection_item_plan_conclusion iipc
+                 LEFT JOIN course_schedule cs ON iipc.course_schedule_id_ = cs.id_
+                 LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
+                 LEFT JOIN sys_user su on iipc.teacher_id_ = su.id_
+        WHERE plan_id_ = #{planId}
+        GROUP BY iipc.course_schedule_id_, iipc.teacher_id_
+    </select>
+
+    <select id="getCountByPlanIdAndCheckConclusion" resultType="int">
+        SELECT COUNT(*)
+        FROM inspection_item_plan_conclusion
+        WHERE plan_id_ = #{planId}
+          AND check_conclusion_ = #{checkConclusion}
     </select>
 </mapper>

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

@@ -95,7 +95,7 @@
                 memo_ = #{memo},
             </if>
             <if test="conclusionStatus != null">
-                conclusion_status = #{conclusionStatus},
+                conclusion_status_ = #{conclusionStatus},
             </if>
             <if test="status != null">
                 status_ = #{status},
@@ -146,7 +146,7 @@
                 AND iip.music_group_id_ = #{musicGroupId}
             </if>
             <if test="conclusionStatus != null">
-                AND conclusion_status = #{conclusionStatus}
+                AND iip.conclusion_status = #{conclusionStatus}
             </if>
             <if test="status !=null">
                 AND iip.status_ = #{status}