Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteachingAchievements.java

@@ -85,6 +85,19 @@ public class SchoolXteachingAchievements
     @Excel(name = "考核分")
     private BigDecimal assessmentScore;
 
+
+
+    /** 优生增量 */
+    @Excel(name = "优生增量")
+    private BigDecimal yszl;
+
+    /** 常规增量 */
+    @Excel(name = "常规增量")
+    private BigDecimal cgzl;
+
+
+
+
     /** 创建者 */
     private String createBy;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXteachingAchievementsVo.java

@@ -79,6 +79,20 @@ public class SchoolXteachingAchievementsVo {
     @Excel(name = "考核分")
     private BigDecimal assessmentScore;
 
+
+
+    /** 优生增量 */
+    @Excel(name = "优生增量")
+    private BigDecimal yszl;
+
+    /** 常规增量 */
+    @Excel(name = "常规增量")
+    private BigDecimal cgzl;
+
+
+
+
+
     /** 创建者 */
     private String createBy;
 

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.xml

@@ -25,10 +25,15 @@
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="yszl"    column="yszl"    />
+        <result property="cgzl"    column="cgzl"    />
     </resultMap>
 
     <sql id="selectSchoolXteachingAchievementsVo">
-        select id, school_year, semester, exam_time, exam_type, year, grade, user_id, user_name, id_card, sub, class_name, class_type, assessment_score, remark, create_by, create_time, update_by, update_time, del_flag from school_xteaching_achievements
+        select id, school_year, semester, exam_time, exam_type, year, grade, user_id, user_name, id_card, sub,
+               class_name, class_type, assessment_score, remark, create_by, create_time, update_by, update_time, del_flag,
+               yszl, cgzl
+          from school_xteaching_achievements
     </sql>
 
     <select id="selectSchoolXteachingAchievementsList" parameterType="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo" resultMap="SchoolXteachingAchievementsResult">
@@ -87,6 +92,8 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="yszl != null and yszl != ''">yszl,</if>
+            <if test="cgzl != null and cgzl != ''">cgzl,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="schoolYear != null and schoolYear != ''">#{schoolYear},</if>
@@ -108,6 +115,8 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="yszl != null and yszl != ''">#{yszl},</if>
+            <if test="cgzl != null and cgzl != ''">#{cgzl},</if>
         </trim>
     </insert>
 
@@ -133,6 +142,8 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="yszl != null and yszl != ''">yszl = #{yszl},</if>
+            <if test="cgzl != null and cgzl != ''">cgzl = #{cgzl},</if>
         </trim>
         where id = #{id}
     </update>