Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HandoverOperationApiServiceImpl.java

@@ -330,6 +330,9 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
         retList.forEach(dto -> {
             TabHandoverTransfer mid = handoverTransferMap.get(dto.getStaffId());
             dto.setFriendCount(mid.getExternalCount());
+            if(null != mid.getUpdateTime()) {
+                dto.setUpdateTime(mid.getUpdateTime());
+            }
         });
 
         return retList;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentCreativeController.java

@@ -262,8 +262,8 @@ public class ContentCreativeController {
         }
         result.setTotalCount(totalCount);
         result.setResult(list);
-        result.setCurrentPage(page.getCurrentPage());
-        result.setPageSize(page.getPageSize());
+        result.setCurrentPage(auditMaterialQO.getPageNum());
+        result.setPageSize(auditMaterialQO.getPageSize());
         if (!convs) {
             List<Long> materialIdList = list.stream().map(ContentMaterialVO::getContentMaterialId).collect(Collectors.toList());
             BasePageInfo pageInfo = new BasePageInfo();

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

@@ -56,16 +56,23 @@ 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 ((dto.getPreTime().getTime() < System.currentTimeMillis() || this.getAheadSignFlag(dto.getAheadSignFlag()) == 1)
-                            && DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() >= DateUtil.getStartTimeOfDay().getTime()) {
-                        vo.setCanSign(1);
-                    } else {
-                        if (DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() < DateUtil.getStartTimeOfDay().getTime()) {
-                            logger.info("已过期");
-                            continue;
-                        } else if (this.getAheadSignFlag(dto.getAheadSignFlag()) == 0 && dto.getPreTime().getTime() > System.currentTimeMillis()) {
-                            vo.setReason("不可提前签到");
+                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);
+                        } else {
+                            if (DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() < DateUtil.getStartTimeOfDay().getTime()) {
+                                logger.info("已过期");
+                                continue;
+                            } else if (this.getAheadSignFlag(dto.getAheadSignFlag()) == 0 && dto.getPreTime().getTime() > System.currentTimeMillis()) {
+                                vo.setReason("不可提前签到");
+                            }
+                        }
+                    }
+                    if(qo.getType()==2) {
+                        if(dto.getStatusFlag() ==0) {
+                            vo.setStatusFlag(2);
                         }
                     }
                 }