xgxt_sd/zhxg_java
15
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:
zhy
2025-09-12 21:23:38 +08:00
parent 73707d176d 03ee3e6e9f
commit b27f522eee
8 changed files with 82 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java
View File

@@ -8,7 +8,7 @@ import lombok.Data;
/**
* 辅导员综合评价状态对象 teacher_evaluation_status
*
*
* @author srs
* @date 2024-01-20
*/
@@ -53,19 +53,26 @@ public class TeacherEvaluationStatus extends BaseEntity {
private String stuYearName;
/** 是否完成综合测评 */
@Excel(name = "是否完成综合测评")
private Boolean isCompleted;
/** 是否完成综合测评 */
@Excel(name = "是否完成综合测评")
private String completed;
/** 待办事项数量 */
@Excel(name = "待办事项数量")
@TableField(exist = false)
private Integer todoCount;
/** 成绩是否已导入 */
@Excel(name = "成绩是否已导入")
@TableField(exist = false)
private Boolean scoreImported;
/** 成绩是否已导入 */
@Excel(name = "成绩是否已导入")
@TableField(exist = false)
private String isScoreImported;
/** 备注 */
@Excel(name = "备注")
private String remarks;
@@ -177,4 +184,4 @@ public class TeacherEvaluationStatus extends BaseEntity {
public void setLastUpdateTime(String lastUpdateTime) {
this.lastUpdateTime = lastUpdateTime;
}
}
}

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

@@ -464,106 +464,29 @@ public class CphTeacherServiceImpl implements ICphTeacherService
@Override
@Transactional(rollbackFor = Exception.class)
public void sqlserverSynchronousMYSQL(List<Map> list) {
//教职工列表
List<QgzxTeacher> qgzxTeachers = qgzxTeacherMapper.selectTeacherList();
//查找重复值
List<Map> updateMap = list.stream()
.filter(obj1 -> qgzxTeachers
.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 = qgzxTeachers.stream()
.map(QgzxTeacher::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<QgzxTeacher> insertStudentList = new ArrayList<>();
for (Map map:insertMap){
QgzxTeacher qgzxTeacher = new QgzxTeacher();
Object xmObj = map.get("xm");
if (xmObj != null) {
qgzxTeacher.setName(xmObj.toString());
for (Map<String, Object> map : list) {
String zgh = (String) map.get("zgh");
String xm=(String) map.get("xm");
String xb=(String) map.get("xb");
String ksh=(String) map.get("ksh");
QgzxTeacher qgzxTeacher = qgzxTeacherMapper.selectQgzxTeacherByEmployeeId(zgh);
Long deptId = qgzxTeacherMapper.selectDeptCode(ksh);
QgzxTeacher entity=new QgzxTeacher();
entity.setEmployeeId(zgh);
entity.setName(xm);
entity.setGender(xb);
if(deptId!=null) {
entity.setDeptId(deptId);
}
Object xbObj = map.get("xb");
if (xbObj != null) {
String s = xbObj.toString();
if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) {
qgzxTeacher.setGender(xbObj.toString());
}
entity.setStatus("1");
entity.setCreateTime(DateUtils.getNowDate());
if(qgzxTeacher==null){
qgzxTeacherMapper.insertQgzxTeacher(entity);
}else{
entity.setEmployeeId(zgh);
qgzxTeacherMapper.updateQgzxTeacherNew(entity);
}
Object zghObj = map.get("zgh");
if (zghObj != null) {
qgzxTeacher.setEmployeeId(zghObj.toString());
}
//学院id
Object yxdmObj = map.get("yxdm");
if (yxdmObj!=null) {
Long deptId = qgzxTeacherMapper.selectDeptCode(yxdmObj.toString());
if (deptId != null) {
qgzxTeacher.setDeptId(deptId);
}
}
qgzxTeacher.setStatus("1");
qgzxTeacher.setCreateTime(DateUtils.getNowDate());
insertStudentList.add(qgzxTeacher);
}
if (insertStudentList.size()!=0) {
qgzxTeacherMapper.insertBatchSomeColumn(insertStudentList);
}
//修改
List<QgzxTeacher> updateSrsStudent = new ArrayList<>();
for (Map map:updateMap){
QgzxTeacher qgzxTeacher = new QgzxTeacher();
Object xmObj = map.get("xm");
if (xmObj != null) {
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," ")) {
qgzxTeacher.setGender(xbObj.toString());
}
}
Object zghObj = map.get("zgh");
if (zghObj != null) {
qgzxTeacher.setEmployeeId(zghObj.toString());
}
//学院id
Object yxdmObj = map.get("yxdm");
if (yxdmObj!=null) {
Long ksh = qgzxTeacherMapper.selectDeptCode(yxdmObj.toString());
if (ksh != null) {
qgzxTeacher.setDeptId(ksh);
}
}
qgzxTeacher.setUpdateTime(DateUtils.getNowDate());
updateSrsStudent.add(qgzxTeacher);
}
/*if (updateSrsStudent.size()!=0) {
List<List<CphTeacher>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
if (lists != null) {
for (List<CphTeacher> studentList : lists) {
cphTeacherMapper.updateSrsClassList(studentList);
}
}
}*/
}