修改新生报到情况接口

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -1836,10 +1836,6 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 //        wrapper.between(WelcomeBed::getCreateTime, nstartTime, nendTime);
 //        int checkInBedTotal = welcomeBedService.count(wrapper);
 
-        //报到率
-        //BigDecimal total = new BigDecimal(enrollmentTotal);
-        //BigDecimal bedTotal = new BigDecimal(checkInBedTotal);
-        //BigDecimal bigDecimal = bedTotal.divide(total).setScale(4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
 //        Double result = enrollmentTotal <= 0 ? 0 : ((double) checkInBedTotal / enrollmentTotal) * 100;
 //        String registrationRate = String.format("%.2f", result);
 
@@ -1928,6 +1924,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         vo.setName("报到总数");
         vo.setCount(count);
         vo.setRate(rate);
+        vo.setTotalCount(enrollmentTotal);
         if (ObjectUtils.isNotEmpty(collegeId)) {
             List<StudentRegisterVo> vos = welcomeStudentService.studentMajorRegister(collegeId, nstartTime, nendTime);
             vos.add(vo);

src/main/java/com/template/model/vo/StudentRegisterVo.java

@@ -6,7 +6,7 @@ import lombok.Data;
 public class StudentRegisterVo {
 //    名称
     private String name;
-//    总数
+//    报到总数
     private Integer count;
 //    比例
     private String rate;

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

@@ -287,7 +287,7 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
 //        未支付，但实缴金额>0
         wss.eq("iden_type",1)
                 .eq("is_pay", 0)
-                .gt("amount_payable", 0)
+                .gt("pay_amount", 0)
                 .eq(ObjectUtils.isNotEmpty(collegeId), "college_id", collegeId);//
         wss.between("create_time", startTime, endTime);
         Integer count = welcomeStudentMapper.selectCount(wss);

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

@@ -110,8 +110,14 @@
 
 
     <select id="studentRegister" resultType="com.template.model.vo.StudentRegisterVo">
-        SELECT count(ws.id) AS count,
-	           wo.`name`
+        SELECT
+            SUM(1) AS totalCount,
+            SUM(CASE WHEN ws.is_registered = 1 THEN 1 ELSE 0 END) AS count,
+            ROUND(
+                        SUM(CASE WHEN ws.is_registered = 1 THEN 1 ELSE 0 END) / SUM(1),
+                        2
+                ) AS rate,
+            wo.`name`
         FROM
             `welcome_student` ws
             LEFT JOIN welcome_org wo
@@ -119,7 +125,6 @@
         WHERE
             ws.deleted = 0
           AND ws.iden_type=1
-          AND ws.is_registered = 1
           AND ws.create_time between #{startTime} and #{endTime}
         GROUP BY
             college_id
@@ -201,8 +206,14 @@
         group by college,sex
     </select>
     <select id="studentMajorRegister" resultType="com.template.model.vo.StudentRegisterVo">
-        SELECT count(ws.id) AS count,
-	           wo.`name`
+        SELECT
+            SUM(1) AS totalCount,
+            SUM(CASE WHEN ws.is_registered = 1 THEN 1 ELSE 0 END) AS count,
+            ROUND(
+                        SUM(CASE WHEN ws.is_registered = 1 THEN 1 ELSE 0 END) / SUM(1),
+                        2
+                ) AS rate,
+            wo.`name`
         FROM
             `welcome_student` ws
             LEFT JOIN welcome_org wo
@@ -210,7 +221,6 @@
         WHERE
             ws.deleted = 0
           AND ws.iden_type=1
-          AND ws.is_registered = 1
           AND ws.college_id= #{collegeId}
           AND ws.create_time between #{startTime} and #{endTime}
         GROUP BY