1、平键管理调整

2、办事指南调整

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateObjectListDto.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -43,4 +44,7 @@ public class EvaluateObjectListDto implements Serializable {
     @ApiModelProperty("结束时间")
     private Date endTime;
 
+    @ApiModelProperty("班级ids")
+    private String classIds;
+
 }

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

@@ -374,9 +374,12 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
         else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.STU_SELF_EVALUATE.getCode())){//学生自评
             BaseStudentUserPageDto studentUserPageDto = new BaseStudentUserPageDto();
             studentUserPageDto.setGradeId(dto.getGradeId());
-            if(dto.getClassId() != null){
+            if(StrUtil.isNotEmpty(dto.getClassIds())){
+                String[] ids = dto.getClassIds().split(",");
                 List<Long> classIds = new ArrayList<>();
-                classIds.add(dto.getClassId());
+                for (String id : ids) {
+                    classIds.add(Long.parseLong(id));
+                }
                 studentUserPageDto.setClassIds(classIds);
             }
             List<BaseStudentUserPageVo> studentList = studentService.getStudentList(studentUserPageDto);
@@ -408,9 +411,12 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
         else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.CLASS_STU_EVALUATE.getCode())){//班级学生交叉互评
             BaseStudentUserPageDto studentUserPageDto = new BaseStudentUserPageDto();
             studentUserPageDto.setGradeId(dto.getGradeId());
-            if(dto.getClassId() != null){
+            if(StrUtil.isNotEmpty(dto.getClassIds())){
+                String[] ids = dto.getClassIds().split(",");
                 List<Long> classIds = new ArrayList<>();
-                classIds.add(dto.getClassId());
+                for (String id : ids) {
+                    classIds.add(Long.parseLong(id));
+                }
                 studentUserPageDto.setClassIds(classIds);
             }
             List<BaseStudentUserPageVo> studentList = studentService.getStudentList(studentUserPageDto);
@@ -450,12 +456,16 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
         else if (dto.getEvaluateType() != null && dto.getEvaluateType().equals(EvaluateTypeEnum.TEA_EVALUATE_STU.getCode())){//教师评价班级学生
             BaseStudentUserPageDto studentUserPageDto = new BaseStudentUserPageDto();
             studentUserPageDto.setGradeId(dto.getGradeId());
-            if(dto.getClassId() != null){
+            if(StrUtil.isNotEmpty(dto.getClassIds())){
+                String[] ids = dto.getClassIds().split(",");
                 List<Long> classIds = new ArrayList<>();
-                classIds.add(dto.getClassId());
+                for (String id : ids) {
+                    classIds.add(Long.parseLong(id));
+                }
                 studentUserPageDto.setClassIds(classIds);
             }
 
+
             List<BaseStudentUserPageVo> studentList = studentService.getStudentList(studentUserPageDto);
 
             for (BaseStudentUserPageVo student : studentList) {

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -526,9 +526,11 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
     private Boolean addRelationByGuideShowRange(News xjrNews) {
         if (xjrNews.getGuideShowRange().contains("2")) {
             newsRelationMapper.insertAllTeaStaff(xjrNews.getId());
-        } else if (xjrNews.getGuideShowRange().contains("3")) {
+        }
+        if (xjrNews.getGuideShowRange().contains("3")) {
             newsRelationMapper.insertAllStudentStaff(xjrNews.getId());
-        } else if(xjrNews.getGuideShowRange().contains("4")){
+        }
+        if(xjrNews.getGuideShowRange().contains("4")){
             newsRelationMapper.insertAllParentsStaff(xjrNews.getId());
         }
         return true;

src/main/resources/mapper/oa/NewsRelationMapper.xml

@@ -19,16 +19,18 @@
 
     <insert id="insertAllStudentStaff" parameterType="java.lang.Long">
         insert into xjr_oa_news_relation (id, news_id, user_id, create_date, read_mark)
-            (select
+            (SELECT
                  UUID(),
                  #{newsId},
                  t.id,
                  NOW(),
                  0
-             from xjr_user t
-                      left join xjr_user_role_relation t3 on t3.user_id = t.id
+             FROM xjr_user t
+                      LEFT JOIN xjr_user_role_relation t3 ON t3.user_id = t.id
                       LEFT JOIN xjr_role t4 ON t4.id = t3.role_id
-             where t.delete_mark = 0 and t4.id = 3)
+                      LEFT JOIN base_student_school_roll t5 ON t.id = t5.user_id
+             WHERE t.delete_mark = 0 AND t4.id = 3
+               AND t5.archives_status = 'FB2901')
     </insert>
     <insert id="insertAllStudentStaff" parameterType="java.lang.Long">
         insert into xjr_oa_news_relation (id, news_id, user_id, create_date, read_mark)