查询签到任务

ch-dao/src/main/java/com/wwdz/ch/db/dao/qiandao/SignInTaskDao.java

@@ -11,6 +11,13 @@ public interface SignInTaskDao {
 
     List<SignInTask> findByPage(SignInTaskRequestDto dto);
 
+    /**
+     * 查询平台任务和自己创建的任务
+     * @param dto
+     * @return
+     */
+    List<SignInTask> findDataByPage(SignInTaskRequestDto dto);
+
     SignInTask findById(long taskId);
 
     boolean updateByPrimaryKey(SignInTask signInTask);

ch-dao/src/main/java/com/wwdz/ch/db/impl/qiandao/SignInTaskDaoImpl.java

@@ -2,6 +2,7 @@ package com.wwdz.ch.db.impl.qiandao;
 
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.dao.qiandao.SignInTaskDao;
+import com.wwdz.ch.db.domain.distribution.SupplierItemExample;
 import com.wwdz.ch.db.domain.qiandao.SignInTask;
 import com.wwdz.ch.db.domain.qiandao.SignInTaskExample;
 import com.wwdz.ch.db.dto.request.qiandao.SignInTaskRequestDto;
@@ -9,6 +10,7 @@ import com.wwdz.ch.db.mapper.qiandao.SignInTaskMapper;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -44,6 +46,20 @@ public class SignInTaskDaoImpl implements SignInTaskDao {
         return signInTaskMapper.selectByExample(example);
     }
 
+    @Override
+    public List<SignInTask> findDataByPage(SignInTaskRequestDto dto) {
+        SignInTaskExample example = new SignInTaskExample();
+        SignInTaskExample.Criteria criteria = example.createCriteria();
+        criteria.andTypeNotEqualTo(3);
+        criteria.andCreatorIdEqualTo(8888888888L);
+        criteria.andStateEqualTo(1);
+        SignInTaskExample.Criteria orCriteria = example.or();
+        orCriteria.andStateEqualTo(1);
+        orCriteria.andCreatorIdEqualTo(dto.getCreatorId());
+        example.setOrderByClause("create_time desc");
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        return signInTaskMapper.selectByExample(example);
+    }
 
     @Override
     public SignInTask findById(long taskId) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdHomePageServiceImpl.java

@@ -59,7 +59,7 @@ public class QdHomePageServiceImpl implements QdHomePageService {
                 SignInTaskRequestDto signInTaskRequestDto = new SignInTaskRequestDto();
                 signInTaskRequestDto.setCreatorId(CommConsts.SYSTEM_ACCOUNT.longValue());
                 signInTaskRequestDto.setLimit(6);
-                List<SignInTask> signInTaskList = signInTaskDao.findByPage(signInTaskRequestDto);
+                List<SignInTask> signInTaskList = signInTaskDao.findDataByPage(signInTaskRequestDto);
                 map.put("taskList", signInTaskList);
             }
             return Result.success(map);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdSignInTaskServiceImpl.java

@@ -58,6 +58,10 @@ public class QdSignInTaskServiceImpl implements QdSignInTaskService {
             signInTask.setImage(dto.getImage());
             signInTask.setCreateTime(now);
             signInTask.setUpdateTime(now);
+            if (dto.getCreatorId().longValue() != CommConsts.SYSTEM_ACCOUNT) {
+                signInTask.setIsPrivate(true);
+                signInTask.setHasReward(false);
+            }
             signInTaskDao.insert(signInTask);
             return Result.success();
         } catch (Exception e) {
@@ -71,7 +75,7 @@ public class QdSignInTaskServiceImpl implements QdSignInTaskService {
         try {
             dto.setCreatorId(CommConsts.SYSTEM_ACCOUNT.longValue());
             dto.setLimit(6);
-            List<SignInTask> signInTaskList = signInTaskDao.findByPage(dto);
+            List<SignInTask> signInTaskList = signInTaskDao.findDataByPage(dto);
             return Result.success(signInTaskList);
         } catch (Exception e) {
             logger.error("首页查询签到任务失败 error :{}", e);
@@ -83,7 +87,7 @@ public class QdSignInTaskServiceImpl implements QdSignInTaskService {
     public Result findList(SignInTaskRequestDto dto) {
         try {
             List<SignInTaskVo> signInTaskVoList = new ArrayList<>();
-            List<SignInTask> taskList = signInTaskDao.findByPage(dto);
+            List<SignInTask> taskList = signInTaskDao.findDataByPage(dto);
             PageInfo pageInfo = new PageInfo<>(taskList);
             for (SignInTask task : taskList) {
                 SignInTaskVo signInTaskVo = new SignInTaskVo();