提交 1b120964 authored 作者: 000516's avatar 000516

根据CP计划ID查询促销员打卡信息,返回促销员手机号

...@@ -50,19 +50,23 @@ public class PromPlanQueryController { ...@@ -50,19 +50,23 @@ public class PromPlanQueryController {
*/ */
@GetMapping("/{id}") @GetMapping("/{id}")
public R queryPlanById(@PathParam("id") @PathVariable Long id){ public R queryPlanById(@PathParam("id") @PathVariable Long id){
// 查询计划
ActivityResponse activityResponse = promPlanQueryService.queryPlanById(id); ActivityResponse activityResponse = promPlanQueryService.queryPlanById(id);
// 查询当前计划是否被稽查
ActivityExamineDto examineDto = exaPlanQueryService.selectByPlanId(id); ActivityExamineDto examineDto = exaPlanQueryService.selectByPlanId(id);
activityResponse.setExamine(examineDto); activityResponse.setExamine(examineDto);
// 查询促销上报任务
List<TemporaryActivityReportedDto> reportedDtos = temporaryActivityQueryService.findListByPlan(id); List<TemporaryActivityReportedDto> reportedDtos = temporaryActivityQueryService.findListByPlan(id);
if (CollectionUtil.isEmpty(reportedDtos)){ if (CollectionUtil.isEmpty(reportedDtos)){
return R.success(activityResponse); return R.success(activityResponse);
} }
// 查询促销上报任务中的打卡信息
List<ActivityResponse.ActivityReported> aas = new ArrayList<>(); List<ActivityResponse.ActivityReported> aas = new ArrayList<>();
for (TemporaryActivityReportedDto reportedDto : reportedDtos) { for (TemporaryActivityReportedDto reportedDto : reportedDtos) {
TemporaryClockWrapper tcw = new TemporaryClockWrapper(); TemporaryClockWrapper tcw = new TemporaryClockWrapper();
tcw.setReportedId(reportedDto.getId()); tcw.setReportedId(reportedDto.getId());
// 查询打卡信息
TemporaryClockDto clockDto = temporaryActivityClockQueryService.selectOne(tcw); TemporaryClockDto clockDto = temporaryActivityClockQueryService.selectOne(tcw);
ActivityResponse.ActivityReported aa = new ActivityResponse.ActivityReported(reportedDto,clockDto); ActivityResponse.ActivityReported aa = new ActivityResponse.ActivityReported(reportedDto,clockDto);
aas.add(aa); aas.add(aa);
......
...@@ -31,6 +31,11 @@ public class TemporaryClockDto { ...@@ -31,6 +31,11 @@ public class TemporaryClockDto {
String temporaryName; String temporaryName;
/**
* 手机号
*/
String phone;
Long planId; Long planId;
/** /**
......
...@@ -4,9 +4,11 @@ import cn.hutool.core.date.DateUtil; ...@@ -4,9 +4,11 @@ import cn.hutool.core.date.DateUtil;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityClockDao; import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityClockDao;
import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityPhotoDao; import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityPhotoDao;
import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper; import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
import com.wangxiaolu.promotion.enums.activity.ActivityPhotoType; import com.wangxiaolu.promotion.enums.activity.ActivityPhotoType;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityPhotoDto; import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityPhotoDto;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto; import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
import com.wangxiaolu.promotion.pojo.user.dto.WxTemporaryInfoDto;
import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityClockQueryService; import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityClockQueryService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -25,9 +27,11 @@ import java.util.Objects; ...@@ -25,9 +27,11 @@ import java.util.Objects;
public class TemporaryActivityClockQueryServiceImpl implements TemporaryActivityClockQueryService { public class TemporaryActivityClockQueryServiceImpl implements TemporaryActivityClockQueryService {
@Autowired @Autowired
TemporaryActivityClockDao temporaryActivityClockDao; private TemporaryActivityClockDao temporaryActivityClockDao;
@Autowired @Autowired
TemporaryActivityPhotoDao temporaryActivityPhotoDao; private TemporaryActivityPhotoDao temporaryActivityPhotoDao;
@Autowired
private TemporaryInfoDao temporaryInfoDao;
@Override @Override
public TemporaryClockDto findTodayTemporaryClockByTemId(Integer temporaryId) { public TemporaryClockDto findTodayTemporaryClockByTemId(Integer temporaryId) {
...@@ -65,6 +69,12 @@ public class TemporaryActivityClockQueryServiceImpl implements TemporaryActivity ...@@ -65,6 +69,12 @@ public class TemporaryActivityClockQueryServiceImpl implements TemporaryActivity
public TemporaryClockDto selectOne(TemporaryClockWrapper tcw) { public TemporaryClockDto selectOne(TemporaryClockWrapper tcw) {
TemporaryClockDto temporaryClockDto = temporaryActivityClockDao.selectOne(tcw); TemporaryClockDto temporaryClockDto = temporaryActivityClockDao.selectOne(tcw);
findClockPhoto(temporaryClockDto); findClockPhoto(temporaryClockDto);
if (Objects.nonNull(temporaryClockDto)) {
// 查询促销员手机号
Integer temporaryId = temporaryClockDto.getTemporaryId();
WxTemporaryInfoDto wxTemporaryInfoDto = temporaryInfoDao.selectOneById(temporaryId);
temporaryClockDto.setPhone(Objects.isNull(wxTemporaryInfoDto) ? null : wxTemporaryInfoDto.getPhone());
}
return temporaryClockDto; return temporaryClockDto;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论