资料审核

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamBeforeServiceImpl.java

@@ -42,7 +42,14 @@ public class ExamBeforeServiceImpl extends ServiceImpl<ExamBeforeMapper, ExamBef
     public List<ExamBeforeVo> queryList(ExamBeforeQueryBo bo) {
         List<ExamBeforeVo> examBeforeVos = baseMapper.queryBefore(bo);
         for (ExamBeforeVo examBeforeVo : examBeforeVos) {
-            if (examBeforeVo.getBeforeEndTime() < System.currentTimeMillis()/1000){
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
+            calendar.setTimeInMillis(System.currentTimeMillis());
+            calendar.set(Calendar.HOUR_OF_DAY, 23);
+            calendar.set(Calendar.MINUTE, 59);
+            calendar.set(Calendar.SECOND, 59);
+            calendar.set(Calendar.MILLISECOND, 999);
+            if (examBeforeVo.getBeforeEndTime() < calendar.getTimeInMillis()){
                 ExamBefore update = new ExamBefore();
                 update.setBeforeId(examBeforeVo.getBeforeId());
                 update.setStatus(2);

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderQueryBo.java

@@ -110,5 +110,5 @@ public class OrderQueryBo extends BaseEntity {
 
 	/** 1有效 0无效 */
 	@ApiModelProperty("1有效 0无效")
-	private Integer status;
+	private Integer[] status;
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -168,12 +168,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="status != null and status.size()!=0 ">
+            AND o.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="startTime != null">
             AND o.create_time >= #{startTime}
         </if>
-        <if test="endTime != null">
-            AND #{endTime} >= o.create_time
-        </if>
         <if test="status != null">
             AND o.status = #{status}
         </if>