Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

@@ -128,7 +128,8 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     public Integer genderCount(String gender) {
         LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
         wrapper.eq(WelcomeStudent::getSex,gender)
-                .eq(WelcomeStudent::getIdenType,1);
+                .eq(WelcomeStudent::getIdenType,1)
+                .eq(WelcomeStudent::getFillStatus,"已填报");
         Integer count = welcomeStudentMapper.selectCount(wrapper);
         return count;
     }
@@ -141,7 +142,8 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     @Override
     public Integer totalCount() {
         LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeStudent::getIdenType,1);
+        wrapper.eq(WelcomeStudent::getIdenType,1)
+                .eq(WelcomeStudent::getFillStatus,"已填报");
         Integer count = welcomeStudentMapper.selectCount(wrapper);
         return count;
     }

src/main/resources/mapper/template/WelcomeDormitoryMapper.xml

@@ -55,9 +55,9 @@
             SUM(wd.bed_number) as bedTotalCount,
             (SELECT COUNT(wd.id) FROM `welcome_dormitory` wd WHERE wd.sex="男" AND wd.deleted=0 AND wd.build_id=#{buildId}) as manDormitoryCount,
             (SELECT COUNT(wd.id) FROM `welcome_dormitory` wd WHERE wd.sex="女" AND wd.deleted=0 AND wd.build_id=#{buildId}) as girlDormitoryCount,
-            (SELECT COUNT(wb.id) FROM `welcome_bed` wb WHERE wb.deleted=0 AND wb.is_check=1 AND wd.build_id=#{buildId}) as checkInTotalCount,
-            (SELECT COUNT(wb.id) FROM `welcome_bed` wb WHERE wb.deleted=0 AND wb.is_check=1 AND wd.build_id=#{buildId} and wb.sex="男") as checkInManCount,
-            (SELECT COUNT(wb.id) FROM `welcome_bed` wb WHERE wb.deleted=0 AND wb.is_check=1 AND wd.build_id=#{buildId} and wb.sex="女") as checkInGirlCount
+            (SELECT COUNT(wb.id) FROM `welcome_bed` wb WHERE wb.deleted=0 AND wb.is_check=1 AND wb.build_id=#{buildId}) as checkInTotalCount,
+            (SELECT COUNT(wb.id) FROM `welcome_bed` wb WHERE wb.deleted=0 AND wb.is_check=1 AND wb.build_id=#{buildId} and wb.sex="男") as checkInManCount,
+            (SELECT COUNT(wb.id) FROM `welcome_bed` wb WHERE wb.deleted=0 AND wb.is_check=1 AND wb.build_id=#{buildId} and wb.sex="女") as checkInGirlCount
         FROM
             `welcome_dormitory` wd
         WHERE wd.deleted=0

src/main/resources/mapper/template/WelcomeStudentMapper.xml

@@ -54,6 +54,7 @@
         WHERE
             ws.deleted = 0
           AND ws.iden_type=1
+          AND ws.fill_status = "已填报"
         GROUP BY
             college_id
     </select>
@@ -65,38 +66,52 @@
         WHERE
             ws.deleted = 0
           AND ws.iden_type=1
+          AND ws.fill_status = "已填报"
         GROUP BY
             traffic_method
     </select>
     <select id="studentSexRatio" resultType="com.template.model.vo.StudentSexRatioVo">
-        SELECT wo.`name`  as collegeName,
-               new.count  AS manCount,
-               new2.count AS girlCount
-        FROM `welcome_student` w
-                 LEFT JOIN (SELECT ws.college_id AS collegeId,
-                                   count(ws.id) AS count
-                            FROM
-                                `welcome_student` ws
-                            WHERE
-                                ws.deleted = 0
-                              AND ws.sex = '男'
-                              AND ws.iden_type=1
-                            GROUP BY
-                                college_id) new ON w.college_id = new.collegeId
-                 LEFT JOIN (SELECT ws.college_id AS collegeId,
-                                   count(ws.id) AS count
-                            FROM
-                                `welcome_student` ws
-                            WHERE
-                                ws.deleted = 0
-                              AND ws.sex = '女'
-                              AND ws.iden_type=1
-                            GROUP BY
-                                college_id) new2 ON w.college_id = new2.collegeId
-                 LEFT JOIN welcome_org wo ON w.college_id = wo.id
-            AND wo.deleted = 0
-        WHERE w.deleted = 0
-          and w.iden_type = 1
-        GROUP BY w.college_id
+        SELECT
+            wo.`name` AS collegeName,
+            new.count AS manCount,
+            new2.count AS girlCount
+        FROM
+            `welcome_student` w
+                LEFT JOIN (
+                SELECT
+                    ws.college_id AS collegeId,
+                    count( ws.id ) AS count
+                FROM
+                    `welcome_student` ws
+                WHERE
+                    ws.deleted = 0
+                  AND ws.sex = '男'
+                  AND ws.iden_type = 1
+                  AND ws.fill_status = "已填报"
+                GROUP BY
+                    college_id
+            ) new ON w.college_id = new.collegeId
+                LEFT JOIN (
+                SELECT
+                    ws.college_id AS collegeId,
+                    count( ws.id ) AS count
+                FROM
+                    `welcome_student` ws
+                WHERE
+                    ws.deleted = 0
+                  AND ws.sex = '女'
+                  AND ws.iden_type = 1
+                  AND ws.fill_status = "已填报"
+                GROUP BY
+                    college_id
+            ) new2 ON w.college_id = new2.collegeId
+                LEFT JOIN welcome_org wo ON w.college_id = wo.id
+                AND wo.deleted = 0
+        WHERE
+            w.deleted = 0
+          AND w.iden_type = 1
+          AND w.fill_status = "已填报"
+        GROUP BY
+            w.college_id
     </select>
 </mapper>