diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphSearch.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphSearch.java index 01e32df..fc8b841 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphSearch.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphSearch.java @@ -36,13 +36,14 @@ public class CphSearch { private String typeName; /* 助学金审核记录操作人*/ private String operator; - + public String step; public String sfzhm; public String xm; public String xh; + private String bj; /** 贫困生认定意见*/ public String yj; public String classCode; diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml index 60aaa7f..7a58159 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml @@ -729,7 +729,7 @@ total_count, male_count, female_count - from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count + from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count(1) as total_count, sum(case when gender='男' then 1 else 0 end) as male_count, sum(case when gender='女' then 1 else 0 end) as female_count from srs_student d left join srs_class e on d.class_id=e.class_id left join srs_grade f on f.grade_id=e.grade_id @@ -781,7 +781,7 @@ total_count, male_count, female_count - from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count + from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count(1) as total_count, sum(case when gender='男' then 1 else 0 end) as male_count, sum(case when gender='女' then 1 else 0 end) as female_count from srs_student d left join srs_class e on d.class_id=e.class_id left join srs_grade f on f.grade_id=e.grade_id diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml index 3cb4ae2..d9cb126 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml @@ -204,6 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.xh = #{stuNo} and a.xm like concat('%',#{xm},'%') and a.xh like concat('%',#{xh},'%') + and c.class_id = #{classId} order by a.id asc