开学报到领导统计调整

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -322,7 +322,7 @@ public class DataUtil {
      * 新增学期
      */
     public Map<String, String> insertSemester(String tableName, Map<String, String> ids) throws Exception {
-        String sql = "select * from " + tableName + " where delete_mark = 0";
+        String sql = "select * from " + tableName + " where delete_mark = 0 order by start_date desc limit 3";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql, BaseSemester.class);
 
         Map<String, String> idMap = new HashMap<>();
@@ -369,7 +369,9 @@ public class DataUtil {
             String result = ScheduleUtil.doPost(url, paramJson.toString(), sign, timestamp);
 
             JsonObject resultJson = jsonParser.parse(result).getAsJsonObject();
-            idMap.put(semester.getId().toString(), resultJson.get("data").getAsString());
+            if(StrUtil.isNotEmpty(resultJson.get("data").getAsString())){
+                idMap.put(semester.getId().toString(), resultJson.get("data").getAsString());
+            }
         }
         //插入记录表
         insertRecord(tableName, idMap);

src/main/java/com/xjrsoft/module/student/controller/StudentReportRecordController.java

@@ -198,7 +198,7 @@ public class StudentReportRecordController {
     @SaCheckPermission("studentreportrecord:detail")
     public RT<StudentReportRecordStatisticsVo> classStatistics(@Valid StudentReportRecordStatisticsDto dto){
 
-        if(dto.getTeacherId() == null){
+         if(dto.getTeacherId() == null && dto.getClassId() == null){
             dto.setTeacherId(StpUtil.getLoginIdAsLong());
         }
         if(dto.getBaseSemesterId() == null){
@@ -211,7 +211,7 @@ public class StudentReportRecordController {
                 dto.setBaseSemesterId(semesterList.get(0).getId());
             }
         }
-        if(dto.getGradeId() == null){
+        if(dto.getGradeId() == null && dto.getClassId() == null){
             LambdaQueryWrapper<BaseGrade> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper
                     .orderByDesc(BaseGrade::getTitle)

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

@@ -36,8 +36,18 @@
         ) AS arrived_count
         FROM base_class t1
         INNER JOIN xjr_user t2 ON t1.teacher_id = t2.id
-        WHERE t1.delete_mark = 0 and t1.grade_id = #{dto.gradeId}
-        AND t1.teacher_id = #{dto.teacherId}
+        WHERE t1.delete_mark = 0
+        <if test="dto.teacherId != null">
+            AND t1.teacher_id = #{dto.teacherId}
+        </if>
+        <if test="dto.gradeId != null">
+            and t1.grade_id = #{dto.gradeId}
+        </if>
+        <if test="dto.classId != null">
+            AND t1.id = #{dto.classId}
+        </if>
+
+
     </select>
     <select id="getMobilePage" parameterType="com.xjrsoft.module.student.dto.StudentReportRecordPageDto"
             resultType="com.xjrsoft.module.student.vo.StudentReportRecordPageVo">

src/test/java/com/xjrsoft/module/job/JianyuekbBaseDataTaskTest.java

@@ -111,47 +111,8 @@ class JianyuekbBaseDataTaskTest {
             sql = "SELECT * FROM base_class WHERE delete_mark = 0" +
                 " and id not in (SELECT source_id FROM jianyue_data WHERE table_name = 'base_class' AND source_id IS NOT NULL)";
 
-            List<Map<String, Object>> dataList = SqlRunnerAdapter.db().selectList(sql, BaseClass.class);
-            String semesterSerialNo = dataUtil.getCurrenSemeter();
-            Map<String, String> idMap = new HashMap<>();
-            JsonParser jsonParser = new JsonParser();
-            for (Map<String, Object> baseClassMap : dataList) {
-                BaseClass baseClass = SqlRunnerAdapterUtil.convertMapToEntity(baseClassMap, BaseClass.class);
-                String url  = ScheduleUtil.apiUrl + "class/create";
-                JsonObject paramJson = new JsonObject();
-                if(baseClass.getTeacherId() != null && teacherMap.get(baseClass.getTeacherId().toString()) != null){
-                    paramJson.addProperty("teacherSerialNo", teacherMap.get(baseClass.getTeacherId().toString()));
-                }
-                paramJson.addProperty("name", baseClass.getName());
-
-                paramJson.addProperty("semesterSerialNo", semesterSerialNo);
-                paramJson.addProperty("eduYearSerialNo", gradeMap.get(baseClass.getOrgId() + "_" + baseClass.getGradeId().toString()));
-                paramJson.addProperty("extendId", baseClass.getId());
-                if(baseClass.getClassroomId() != null && classroomMap.get(baseClass.getClassroomId().toString()) != null){
-                    paramJson.addProperty("classRoomSerialNo", classroomMap.get(baseClass.getClassroomId().toString()));
-                }
-//                if(ids != null && ids.get(baseClass.getId().toString()) != null){
-//                    url  = ScheduleUtil.apiUrl + "class/update";
-//                    paramJson.addProperty("serialNo", ids.get(baseClass.getId().toString()));
-//                    long timestamp = System.currentTimeMillis();
-//                    //生成签名
-//                    String sign = ScheduleUtil.createSign(timestamp);
-//                    ScheduleUtil.doPost(url, paramJson.toString(), sign, timestamp);
-//                    continue;
-//                }
-
-                //获取时间戳
-                long timestamp = System.currentTimeMillis();
-                //生成签名
-                String sign = ScheduleUtil.createSign(timestamp);
-                String result = ScheduleUtil.doPost(url, paramJson.toString(), sign, timestamp);
-                if(result == null){
-                    continue;
-                }
-                JsonObject resultJson = jsonParser.parse(result).getAsJsonObject();
-                idMap.put(baseClass.getId().toString(), resultJson.get("data").getAsString());
-            }
-            dataUtil.insertRecord("base_class", idMap);
+            tableName = "base_semester";
+            dataUtil.insertSemester(tableName, dataMap.get(tableName));
         } catch (Exception e) {
         }
     }
@@ -159,6 +120,9 @@ class JianyuekbBaseDataTaskTest {
     @Test
     void test3() throws Exception {
         DataUtil dataUtil = new DataUtil();
+        String currenSemeter = dataUtil.getCurrenSemeter();
+
+
     }
 
     @Test