From aa76c2b0bb73e9fe463387fb5656ea80094eceec Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 04 八月 2021 15:15:59 +0800
Subject: [PATCH] 值班表导入bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
index 00d401c..041110a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -87,14 +87,18 @@
if(comActEasyPhotoVO1.getActivityId() != null && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.ywc)){
//查询随手拍活动
ComActEasyPhotoActivityDO photoActivityDO = comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO1.getActivityId());
- if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)){
- comActEasyPhotoVO1.setActivityAmount(photoActivityDO.getGoodReward());
- }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)){
- comActEasyPhotoVO1.setActivityAmount(photoActivityDO.getExcellentReward());
- }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)){
- comActEasyPhotoVO1.setActivityAmount(photoActivityDO.getOrdinaryReward());
- }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){
- comActEasyPhotoVO1.setActivityAmount(photoActivityDO.getCommonlyReward());
+ if(photoActivityDO != null){
+ if(comActEasyPhotoVO1.getActivityType() != null){
+ if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)){
+ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getGoodReward());
+ }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)){
+ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getExcellentReward());
+ }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)){
+ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getOrdinaryReward());
+ }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){
+ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getCommonlyReward());
+ }
+ }
}
}
});
@@ -223,7 +227,6 @@
// 操作类型 1审核通过 2驳回 3反馈
ComActEasyPhotoDO cmActEasyPhotoDO=new ComActEasyPhotoDO();
cmActEasyPhotoDO.setId(comActEasyPhotoVO.getId());
- cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
// cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
Date date = new Date();
switch (type){
@@ -239,6 +242,7 @@
}else{
cmActEasyPhotoDO.setStatus(4);//已完成
}
+ cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
cmActEasyPhotoDO.setExamineAt(date);
cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
break;
@@ -247,6 +251,7 @@
if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
return R.fail("该随手拍已审核，不可重复操作");
}
+ cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
cmActEasyPhotoDO.setStatus(3);//已驳回
cmActEasyPhotoDO.setExamineAt(date);
cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());
@@ -256,6 +261,7 @@
if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dfk)){
return R.fail("该随手拍不是待反馈状态，不可进行反馈");
}
+ cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
cmActEasyPhotoDO.setHandleResult(comActEasyPhotoVO.getHandleResult());
cmActEasyPhotoDO.setHandlePhotoList(comActEasyPhotoVO.getHandlePhotoList());
cmActEasyPhotoDO.setStatus(4);//已完成
--
Gitblit v1.7.1