1、学生评价调整

2、办事指南增加字段返回
3、我的承办接口调整

src/main/java/com/xjrsoft/common/enums/EvaluateTypeEnum.java

@@ -20,7 +20,12 @@ public enum EvaluateTypeEnum {
 
     TEACHER_EVALUATE_CLASS("tea_evaluate_class", "任课教师对班级评价"),
 
-    TEACHER_EVALUATE("teacher_evaluate", "任课教师对班级评价");
+    TEACHER_EVALUATE("teacher_evaluate", "任课教师对班级评价"),
+    STU_SELF_EVALUATE("stu_self_evaluate", "学生自评"),
+
+    CLASS_STU_EVALUATE("class_stu_evaluate", "班级学生交叉互评"),
+
+    TEA_EVALUATE_STU("tea_evaluate_stu", "教师评价班级学生");
 
     final String code;
     final String value;

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateObjectServiceImpl.java

@@ -242,7 +242,8 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
                 objectListVo.setExecuterCount(executerList.size());
                 objectListVo.setExecuterList(executerList);
             }
-        } else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.DRILLMASTER_EVALUATE_CLASS.getCode())) {//入参评价类型是教官评价班级
+        }
+        else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.DRILLMASTER_EVALUATE_CLASS.getCode())) {//入参评价类型是教官评价班级
             newObjectList = evaluateObjectMapper.getNewObjectList(dto);
             List<EvaluateExecuterVo> newExecuterList = evaluateObjectMapper.getNewExecuterList(dto);
 
@@ -250,7 +251,8 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
                 objectListVo.setExecuterCount(newExecuterList.size());
                 objectListVo.setExecuterList(newExecuterList);
             }
-        } else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.TEACHER_EVALUATE_CLASS.getCode())) {//任课教师对班级评价
+        }
+        else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.TEACHER_EVALUATE_CLASS.getCode())) {//任课教师对班级评价
             EvaluateManage manage = evaluateManageMapper.selectById(dto.getEvaluateManageId());
             newObjectList = evaluateObjectMapper.getNewObjectList(dto);
 
@@ -289,7 +291,8 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
                 objectListVo.setExecuterCount(currentExecuterList.size());
                 objectListVo.setExecuterList(currentExecuterList);
             }
-        } else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.STUDENT_EVALUATE_COURSE_TEACHER.getCode())) {//入参评价类型是学生评价教师
+        }
+        else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.STUDENT_EVALUATE_COURSE_TEACHER.getCode())) {//入参评价类型是学生评价教师
             EvaluateManage manage = evaluateManageMapper.selectById(dto.getEvaluateManageId());
             //查询这个年级的所有学生
             List<EvaluateExecuterVo> newExecuterList = evaluateObjectMapper.getNewExecuterList(dto);
@@ -358,6 +361,15 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
                 newObjectList.add(objectListVo);
             }
         }
+        else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.STU_SELF_EVALUATE.getCode())){//学生自评
+
+        }
+        else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.STU_SELF_EVALUATE.getCode())){//学生自评
+
+        }
+        else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.STU_SELF_EVALUATE.getCode())){//学生自评
+
+        }
 
         return newObjectList;
     }

src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentReceivedHandleController.java

@@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import javax.ws.rs.GET;
 import java.util.List;
 
 /**
@@ -67,7 +68,7 @@ public class OfficialDocumentReceivedHandleController {
         return RT.ok(BeanUtil.toBean(officialDocumentReceivedHandle, OfficialDocumentReceivedHandleVo.class));
     }
 
-    @PostMapping(value = "last-alert-time")
+    @GetMapping(value = "last-alert-time")
     @ApiOperation(value = "新增公文收文-承办表-最新提醒时间")
     @SaCheckPermission("officialdocumentreceivedhandle:add")
     @XjrLog(value = "新增公文收文-承办表-最新提醒时间")

src/main/java/com/xjrsoft/module/oa/vo/NewsPageVo.java

@@ -190,4 +190,10 @@ public class NewsPageVo {
 
     @ApiModelProperty("封面url")
     private String coverUrl;
+
+    @ApiModelProperty("办事指南显示范围")
+    private String guideShowRange;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime modifyDate;
 }