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

8
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java
View File

@@ -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<CphAuditDetails> list=cphAuditDetailsService.getcphiamByOne(stuNo);
return getDataTable(list);
}
/**
* 新增审核明细

45
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java
View File

@@ -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<CphAuditDetails> list=srsCqScoreService.getcphiamByOne(stuNo);
return getDataTable(list);
}
@GetMapping("/getOwncphiamByOne")
public TableDataInfo getOwncphiamByOne() {
List<CphAuditDetails> list=srsCqScoreService.getcphiamByOne(getUsername());
return getDataTable(list);
}
/**
* 查询个人素质综合信息
*/
@GetMapping("/getStuData")
public TableDataInfo getStuData(String stuNo) {
List<SrsCqScore> list=srsCqScoreService.getStuData(stuNo);
return getDataTable(list);
}
@GetMapping("/getOwnData")
public TableDataInfo getOwnData() {
List<SrsCqScore> 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));
}
}

8
srs-admin/src/main/resources/application.yml
View File

@@ -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:

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

14
srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml
View File

@@ -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};
</select>
<select id="getcphiamByOne" resultType="com.srs.comprehensive.domain.CphAuditDetails" parameterType="String">
select c.rule_name as rule_name, g.stu_year_name as stu_year_name,a.iam_score as operate_score
from cph_iam as a
left join srs_student as b on a.to_add = b.stu_id
left join cph_rules as c on a.rule_id = c.rule_id
left join srs_class as d on b.class_id = d.class_id
left join srs_majors as e on d.major_id = e.major_id
left join sys_dept as f on e.college_id = f.dept_id
left join srs_stu_year as g on a.stu_year_id = g.id
left join cph_audit_details as h on a.id = h.project_id
where b.stu_no = #{stuNo} and audit_status=6
ORDER BY a.create_time desc
</select>
</mapper>

69
srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCqScoreMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.srs.comprehensive.mapper.SrsCqScoreMapper">
<resultMap type="SrsCqScore" id="SrsCqScoreResult">
<result property="id" column="id"/>
<result property="stuNo" column="stu_no"/>
@@ -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
</sql>
<select id="getComprehensiveSummary" parameterType="int" statementType="CALLABLE" resultType="java.util.Map">
{CALL test2(#{id, mode=IN})}
@@ -82,8 +82,32 @@
) as t1
where t1.stu_no = #{stuNo}
</select>
<select id="getOwn2" resultType="com.srs.comprehensive.domain.Vo.CphOwnScore">
select t1.stu_year_id,t1.stu_year_name,t1.total_score,t1.iam_score,t1.sport_score,
t1.ce_score,t1.stu_score,t1.classtwo_score,t1.class_rank,t1.major_rank
from (
select a.stu_year_id,b.stu_year_name,
a.cph_score as total_score,
a.iam_score as iam_score,
a.sport_score as sport_score,
a.ce_score as ce_score,
a.stu_score as stu_score,
a.classtwo_score as classtwo_score,
a.stu_no,
RANK() OVER(PARTITION BY a.class_id,a.stu_year_id,c.grade_id ORDER BY a.cph_score DESC ) as class_rank,
RANK() OVER(PARTITION BY a.major_id,a.stu_year_id,c.grade_id ORDER BY a.cph_score DESC ) as major_rank
from cph_total_score as a
left join srs_stu_year as b on a.stu_year_id = b.id
left join srs_class as c on a.class_code = c.class_code
left join srs_student as e on a.stu_no = e.stu_no
left join srs_majors as d on c.major_id = d.major_id
ORDER BY a.stu_year_id,a.stu_no
) as t1
where t1.stu_no = #{stuNo} order by stu_year_name desc
</select>
<select id="selectSrsCqScoreList" parameterType="CphSearch" resultMap="SrsCqScoreResult">
<include refid="selectSrsCqScoreVo"/>
<where>
@@ -145,7 +169,7 @@
select '分数&lt;60' as `name`, count(*) as`value` from cph_total_score as a
where a.cph_score &lt; 60 and a.stu_year_id = #{stuYearId}
</select>
<select id="selectSrsCqScoreById" parameterType="Long" resultMap="SrsCqScoreResult">
<include refid="selectSrsCqScoreVo"/>
where cq.id = #{id}
@@ -355,9 +379,6 @@
</select>
<insert id="insertSrsCqScore" parameterType="SrsCqScore">
insert into srs_cq_score
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -383,7 +404,7 @@
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateSrsCqScore" parameterType="SrsCqScore">
update srs_cq_score
<trim prefix="SET" suffixOverrides=",">
@@ -398,20 +419,20 @@
</trim>
where id = #{id}
</update>
<delete id="deleteSrsCqScoreById" parameterType="Long">
delete
from srs_cq_score
where id = #{id}
</delete>
<delete id="deleteSrsCqScoreByIds" parameterType="String">
delete from srs_cq_score where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="getScoreDistribution" resultType="java.util.Map">
select s.stu_id, s.stu_no, s.name, s.class_id,
COALESCE(ts.score, 0) + COALESCE(ci.score, 0) + COALESCE(st.score, 0) + COALESCE(cs.score, 0) +
@@ -470,7 +491,7 @@
<if test="majorId != null">and sm.major_id = #{majorId}</if>
</where>
</select>
<select id="selectPerson"
resultType="com.srs.comprehensive.domain.Vo.SrsCeScoreClassDeptGradeMajorsStudentStuYear">
SELECT
@@ -539,5 +560,21 @@
AND stu_year_id=#{stuYearId}
</select>
</mapper>
<select id="getcphiamByOne" resultType="com.srs.comprehensive.domain.CphAuditDetails" parameterType="String">
select c.rule_name as rule_name, g.stu_year_name as stu_year_name,a.iam_score as operate_score
from cph_iam as a
left join srs_student as b on a.to_add = b.stu_id
left join cph_rules as c on a.rule_id = c.rule_id
left join srs_class as d on b.class_id = d.class_id
left join srs_majors as e on d.major_id = e.major_id
left join sys_dept as f on e.college_id = f.dept_id
left join srs_stu_year as g on a.stu_year_id = g.id
left join cph_audit_details as h on a.id = h.project_id
where b.stu_no = #{stuNo} and audit_status=6
ORDER BY a.create_time desc
</select>
<select id="getStuData" resultType="com.srs.comprehensive.domain.SrsCqScore" parameterType="String">
select a.*,b.stu_year_name from cph_total_score as a left join srs_stu_year as b on a.stu_year_id = b.id
where stu_no=#{stuNo} order by b.stu_year_name desc limit 3
</select>
</mapper>