Merge remote-tracking branch 'origin/master'

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

@@ -168,10 +168,10 @@
         <where>
             <if test="searchType != null and searchType != ''">
                 <if test="searchType == 'INSPECTION_ITEM'">
-                    AND ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ ='' AND DATE_FORMAT(i.month_,'%Y-%m-%d') >= #{startTime}
+                    AND ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ ='' AND DATE_FORMAT(i.month_,'%Y-%m-%d') >= #{searchStartTime}
                 </if>
                 <if test="searchType == 'STUDENT_VISIT'">
-                    AND ii.item_ = 'VISIT' AND ii.memo_ ='' AND DATE_FORMAT(i.month_,'%Y-%m-%d') >= #{startTime}
+                    AND ii.item_ = 'VISIT' AND ii.memo_ ='' AND DATE_FORMAT(i.month_,'%Y-%m-%d') >= #{searchStartTime}
                     AND ii.times_ > (SELECT COUNT(DISTINCT sv.id_) FROM student_visit sv
                     WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(ii.create_time_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m'))
                 </if>

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

@@ -171,6 +171,9 @@
             <if test="startTime != null">
                 AND iip.plan_start_ >= #{startTime}
             </if>
+            <if test="searchStartTime != null and searchStartTime != ''">
+                AND iip.plan_start_ >= #{searchStartTime}
+            </if>
             <if test="endTime != null">
                 <![CDATA[AND iip.plan_start_ <= #{endTime}]]>
             </if>