From a0c41f55201df34081743b02a105e806daae136a Mon Sep 17 00:00:00 2001 From: zhy <17877871893@163.com> Date: Sat, 13 Sep 2025 22:38:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=80=9D=E6=83=B3=E5=93=81?= =?UTF-8?q?=E5=BE=B7=E5=8A=A0=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CphAuditDetailsController.java | 27 ++++++ .../comprehensive/domain/CphAuditDetails.java | 3 + .../comprehensive/domain/SrsAddRecord.java | 4 + .../srs/comprehensive/domain/Vo/CheckIam.java | 21 +++++ .../mapper/CphAuditDetailsMapper.java | 8 ++ .../service/ICphAuditDetailsService.java | 11 +++ .../impl/CphAuditDetailsServiceImpl.java | 87 ++++++++++++++++++- .../comprehensive/CphAuditDetailsMapper.xml | 68 +++++++++++++++ 8 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CheckIam.java 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 8ff8314..dbdeda0 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 @@ -1,14 +1,18 @@ package com.srs.web.controller.comprehensive; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import com.srs.common.annotation.RepeatSubmit; import com.srs.comprehensive.domain.CphMsg; import com.srs.comprehensive.domain.Dto.CphCancel; import com.srs.comprehensive.domain.Dto.CphResub; +import com.srs.comprehensive.domain.SrsAddRecord; import com.srs.comprehensive.domain.SrsStudent; +import com.srs.comprehensive.domain.Vo.CheckIam; import com.srs.comprehensive.domain.Vo.CphApply; import com.srs.comprehensive.domain.Vo.CphSearch; import com.srs.comprehensive.service.ICphMsgService; @@ -52,6 +56,29 @@ public class CphAuditDetailsController extends BaseController { @Autowired private ISrsStudentService _student; + @PostMapping("/plusCheckRecord") + public AjaxResult plusCheckRecord(@RequestBody CphAuditDetails param){ + return cphAuditDetailsService.plusCheckRecord(param); + } + + + @GetMapping("/listCheckAuditAndRecord") + public AjaxResult listCheckAuditAndRecord(CheckIam param) { + Map map = new HashMap<>(); + List list = cphAuditDetailsService.listCheckAudit(param); + List srsAddRecordList = cphAuditDetailsService.ListCheckRecord(param); + map.put("auditList", list); + map.put("recordList", srsAddRecordList); + return AjaxResult.success(map); + } + + @GetMapping("/checkIamList") + public AjaxResult checkIamList(){ + List res = cphAuditDetailsService.checkIamList(); + return AjaxResult.success(res); + } + + //清除审核状态不正确的加分记录 @PostMapping("/cleanCancelRecord") public AjaxResult cleanCancelRecord(){ diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java index 75b909d..5ebb94d 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java @@ -64,6 +64,9 @@ public class CphAuditDetails extends BaseEntity private String className; private String stuNo; private Long gradeId; + public BigDecimal iamScore; + public String auditStatus; + public Long stuYearId; public String getDeptName() { diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsAddRecord.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsAddRecord.java index 00f07cb..79f01e6 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsAddRecord.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsAddRecord.java @@ -1,6 +1,7 @@ package com.srs.comprehensive.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -86,6 +87,9 @@ public class SrsAddRecord extends BaseEntity { */ private String delFlag; + @TableField(exist = false) + public String ruleName; + // public void setAddPointsPerson(Long addPointsPerson) { // this.addPointsPerson = addPointsPerson; // } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CheckIam.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CheckIam.java new file mode 100644 index 0000000..51fc598 --- /dev/null +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CheckIam.java @@ -0,0 +1,21 @@ +package com.srs.comprehensive.domain.Vo; + +import lombok.Data; + +import java.math.BigDecimal; + +//思想品德检查 +@Data +public class CheckIam { + + public Long stuYearId; + + public String stuNo; + + public BigDecimal q2Score; + + public BigDecimal q1Score; + + public String diffType; + +} 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 16b5f0c..a9c5d44 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 @@ -3,6 +3,7 @@ package com.srs.comprehensive.mapper; import java.util.List; import com.srs.comprehensive.domain.CphAuditDetails; import com.srs.comprehensive.domain.SrsAddRecord; +import com.srs.comprehensive.domain.Vo.CheckIam; import org.apache.ibatis.annotations.Mapper; /** @@ -85,4 +86,11 @@ public interface CphAuditDetailsMapper //查询审核状态不对的加分记录 public List listCancelRecord(); + + public List checkIamList(); + + public List listCheckAudit(CheckIam param); + + public List ListCheckRecord(CheckIam param); + } 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 cc03ac7..fe45d0a 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 @@ -6,8 +6,11 @@ import com.srs.common.core.domain.AjaxResult; import com.srs.comprehensive.domain.CphAuditDetails; import com.srs.comprehensive.domain.Dto.CphCancel; import com.srs.comprehensive.domain.Dto.CphResub; +import com.srs.comprehensive.domain.SrsAddRecord; +import com.srs.comprehensive.domain.Vo.CheckIam; import com.srs.comprehensive.domain.Vo.CphApply; import com.srs.comprehensive.domain.Vo.CphSearch; +import org.springframework.web.bind.annotation.RequestBody; /** * 审核明细Service接口 @@ -18,6 +21,14 @@ import com.srs.comprehensive.domain.Vo.CphSearch; public interface ICphAuditDetailsService { + public AjaxResult plusCheckRecord( CphAuditDetails param); + + public List listCheckAudit(CheckIam param); + + public List ListCheckRecord(CheckIam param); + + public List checkIamList(); + public AjaxResult cleanCancelRecord(); public int reSub(CphResub 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 e5cbe57..c4ea80f 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 @@ -14,10 +14,12 @@ import com.srs.common.utils.PageUtils; import com.srs.comprehensive.domain.*; import com.srs.comprehensive.domain.Dto.CphCancel; import com.srs.comprehensive.domain.Dto.CphResub; +import com.srs.comprehensive.domain.Vo.CheckIam; import com.srs.comprehensive.domain.Vo.CphApply; import com.srs.comprehensive.domain.Vo.CphSearch; import com.srs.comprehensive.mapper.CphIamMapper; import com.srs.comprehensive.mapper.SrsAddRecordMapper; +import com.srs.comprehensive.mapper.ViewStuInfoMapper; import com.srs.comprehensive.service.*; import com.srs.system.domain.SysPost; import com.srs.system.service.ISysPostService; @@ -437,8 +439,8 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService { temp.setId(cphAuditDetails.getProjectId()); temp.setAuditStatus(cphAuditDetails.getStatusCode().toString()); cphIamService.updateCphIam(temp); - Long statusCode=cphAuditDetailsMapper.selectCphAuditDetailsById(cphAuditDetails.getId()).getStatusCode(); - if (statusCode == 6L)//判断审核状态是否完成 +// Long statusCode=cphAuditDetailsMapper.selectCphAuditDetailsById(cphAuditDetails.getId()).getStatusCode(); + if (cphAuditDetails.getStatusCode() == 6L)//判断审核状态是否完成 { SrsStudent stu = _stuService.selectSrsStudentByStuId(cphAuditDetails.getSubmitterId()); SrsAddRecord srsAddRecord = new SrsAddRecord();//加分记录表 @@ -575,6 +577,85 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService { cphAuditDetailsS.setStatusCode(cphAuditDetails.getStatusCode()); int i = cphAuditDetailsMapper.updateCphAuditDetails(cphAuditDetailsS); return -1; - } + + @Override + public List checkIamList(){ + return cphAuditDetailsMapper.checkIamList(); + } + + @Override + public List listCheckAudit(CheckIam param){ + return cphAuditDetailsMapper.listCheckAudit(param); + } + + + @Override + public List ListCheckRecord(CheckIam param){ + return cphAuditDetailsMapper.ListCheckRecord(param); + } + + @Autowired + private ViewStuInfoMapper viewStuInfoMapper; + + @Override + public AjaxResult plusCheckRecord(CphAuditDetails param){ + try{ + Long auditId = param.getId(); + CphAuditDetails cphAuditDetails = selectCphAuditDetailsById(auditId); + if(cphAuditDetails == null){ + throw new Exception("审核记录不存在"); + } + + Long iamId = cphAuditDetails.getProjectId(); + CphIam cphIam = cphIamService.selectCphIamById(iamId); + if(cphIam == null){ + throw new Exception("思想品德记录不存在"); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("stu_id", cphIam.getToAdd()); + ViewStuInfo viewStuInfo = viewStuInfoMapper.selectOne(queryWrapper); + if(viewStuInfo == null) { + throw new Exception("学生信息不存在"); + } + + SrsAddRecord query = new SrsAddRecord(); + query.setIamId(iamId); + query.setStatusCode("6"); + query.setStuYearId(Math.toIntExact(cphIam.getStuYearId())); + List srsAddRecordList = srsAddRecordService.selectSrsAddRecordList(query); + if(!srsAddRecordList.isEmpty()){ + throw new Exception("该记录已存在"); + } + + SrsAddRecord srsAddRecord = new SrsAddRecord(); + srsAddRecord.setStuNo(viewStuInfo.getStuNo()); + srsAddRecord.setApplicant(getUserId()); + srsAddRecord.setRuleId(cphIam.getRuleId()); + srsAddRecord.setDescription(cphIam.getDescription()); + srsAddRecord.setMaterial(cphIam.getMaterial()); + srsAddRecord.setRecordScore(cphIam.getIamScore()); + srsAddRecord.setStuYearId(Math.toIntExact(cphIam.getStuYearId())); + srsAddRecord.setIamId(cphIam.getId()); + + srsAddRecord.setStatusCode("6"); + srsAddRecord.setStatus("0"); + srsAddRecord.setDelFlag("0"); + + srsAddRecord.setCreateBy(getUsername()); + srsAddRecord.setUpdateBy(getUsername()); + srsAddRecord.setCreateTime(getNowDate()); + srsAddRecord.setUpdateTime(getNowDate()); + + int i = srsAddRecordService.insertSrsAddRecord(srsAddRecord); + if(i == 0){ + throw new Exception("添加加分记录失败"); + } + + 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 1a1d597..1aeef9b 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml @@ -177,4 +177,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join cph_iam as b on a.iam_id = b.id where b.audit_status not in (6,12) + + + + + +