1、班级量化考核调整

2、数据看板访客统计调整

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -189,19 +189,19 @@ public class DataboardController {
     @ApiOperation(value="访客统计")
     @SaCheckPermission("databoard:detail")
     public RT<VisitorStatisticsVo> visitorStatistics(@Valid StatisticsDto dto){
-        List<VisitorOutInRecord> list = visitorService.list(
-                new QueryWrapper<VisitorOutInRecord>().lambda()
-                        .eq(VisitorOutInRecord::getDeleteMark, DeleteMark.NODELETE.getCode())
-        );
         VisitorStatisticsVo result = new VisitorStatisticsVo();
-        result.setAllCount(list.size());
-        LocalDate today = LocalDate.now();
-        int todayCount = 0;
-        for (VisitorOutInRecord record : list) {
-            if(today.equals(record.getRecordTime().toLocalDate())){
-                todayCount ++;
-            }
-        }
+
+        String sql = "SELECT * FROM reservation_school_people t1" +
+                " INNER JOIN reservation_school t2 ON t1.reservation_schoo_id = t2.id" +
+                " INNER JOIN xjr_workflow_form_relation t3 ON CAST(t2.id AS CHAR) = t3.form_key_value" +
+                " WHERE t3.current_state = 'COMPLETED' AND t1.delete_mark = 0 AND t1.enabled_mark = 1" +
+                " AND t2.delete_mark = 0 AND t2.enabled_mark = 1";
+        int size = SqlRunnerAdapter.db().selectList(sql).size();
+        result.setAllCount(size);
+
+        sql += " and now() between t2.start_time and t2.end_time";
+
+        int todayCount = SqlRunnerAdapter.db().selectList(sql).size();
         result.setTodayCount(todayCount);
         return RT.ok(result);
     }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoDetailVo.java

@@ -123,4 +123,7 @@ public class BaseStudentInfoDetailVo {
 
     @ApiModelProperty("学籍号")
     private String rollNumber;
+
+    @ApiModelProperty("学生档案编号")
+    private String archivesNumber;
 }

src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -231,7 +231,7 @@
     <select id="getAssessmentInspectionByClassIdList" parameterType="com.xjrsoft.module.student.dto.QuantitativeAssessmentSingleScoreDto" resultType="com.xjrsoft.module.student.vo.QuantitativeAssessmentSingleScoreVo">
         select
         t.class_ids as class_id,
-        SUM(t.score * IF(personal_student_user_ids IS NULL, 1,(LENGTH(personal_student_user_ids) - LENGTH(REPLACE(personal_student_user_ids, ',', '')) + 1))) AS sumScore
+        SUM(t.score * IF(personal_student_user_ids IS NULL, 1, (SELECT COUNT(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id = t.id AND delete_mark = 0 AND enabled_mark = 1))) AS sumScore
         from base_student_assessment_inspection t
         inner join base_student_assessment_category t1 on t1.id = t.base_student_assessment_category_id
         where t.delete_mark = 0 and t.enabled_mark = 1

src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -99,7 +99,7 @@
                t3.stduy_status                                                                                               as stduyStatusCode,
                t3.roll_modality                                                                                              as rollModalityCode,
                t3.roll_number AS rollNumber,
-                t12.name AS student_form,
+                t12.name AS student_form,t3.archives_number,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010604%' AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS jxf,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode = 103042766003001 AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS ssf,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010603%' AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS jcf,