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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
weishengyou
2025-12-10 09:38:43 +08:00
parent 79886171c7 23aec500b8
commit 37df108fb2
109 changed files with 6403 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java
View File

@@ -80,6 +80,8 @@ public class SrsStudent extends BaseEntity
})
@TableField(exist = false)
private SysDept dept;
@TableField(exist = false)
private String deptName;
@Excel(name = "年级")
@TableField(exist = false)
private String gradeName;
@@ -114,7 +116,10 @@ public class SrsStudent extends BaseEntity
@TableField(exist = false)
// @NotNull("家庭地址")
private String address;
@TableField(exist = false)
private String stuYearName;
@TableField(exist = false)
private String needMoney;
/** 状态（0正常 */
@Excel(name = "状态",

2
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java
View File

@@ -23,7 +23,7 @@ public interface SrsMajorsMapper extends EasyBaseMapper<SrsMajors>
* @return 【请填写功能名称】
*/
public SrsMajors selectSrsMajorsByMajorId(Long majorId);
public SrsMajors getOwnMajorName(String stuNo);
//根据专业名获取专业id
public Long getMajorIdByName(String name);
/**

5
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsStudentMapper.java
View File

@@ -68,11 +68,12 @@ public interface SrsStudentMapper extends EasyBaseMapper<SrsStudent>
/**
* 通过学号查询信息
*
* @param stuNO 学号
* @param stuNo 学号
* @return 学生信息
*/
public SrsStudent selectSrsStudentByStuNo(String stuNO);
public SrsStudent selectSrsStudentByStuNo(String stuNo);
public SrsStudent selectSrsStudentByStuNoNew(String stuNo);
/**
* 连表查询
*

6
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsZxjApplyMapper.java
View File

@@ -4,6 +4,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.srs.comprehensive.domain.SrsZxjApply;
import com.srs.comprehensive.domain.Vo.CphSearch;
@@ -107,4 +108,9 @@ public interface SrsZxjApplyMapper extends BaseMapper<SrsZxjApply> {
int updateFdySignature(CphSearch cphSearch);
int updateEjxySignature(CphSearch cphSearch);
int updateScSignature(CphSearch cphSearch);
/**
* 仅更新申请理由（sqly）
*/
int updateSqly(@Param("id") Long id, @Param("sqly") String sqly);
}

3
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java
View File

@@ -70,4 +70,7 @@ public interface ISrsMajorsService
void sqlserverSynchronousMYSQL(List<Map> list);
//根据专业名称获取专业id
public Long getMajorIdByName(String name);
//获取学生的专业名称
public SrsMajors getOwnMajorName(String stuNo);
}

7
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java
View File

@@ -43,7 +43,9 @@ public interface ISrsStudentService extends IService<SrsStudent>
List<StuCount> countGoodBiyeGradeStu();
List<StuCount> countDeptGradeStu();
List<StuCount> countDeptStu();
public AjaxResult changeStuInfo( SrsStudent param);
public SrsStudent getStuInfo(String stuNo);
@@ -56,9 +58,14 @@ public interface ISrsStudentService extends IService<SrsStudent>
*/
public SrsStudent selectSrsStudentByStuId(Long stuId);
public SrsStudent getSrsStudentByStuNo(String stuNo);
public SrsStudent getSrsStudentByStuNoNew(String stuNo);
public List<SrsStudent> listEnableStu();
public StuClass getOwnClass(String stuNo);
public List<StuStatus> statusList();
/**

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

@@ -95,4 +95,9 @@ public interface ISrsZxjApplyService extends IService<SrsZxjApply> {
List<SrsZxjApply> countXw(CphSearch param);
int updateSignature(CphSearch cphSearch);
/**
* 仅更新申请理由（sqly）
*/
int updateSqly(Long id, String sqly);
}

33
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java
View File

@@ -47,9 +47,9 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
if(!Objects.equals(apply.getStuNo(), getUsername())){
throw new Exception("只能重新申请自己的申请");
}
if(!Objects.equals(apply.getApplyStatus(), "10")){
throw new Exception("申请已处理");
}
// if(!Objects.equals(apply.getApplyStatus(), "10")){
// throw new Exception("申请已处理");
// }
UpdateWrapper<KnzzTufaApply> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", apply.getId())
// 需要重置的审批流程相关字段
@@ -225,9 +225,9 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
if(!Objects.equals(apply.getStuNo(), getUsername())){
throw new Exception("只能取消自己的申请");
}
if(!Objects.equals(apply.getApplyStatus(), "1")){
throw new Exception("申请已处理");
}
// if(!Objects.equals(apply.getApplyStatus(), "1")){
// throw new Exception("申请已处理");
// }
int res = knzzTufaApplyMapper.deleteById(id);
if(res == 0){
throw new Exception("取消失败");
@@ -248,13 +248,13 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
throw new Exception("申请不存在");
}
if(!Objects.equals(apply.getStuNo(), getUsername())){
throw new Exception("只能修改自己的申请");
}
// if(!Objects.equals(apply.getStuNo(), getUsername())){
// throw new Exception("只能修改自己的申请");
// }
if(!Objects.equals(apply.getApplyStatus(), "1")){
throw new Exception("申请已处理");
}
// if(!Objects.equals(apply.getApplyStatus(), "1")){
// throw new Exception("申请已处理");
// }
apply.helpHis = param.helpHis;
apply.yearMoney = param.yearMoney;
@@ -263,6 +263,15 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
apply.applyReason = param.applyReason;
apply.applySign = param.applySign;
apply.hardFile = param.hardFile;
apply.bankCard = param.bankCard;
apply.jthk = param.jthk;
apply.hardCondition = param.hardCondition;
apply.familyAddr = param.familyAddr;
apply.postCode = param.postCode;
// 家庭成员列表不在辅导员修改范围，保留原值
if (param.applyStatus != null && !param.applyStatus.isEmpty()) {
apply.applyStatus = param.applyStatus;
}
apply.setUpdateTime(getNowDate());
apply.setUpdateBy(getUsername());

15
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZsgApplyServiceImpl.java
View File

@@ -142,13 +142,13 @@ public class KnzzZsgApplyServiceImpl extends ServiceImpl<KnzzZsgApplyMapper,Knzz
throw new Exception("申请不存在");
}
if(!Objects.equals(apply.getStuNo(), getUsername())){
throw new Exception("只能修改自己的申请");
}
if(!Objects.equals(apply.getApplyStatus(), "1")){
throw new Exception("申请已处理");
}
// if(!Objects.equals(apply.getStuNo(), getUsername())){
// throw new Exception("只能修改自己的申请");
// }
//
// if(!Objects.equals(apply.getApplyStatus(), "1")){
// throw new Exception("申请已处理");
// }
apply.setBankCard(param.getBankCard());
apply.setBankAddr(param.getBankAddr());
apply.setStuPhone(param.getStuPhone());
@@ -167,6 +167,7 @@ public class KnzzZsgApplyServiceImpl extends ServiceImpl<KnzzZsgApplyMapper,Knzz
apply.setUpdateTime(getNowDate());
apply.setUpdateBy(getUsername());
apply.setDiplomaCertificate(param.getDiplomaCertificate());
apply.setApplyStatus(param.getApplyStatus());
int res = knzzZsgApplyMapper.updateById(apply);
if(res == 0){
throw new Exception("修改失败");

15
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzZzqApplyServiceImpl.java
View File

@@ -156,13 +156,13 @@ public class KnzzZzqApplyServiceImpl extends ServiceImpl<KnzzZzqApplyMapper,Knzz
throw new Exception("申请不存在");
}
if(!Objects.equals(apply.getStuNo(), getUsername())){
throw new Exception("只能修改自己的申请");
}
if(!Objects.equals(apply.getApplyStatus(), "1")){
throw new Exception("申请已处理");
}
// if(!Objects.equals(apply.getStuNo(), getUsername())){
// throw new Exception("只能修改自己的申请");
// }
//
// if(!Objects.equals(apply.getApplyStatus(), "1")){
// throw new Exception("申请已处理");
// }
apply.inTime = param.inTime;
apply.helpHis = param.helpHis;
@@ -176,6 +176,7 @@ public class KnzzZzqApplyServiceImpl extends ServiceImpl<KnzzZzqApplyMapper,Knzz
apply.applyReason = param.applyReason;
apply.applyFile = param.applyFile;
apply.applySign = param.applySign;
apply.applyStatus = param.applyStatus;
apply.setUpdateTime(getNowDate());
apply.setUpdateBy(getUsername());

24
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsKnrdApplyServiceImpl.java
View File

@@ -1,28 +1,30 @@
package com.srs.comprehensive.service.impl;
import java.util.Calendar;
import static com.srs.common.utils.SecurityUtils.getUserId;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.srs.common.core.domain.AjaxResult;
import com.srs.common.core.domain.entity.SysUser;
import com.srs.common.core.domain.model.LoginUser;
import com.srs.common.utils.SecurityUtils;
import com.srs.comprehensive.domain.*;
import com.srs.comprehensive.domain.SrsFemilyMenber;
import com.srs.comprehensive.domain.SrsHandAllKnrd;
import com.srs.comprehensive.domain.SrsKnrdApply;
import com.srs.comprehensive.domain.SrsKnrdApprovalRecord;
import com.srs.comprehensive.domain.SrsStuYear;
import com.srs.comprehensive.domain.SrsStudent;
import com.srs.comprehensive.domain.Vo.CphSearch;
import com.srs.comprehensive.mapper.SrsKnrdApplyMapper;
import com.srs.comprehensive.mapper.SrsKnrdApprovalRecordMapper;
import com.srs.comprehensive.mapper.SrsStuYearMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import com.srs.comprehensive.mapper.SrsKnrdApplyMapper;
import com.srs.comprehensive.service.ISrsKnrdApplyService;
import org.springframework.transaction.annotation.Transactional;
import static com.srs.common.utils.SecurityUtils.getUserId;
import static com.srs.common.utils.SecurityUtils.getUsername;
/**
* 困难认定Service业务层处理

4
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java
View File

@@ -53,6 +53,10 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService
{
return srsMajorsMapper.selectSrsMajorsByMajorId(majorId);
}
@Override
public SrsMajors getOwnMajorName(String stuNo){
return srsMajorsMapper.getOwnMajorName(stuNo);
}
@Override
public Long getMajorIdByName(String name){
return srsMajorsMapper.getMajorIdByName(name);

14
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java
View File

@@ -276,6 +276,9 @@ public class SrsStudentServiceImpl extends ServiceImpl<SrsStudentMapper, SrsStud
.last("limit 1");
//SrsStudent stu = srsStudentMapper.selectOne(queryWrapper);
SrsStudent stu = srsStudentMapper.selectSrsStudentByStuNo(stuNo);
if(stu == null){
return null;
}
if(stu.getClassId() != null){
SrsClass srsClass = srsClassMapper.selectById(stu.getClassId());
if(srsClass != null){
@@ -320,7 +323,16 @@ public class SrsStudentServiceImpl extends ServiceImpl<SrsStudentMapper, SrsStud
{
return srsStudentMapper.selectSrsStudentByStuId(stuId);
}
@Override
public SrsStudent getSrsStudentByStuNo(String stuNo)
{
return srsStudentMapper.selectSrsStudentByStuNo(stuNo);
}
@Override
public SrsStudent getSrsStudentByStuNoNew(String stuNo)
{
return srsStudentMapper.selectSrsStudentByStuNoNew(stuNo);
}
@Override
public StuClass getOwnClass(String stuNo){
List<StuClass> res = srsStudentMapper.getOwnClass(stuNo);

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

@@ -334,4 +334,9 @@ public class SrsZxjApplyServiceImpl extends ServiceImpl<SrsZxjApplyMapper, SrsZx
return (row1 + row2 + row3 + row4);
}
@Override
public int updateSqly(Long id, String sqly) {
return srsZxjApplyMapper.updateSqly(id, sqly);
}
}