Browse Source

学生考勤调整

dzx 1 year ago
parent
commit
bef69ecb6d

+ 1 - 0
src/main/resources/mapper/outin/StudentOutInRecordMapper.xml

@@ -39,6 +39,7 @@
         INNER JOIN base_student_school_roll t2 ON t1.user_id = t2.user_id
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 and t1.status = #{status}
         AND t1.record_time BETWEEN #{startTime} AND #{endTime}
+        AND t2.stduy_status = 'FB3001'
         order by t1.record_time
     </select>
 </mapper>

+ 2 - 2
src/test/java/com/xjrsoft/module/job/HikvisionBaseDataTaskTest.java

@@ -294,7 +294,7 @@ class HikvisionBaseDataTaskTest {
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("pageNo", 1);
         jsonObject.addProperty("pageSize", 500);
-        jsonObject.addProperty("personName", "胡玉");
+        jsonObject.addProperty("personName", "彭兴玲");
         String result = apiUtil.doPost(apiPath, jsonObject.toString(), null, null);
         System.out.println(result);
 
@@ -387,7 +387,7 @@ class HikvisionBaseDataTaskTest {
                 " INNER JOIN xjr_user_dept_relation t3 ON t1.id = t3.user_id" +
                 " INNER JOIN xjr_department t4 ON t3.dept_id = t4.id " +
                 " WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND t4.delete_mark = 0" +
-                " AND t1.name = '黄文宇'";
+                " AND t1.name = '李江涛'";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql, String[].class);
         JsonArray paramArray = new JsonArray();
         Map<Integer, String> clientMap = new HashMap<>();

+ 1 - 1
src/test/java/com/xjrsoft/module/liteflow/node/ImportTeacherFaceNodeTest.java

@@ -31,7 +31,7 @@ class ImportTeacherFaceNodeTest {
     @Test
     public void process() throws Exception {
         // 获取表单中数据编号
-        Long formId = 1793948095216664576L;
+        Long formId = 1802867597624520704L;
         if (formId != null) {
             String fileUrl = faceImportMapper.GetTeacherHikvisionImgById(formId);
             // 数据处理