乐队指导训练营新增删除标识

mec-application/src/main/java/com/ym/mec/student/controller/TempDirectorTrainingCampController.java

@@ -38,7 +38,10 @@ public class TempDirectorTrainingCampController extends BaseController {
     @ApiOperation(value="获取训练营详情")
     @GetMapping(value = "/getDetail")
     public HttpResponseResult<TempDirectorTrainingCamp> getDetail(Integer campId){
-        return succeed(tempDirectorTrainingCampService.getById(campId));
+        return succeed(tempDirectorTrainingCampService.lambdaQuery()
+                .eq(TempDirectorTrainingCamp::getId,campId)
+                .eq(TempDirectorTrainingCamp::getDelFlag,true)
+                .last("LIMIT 1").one());
     }
 
     @ApiOperation(value="根据身份证号、手机号获取用户基本信息")

mec-application/src/main/java/com/ym/mec/web/controller/TempDirectorTrainingCampController.java

@@ -29,7 +29,7 @@ public class TempDirectorTrainingCampController extends BaseController {
     @Resource
     private TempDirectorTrainingCampService tempDirectorTrainingCampService;
 
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
 
     @ApiOperation("创建训练营")

mec-application/src/main/java/com/ym/mec/web/controller/TempDirectorTrainingCampDetailController.java

@@ -15,6 +15,7 @@ import com.ym.mec.biz.service.TempDirectorTrainingCampDetailService;
 import com.ym.mec.biz.service.TempDirectorTrainingCampService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -61,16 +62,18 @@ public class TempDirectorTrainingCampDetailController extends BaseController {
         if (queryInfo.getTempDirectorTrainingCampId()==null) {
             return failed("训练营编号不能为空");
         }
-
-
+        TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.lambdaQuery()
+                .eq(TempDirectorTrainingCamp::getId, queryInfo.getTempDirectorTrainingCampId())
+                .eq(TempDirectorTrainingCamp::getDelFlag, true)
+                .last("LIMIT 1").one();
+        if (trainingCamp==null) {
+            throw new BizException("训练营不存在");
+        }
         IPage<TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail> tempDirectorTrainingCampIPage = tempDirectorTrainingCampDetailService.queryPage(new Page<>(1,-1), queryInfo);
         List<TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail> records = tempDirectorTrainingCampIPage.getRecords();
         if (records.size()==0) {
             return failed("没有可导出数据");
         }
-        TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.getById(queryInfo.getTempDirectorTrainingCampId());
-
-
         TempDirectorTrainingCampDetailWrapper.DownloadInfo downloadInfo = generateExportExcelFile(records, TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail.class, trainingCamp.getName()+"导出", trainingCamp.getName()+"导出");
         return succeed(downloadInfo);
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TempDirectorTrainingCamp.java

@@ -56,6 +56,10 @@ public class TempDirectorTrainingCamp implements Serializable {
     @ApiModelProperty(value = "修改人")
     private Integer updateBy;
 
+    @TableField("del_flag_")
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempDirectorTrainingCampDetailServiceImpl.java

@@ -88,7 +88,10 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
     @Transactional(rollbackFor = Exception.class)
     public TempDirectorTrainingCampDetailWrapper.ApplyCampResult applyCamp(TempDirectorTrainingCampDetailWrapper.ApplyCamp applyCamp) {
         Date now = new Date();
-        TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.getById(applyCamp.getTempDirectorTrainingCampId());
+        TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.lambdaQuery()
+                .eq(TempDirectorTrainingCamp::getId,applyCamp.getTempDirectorTrainingCampId())
+                .eq(TempDirectorTrainingCamp::getDelFlag,true)
+                .last("LIMIT 1").one();
         this.checkTraining(now,trainingCamp);
         if(!smsCodeService.verifyValidCode(applyCamp.getMobile(), applyCamp.getAuthCode())){
             throw new BizException("验证码校验失败");
@@ -207,7 +210,10 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
         Teacher teacher = teacherDao.get(userId);
         TenantContextHolder.setTenantId(teacher.getTenantId());
         Date now = new Date();
-        TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.getById(campDetail.getTempDirectorTrainingCampId());
+        TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.lambdaQuery()
+                .eq(TempDirectorTrainingCamp::getId,campDetail.getTempDirectorTrainingCampId())
+                .eq(TempDirectorTrainingCamp::getDelFlag,true)
+                .last("LIMIT 1").one();
         this.checkTraining(now,trainingCamp);
         List<StudentPaymentOrder> studentPaymentOrders = studentPaymentOrderService.queryByCondition(GroupType.SPORADIC,
                 tempDirectorTrainingCampDetailId.toString(),

mec-biz/src/main/resources/config/mybatis/TempDirectorTrainingCampMapper.xml

@@ -17,6 +17,7 @@
                update_time_
         from temp_director_training_camp t
         <where>
+            t.del_flag_ = 0
             <if test="param.search != null and param.search != ''">
                 and (t.name_ like concat('%', #{param.search}, '%') )
             </if>