xgxt_sd/zhxg_java
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

个人画像大屏修改

Browse Source
This commit is contained in:
15976874561
2025-12-12 17:33:57 +08:00
parent 86df798c25
commit b27938762b
14 changed files with 161 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsCqScore.java
View File

@@ -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;
}

1
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphOwnScore.java
View File

@@ -28,5 +28,4 @@ public class CphOwnScore {
public BigDecimal stuScore;
public BigDecimal sportScore;
}

1
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphStuScoreType.java
View File

@@ -20,5 +20,6 @@ public class CphStuScoreType {
public String typeName;
public BigDecimal totalScore;
}

1
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java
View File

@@ -22,7 +22,6 @@ public interface CphAuditDetailsMapper
* @return 审核明细
*/
public CphAuditDetails selectCphAuditDetailsById(Long id);
public List<CphAuditDetails> getcphiamByOne(String stuNo);
public CphAuditDetails selectCphAuditDetailsByProjectId(Long id);

18
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsCqScoreMapper.java
View File

@@ -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<SrsCqScore>
/**
* 查询学生综合素质评分表
*
*
* @param id 学生综合素质评分表主键
* @return 学生综合素质评分表
*/
@@ -45,6 +46,8 @@ public interface SrsCqScoreMapper extends BaseMapper<SrsCqScore>
public List<CphStuScoreType> listOwnFive(String stuNo);
public List<CphAuditDetails> getcphiamByOne(String stuNo);
public List<CphCollegeLook> listOwnCollegeScore(CphSearch param);
public List<CphCollegeLook> listOwnCollegeStu(CphSearch param);
@@ -54,6 +57,7 @@ public interface SrsCqScoreMapper extends BaseMapper<SrsCqScore>
public List<SrsMajors> listOwnClass(CphSearch param);
public List<SrsCqScore> getStuData(String stuNo);
/**
@@ -80,6 +84,8 @@ public interface SrsCqScoreMapper extends BaseMapper<SrsCqScore>
public List<CphOwnScore> getOwn(String stuNo);
public List<CphOwnScore> getOwn2(String stuNo);
public void generateComprehensiveSummary(@Param("id") int id);
@@ -87,7 +93,7 @@ public interface SrsCqScoreMapper extends BaseMapper<SrsCqScore>
/**
* 新增学生综合素质评分表
*
*
* @param srsCqScore 学生综合素质评分表
* @return 结果
*/
@@ -97,7 +103,7 @@ public interface SrsCqScoreMapper extends BaseMapper<SrsCqScore>
/**
* 修改学生综合素质评分表
*
*
* @param srsCqScore 学生综合素质评分表
* @return 结果
*/
@@ -105,7 +111,7 @@ public interface SrsCqScoreMapper extends BaseMapper<SrsCqScore>
/**
* 删除学生综合素质评分表
*
*
* @param id 学生综合素质评分表主键
* @return 结果
*/
@@ -113,7 +119,7 @@ public interface SrsCqScoreMapper extends BaseMapper<SrsCqScore>
/**
* 批量删除学生综合素质评分表
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/

8
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java
View File

@@ -49,14 +49,6 @@ public interface ICphAuditDetailsService
*/
public CphAuditDetails selectCphAuditDetailsById(Long id);
/**
* 查询个人思想品得加分项申请
*
* @param stuNo
* @return
**/
public List<CphAuditDetails> getcphiamByOne(String stuNo);
/**
* 我的已审核
* @author zhy

8
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsCqScoreService.java
View File

@@ -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<CphOwnScore> getOwn(String stuNo);
public List<CphOwnScore> getOwn2(String stuNo);
public List<CphAuditDetails> getcphiamByOne(String stuNo);
public List<CphTotalScoreInfo> listCphScore(CphSearch search);
public List<CphCollegeLook> listOwnCollegeScore(CphSearch param);
@@ -109,4 +115,6 @@ public interface ISrsCqScoreService
List<SrsCeScoreClassDeptGradeMajorsStudentStuYear> comprehensiveRanking(SrsCqScore srsCqScore);
public List<SrsCqScore> getStuData(String stuNo);
}

5
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java
View File

@@ -331,11 +331,6 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService {
return cphAuditDetailsMapper.selectCphAuditDetailsById(id);
}
//查询个人思想品得加分申请
public List<CphAuditDetails> getcphiamByOne(String stuNo){
return cphAuditDetailsMapper.getcphiamByOne(stuNo);
}
/**
* 查询已审核
*

16
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsCqScoreServiceImpl.java
View File

@@ -89,7 +89,12 @@ public class SrsCqScoreServiceImpl extends ServiceImpl<SrsCqScoreMapper, SrsCqSc
@Override
public List<CphOwnScore> getOwn(String stuNo){
return srsCqScoreMapper.getOwn( stuNo);
return srsCqScoreMapper.getOwn(stuNo);
}
@Override
public List<CphOwnScore> getOwn2(String stuNo){
return srsCqScoreMapper.getOwn2(stuNo);
}
@Override
@@ -342,5 +347,12 @@ public class SrsCqScoreServiceImpl extends ServiceImpl<SrsCqScoreMapper, SrsCqSc
return baseMapper.selectPerson(params);
}
//查询个人思想品得加分申请
public List<CphAuditDetails> getcphiamByOne(String stuNo){
return srsCqScoreMapper.getcphiamByOne(stuNo);
}
//查询个人素质综合信息
public List<SrsCqScore> getStuData(String stuNo){
return srsCqScoreMapper.getStuData(stuNo);
}
}