src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -331,4 +331,25 @@ return R.data(detail); } /** * 取消报名 * @param apply 考试报名信息对象 */ @PostMapping("/cancelApply") public R cancelApply(@RequestBody Apply apply){ //查询人员是否已报名 List<Apply> applyList = applyService.getSecurityApplyInfo(apply); if (applyList.size()>0){ Apply apply1 = applyList.get(0); apply1.setApplyStatus(4); boolean status = applyService.updateById(apply1); if (status){ return R.data(200,"取消报名成功"); } }else { return R.data(201,"尚未报名"); } return R.data(202,"取消报名失败"); } } src/main/java/org/springblade/modules/apply/entity/Apply.java
@@ -176,4 +176,10 @@ */ @TableField("is_exam") private Integer isExam; /** * 行政区 */ private String jurisdiction; } src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.java
@@ -75,4 +75,11 @@ * @return */ Integer getIsApply(@Param("apply")Apply apply); /** * 查询人员是否已报名 * @param apply * @return */ List<Apply> getSecurityApplyInfo(@Param("apply")Apply apply); } src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -196,4 +196,15 @@ and (apply_status = 1 or apply_status = 2) limit 1 </select> <!--查询人员是否已经报名--> <select id="getSecurityApplyInfo" resultType="org.springblade.modules.apply.entity.Apply"> select * from sys_apply where 1=1 and is_exam = 1 and user_id = #{apply.userId} and apply_status = 2 limit 1 </select> </mapper> src/main/java/org/springblade/modules/apply/service/ApplyService.java
@@ -73,4 +73,11 @@ * @return */ Integer getIsApply(Apply apply); /** * 查询人员是否已报名 * @param apply * @return */ List<Apply> getSecurityApplyInfo(Apply apply); } src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
@@ -294,4 +294,14 @@ public Integer getIsApply(Apply apply) { return baseMapper.getIsApply(apply); } /** * 查询人员是否已报名 * @param apply * @return */ @Override public List<Apply> getSecurityApplyInfo(Apply apply) { return baseMapper.getSecurityApplyInfo(apply); } } src/main/java/org/springblade/modules/equipage/controller/CarController.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.common.utils.arg; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -13,6 +14,10 @@ import org.springblade.modules.equipage.service.CarService; import org.springblade.modules.equipage.vo.CarVo; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; /** * @author zhongrj