班级考核调整

src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentInspection.java

@@ -148,4 +148,7 @@ public class BaseStudentAssessmentInspection implements Serializable {
 
     @ApiModelProperty("学生考核项目编号(base_student_assessment_item主键)")
     private Long baseStudentAssessmentItemId;
+
+    @ApiModelProperty("总分数")
+    private Double totalScore;
 }

src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentStudentRelation.java

@@ -80,4 +80,6 @@ public class BaseStudentAssessmentStudentRelation implements Serializable {
     private String majorName;
 
 
+    @ApiModelProperty("被扣分数")
+    private Double score;
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -493,6 +493,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
         //获取考核记录
         BaseStudentAssessmentInspection baseStudentAssessmentInspection = this.getById(id);
         if(baseStudentAssessmentInspection != null){
+            double totalScore = 0d;
             if(StrUtil.isNotEmpty(baseStudentAssessmentInspection.getClassIds())) {
                 //同步数据到考核关联班级表
                 String[] classIds = baseStudentAssessmentInspection.getClassIds().split(",");
@@ -506,6 +507,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                         setSortCode(b.getSortCode() + 1);
                     }});
                 }
+                totalScore = baseStudentAssessmentInspection.getScore();
             }
             //同步数据到考核关联学生表
             if(StrUtil.isNotEmpty(baseStudentAssessmentInspection.getPersonalStudentUserIds())){
@@ -527,9 +529,16 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                         queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
                         BaseStudentAssessmentStudentRelation b = assessmentStudentRelationMapper.selectOne(queryWrapperSortcode);
                         setSortCode(b.getSortCode() + 1);
+                        setScore(baseStudentAssessmentInspection.getScore());
+
                     }});
                 }
+
+                totalScore = studentIds.length * baseStudentAssessmentInspection.getScore();
             }
+            baseStudentAssessmentInspection.setTotalScore(totalScore);
+            this.updateById(baseStudentAssessmentInspection);
+
         }
         return true;
     }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentInspectionPageVo.java

@@ -57,4 +57,7 @@ public class BaseStudentAssessmentInspectionPageVo {
 
     @ApiModelProperty("考核对象")
     private String assessmentType;
+
+    @ApiModelProperty("分数")
+    private Double totalScore;
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentInspectionVo.java

@@ -69,4 +69,7 @@ public class BaseStudentAssessmentInspectionVo {
 
     @ApiModelProperty("考核对象")
     private String assessmentType;
+
+    @ApiModelProperty("总分数")
+    private Double totalScore;
 }

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.student.mapper.BaseStudentAssessmentInspectionMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo">
-        SELECT t.id,t.score,t.score_type,t.create_date AS assessment_date,t.reason,t1.name AS assessment_category_name,t2.name AS assessment_project_name,t3.name AS semester_name,t4.name AS grade_name,t5.name AS assessment_user_name,t6.name AS score_type_cn,
+        SELECT t.id,t.score,t.total_score,t.score_type,t.assessment_date,t.reason,t1.name AS assessment_category_name,t2.name AS assessment_project_name,t3.name AS semester_name,t4.name AS grade_name,t5.name AS assessment_user_name,t6.name AS score_type_cn,
         (
         SELECT NAME FROM base_class
         WHERE id = t.class_ids
@@ -46,6 +46,7 @@
     <select id="getInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo">
         select t.id,t.score,t.score_type,t.assessment_date,t.reason,t1.name as assessment_category_name,t2.name as assessment_project_name,
         t3.name as semester_name,t4.name as grade_name,t5.name as assessment_user_name,t6.name as score_type_cn,t.file_id,t7.name as create_user_name
+        ,t.total_score
         from base_student_assessment_inspection t
         left join base_student_assessment_category t1 on (t1.id = t.base_student_assessment_category_id)
         left join base_student_assessment_project t2 on (t2.id = t.base_student_assessment_project_id)
@@ -306,7 +307,9 @@
     </select>
     <select id="getStudentListByInspectionId"
             resultType="com.xjrsoft.module.student.entity.BaseStudentAssessmentStudentRelation">
-        SELECT t1.id,t1.user_id,t1.class_id,t3.student_id,t2.name,t6.name AS nation,t4.name AS class_name,t5.name AS major_name,t7.name as gender FROM base_student_assessment_student_relation t1
+        SELECT t1.id,t1.user_id,t1.class_id,t3.student_id,t2.name,t6.name AS nation,t4.name AS class_name,
+               t5.name AS major_name,t7.name as gender,t1.score
+        FROM base_student_assessment_student_relation t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         INNER JOIN base_student t3 ON t2.id = t3.user_id
         INNER JOIN base_class t4 ON t4.id = t1.class_id