预约

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/offline/OfflinePreController.java

@@ -56,7 +56,8 @@ public class OfflinePreController {
             List<OfflinePreInfoVO> voList = new ArrayList<>() ;
             for(OfflinePreInfoDTO dto : list) {
                 OfflinePreInfoVO vo = EntityUtil.changeEntityByJSON(OfflinePreInfoVO.class,dto) ;
-                if(null != qo.getType() && qo.getType()==1) {
+                if(null != qo.getType()) {
+                    if(qo.getType()==1) {
                         if ((dto.getPreTime().getTime() < System.currentTimeMillis() || this.getAheadSignFlag(dto.getAheadSignFlag()) == 1)
                                 && DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() >= DateUtil.getStartTimeOfDay().getTime()) {
                             vo.setCanSign(1);
@@ -69,6 +70,12 @@ public class OfflinePreController {
                             }
                         }
                     }
+                    if(qo.getType()==2) {
+                        if(dto.getStatusFlag() ==0) {
+                            vo.setStatusFlag(2);
+                        }
+                    }
+                }
                 voList.add(vo) ;
             }
             pageVO.setResult(voList);