dsx 2 years ago
parent
commit
0c2910c507

+ 2 - 1
src/main/java/com/fdkankan/scene/service/IScenePlusService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.bean.SceneBean;
 import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import java.util.List;
@@ -34,6 +35,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ResultData uploadShareLogo(String num, MultipartFile file) throws Exception;
 
-    ResultData listCleanOrigScene();
+    List<SceneBean> listCleanOrigScene();
 
 }

+ 4 - 3
src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -17,6 +17,7 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
+import com.fdkankan.scene.bean.SceneBean;
 import com.fdkankan.scene.entity.SceneEditInfoExt;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.service.ISceneEditInfoExtService;
@@ -246,9 +247,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
-    public ResultData listCleanOrigScene() {
+    public List<SceneBean> listCleanOrigScene() {
         Date time = Calendar.getInstance().getTime();
-        DateUtil.offset(time, DateField.MONTH, 6)
-        return this.baseMapper.selectCleanOrigScene();
+        time = DateUtil.beginOfDay(DateUtil.offset(time, DateField.MONTH, 6));
+        return this.baseMapper.selectCleanOrigScene(time);
     }
 }