1

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -429,10 +429,10 @@
                 and b.S_ShiftNo = #{shiftNo}
             </if>
             <if test="startDate != null ">
-                and ReportDate >= #{startDate}
+                and b.ReportDate >= #{startDate}
             </if>
             <if test="endDate != null ">
-                and #{endDate} >= ReportDate
+                and #{endDate} >= b.ReportDate
             </if>
             </where>
 			  ) d
@@ -470,10 +470,10 @@
                 and c.S_ShiftNo = #{shiftNo}
             </if>
             <if test="startDate != null ">
-                and ReportDate >= #{startDate}
+                and b.ReportDate >= #{startDate}
             </if>
             <if test="endDate != null ">
-                and #{endDate} >= ReportDate
+                and #{endDate} >= b.ReportDate
             </if>
               <if test="defectCode != null and defectCode != ''">
                 and a.defectCode like #{defectCode}
@@ -518,10 +518,10 @@
                 and b.S_ShiftNo = #{shiftNo}
             </if>
             <if test="startDate != null ">
-                and ReportDate >= #{startDate}
+                and b.ReportDate >= #{startDate}
             </if>
             <if test="endDate != null ">
-                and #{endDate} >= ReportDate
+                and #{endDate} >= b.ReportDate
             </if>
             </where>
         ) a
@@ -560,10 +560,10 @@
                 and b.S_ShiftNo = #{shiftNo}
             </if>
             <if test="startDate != null ">
-                and ReportDate >= #{startDate}
+                and b.ReportDate >= #{startDate}
             </if>
             <if test="endDate != null ">
-                and #{endDate} >= ReportDate
+                and #{endDate} >= b.ReportDate
             </if>
             </where>
         ) a
@@ -602,10 +602,10 @@
                 and b.S_ShiftNo = #{shiftNo}
             </if>
             <if test="startDate != null ">
-                and ReportDate >= #{startDate}
+                and b.ReportDate >= #{startDate}
             </if>
             <if test="endDate != null ">
-                and #{endDate} >= ReportDate
+                and #{endDate} >= b.ReportDate
             </if>
             </where>
         ) a
@@ -644,10 +644,10 @@
                 and b.S_ShiftNo = #{shiftNo}
             </if>
             <if test="startDate != null ">
-                and ReportDate >= #{startDate}
+                and b.ReportDate >= #{startDate}
             </if>
             <if test="endDate != null ">
-                and #{endDate} >= ReportDate
+                and #{endDate} >= b.ReportDate
             </if>
             </where>
         ) a