新增方案删除接口

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/VolunteerMapper.java

@@ -14,4 +14,6 @@ public interface VolunteerMapper extends BaseMapper<Volunteer> {
     List<Volunteer>  getList(Map<String,Object> map);
 
     List<Volunteer> getListByIds(@Param("list") List<Integer> ids);
+
+    int updateBySchemeId(@Param("schemeId") Integer schemeId);
 }

wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml

@@ -86,6 +86,19 @@
         )
     </insert>
 
+
+    <update id="updateBySchemeId">
+        UPDATE
+        <include refid="table"/>
+        <set>
+            is_delete=1
+        </set>
+        <where>
+            scheme_id = #{schemeId}
+            and is_delete=0
+        </where>
+    </update>
+
     <select id="getList" resultType="cn.wisenergy.model.app.Volunteer">
 
     </select>

wisenergy-model/src/main/java/cn/wisenergy/model/app/UserInfo.java

@@ -67,6 +67,12 @@ public class UserInfo extends BaseEntity implements Serializable {
     @ApiModelProperty(name = "examType",value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文学编导考生")
     private Integer studentType;
 
+    /**
+     * 来源 1：电脑端 2: 手机端
+     */
+    @ApiModelProperty(name = "source",value = "来源 1：电脑端 2: 手机端")
+    private Integer source;
+
     /**
      * 用户剩余查询次数
      */

wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeService.java

@@ -3,6 +3,7 @@ package cn.wisenergy.service.app;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.vo.SchemeQueryVo;
 import cn.wisenergy.model.vo.VolunteerVo;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -22,4 +23,11 @@ public interface SchemeService {
      * @return  方案查询结果列表
      */
     R<VolunteerVo> getList(SchemeQueryVo schemeQueryVo);
+
+    /**
+     * 根据方案id，删除方案
+     * @param schemeId 方案id
+     * @return
+     */
+    R<Boolean> deleteById(Integer schemeId);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java

@@ -6,6 +6,8 @@ import cn.wisenergy.model.app.*;
 import cn.wisenergy.model.vo.SchemeQueryVo;
 import cn.wisenergy.model.vo.VolunteerVo;
 import cn.wisenergy.service.app.SchemeService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,10 +22,10 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
+ * @author 86187
  * @ Description: 方案接口实现
  * @ Author     : 86187
  * @ Date       : 2021/1/13 15:04
- * @author 86187
  */
 @Service
 @Slf4j
@@ -85,6 +87,45 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         return R.ok(volunteerVo);
     }
 
+    @Override
+    public R<Boolean> deleteById(Integer schemeId) {
+        log.info("volunteer-service[]SchemeServiceImpl[]deleteById[]input.param.schemeId:" + schemeId);
+        if (null == schemeId) {
+            return R.error("入参为空!");
+        }
+        //根据方案id,获取方案信息
+        QueryWrapper<SchemeInfo> query = new QueryWrapper<>();
+        query.eq("id", schemeId);
+        query.eq("is_delete", 0);
+        SchemeInfo schemeInfo = baseMapper.selectOne(query);
+        if (null == schemeInfo) {
+            return R.error("方案信息不存在!");
+        }
+
+        //todo 关联删除，需要加事务
+        //更新方案状态为 ：1 删除
+        schemeInfo.setIsDelete(1);
+        int sum = baseMapper.updateById(schemeInfo);
+        if (sum == 0) {
+            return R.ok(1, false);
+        }
+
+        //根据方案id,获取志愿信息
+        QueryWrapper<Volunteer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("scheme_id", schemeId);
+        queryWrapper.eq("is_delete", 0);
+        List<Volunteer> list = volunteerMapper.selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return R.ok(0, true);
+        }
+
+        int count = volunteerMapper.updateBySchemeId(schemeId);
+        if (list.size() != count) {
+            return R.ok(1, false);
+        }
+        return R.ok(0, true);
+    }
+
 
     /**
      * 保存方案查询记录和关联关系