change hace 4 años
padre
commit
21bbaa1426

+ 7 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityAdvertisingServiceImpl.java

@@ -14,6 +14,7 @@ import com.zhongzheng.modules.activity.domain.ActivityAdvertising;
 import com.zhongzheng.modules.activity.mapper.ActivityAdvertisingMapper;
 import com.zhongzheng.modules.activity.service.IActivityAdvertisingService;
 import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,6 +32,9 @@ import java.util.stream.Collectors;
 @Service
 public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertisingMapper, ActivityAdvertising> implements IActivityAdvertisingService {
 
+    @Autowired
+    private IActivityAdvertisingService activityAdvertisingService;
+
     @Override
     public ActivityAdvertisingVo queryById(Long id){
         ActivityAdvertising db = this.baseMapper.selectById(id);
@@ -83,7 +87,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         add.setStatus(1);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add)?add.getId():0;
+        return activityAdvertisingService.save(add)?add.getId():0;
     }
 
     @Override
@@ -93,7 +97,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         ActivityAdvertisingVo activityAdvertisingVo = this.queryById(update.getId());
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-        this.updateById(update);
+        activityAdvertisingService.updateById(update);
         return activityAdvertisingVo;
     }
 
@@ -111,7 +115,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         ArrayList<ActivityAdvertising> activityAdvertisingList = new ArrayList<>();
         ids.stream().forEach(id -> activityAdvertisingList.add(new ActivityAdvertising().setId(id).setStatus(0).setUpdateTime(DateUtils.getNowTime())));
-        return this.updateBatchById(activityAdvertisingList);
+        return activityAdvertisingService.updateBatchById(activityAdvertisingList);
     }
 
     @Override

+ 5 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -49,6 +49,9 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     @Autowired
     private IActivityConfigurationCourseService activityConfigurationCourseService;
 
+    @Autowired
+    private  IActivityConfigurationService iActivityConfigurationService;
+
     @Override
     public ActivityConfigurationVo queryById(Long id){
         ActivityConfigurationVo activityConfigurationVo = baseMapper.selectConfigures(id);
@@ -132,7 +135,7 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
         if (bo.getCoursesId() != null){
             updateConfigCourse(bo);
         }
-        return this.updateById(update);
+        return iActivityConfigurationService.updateById(update);
     }
 
     private void updateConfigCourse(ActivityConfigurationEditBo bo) {
@@ -158,7 +161,7 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         ArrayList<ActivityConfiguration> activityConfigurations = new ArrayList<>();
         ids.stream().forEach(id -> activityConfigurations.add(new ActivityConfiguration().setId(id).setStatus(0).setUpdateTime(DateUtils.getNowTime())));
-        return this.updateBatchById(activityConfigurations);
+        return iActivityConfigurationService.updateBatchById(activityConfigurations);
     }
 
     @Override

+ 6 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradeServiceImpl.java

@@ -55,6 +55,9 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     @Autowired
     private IUserService userService;
 
+    @Autowired
+    private  IActivityGradeService iActivityGradeService;
+
     @Override
     public ActivityGradeVo queryById(Long id){
         ActivityGrade db = this.baseMapper.selectById(id);
@@ -145,7 +148,7 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        boolean save = this.save(add);
+        boolean save = iActivityGradeService.save(add);
         //添加特权类型
         if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeAddBos())) {
             bo.getActivityGradePrivilegeAddBos().stream().forEach(p ->{
@@ -181,7 +184,7 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeEditBos())) {
             updateGradePrivilege(bo);
         }
-        return this.updateById(update);
+        return iActivityGradeService.updateById(update);
     }
 
     private void updateGradePrivilege(ActivityGradeEditBo bo) {
@@ -214,7 +217,7 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         ArrayList<ActivityGrade> activityGradeArrayList = new ArrayList<>();
         ids.stream().forEach(id -> activityGradeArrayList.add(new ActivityGrade().setId(id)));
-        return this.updateBatchById(activityGradeArrayList);
+        return iActivityGradeService.updateBatchById(activityGradeArrayList);
     }
 
     @Override

+ 6 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskServiceImpl.java

@@ -44,6 +44,9 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
     @Autowired
     private IActivityTaskUserService activityTaskUserService;
 
+    @Autowired
+    private IActivityTaskService iActivityTaskService;
+
     @Override
     public ActivityTaskVo queryById(Long id){
         ActivityTask db = this.baseMapper.selectById(id);
@@ -127,7 +130,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        boolean save = this.save(add);
+        boolean save = iActivityTaskService.save(add);
         if (bo.getTaskType() != null && bo.getTaskType() == 5){
             bo.getActivityTaskTimeAddBo().stream().forEach(t -> activityTaskTimeService.inserTaskTime(BeanUtil.toBean(t,ActivityTaskTime.class).setTaskId(add.getId())));
         }
@@ -145,7 +148,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
             activityTaskTimeService.removeById(bo.getId());
             bo.getActivityTaskTimeEditBoList().stream().forEach(t -> activityTaskTimeService.inserTaskTime(BeanUtil.toBean(t,ActivityTaskTime.class).setTaskId(bo.getId())));
         }
-        return this.updateById(update);
+        return iActivityTaskService.updateById(update);
     }
 
     /**
@@ -162,7 +165,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return this.removeByIds(ids);
+        return iActivityTaskService.removeByIds(ids);
     }
 
     @Override