Skip to content

D
dd_school
Commit d509cee7 by baochunxin
Options

#G：修改个人综合查询信息

parent a6b82312
Showing with 27 additions and 0 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteamAwardController.java
...@@ -43,11 +43,24 @@ public class SchoolXteamAwardController extends BaseController ...@@ -43,11 +43,24 @@ public class SchoolXteamAwardController extends BaseController
public TableDataInfo list(SchoolXteamAward schoolXteamAward) public TableDataInfo list(SchoolXteamAward schoolXteamAward)
{ {
startPage(); startPage();
schoolXteamAward.setNoAuditState("0");
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAward); List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAward);
return getDataTable(list); return getDataTable(list);
} }
/** /**
* 团队获奖个人页面查询
*/
@GetMapping("/personlist")
public TableDataInfo personlist(SchoolXteamAward schoolXteamAward)
{
startPage();
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAward);
return getDataTable(list);
}
/**
* 导出团队获奖列表 * 导出团队获奖列表
*/ */
@Log(title = "团队获奖", businessType = BusinessType.EXPORT) @Log(title = "团队获奖", businessType = BusinessType.EXPORT)
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolGkAchievement.java
...@@ -65,6 +65,7 @@ public class SchoolGkAchievement extends BaseEntity ...@@ -65,6 +65,7 @@ public class SchoolGkAchievement extends BaseEntity
/** 审核状态（0未提交，1审核中，2同意，3驳回） */ /** 审核状态（0未提交，1审核中，2同意，3驳回） */
private String auditState; private String auditState;
private String noAuditState;
/** 删除状态 */ /** 删除状态 */
private String delFlag; private String delFlag;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteamAward.java
...@@ -54,7 +54,10 @@ public class SchoolXteamAward extends BaseEntity ...@@ -54,7 +54,10 @@ public class SchoolXteamAward extends BaseEntity
@Excel(name = "审核状态", readConverterExp = "0=未提交，1审核中，2同意，3驳回") @Excel(name = "审核状态", readConverterExp = "0=未提交，1审核中，2同意，3驳回")
private String auditState; private String auditState;
private String noAuditState;
/** 删除状态 */ /** 删除状态 */
private String delFlag; private String delFlag;
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
...@@ -1273,6 +1273,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -1273,6 +1273,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
// * 4.1高考成绩 // * 4.1高考成绩
SchoolGkAchievement schoolGkAchievement = new SchoolGkAchievement(); SchoolGkAchievement schoolGkAchievement = new SchoolGkAchievement();
schoolGkAchievement.setUserId(sysUser.getUserId()); schoolGkAchievement.setUserId(sysUser.getUserId());
schoolGkAchievement.setNoAuditState("0");
List<SchoolGkAchievementVo> schoolGkAchievementVos = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievement); List<SchoolGkAchievementVo> schoolGkAchievementVos = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievement);
comperhensiveVo.setSchoolGkAchievement(schoolGkAchievementVos); comperhensiveVo.setSchoolGkAchievement(schoolGkAchievementVos);
// *4.2 教学成绩 // *4.2 教学成绩
...@@ -1284,6 +1285,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -1284,6 +1285,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
//* 4.3 综合成绩 //* 4.3 综合成绩
SchoolXcomprehensiveHonorsVo vo = new SchoolXcomprehensiveHonorsVo(); SchoolXcomprehensiveHonorsVo vo = new SchoolXcomprehensiveHonorsVo();
vo.setUserId(sysUser.getUserId()); vo.setUserId(sysUser.getUserId());
vo.setNoAuditState("0");
List<SchoolXcomprehensiveHonorsVo> schoolXcomprehensiveHonorsVos = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(vo); List<SchoolXcomprehensiveHonorsVo> schoolXcomprehensiveHonorsVos = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(vo);
for (SchoolXcomprehensiveHonorsVo date : schoolXcomprehensiveHonorsVos){ for (SchoolXcomprehensiveHonorsVo date : schoolXcomprehensiveHonorsVos){
SpecialityVo specialityVo = new SpecialityVo(); SpecialityVo specialityVo = new SpecialityVo();
...@@ -1322,6 +1324,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -1322,6 +1324,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
} }
// * 4.5 讲课获奖 // * 4.5 讲课获奖
SchoolXlectureAwardsVo schoolXlectureAwardsVo = new SchoolXlectureAwardsVo(); SchoolXlectureAwardsVo schoolXlectureAwardsVo = new SchoolXlectureAwardsVo();
schoolXlectureAwardsVo.setAuditState("0");
schoolXlectureAwardsVo.setUserId(sysUser.getUserId()); schoolXlectureAwardsVo.setUserId(sysUser.getUserId());
List<SchoolXlectureAwardsVo> schoolXlectureAwardsVos = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); List<SchoolXlectureAwardsVo> schoolXlectureAwardsVos = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo date : schoolXlectureAwardsVos){ for (SchoolXlectureAwardsVo date : schoolXlectureAwardsVos){
...@@ -1343,6 +1346,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -1343,6 +1346,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
// * 4.6 论文论著 // * 4.6 论文论著
SchoolXacademicWorksVo schoolXacademicWorksVo = new SchoolXacademicWorksVo(); SchoolXacademicWorksVo schoolXacademicWorksVo = new SchoolXacademicWorksVo();
schoolXacademicWorksVo.setUserId(sysUser.getUserId()); schoolXacademicWorksVo.setUserId(sysUser.getUserId());
schoolXacademicWorksVo.setAuditState("0");
List<SchoolXacademicWorksVo> schoolXacademicWorksVos = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); List<SchoolXacademicWorksVo> schoolXacademicWorksVos = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo date : schoolXacademicWorksVos){ for (SchoolXacademicWorksVo date : schoolXacademicWorksVos){
SpecialityVo specialityVo = new SpecialityVo(); SpecialityVo specialityVo = new SpecialityVo();
...@@ -1361,6 +1365,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -1361,6 +1365,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
// * 4.7课题研究 // * 4.7课题研究
SchoolXprojectResearchVo schoolXprojectResearchVo = new SchoolXprojectResearchVo(); SchoolXprojectResearchVo schoolXprojectResearchVo = new SchoolXprojectResearchVo();
schoolXprojectResearchVo.setUserId(sysUser.getUserId()); schoolXprojectResearchVo.setUserId(sysUser.getUserId());
schoolXprojectResearchVo.setAuditState("0");
List<SchoolXprojectResearchVo> schoolXprojectResearchVos = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); List<SchoolXprojectResearchVo> schoolXprojectResearchVos = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
for (SchoolXprojectResearchVo date : schoolXprojectResearchVos){ for (SchoolXprojectResearchVo date : schoolXprojectResearchVos){
SpecialityVo specialityVo = new SpecialityVo(); SpecialityVo specialityVo = new SpecialityVo();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsVo.java
...@@ -74,6 +74,7 @@ public class SchoolXcomprehensiveHonorsVo ...@@ -74,6 +74,7 @@ public class SchoolXcomprehensiveHonorsVo
/** 审核状态（0未提交，1审核中，2通过，3驳回） */ /** 审核状态（0未提交，1审核中，2通过，3驳回） */
private String auditState; private String auditState;
private String noAuditState;
/** 创建者 */ /** 创建者 */
private String createBy; private String createBy;
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolGkAchievementMapper.xml
...@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="teachingClassName != null and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if> <if test="teachingClassName != null and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if>
<if test="classType != null and classType != ''"> and class_type like concat('%', #{classType}, '%')</if> <if test="classType != null and classType != ''"> and class_type like concat('%', #{classType}, '%')</if>
<if test="gkAppraising != null and gkAppraising != ''"> and gk_appraising = #{gkAppraising}</if> <if test="gkAppraising != null and gkAppraising != ''"> and gk_appraising = #{gkAppraising}</if>
<if test="noAuditState != null and noAuditState != ''"> and audit_state != #{noAuditState}</if>
</select> </select>
<select id="selectSchoolGkAchievementList" parameterType="SchoolGkAchievement" resultMap="SchoolGkAchievementResult"> <select id="selectSchoolGkAchievementList" parameterType="SchoolGkAchievement" resultMap="SchoolGkAchievementResult">
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationMapper.xml
...@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND name like concat('%', #{name}, '%') AND name like concat('%', #{name}, '%')
</if> </if>
<if test="sex != null and sex != ''"> and sex = #{sex}</if> <if test="sex != null and sex != ''"> and sex = #{sex}</if>
<if test="ddPhone != null and ddPhone != ''"> and dd_phone = #{ddPhone}</if>
<if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
<if test="birthDategt != null and birthDate != ''"> and birth_date &gt; #{birthDategt}</if> <if test="birthDategt != null and birthDate != ''"> and birth_date &gt; #{birthDategt}</if>
<if test="birthDategtd != null and birthDate != ''"> and birth_date &gt;= #{birthDategtd}</if> <if test="birthDategtd != null and birthDate != ''"> and birth_date &gt;= #{birthDategtd}</if>
<if test="birthDatelt != null and birthDate != ''"> and birth_date &lt; #{birthDatelt}</if> <if test="birthDatelt != null and birthDate != ''"> and birth_date &lt; #{birthDatelt}</if>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteamAwardMapper.xml
...@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="teamMembersContribution != null and teamMembersContribution != ''"> and team_members_contribution = #{teamMembersContribution}</if> <if test="teamMembersContribution != null and teamMembersContribution != ''"> and team_members_contribution = #{teamMembersContribution}</if>
<if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if> <if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if> <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="noAuditState != null and noAuditState != ''"> and audit_state != #{noAuditState}</if>
</where> </where>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment