zouxuan 5 gadi atpakaļ
vecāks
revīzija
aaa1b3036b

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

@@ -189,10 +189,10 @@
                 AND sr.repair_status_ = #{repairStatus}
             </if>
             <if test="startTime != null">
-                AND sr.finish_time_ >= #{startTime}
+                AND sr.create_time_ >= #{startTime}
             </if>
             <if test="endTime != null">
-                AND sr.finish_time_ &lt;= #{endTime}
+                AND sr.create_time_ &lt;= #{endTime}
             </if>
         </where>
     </sql>

+ 6 - 0
mec-web/src/main/java/com/ym/mec/web/controller/StudentRepairController.java

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.page.RepairStudentQueryInfo;
 import com.ym.mec.biz.service.StudentRepairService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -56,6 +58,10 @@ public class StudentRepairController extends BaseController {
                 }
             }
         }
+        Date endTime = queryInfo.getEndTime();
+        if(endTime != null){
+            queryInfo.setEndTime(DateUtil.addDays(endTime, 1));
+        }
         return succeed(studentRepairService.queryPage(queryInfo));
     }