From 0ceb3c850cc2d6df73819985dbbc67630b435314 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 28 六月 2024 14:16:56 +0800
Subject: [PATCH] 花城 修改【小程序】【需求清单】位接单后，切换问题、需求数据一样
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java | 98 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 72 insertions(+), 26 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java
index fb27156..a10f4ae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_dangjian.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,13 +8,20 @@
import com.panzhihua.common.model.dtos.partybuilding.UserRankDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiExperienceActivityVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.common.utlis.WxUtil;
+import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_dangjian.dao.NeedProblemInventoryDAO;
import com.panzhihua.service_dangjian.dao.NewStriveForDAO;
import com.panzhihua.service_dangjian.service.NeedProblemInventoryService;
import com.panzhihua.service_dangjian.service.NewStriveForService;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
@@ -27,24 +35,33 @@
implements NeedProblemInventoryService
{
+ @Resource
+ private UserService userService;
+
@Override
- public IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize,String search,String status,
+ public IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize,String search,String classifyId,String status,
String kind,
String userId,
String userIds,
- String communityId)
+ String isDisplay,
+ String communityId,
+ Date startTime,
+ Date endTime)
{
Page page = new Page<>(pageNum,pageSize);
- return baseMapper.getList(page, search, status,kind,userId,userIds,communityId);
+ return baseMapper.getList(page, search, classifyId,status,kind,userId,userIds,isDisplay,communityId,startTime,endTime);
}
@Override
public IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize,String search,String status,
String kind,
String userIds,
- String userId) {
+ String isDisplay,
+ String userId,
+ Date startTime,
+ Date endTime) {
Page page = new Page<>(pageNum,pageSize);
- return baseMapper.getMyJoinList(page, search, status,kind,userIds,userId);
+ return baseMapper.getMyJoinList(page, search, status,kind,userIds,isDisplay,userId,startTime,endTime);
}
@Override
@@ -53,9 +70,46 @@
}
@Override
- public int addData(NeedProblemInventoryDTO item) {
+ public int addData(NeedProblemInventoryDTO item)
+ {
item.setStatus("1");
- return baseMapper.addData(item);
+ int num=baseMapper.addData(item);
+ //1问题清单 2需求清单
+ if(num>0)
+ {
+ List<String> openIdList=baseMapper.getOpenIdList(item.getCommunityId());
+ if(openIdList==null || openIdList.size()<=0)
+ {
+ return num;
+ }
+ if(item.getKind().equals("1"))
+ {
+ WxXCXTempSend util = new WxXCXTempSend();
+ try {
+ for (String str:openIdList)
+ {
+ WxUtil.sendLongTimeTemplate(str,util.getAccessToken(),"问题清单发布提醒",item.getTitle(),"/packageH/pages/problemDetail/problemDetail?type=1&id="+item.getId());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return num;
+ }
+ }
+ else
+ {
+ WxXCXTempSend util = new WxXCXTempSend();
+ try {
+ for (String str:openIdList)
+ {
+ WxUtil.sendLongTimeTemplate(str,util.getAccessToken(),"需求清单发布提醒",item.getTitle(),"/packageH/pages/problemDetail/problemDetail?type=2&id="+item.getId());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return num;
+ }
+ }
+ }
+ return num;
}
@Override
@@ -72,6 +126,8 @@
public R timedNewFightNeedProblemInventoryHandler() {
// 定时任务
List<NeedProblemInventoryDTO> list = baseMapper.getTimeList();
+ int num=0;
+ int num2=0;
for (NeedProblemInventoryDTO item : list) {
//当前时间
@@ -89,43 +145,33 @@
switch (item.getStatus()) {
//待开始
case "1":
- if (newTime >= applyStartTime && newTime <= applyEndTime) {
- NeedProblemInventoryDTO vo = new NeedProblemInventoryDTO();
- vo.setId(item.getId());
- vo.setStatus("1");
- baseMapper.editData(vo);
- }
-
- if (newTime > applyEndTime && newTime < activityStartTime) {
+ if (newTime > applyEndTime) {
//报名结束
NeedProblemInventoryDTO vo = new NeedProblemInventoryDTO();
vo.setId(item.getId());
vo.setStatus("2");
baseMapper.editData(vo);
+ num++;
}
break;
//报名中
case "2":
- if (newTime >= activityStartTime && newTime <= activityEndTime) {
- NeedProblemInventoryDTO vo = new NeedProblemInventoryDTO();
- vo.setId(item.getId());
- vo.setStatus("2");
- baseMapper.editData(vo);
- }
- break;
- //已开始
- case "3":
- if (newTime <= activityEndTime) {
+ if (newTime > activityEndTime) {
NeedProblemInventoryDTO vo = new NeedProblemInventoryDTO();
vo.setId(item.getId());
vo.setStatus("3");
baseMapper.editData(vo);
+ num2++;
}
+ break;
+ //已开始
+ case "3":
+
break;
}
}
- return R.ok();
+ return R.ok(num+" "+num2);
}
}
--
Gitblit v1.7.1