From 7b66a16a40e14b2e8ef8c8c0c5f021ef15a47b40 Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Sat, 13 Sep 2025 20:20:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=AE=A1=E6=A0=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CphAuditDetailsController.java | 7 +++++ .../mapper/CphAuditDetailsMapper.java | 4 +++ .../service/ICphAuditDetailsService.java | 2 ++ .../impl/CphAuditDetailsServiceImpl.java | 29 +++++++++++++++++++ .../comprehensive/CphAuditDetailsMapper.xml | 7 +++++ 5 files changed, 49 insertions(+) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java index 6e86417..8ff8314 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java @@ -52,6 +52,13 @@ public class CphAuditDetailsController extends BaseController { @Autowired private ISrsStudentService _student; + //清除审核状态不正确的加分记录 + @PostMapping("/cleanCancelRecord") + public AjaxResult cleanCancelRecord(){ + return cphAuditDetailsService.cleanCancelRecord(); + } + + /*** * 重新提交 （学生） * @author zhy diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java index 33a6b81..16b5f0c 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java @@ -2,6 +2,7 @@ package com.srs.comprehensive.mapper; import java.util.List; import com.srs.comprehensive.domain.CphAuditDetails; +import com.srs.comprehensive.domain.SrsAddRecord; import org.apache.ibatis.annotations.Mapper; /** @@ -81,4 +82,7 @@ public interface CphAuditDetailsMapper public int deleteCphAuditDetailsByIds(Long[] ids); public int cancelAuditById(Long id); public int cancelCphAudiDetailsById(Long id); + + //查询审核状态不对的加分记录 + public List listCancelRecord(); } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java index f9dafca..cc03ac7 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java @@ -18,6 +18,8 @@ import com.srs.comprehensive.domain.Vo.CphSearch; public interface ICphAuditDetailsService { + public AjaxResult cleanCancelRecord(); + public int reSub(CphResub param); public AjaxResult cancelProcess(CphCancel param); public List listOwnProcessed(CphSearch param); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java index cb354d0..e5cbe57 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.srs.common.core.domain.AjaxResult; @@ -519,13 +521,40 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService { public int deleteCphAuditDetailsByIds(Long[] ids) { return cphAuditDetailsMapper.deleteCphAuditDetailsByIds(ids); } + @Override + @Transactional(rollbackFor = Exception.class) public int cancelAuditById(Long id) { int result=0; result=cphAuditDetailsMapper.cancelAuditById(id); result+= cphAuditDetailsMapper.cancelCphAudiDetailsById(id); + List cancelList = cphAuditDetailsMapper.listCancelRecord(); + Set recordIds = cancelList.stream().map(SrsAddRecord::getId).collect(Collectors.toSet()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", recordIds); + _addRecordMapper.delete(queryWrapper); + return result; } + + + @Override + public AjaxResult cleanCancelRecord(){ + try{ + List cancelList = cphAuditDetailsMapper.listCancelRecord(); + if(!cancelList.isEmpty()){ + Set recordIds = cancelList.stream().map(SrsAddRecord::getId).collect(Collectors.toSet()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", recordIds); + _addRecordMapper.delete(queryWrapper); + } + return AjaxResult.success(); + }catch(Exception ex){ + return AjaxResult.error(ex.getMessage()); + } + } + /** * 删除审核明细信息 * diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml index 749b0cd..1a1d597 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml @@ -170,4 +170,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update cph_audit_details set status_code=1 where project_id=#{id} + +