优化

renren-admin/src/main/java/io/renren/modules/job/task/WaTask.java

@@ -35,7 +35,6 @@ public class WaTask implements ITask {
 
 	@Override
 	public void run(String params){
-		Date date = new Date();
 //		WorkEntity work = new WorkEntity();
 //		work.setIsPublish("0");
 //		workService.update(work, new QueryWrapper<WorkEntity>().le("workdate_end", now));

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/ActivityServiceImpl.java

@@ -2032,22 +2032,24 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
                     if (CollectionUtil.isNotEmpty(activityStuList)){
                         for (ActivityStuEntity activityStuEntity : activityStuList) {
                             //送积分
-                            TaskManage taskManage = taskManageService.getById(TaskType.WORK_ACTIVITY.getCode(), false);
-                            // 增加积分记录
-                            ScoreStu scoreStu = new ScoreStu();
-                            scoreStu.setStuId(activityStuEntity.getStuId());
-                            scoreStu.setScoreType(ScoreType.TASK_SCORE.getCode());
-                            scoreStu.setDay(new SimpleDateFormat("yyyyMMdd").format(new Date()));
-                            scoreStu.setBusinessId(activityStuEntity.getActivityId());
-                            scoreStu.setTaskId(taskManage.getId());
-                            // 查询积分值
-                            Integer taskScore = taskManage.getTaskScore();
-                            Integer totalScore = scoreStuService.getTotalScore(activityStuEntity.getStuId());
-                            scoreStu.setSurplusScore(totalScore + taskScore);
-                            scoreStu.setScoreValue(taskScore);
-                            scoreStu.setScoreEvent(TaskType.ACTIVITY.getInfo());
-                            scoreStu.setCreateTime(new Date());
-                            scoreStuService.save(scoreStu);
+                            if (!activityStuEntity.getStatus().equals("02") && activityStuEntity.getIsDelete().equals("0")){
+                                TaskManage taskManage = taskManageService.getById(TaskType.WORK_ACTIVITY.getCode(), false);
+                                // 增加积分记录
+                                ScoreStu scoreStu = new ScoreStu();
+                                scoreStu.setStuId(activityStuEntity.getStuId());
+                                scoreStu.setScoreType(ScoreType.TASK_SCORE.getCode());
+                                scoreStu.setDay(new SimpleDateFormat("yyyyMMdd").format(new Date()));
+                                scoreStu.setBusinessId(activityStuEntity.getActivityId());
+                                scoreStu.setTaskId(taskManage.getId());
+                                // 查询积分值
+                                Integer taskScore = taskManage.getTaskScore();
+                                Integer totalScore = scoreStuService.getTotalScore(activityStuEntity.getStuId());
+                                scoreStu.setSurplusScore(totalScore + taskScore);
+                                scoreStu.setScoreValue(taskScore);
+                                scoreStu.setScoreEvent(TaskType.ACTIVITY.getInfo());
+                                scoreStu.setCreateTime(new Date());
+                                scoreStuService.save(scoreStu);
+                            }
                         }
                     }
                     baseMapper.update(null, new LambdaUpdateWrapper<ActivityEntity>().set(ActivityEntity::getIsPublish, "0")

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/WorkServiceImpl.java

@@ -1819,22 +1819,24 @@ public class WorkServiceImpl extends ServiceImpl<WorkDao, WorkEntity> implements
                     if (CollectionUtil.isNotEmpty(workStuList)){
                         for (WorkStuEntity workStuEntity : workStuList) {
                             //送积分
-                            TaskManage taskManage = taskManageService.getById(TaskType.WORK_ACTIVITY.getCode(), false);
-                            // 增加积分记录
-                            ScoreStu scoreStu = new ScoreStu();
-                            scoreStu.setStuId(workStuEntity.getStuId());
-                            scoreStu.setScoreType(ScoreType.TASK_SCORE.getCode());
-                            scoreStu.setDay(new SimpleDateFormat("yyyyMMdd").format(new Date()));
-                            scoreStu.setBusinessId(workStuEntity.getWorkId());
-                            scoreStu.setTaskId(taskManage.getId());
-                            // 查询积分值
-                            Integer taskScore = taskManage.getTaskScore();
-                            Integer totalScore = scoreStuService.getTotalScore(workStuEntity.getStuId());
-                            scoreStu.setSurplusScore(totalScore + taskScore);
-                            scoreStu.setScoreValue(taskScore);
-                            scoreStu.setScoreEvent(TaskType.WORK_ACTIVITY.getInfo());
-                            scoreStu.setCreateTime(new Date());
-                            scoreStuService.save(scoreStu);
+                            if (!workStuEntity.getStatus().equals("02") && workStuEntity.getIsDelete().equals("0")){
+                                TaskManage taskManage = taskManageService.getById(TaskType.WORK_ACTIVITY.getCode(), false);
+                                // 增加积分记录
+                                ScoreStu scoreStu = new ScoreStu();
+                                scoreStu.setStuId(workStuEntity.getStuId());
+                                scoreStu.setScoreType(ScoreType.TASK_SCORE.getCode());
+                                scoreStu.setDay(new SimpleDateFormat("yyyyMMdd").format(new Date()));
+                                scoreStu.setBusinessId(workStuEntity.getWorkId());
+                                scoreStu.setTaskId(taskManage.getId());
+                                // 查询积分值
+                                Integer taskScore = taskManage.getTaskScore();
+                                Integer totalScore = scoreStuService.getTotalScore(workStuEntity.getStuId());
+                                scoreStu.setSurplusScore(totalScore + taskScore);
+                                scoreStu.setScoreValue(taskScore);
+                                scoreStu.setScoreEvent(TaskType.WORK_ACTIVITY.getInfo());
+                                scoreStu.setCreateTime(new Date());
+                                scoreStuService.save(scoreStu);
+                            }
                         }
                     }
                     baseMapper.update(null, new LambdaUpdateWrapper<WorkEntity>().set(WorkEntity::getIsPublish, "0")