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

综合素质申请

Browse Source
This commit is contained in:
15976874561
2025-08-15 11:11:12 +08:00
parent c3318b41f4
commit 133f21d085
9 changed files with 225 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,4 +284,11 @@ public class CphAuditDetailsController extends BaseController {
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(cphAuditDetailsService.deleteCphAuditDetailsByIds(ids));
}
/**
* 撤销审核
*/
@PostMapping("/cancelAudit/{ids}")
public AjaxResult cancelAudit(@PathVariable Long[] ids) {
return toAjax(cphAuditDetailsService.cancelAuditByIds(ids));
}
}

19
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,10 @@ public interface CphAuditDetailsMapper
/**
* 批量删除审核明细
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCphAuditDetailsByIds(Long[] ids);
public int cancelAudiByIds(Long[] ids);
}

18
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 结果
*/
@@ -94,15 +94,17 @@ public interface ICphAuditDetailsService
/**
* 批量删除审核明细
*
*
* @param ids 需要删除的审核明细主键集合
* @return 结果
*/
public int deleteCphAuditDetailsByIds(Long[] ids);
//撤销
public int cancelAuditByIds(Long[] ids);
/**
* 删除审核明细信息
*
*
* @param id 审核明细主键
* @return 结果
*/

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

@@ -519,7 +519,10 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService {
public int deleteCphAuditDetailsByIds(Long[] ids) {
return cphAuditDetailsMapper.deleteCphAuditDetailsByIds(ids);
}
@Override
public int cancelAuditByIds(Long[] ids) {
return cphAuditDetailsMapper.cancelAudiByIds(ids);
}
/**
* 删除审核明细信息
*

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

18
srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.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.CphAuditDetailsMapper">
<resultMap type="CphAuditDetails" id="CphAuditDetailsResult">
<result property="id" column="id" />
<result property="projectName" column="project_name" />
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCphAuditDetailsList" parameterType="CphAuditDetails" resultMap="CphAuditDetailsResult">
<include refid="selectCphAuditDetailsVo"/>
<where>
<where>
<if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
<if test="submitterId != null "> and submitter_id = #{submitterId}</if>
<if test="submitterName != null and submitterName != ''"> and submitter_name like concat('%', #{submitterName}, '%')</if>
@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by stu_no,id desc
</select>
<select id="selectCphAuditDetailsById" parameterType="Long" resultMap="CphAuditDetailsResult">
<include refid="selectCphAuditDetailsVo"/>
where ad.id = #{id}
@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectCphAuditDetailsVo"/>
where ad.project_id = #{id}
</select>
<insert id="insertCphAuditDetails" parameterType="CphAuditDetails" useGeneratedKeys="true" keyProperty="id">
insert into cph_audit_details
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -159,9 +159,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteCphAuditDetailsByIds" parameterType="String">
delete from cph_audit_details where id in
delete from cph_audit_details where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
<update id="cancelAudiByIds" parameterType="String">
update cph_audit_details set status_code=1 where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
</mapper>

5
srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java
View File

@@ -4,6 +4,7 @@ import java.util.List;
import com.srs.system.domain.QgzxTeacher;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* 教职工信息Mapper接口
@@ -59,4 +60,8 @@ public interface QgzxTeacherMapper extends BaseMapper<QgzxTeacher> {
* @return 结果
*/
int deleteQgzxTeacherByTeacherIds(Long[] teacherIds);
public List<QgzxTeacher> selectTeacherList();
Long selectDeptCode(String ksh);
Integer insertBatchSomeColumn(@Param("list")List<QgzxTeacher> entityList);
}

24
srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml
View File

@@ -39,7 +39,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectQgzxTeacherVo"/>
where teacher_id = #{teacherId}
</select>
<select id="selectTeacherList" resultType="com.srs.system.domain.QgzxTeacher">
select * from qgzx_teacher
</select>
<select id="selectDeptCode" resultType="java.lang.Long">
select a.dept_id
from sys_dept as a
where dept_code = #{ksh}
</select>
<insert id="insertQgzxTeacher" parameterType="QgzxTeacher" useGeneratedKeys="true" keyProperty="teacherId">
insert into qgzx_teacher
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -65,6 +72,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<insert id="insertBatchSomeColumn">
insert into qgzx_teacher(name,gender,age,employee_id,dept_id,status,create_time)
values
<foreach item="entity" collection="List" separator="," open="(" close=")">
(
<if test="entity.name != null and entity.name != ''">#{entity.name},</if>
<if test="entity.gender != null and entity.gender != ''">#{entity.gender},</if>
<if test="entity.age!=null">#{entity.age},</if>
<if test="entity.employeeId != null and entity.employeeId != ''">#{entity.employeeId},</if>
<if test="entity.deptId!=null">#{entity.deptId},</if>
<if test="entity.status != null and entity.status != ''">#{entity.status},</if>
<if test="entity.createTime!=null">#{entity.createTime},</if>
)
</foreach>
</insert>
<update id="updateQgzxTeacher" parameterType="QgzxTeacher">
update qgzx_teacher

24
srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxPostServiceImpl.java
View File

@@ -8,6 +8,8 @@ import com.srs.common.core.domain.entity.SysUser;
import com.srs.common.enums.QgzxApplyStatus;
import com.srs.comprehensive.domain.CphTeacher;
import com.srs.comprehensive.mapper.CphTeacherMapper;
import com.srs.system.domain.QgzxTeacher;
import com.srs.system.mapper.QgzxTeacherMapper;
import com.srs.system.mapper.SysDeptMapper;
import com.srs.system.mapper.SysUserMapper;
import com.srs.workstudy.domain.QgzxMoney;
@@ -61,6 +63,8 @@ public class QgzxPostServiceImpl extends ServiceImpl<QgzxPostMapper,QgzxPost> im
@Autowired
private CphTeacherMapper _teacherMapper;
@Autowired
private QgzxTeacherMapper _qgzxteacherMapper;
@Autowired
private SysUserMapper _userMapper;
@@ -383,10 +387,14 @@ public class QgzxPostServiceImpl extends ServiceImpl<QgzxPostMapper,QgzxPost> im
}
}
QueryWrapper<CphTeacher> fzrQuery = new QueryWrapper<>();
fzrQuery.eq("employee_id", param.fzrNo)
.last("limit 1");
CphTeacher fzr = _teacherMapper.selectOne(fzrQuery);
// QueryWrapper<CphTeacher> fzrQuery = new QueryWrapper<>();
// fzrQuery.eq("employee_id", param.fzrNo)
// .last("limit 1");
// CphTeacher fzr = _teacherMapper.selectOne(fzrQuery);
QueryWrapper<QgzxTeacher> fzrQuery = new QueryWrapper<>();
fzrQuery.eq("employee_id", param.fzrNo)
.last("limit 1");
QgzxTeacher fzr = _qgzxteacherMapper.selectOne(fzrQuery);
if (fzr == null) {
throw new Exception("负责人工号不存在");
} else {
@@ -437,10 +445,14 @@ public class QgzxPostServiceImpl extends ServiceImpl<QgzxPostMapper,QgzxPost> im
}
}
QueryWrapper<CphTeacher> fzrQuery = new QueryWrapper<>();
// QueryWrapper<CphTeacher> fzrQuery = new QueryWrapper<>();
// fzrQuery.eq("employee_id", param.fzrNo)
// .last("limit 1");
// CphTeacher fzr = _teacherMapper.selectOne(fzrQuery);
QueryWrapper<QgzxTeacher> fzrQuery = new QueryWrapper<>();
fzrQuery.eq("employee_id", param.fzrNo)
.last("limit 1");
CphTeacher fzr = _teacherMapper.selectOne(fzrQuery);
QgzxTeacher fzr = _qgzxteacherMapper.selectOne(fzrQuery);
if (fzr == null) {
throw new Exception("负责人工号不存在");
} else {