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:
MDSMO
2025-08-29 19:49:07 +08:00
parent 20385e3084 f317087ea2
commit 735100ba7c
150 changed files with 5889 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
srs-comprehensive/src/main/java/com/srs/comprehensive/controller/SrsIdentifytableController.java
View File

@@ -126,4 +126,15 @@ public class SrsIdentifytableController extends BaseController {
{
return toAjax(srsIdentifytableService.deleteSrsIdentifytableByIds(ids));
}
/**
* 班级信息
*/
@Log(title = "学生鉴定信息", businessType = BusinessType.DELETE)
@GetMapping("/deptdata")
@ApiOperation("获取对应人的班级信息")
public AjaxResult deptData()
{
return success(srsIdentifytableService.deptDataLsit());
}
}

3
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsComplaint.java
View File

@@ -2,6 +2,8 @@ package com.srs.comprehensive.domain;
import com.srs.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.*;
import com.srs.common.annotation.Sensitive;
import com.srs.common.enums.DesensitizedType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@@ -70,6 +72,7 @@ private static final long serialVersionUID=1L;
@ApiModelProperty("联系电话")
@TableField("contact_number")
@Excel(name = "联系电话")
@Sensitive(desensitizedType = DesensitizedType.PHONE)
private String contactNumber;
/**

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

@@ -91,6 +91,8 @@ public class SrsStudent extends BaseEntity
})
@TableField(exist = false)
private SrsMajors srsMajors;
@TableField(exist = false)
private CphStuExtraInfo cphStuExtraInfo;
/** 所属班级ID */
private Long classId;

3
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/ViewStuInfo.java
View File

@@ -217,6 +217,7 @@ private static final long serialVersionUID=1L;
@TableField(exist = false)
public String editStatus;
@TableField(exist = false)
public String surveyName;
}

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

@@ -6,16 +6,16 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 审核明细Mapper接口
*
*
* @author 邓
* @date 2023-07-04
*/
@Mapper
public interface CphAuditDetailsMapper
public interface CphAuditDetailsMapper
{
/**
* 查询审核明细
*
*
* @param id 审核明细主键
* @return 审核明细
*/
@@ -25,12 +25,12 @@ public interface CphAuditDetailsMapper
/**
* 查询审核明细列表
*
*
* @param cphAuditDetails 审核明细
* @return 审核明细集合
*/
public List<CphAuditDetails> selectCphAuditDetailsList(CphAuditDetails cphAuditDetails);
/**
* 查询已审核
* @author zhy
@@ -50,7 +50,7 @@ public interface CphAuditDetailsMapper
/**
* 新增审核明细
*
*
* @param cphAuditDetails 审核明细
* @return 结果
*/
@@ -58,7 +58,7 @@ public interface CphAuditDetailsMapper
/**
* 修改审核明细
*
*
* @param cphAuditDetails 审核明细
* @return 结果
*/
@@ -66,7 +66,7 @@ public interface CphAuditDetailsMapper
/**
* 删除审核明细
*
*
* @param id 审核明细主键
* @return 结果
*/
@@ -74,9 +74,11 @@ public interface CphAuditDetailsMapper
/**
* 批量删除审核明细
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCphAuditDetailsByIds(Long[] ids);
public int cancelAuditById(Long id);
public int cancelCphAudiDetailsById(Long id);
}

15
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphClasstwoMapper.java
View File

@@ -1,6 +1,5 @@
package com.srs.comprehensive.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.CphClasstwo;
import com.srs.comprehensive.domain.Vo.CphScoreVo;
import com.srs.comprehensive.domain.Vo.StuIdNo;
@@ -12,7 +11,7 @@ import java.util.List;
/**
* 第二课堂Mapper接口
*
*
* @author zhy
* @date 2023-07-03
*/
@@ -29,7 +28,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 查询第二课堂
*
*
* @param id 第二课堂主键
* @return 第二课堂
*/
@@ -37,7 +36,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 查询第二课堂列表
*
*
* @param cphClasstwo 第二课堂
* @return 第二课堂集合
*/
@@ -57,7 +56,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 新增第二课堂
*
*
* @param cphClasstwo 第二课堂
* @return 结果
*/
@@ -65,7 +64,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 修改第二课堂
*
*
* @param cphClasstwo 第二课堂
* @return 结果
*/
@@ -73,7 +72,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 删除第二课堂
*
*
* @param id 第二课堂主键
* @return 结果
*/
@@ -81,7 +80,7 @@ public interface CphClasstwoMapper extends EasyBaseMapper<CphClasstwo>
/**
* 批量删除第二课堂
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/

31
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphMsgMapper.java
View File

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 消息Mapper接口
*
*
* @author srs
* @date 2023-07-12
*/
@@ -17,7 +17,7 @@ public interface CphMsgMapper extends BaseMapper<CphMsg>
{
/**
* 查询消息
*
*
* @param id 消息主键
* @return 消息
*/
@@ -25,7 +25,7 @@ public interface CphMsgMapper extends BaseMapper<CphMsg>
/**
* 查询消息列表
*
*
* @param cphMsg 消息
* @return 消息集合
*/
@@ -33,7 +33,7 @@ public interface CphMsgMapper extends BaseMapper<CphMsg>
/**
* 新增消息
*
*
* @param cphMsg 消息
* @return 结果
*/
@@ -41,7 +41,7 @@ public interface CphMsgMapper extends BaseMapper<CphMsg>
/**
* 修改消息
*
*
* @param cphMsg 消息
* @return 结果
*/
@@ -49,17 +49,34 @@ public interface CphMsgMapper extends BaseMapper<CphMsg>
/**
* 删除消息
*
*
* @param id 消息主键
* @return 结果
*/
public int deleteCphMsgById(Long id);
/**
* 根据接收人和内容中的标识来查找流程消息 (使用LIKE查询) 知无涯
*
* @param cphMsg 包含 receiver 和 content (作为模糊查询的标识) 的查询对象
* @return 匹配的消息列表
*/
public List<CphMsg> selectCphMsgListForFlowable(CphMsg cphMsg);
/**
* 批量删除消息
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCphMsgByIds(Long[] ids);
/**
* 根据学号查询用户ID
*
* @param stuNo 学号
* @return 用户ID
*/
public Long getUserIdByStuNo(String stuNo);
}

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

@@ -1,8 +1,6 @@
package com.srs.comprehensive.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.CphStuScoreMiddle;
import com.srs.comprehensive.domain.Dto.CphStuScoreMiddleDto;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;

3
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphTeacherMapper.java
View File

@@ -1,13 +1,10 @@
package com.srs.comprehensive.mapper;
import com.srs.common.core.domain.entity.SysDept;
import java.util.List;
import java.util.Map;
import com.srs.comprehensive.domain.CphTeacher;
import com.srs.comprehensive.domain.Dto.CphExport;
import com.srs.comprehensive.domain.SrsClass;
import com.srs.comprehensive.domain.SrsGrade;
import com.srs.comprehensive.domain.SrsMajors;
import com.srs.comprehensive.domain.Vo.*;

14
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsAddRecordMapper.java
View File

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
/**
* 【加分记录】Mapper接口
*
*
* @author srs
* @date 2023-06-20
*/
@@ -24,7 +24,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 查询【请填写功能名称】
*
*
* @param id 【请填写功能名称】主键
* @return 【请填写功能名称】
*/
@@ -32,7 +32,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 查询【请填写功能名称】列表
*
*
* @param srsAddRecord 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
@@ -40,7 +40,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 新增【请填写功能名称】
*
*
* @param srsAddRecord 【请填写功能名称】
* @return 结果
*/
@@ -50,7 +50,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 修改【请填写功能名称】
*
*
* @param srsAddRecord 【请填写功能名称】
* @return 结果
*/
@@ -58,7 +58,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 删除【请填写功能名称】
*
*
* @param id 【请填写功能名称】主键
* @return 结果
*/
@@ -66,7 +66,7 @@ public interface SrsAddRecordMapper extends EasyBaseMapper<SrsAddRecord>
/**
* 批量删除【请填写功能名称】
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/

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

@@ -7,7 +7,6 @@ import com.srs.comprehensive.domain.Vo.CphSearch;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;

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

@@ -2,7 +2,6 @@ package com.srs.comprehensive.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.SrsGrade;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.Mapper;

11
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsIdentifytableMapper.java
View File

@@ -2,6 +2,8 @@ package com.srs.comprehensive.mapper;
import java.util.List;
import com.srs.common.core.domain.entity.SysDept;
import com.srs.comprehensive.domain.SrsClass;
import com.srs.comprehensive.domain.SrsIdentifytable;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -107,4 +109,13 @@ public interface SrsIdentifytableMapper extends BaseMapper<SrsIdentifytable> {
* @return 结果
*/
int deleteSrsGraduataByIds(Long[] ids);
/**
* 获取对应人的班级信息
*
* @param userName 用户名称
* @return 结果
*/
List<SrsClass> selectDeptByDeptCodes(String userName);
}

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

@@ -2,7 +2,6 @@ package com.srs.comprehensive.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.SrsMajors;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.Mapper;

17
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsSportTestMapper.java
View File

@@ -1,13 +1,10 @@
package com.srs.comprehensive.mapper;
import java.util.List;
import java.util.Set;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.srs.comprehensive.domain.SrsSportTest;
import com.srs.comprehensive.domain.SumSportTest;
import com.srs.comprehensive.domain.Vo.CphScoreVo;
import com.srs.comprehensive.domain.Vo.SrsSportTestStudent;
import com.srs.comprehensive.domain.Vo.StuIdNo;
import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -15,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
/**
* 体能测试Mapper接口
*
*
* @author srs
* @date 2023-06-28
*/
@@ -39,7 +36,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 查询体能测试
*
*
* @param id 体能测试主键
* @return 体能测试
*/
@@ -53,7 +50,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 查询体能测试列表
*
*
* @param srsSportTest 体能测试
* @return 体能测试集合
*/
@@ -63,7 +60,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 新增体能测试
*
*
* @param srsSportTest 体能测试
* @return 结果
*/
@@ -71,7 +68,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 修改体能测试
*
*
* @param srsSportTest 体能测试
* @return 结果
*/
@@ -79,7 +76,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 删除体能测试
*
*
* @param id 体能测试主键
* @return 结果
*/
@@ -87,7 +84,7 @@ public interface SrsSportTestMapper extends EasyBaseMapper<SrsSportTest>
/**
* 批量删除体能测试
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/

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

@@ -11,11 +11,11 @@ import com.srs.comprehensive.domain.Vo.CphSearch;
/**
* 审核明细Service接口
*
*
* @author 邓
* @date 2023-07-04
*/
public interface ICphAuditDetailsService
public interface ICphAuditDetailsService
{
public int reSub(CphResub param);
@@ -30,7 +30,7 @@ public interface ICphAuditDetailsService
/**
* 查询审核明细
*
*
* @param id 审核明细主键
* @return 审核明细
*/
@@ -48,7 +48,7 @@ public interface ICphAuditDetailsService
/**
* 查询审核明细列表
*
*
* @param cphAuditDetails 审核明细
* @return 审核明细集合
*/
@@ -64,7 +64,7 @@ public interface ICphAuditDetailsService
/**
* 新增审核明细
*
*
* @param cphAuditDetails 审核明细
* @return 结果
*/
@@ -72,7 +72,7 @@ public interface ICphAuditDetailsService
/**
* 修改审核明细
*
*
* @param cphAuditDetails 审核明细
* @return 结果
*/
@@ -85,6 +85,12 @@ public interface ICphAuditDetailsService
*/
public int auditOpera(CphAuditDetails cphAuditDetails);
/**
* 批量同意
* @param
* @return
*/
/**
* 批量同意
* @param
@@ -94,15 +100,17 @@ public interface ICphAuditDetailsService
/**
* 批量删除审核明细
*
*
* @param ids 需要删除的审核明细主键集合
* @return 结果
*/
public int deleteCphAuditDetailsByIds(Long[] ids);
//撤销
public int cancelAuditById(Long id);
/**
* 删除审核明细信息
*
*
* @param id 审核明细主键
* @return 结果
*/

32
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphMsgService.java
View File

@@ -5,15 +5,15 @@ import com.srs.comprehensive.domain.CphMsg;
/**
* 消息Service接口
*
*
* @author srs
* @date 2023-07-12
*/
public interface ICphMsgService
public interface ICphMsgService
{
/**
* 查询消息
*
*
* @param id 消息主键
* @return 消息
*/
@@ -21,7 +21,7 @@ public interface ICphMsgService
/**
* 查询消息列表
*
*
* @param cphMsg 消息
* @return 消息集合
*/
@@ -29,7 +29,7 @@ public interface ICphMsgService
/**
* 新增消息
*
*
* @param cphMsg 消息
* @return 结果
*/
@@ -37,7 +37,7 @@ public interface ICphMsgService
/**
* 修改消息
*
*
* @param cphMsg 消息
* @return 结果
*/
@@ -45,7 +45,7 @@ public interface ICphMsgService
/**
* 批量删除消息
*
*
* @param ids 需要删除的消息主键集合
* @return 结果
*/
@@ -53,9 +53,25 @@ public interface ICphMsgService
/**
* 删除消息信息
*
*
* @param id 消息主键
* @return 结果
*/
public int deleteCphMsgById(Long id);
/**
* 删除消息信息 精准匹配版
*
* @param cphMsg 消息
* @return 列表
*/
List<CphMsg> selectCphMsgListForFlowable(CphMsg cphMsg);
/**
* 根据学号查询用户ID
*
* @param stuNo 学号
* @return 用户ID
*/
public Long getUserIdByStuNo(String stuNo);
}

10
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsIdentifytableService.java
View File

@@ -3,6 +3,8 @@ package com.srs.comprehensive.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.srs.comprehensive.domain.CascaderEntity;
import com.srs.comprehensive.domain.SrsClass;
import com.srs.comprehensive.domain.SrsIdentifytable;
/**
@@ -59,4 +61,12 @@ public interface ISrsIdentifytableService extends IService<SrsIdentifytable> {
* @return 结果
*/
int deleteSrsIdentifytableById(Long id);
/**
* 获取对应人的班级信息
*
* @param
* @return 集合结果
*/
List<SrsClass> deptDataLsit();
}

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

@@ -435,8 +435,8 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService {
temp.setId(cphAuditDetails.getProjectId());
temp.setAuditStatus(cphAuditDetails.getStatusCode().toString());
cphIamService.updateCphIam(temp);
if (cphAuditDetails.getStatusCode() == 6L)//判断审核状态是否完成
Long statusCode=cphAuditDetailsMapper.selectCphAuditDetailsById(cphAuditDetails.getId()).getStatusCode();
if (statusCode == 6L)//判断审核状态是否完成
{
SrsStudent stu = _stuService.selectSrsStudentByStuId(cphAuditDetails.getSubmitterId());
SrsAddRecord srsAddRecord = new SrsAddRecord();//加分记录表
@@ -519,7 +519,13 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService {
public int deleteCphAuditDetailsByIds(Long[] ids) {
return cphAuditDetailsMapper.deleteCphAuditDetailsByIds(ids);
}
@Override
public int cancelAuditById(Long id) {
int result=0;
result=cphAuditDetailsMapper.cancelAuditById(id);
result+= cphAuditDetailsMapper.cancelCphAudiDetailsById(id);
return result;
}
/**
* 删除审核明细信息
*

36
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphMsgServiceImpl.java
View File

@@ -12,7 +12,7 @@ import com.srs.comprehensive.service.ICphMsgService;
/**
* 消息Service业务层处理
*
*
* @author srs
* @date 2023-07-12
*/
@@ -24,7 +24,7 @@ public class CphMsgServiceImpl extends ServiceImpl<CphMsgMapper,CphMsg> implemen
/**
* 查询消息
*
*
* @param id 消息主键
* @return 消息
*/
@@ -36,7 +36,7 @@ public class CphMsgServiceImpl extends ServiceImpl<CphMsgMapper,CphMsg> implemen
/**
* 查询消息列表
*
*
* @param cphMsg 消息
* @return 消息
*/
@@ -48,7 +48,7 @@ public class CphMsgServiceImpl extends ServiceImpl<CphMsgMapper,CphMsg> implemen
/**
* 新增消息
*
*
* @param cphMsg 消息
* @return 结果
*/
@@ -61,7 +61,7 @@ public class CphMsgServiceImpl extends ServiceImpl<CphMsgMapper,CphMsg> implemen
/**
* 修改消息
*
*
* @param cphMsg 消息
* @return 结果
*/
@@ -74,7 +74,7 @@ public class CphMsgServiceImpl extends ServiceImpl<CphMsgMapper,CphMsg> implemen
/**
* 批量删除消息
*
*
* @param ids 需要删除的消息主键
* @return 结果
*/
@@ -86,7 +86,7 @@ public class CphMsgServiceImpl extends ServiceImpl<CphMsgMapper,CphMsg> implemen
/**
* 删除消息信息
*
*
* @param id 消息主键
* @return 结果
*/
@@ -95,4 +95,26 @@ public class CphMsgServiceImpl extends ServiceImpl<CphMsgMapper,CphMsg> implemen
{
return cphMsgMapper.deleteCphMsgById(id);
}
/**
* 删除消息信息
*
* @param cphMsg 消息
* @return 结果
*/
@Override
public List<CphMsg> selectCphMsgListForFlowable(CphMsg cphMsg) {
return cphMsgMapper.selectCphMsgListForFlowable(cphMsg);
}
/**
* 根据学号查询用户ID
*
* @param stuNo 学号
* @return 用户ID
*/
@Override
public Long getUserIdByStuNo(String stuNo)
{
return cphMsgMapper.getUserIdByStuNo(stuNo);
}
}

161
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java
View File

@@ -19,8 +19,10 @@ import com.srs.comprehensive.mapper.ClassCounMapper;
import com.srs.comprehensive.mapper.Gxsdxy02JzgxxMapper;
import com.srs.comprehensive.mapper.InfoTeacherMapper;
import com.srs.comprehensive.util.ListSliceUtil;
import com.srs.system.domain.QgzxTeacher;
import com.srs.system.domain.SysPost;
import com.srs.system.domain.SysUserRole;
import com.srs.system.mapper.QgzxTeacherMapper;
import com.srs.system.mapper.SysRoleMapper;
import com.srs.system.mapper.SysUserMapper;
import com.srs.system.mapper.SysUserRoleMapper;
@@ -47,6 +49,8 @@ public class CphTeacherServiceImpl implements ICphTeacherService
{
@Autowired
private CphTeacherMapper cphTeacherMapper;
@Autowired
private QgzxTeacherMapper qgzxTeacherMapper;
@Autowired
private Gxsdxy02JzgxxMapper teacherMapper;
@@ -350,14 +354,121 @@ public class CphTeacherServiceImpl implements ICphTeacherService
}
//同步辅导员
// @Override
// @Transactional(rollbackFor = Exception.class)
// public void sqlserverSynchronousMYSQL(List<Map> list) {
// //辅导员列表
// List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();
// //查找重复值
// List<Map> updateMap = list.stream()
// .filter(obj1 -> cphTeachers
// .stream().anyMatch(obj2 -> {
// Object xhObj = obj1.get("zgh");
// if (xhObj != null) {
// String zgh = xhObj.toString();
// return obj2.getEmployeeId().equals(zgh);
// }
// return false;
// }))
// .collect(Collectors.toList());
//
// //添加需要
// List<String> kshList2 = cphTeachers.stream()
// .map(CphTeacher::getEmployeeId)
// .collect(Collectors.toList());
//
// List<Map> insertMap = list.stream()
// .filter(obj -> {
// Object xhObj = obj.get("zgh");
// return xhObj != null && !kshList2.contains(xhObj.toString());
// })
// .collect(Collectors.toList());
// //添加
// List<CphTeacher> insertStudentList = new ArrayList<>();
// for (Map map:insertMap){
// CphTeacher cphTeacher = new CphTeacher();
// Object xmObj = map.get("xm");
// if (xmObj != null) {
// cphTeacher.setName(xmObj.toString());
// }
// Object xbObj = map.get("xb");
// if (xbObj != null) {
// String s = xbObj.toString();
// if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) {
// cphTeacher.setGender(xbObj.toString());
// }
// }
// Object zghObj = map.get("zgh");
// if (zghObj != null) {
// cphTeacher.setEmployeeId(zghObj.toString());
// }
// //学院id
// Object yxdmObj = map.get("yxdm");
// if (yxdmObj!=null) {
// Long deptId = cphTeacherMapper.selectDeptCode(yxdmObj.toString());
// if (deptId != null) {
// cphTeacher.setDeptId(deptId);
// }
// }
// cphTeacher.setStatus("1");
// cphTeacher.setCreateTime(DateUtils.getNowDate());
// insertStudentList.add(cphTeacher);
// }
// if (insertStudentList.size()!=0) {
// cphTeacherMapper.insertBatchSomeColumn(insertStudentList);
// }
// //修改
// List<CphTeacher> updateSrsStudent = new ArrayList<>();
// for (Map map:updateMap){
// CphTeacher cphTeacher = new CphTeacher();
// Object xmObj = map.get("xm");
// if (xmObj != null) {
// cphTeacher.setName(xmObj.toString());
// }
// Object xbObj = map.get("xb");
// if (xbObj != null) {
// String s = xbObj.toString();
// if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) {
// cphTeacher.setGender(xbObj.toString());
// }
// }
// Object zghObj = map.get("zgh");
// if (zghObj != null) {
// cphTeacher.setEmployeeId(zghObj.toString());
// }
// //学院id
// Object yxdmObj = map.get("yxdm");
// if (yxdmObj!=null) {
// Long ksh = cphTeacherMapper.selectDeptCode(yxdmObj.toString());
// if (ksh != null) {
// cphTeacher.setDeptId(ksh);
// }
// }
// cphTeacher.setUpdateTime(DateUtils.getNowDate());
// updateSrsStudent.add(cphTeacher);
// }
// /*if (updateSrsStudent.size()!=0) {
// List<List<CphTeacher>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
// if (lists != null) {
// for (List<CphTeacher> studentList : lists) {
// cphTeacherMapper.updateSrsClassList(studentList);
// }
// }
// }*/
//
//
//
// }
//同步教职工表
@Override
@Transactional(rollbackFor = Exception.class)
public void sqlserverSynchronousMYSQL(List<Map> list) {
//辅导员列表
List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();
//教职工列表
List<QgzxTeacher> qgzxTeachers = qgzxTeacherMapper.selectTeacherList();
//查找重复值
List<Map> updateMap = list.stream()
.filter(obj1 -> cphTeachers
.filter(obj1 -> qgzxTeachers
.stream().anyMatch(obj2 -> {
Object xhObj = obj1.get("zgh");
if (xhObj != null) {
@@ -369,8 +480,8 @@ public class CphTeacherServiceImpl implements ICphTeacherService
.collect(Collectors.toList());
//添加需要
List<String> kshList2 = cphTeachers.stream()
.map(CphTeacher::getEmployeeId)
List<String> kshList2 = qgzxTeachers.stream()
.map(QgzxTeacher::getEmployeeId)
.collect(Collectors.toList());
List<Map> insertMap = list.stream()
@@ -380,68 +491,68 @@ public class CphTeacherServiceImpl implements ICphTeacherService
})
.collect(Collectors.toList());
//添加
List<CphTeacher> insertStudentList = new ArrayList<>();
List<QgzxTeacher> insertStudentList = new ArrayList<>();
for (Map map:insertMap){
CphTeacher cphTeacher = new CphTeacher();
QgzxTeacher qgzxTeacher = new QgzxTeacher();
Object xmObj = map.get("xm");
if (xmObj != null) {
cphTeacher.setName(xmObj.toString());
qgzxTeacher.setName(xmObj.toString());
}
Object xbObj = map.get("xb");
if (xbObj != null) {
String s = xbObj.toString();
if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) {
cphTeacher.setGender(xbObj.toString());
qgzxTeacher.setGender(xbObj.toString());
}
}
Object zghObj = map.get("zgh");
if (zghObj != null) {
cphTeacher.setEmployeeId(zghObj.toString());
qgzxTeacher.setEmployeeId(zghObj.toString());
}
//学院id
Object yxdmObj = map.get("yxdm");
if (yxdmObj!=null) {
Long deptId = cphTeacherMapper.selectDeptCode(yxdmObj.toString());
Long deptId = qgzxTeacherMapper.selectDeptCode(yxdmObj.toString());
if (deptId != null) {
cphTeacher.setDeptId(deptId);
qgzxTeacher.setDeptId(deptId);
}
}
cphTeacher.setStatus("1");
cphTeacher.setCreateTime(DateUtils.getNowDate());
insertStudentList.add(cphTeacher);
qgzxTeacher.setStatus("1");
qgzxTeacher.setCreateTime(DateUtils.getNowDate());
insertStudentList.add(qgzxTeacher);
}
if (insertStudentList.size()!=0) {
cphTeacherMapper.insertBatchSomeColumn(insertStudentList);
qgzxTeacherMapper.insertBatchSomeColumn(insertStudentList);
}
//修改
List<CphTeacher> updateSrsStudent = new ArrayList<>();
List<QgzxTeacher> updateSrsStudent = new ArrayList<>();
for (Map map:updateMap){
CphTeacher cphTeacher = new CphTeacher();
QgzxTeacher qgzxTeacher = new QgzxTeacher();
Object xmObj = map.get("xm");
if (xmObj != null) {
cphTeacher.setName(xmObj.toString());
qgzxTeacher.setName(xmObj.toString());
}
Object xbObj = map.get("xb");
if (xbObj != null) {
String s = xbObj.toString();
if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) {
cphTeacher.setGender(xbObj.toString());
qgzxTeacher.setGender(xbObj.toString());
}
}
Object zghObj = map.get("zgh");
if (zghObj != null) {
cphTeacher.setEmployeeId(zghObj.toString());
qgzxTeacher.setEmployeeId(zghObj.toString());
}
//学院id
Object yxdmObj = map.get("yxdm");
if (yxdmObj!=null) {
Long ksh = cphTeacherMapper.selectDeptCode(yxdmObj.toString());
Long ksh = qgzxTeacherMapper.selectDeptCode(yxdmObj.toString());
if (ksh != null) {
cphTeacher.setDeptId(ksh);
qgzxTeacher.setDeptId(ksh);
}
}
cphTeacher.setUpdateTime(DateUtils.getNowDate());
updateSrsStudent.add(cphTeacher);
qgzxTeacher.setUpdateTime(DateUtils.getNowDate());
updateSrsStudent.add(qgzxTeacher);
}
/*if (updateSrsStudent.size()!=0) {
List<List<CphTeacher>> lists = ListSliceUtil.updateSlice(updateSrsStudent);

34
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsIdentifytableServiceImpl.java
View File

@@ -1,17 +1,20 @@
package com.srs.comprehensive.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import com.srs.common.core.domain.entity.SysDept;
import com.srs.common.core.domain.model.LoginUser;
import com.srs.common.utils.DateUtils;
import com.srs.comprehensive.domain.GraduateStudentNews;
import com.srs.comprehensive.domain.SaveStudent;
import com.srs.comprehensive.mapper.GraduateTextMapper;
import com.srs.comprehensive.mapper.SrsGraduateStudentMapper;
import com.srs.common.utils.SecurityUtils;
import com.srs.comprehensive.domain.*;
import com.srs.comprehensive.mapper.*;
import com.srs.comprehensive.service.ICascaderDataStudentService;
import com.srs.comprehensive.util.FileUploadUtil;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import com.srs.comprehensive.mapper.SrsIdentifytableMapper;
import com.srs.comprehensive.domain.SrsIdentifytable;
import com.srs.comprehensive.service.ISrsIdentifytableService;
/**
@@ -156,4 +159,23 @@ public class SrsIdentifytableServiceImpl extends ServiceImpl<SrsIdentifytableMap
public int deleteSrsIdentifytableById(Long id) {
return srsIdentifytableMapper.deleteSrsIdentifytableById(id);
}
/**
* 获取对应人的班级信息
*
* @param
* @return 集合结果
*/
@Override
public List<SrsClass> deptDataLsit() {
//获取登录人的信息
LoginUser loginUser = SecurityUtils.getLoginUser();
List<SrsClass> depts = srsIdentifytableMapper.selectDeptByDeptCodes(loginUser.getUsername());
if(depts != null && depts.size() > 0) {
return depts;
}
return new ArrayList<>();
}
}