From b27938762b58b97102ba4e22c93dd8547e5faa9e Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Fri, 12 Dec 2025 17:33:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=94=BB=E5=83=8F=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CphAuditDetailsController.java | 8 --- .../comprehensive/SrsCqScoreController.java | 45 ++++++++++-- srs-admin/src/main/resources/application.yml | 8 +-- .../srs/comprehensive/domain/SrsCqScore.java | 40 ++++++++--- .../comprehensive/domain/Vo/CphOwnScore.java | 1 - .../domain/Vo/CphStuScoreType.java | 1 + .../mapper/CphAuditDetailsMapper.java | 1 - .../mapper/SrsCqScoreMapper.java | 18 +++-- .../service/ICphAuditDetailsService.java | 8 --- .../service/ISrsCqScoreService.java | 8 +++ .../impl/CphAuditDetailsServiceImpl.java | 5 -- .../service/impl/SrsCqScoreServiceImpl.java | 16 ++++- .../comprehensive/CphAuditDetailsMapper.xml | 14 +--- .../mapper/comprehensive/SrsCqScoreMapper.xml | 69 ++++++++++++++----- 14 files changed, 161 insertions(+), 81 deletions(-) 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 8030c5a..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 @@ -266,14 +266,6 @@ public class CphAuditDetailsController extends BaseController { public AjaxResult getInfo(@PathVariable("id") Long id) { return success(cphAuditDetailsService.selectCphAuditDetailsById(id)); } - /** - * 查询个人思想品得加分项申请 - */ - @PostMapping("/getcphiamByOne/{stuNo}") - public TableDataInfo getcphiamByOne(@PathVariable("stuNo") String stuNo) { - List list=cphAuditDetailsService.getcphiamByOne(stuNo); - return getDataTable(list); - } /** * 新增审核明细 diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java index 9f706b7..7ea7fdb 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletResponse; +import com.srs.comprehensive.domain.CphAuditDetails; import com.srs.comprehensive.domain.Dto.CphExport; import com.srs.comprehensive.domain.SrsCqScore; import com.srs.comprehensive.domain.SrsMajors; @@ -235,13 +236,6 @@ public class SrsCqScoreController extends BaseController { } - @GetMapping("/getOwn") - public AjaxResult getOwn() { - String stuNo = getUsername(); - return success(srsCqScoreService.getOwn(stuNo)); - } - - /** * 导出学生综合素质评分表列表 */ @@ -337,4 +331,41 @@ public class SrsCqScoreController extends BaseController { return getDataTable(list); } + /** + * 查询个人思想品得加分项申请 + */ + @PostMapping("/getcphiamByOne/{stuNo}") + public TableDataInfo getcphiamByOne(@PathVariable("stuNo") String stuNo) { + List list=srsCqScoreService.getcphiamByOne(stuNo); + return getDataTable(list); + } + @GetMapping("/getOwncphiamByOne") + public TableDataInfo getOwncphiamByOne() { + List list=srsCqScoreService.getcphiamByOne(getUsername()); + return getDataTable(list); + } + + /** + * 查询个人素质综合信息 + */ + @GetMapping("/getStuData") + public TableDataInfo getStuData(String stuNo) { + List list=srsCqScoreService.getStuData(stuNo); + return getDataTable(list); + } + @GetMapping("/getOwnData") + public TableDataInfo getOwnData() { + List list=srsCqScoreService.getStuData(getUsername()); + return getDataTable(list); + } + //查询综合素质分数 + @GetMapping("/getOwn") + public TableDataInfo getOwn() { + String stuNo = getUsername(); + return getDataTable(srsCqScoreService.getOwn2(stuNo)); + } + @GetMapping("/getStu") + public TableDataInfo getStu(String stuNo){ + return getDataTable(srsCqScoreService.getOwn2(stuNo)); + } } diff --git a/srs-admin/src/main/resources/application.yml b/srs-admin/src/main/resources/application.yml index efab106..b51ace4 100644 --- a/srs-admin/src/main/resources/application.yml +++ b/srs-admin/src/main/resources/application.yml @@ -81,15 +81,15 @@ spring: # redis 配置 redis: # 地址 - host: localhost #正式环境redis -# host: 47.112.118.149 #测试开发地址 +# host: localhost #正式环境redis + host: 47.112.118.149 #测试开发地址 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 密码SSSS -# password: Houpuyfb #测试开发密码 - password: #正式环境密码 + password: Houpuyfb #测试开发密码 +# password: #正式环境密码 # 连接超时时间 timeout: 10s lettuce: diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsCqScore.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsCqScore.java index 10dca31..2c07316 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsCqScore.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsCqScore.java @@ -1,6 +1,9 @@ package com.srs.comprehensive.domain; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.srs.common.annotation.Excel; @@ -8,10 +11,11 @@ import com.srs.common.core.domain.BaseEntity; /** * 学生综合素质评分表对象 srs_cq_score - * + * * @author srs * @date 2023-06-29 */ +@Data public class SrsCqScore extends BaseEntity { private static final long serialVersionUID = 1L; @@ -45,7 +49,23 @@ public class SrsCqScore extends BaseEntity private String majorsName; @Excel(name = "班级") private String className; - + //思想品德 + @TableField(exist = false) + private BigDecimal iamScore; + //第二课堂 + @TableField(exist = false) + private BigDecimal classtwoScore; + //综合评价 + @TableField(exist = false) + private BigDecimal ceScore; + //科学文化素质 + @TableField(exist = false) + private BigDecimal stuScore; + //体能素质 + @TableField(exist = false) + private BigDecimal sportScore; + @TableField(exist = false) + private BigDecimal totalScore; public String getStuYearName() { return stuYearName; @@ -94,12 +114,12 @@ public class SrsCqScore extends BaseEntity } - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } @@ -110,30 +130,30 @@ public class SrsCqScore extends BaseEntity public void setStuNo(String stuNo) { this.stuNo = stuNo; } - public void setStuYearId(Long stuYearId) + public void setStuYearId(Long stuYearId) { this.stuYearId = stuYearId; } - public Long getStuYearId() + public Long getStuYearId() { return stuYearId; } - public void setCqScore(BigDecimal cqScore) + public void setCqScore(BigDecimal cqScore) { this.cqScore = cqScore; } - public BigDecimal getCqScore() + public BigDecimal getCqScore() { return cqScore; } - public void setDelFlag(String delFlag) + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getDelFlag() + public String getDelFlag() { return delFlag; } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphOwnScore.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphOwnScore.java index 23affe3..c1864a6 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphOwnScore.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphOwnScore.java @@ -28,5 +28,4 @@ public class CphOwnScore { public BigDecimal stuScore; public BigDecimal sportScore; - } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphStuScoreType.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphStuScoreType.java index d1d61e2..33ab75b 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphStuScoreType.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphStuScoreType.java @@ -20,5 +20,6 @@ public class CphStuScoreType { public String typeName; + public BigDecimal totalScore; } 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 99f58c4..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 @@ -22,7 +22,6 @@ public interface CphAuditDetailsMapper * @return 审核明细 */ public CphAuditDetails selectCphAuditDetailsById(Long id); - public List getcphiamByOne(String stuNo); public CphAuditDetails selectCphAuditDetailsByProjectId(Long id); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsCqScoreMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsCqScoreMapper.java index 6c69a2c..cc2423b 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsCqScoreMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsCqScoreMapper.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.srs.comprehensive.domain.CphAuditDetails; import com.srs.comprehensive.domain.Dto.CphExport; import com.srs.comprehensive.domain.SrsCqScore; import com.srs.comprehensive.domain.SrsMajors; @@ -14,7 +15,7 @@ import org.springframework.data.repository.query.Param; /** * 学生综合素质评分表Mapper接口 - * + * * @author srs * @date 2023-06-29 */ @@ -29,7 +30,7 @@ public interface SrsCqScoreMapper extends BaseMapper /** * 查询学生综合素质评分表 - * + * * @param id 学生综合素质评分表主键 * @return 学生综合素质评分表 */ @@ -45,6 +46,8 @@ public interface SrsCqScoreMapper extends BaseMapper public List listOwnFive(String stuNo); + public List getcphiamByOne(String stuNo); + public List listOwnCollegeScore(CphSearch param); public List listOwnCollegeStu(CphSearch param); @@ -54,6 +57,7 @@ public interface SrsCqScoreMapper extends BaseMapper public List listOwnClass(CphSearch param); + public List getStuData(String stuNo); /** @@ -80,6 +84,8 @@ public interface SrsCqScoreMapper extends BaseMapper public List getOwn(String stuNo); + public List getOwn2(String stuNo); + public void generateComprehensiveSummary(@Param("id") int id); @@ -87,7 +93,7 @@ public interface SrsCqScoreMapper extends BaseMapper /** * 新增学生综合素质评分表 - * + * * @param srsCqScore 学生综合素质评分表 * @return 结果 */ @@ -97,7 +103,7 @@ public interface SrsCqScoreMapper extends BaseMapper /** * 修改学生综合素质评分表 - * + * * @param srsCqScore 学生综合素质评分表 * @return 结果 */ @@ -105,7 +111,7 @@ public interface SrsCqScoreMapper extends BaseMapper /** * 删除学生综合素质评分表 - * + * * @param id 学生综合素质评分表主键 * @return 结果 */ @@ -113,7 +119,7 @@ public interface SrsCqScoreMapper extends BaseMapper /** * 批量删除学生综合素质评分表 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ 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 860528c..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 @@ -49,14 +49,6 @@ public interface ICphAuditDetailsService */ public CphAuditDetails selectCphAuditDetailsById(Long id); - /** - * 查询个人思想品得加分项申请 - * - * @param stuNo - * @return - **/ - public List getcphiamByOne(String stuNo); - /** * 我的已审核 * @author zhy diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsCqScoreService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsCqScoreService.java index b8b376e..1a9f00c 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsCqScoreService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsCqScoreService.java @@ -1,6 +1,7 @@ package com.srs.comprehensive.service; import com.srs.common.core.domain.AjaxResult; +import com.srs.comprehensive.domain.CphAuditDetails; import com.srs.comprehensive.domain.Dto.CphExport; import com.srs.comprehensive.domain.SrsCqScore; import com.srs.comprehensive.domain.SrsMajors; @@ -37,6 +38,11 @@ public interface ISrsCqScoreService public List getOwn(String stuNo); + public List getOwn2(String stuNo); + + public List getcphiamByOne(String stuNo); + + public List listCphScore(CphSearch search); public List listOwnCollegeScore(CphSearch param); @@ -109,4 +115,6 @@ public interface ISrsCqScoreService List comprehensiveRanking(SrsCqScore srsCqScore); + public List getStuData(String stuNo); + } 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 0b6843f..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 @@ -331,11 +331,6 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService { return cphAuditDetailsMapper.selectCphAuditDetailsById(id); } - //查询个人思想品得加分申请 - public List getcphiamByOne(String stuNo){ - return cphAuditDetailsMapper.getcphiamByOne(stuNo); - } - /** * 查询已审核 * diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsCqScoreServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsCqScoreServiceImpl.java index 262c915..ecfd049 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsCqScoreServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsCqScoreServiceImpl.java @@ -89,7 +89,12 @@ public class SrsCqScoreServiceImpl extends ServiceImpl getOwn(String stuNo){ - return srsCqScoreMapper.getOwn( stuNo); + return srsCqScoreMapper.getOwn(stuNo); + } + + @Override + public List getOwn2(String stuNo){ + return srsCqScoreMapper.getOwn2(stuNo); } @Override @@ -342,5 +347,12 @@ public class SrsCqScoreServiceImpl extends ServiceImpl getcphiamByOne(String stuNo){ + return srsCqScoreMapper.getcphiamByOne(stuNo); + } + //查询个人素质综合信息 + public List getStuData(String stuNo){ + return srsCqScoreMapper.getStuData(stuNo); + } } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml index 58ebb0f..445cd29 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml @@ -245,17 +245,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join cph_rules as b on a.rule_id = b.rule_id where stu_no = #{stuNo} and stu_year_id = #{stuYearId}; - + diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCqScoreMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCqScoreMapper.xml index 7c07024..86da603 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCqScoreMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCqScoreMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -37,7 +37,7 @@ m.major_name, c.class_name, stu_year_name - + from srs_cq_score cq left join srs_student s on s.stu_no = cq.stu_no @@ -46,7 +46,7 @@ left JOIN srs_majors m ON c.major_id = m.major_id left JOIN sys_dept d ON m.college_id = d.dept_id left JOIN srs_stu_year sy ON cq.stu_year_id = sy.id - + - - + + + + - + - - - insert into srs_cq_score @@ -383,7 +404,7 @@ #{delFlag}, - + update srs_cq_score @@ -398,20 +419,20 @@ where id = #{id} - + delete from srs_cq_score where id = #{id} - + delete from srs_cq_score where id in #{id} - + - + - - \ No newline at end of file + + +