فهرست منبع

班级考核汇总鉴权查询

dzx 8 ماه پیش
والد
کامیت
dffca25a14

+ 1 - 2
src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

@@ -137,9 +137,8 @@ public class DatadetailController {
         List<Map<String, Object>> completeCountList = dataList.stream()
                 .filter(x -> HistoricProcessInstance.STATE_COMPLETED.equals(x.get("current_state").toString()))
                 .collect(Collectors.toList());
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         completeCountList.stream().forEach(el -> {
-            Duration diff = Duration.between(LocalDateTime.parse(el.get("start_time").toString(), formatter), LocalDateTime.parse(el.get("end_time").toString(), formatter));
+            Duration diff = Duration.between((LocalDateTime)el.get("start_time"), (LocalDateTime)el.get("end_time"));
             secondList.add(diff.getSeconds());
         });
 

+ 4 - 0
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -57,6 +57,10 @@ public class BaseStudentAssessmentInspectionController {
         if (roleList.size() == 2 && roleList.contains("TEACHER") && roleList.contains("CLASSTE")) {
             dto.setTeacherId(StpUtil.getLoginIdAsLong());
         }
+        if(!roleList.contains("BJKHGLY")){
+            dto.setCreateUserId(StpUtil.getLoginIdAsLong());
+        }
+
         Page<BaseStudentAssessmentInspectionPageVo> page = inspectionService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         return RT.ok(ConventPage.getPageOutput(page, BaseStudentAssessmentInspectionPageVo.class));
     }

+ 3 - 0
src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentInspectionPageDto.java

@@ -42,4 +42,7 @@ public class BaseStudentAssessmentInspectionPageDto extends PageInput {
 
     @ApiModelProperty("教师id")
     private Long teacherId;
+
+    @ApiModelProperty("创建人id")
+    private Long createUserId;
 }

+ 3 - 0
src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -43,6 +43,9 @@
         <if test="dto.teacherId != null">
             and t7.teacher_id = #{dto.teacherId}
         </if>
+        <if test="dto.createUserId != null">
+            and t.create_user_id = #{dto.createUserId}
+        </if>
         order by t.id desc
     </select>