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

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.microsvc.toolkit.common.response.template.R;
 import com.microsvc.toolkit.common.tools.DownloadManager;
 import com.microsvc.toolkit.middleware.oss.OssPluginContext;
 import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
@@ -16,13 +15,10 @@ 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.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.io.File;
 import java.text.MessageFormat;
-import java.util.Date;
 import java.util.List;
 
 @Api(tags = "乐队指导训练营活动")
@@ -39,17 +34,11 @@ import java.util.List;
 @Slf4j
 @RequestMapping("${app-config.url.web:}/tempDirectorTrainingDetailCamp")
 public class TempDirectorTrainingCampDetailController extends BaseController {
-    /**
-     * 服务对象
-     */
     @Resource
     private TempDirectorTrainingCampDetailService tempDirectorTrainingCampDetailService;
-
-    @Autowired
+    @Resource
     private OssPluginContext ossPluginContext;
-
-
-    @Autowired
+    @Resource
     private TempDirectorTrainingCampService tempDirectorTrainingCampService;
 
 

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

@@ -4,14 +4,13 @@
 
     <select id="getStat"
             resultType="com.ym.mec.biz.dal.wrapper.TempDirectorTrainingCampWrapper$TempDirectorTrainingCamp">
-
         select
         t.temp_director_training_camp_id_ as id,
         count(t.id_) as applyCount,
         sum(if(t.payment_status_ = 'PAID',1,0)) as payCount,
         sum(if(t.payment_status_ = 'PAID',t.payment_amount_,0)) as payAmount
         from temp_director_training_camp_detail t
-        where t.temp_director_training_camp_id_ in
+        where t.del_flag_ = 0 AND t.temp_director_training_camp_id_ in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -19,6 +18,7 @@
     </select>
 
     <sql id="SelectSql">
+            t.del_flag_ = 0
         <if test="param.tempDirectorTrainingCampId != null">
             and t.temp_director_training_camp_id_ = #{param.tempDirectorTrainingCampId}
         </if>
@@ -40,7 +40,6 @@
     </sql>
     <select id="queryPage"
             resultType="com.ym.mec.biz.dal.wrapper.TempDirectorTrainingCampDetailWrapper$TempDirectorTrainingCampDetail">
-
         select *
         from temp_director_training_camp_detail t
         <where>