修改综合评价达标量不能导出

srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java

@@ -47,11 +47,23 @@ public class TeacherEvaluationStatusController extends BaseController {
     /**
      * 导出辅导员综合评价状态列表
      */
-    @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:export')")
+//    @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:export')")
     @Log(title = "辅导员综合评价状态", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TeacherEvaluationStatus teacherEvaluationStatus) {
         List<TeacherEvaluationStatus> list = teacherEvaluationStatusService.selectTeacherEvaluationStatusList(teacherEvaluationStatus);
+       for (TeacherEvaluationStatus entity : list){
+           if(entity.getIsCompleted()){
+               entity.setCompleted("是");
+           }else{
+               entity.setCompleted("否");
+           }
+           if(entity.getScoreImported()){
+               entity.setIsScoreImported("是");
+           }else{
+               entity.setIsScoreImported("否");
+           }
+       }
         ExcelUtil<TeacherEvaluationStatus> util = new ExcelUtil<TeacherEvaluationStatus>(TeacherEvaluationStatus.class);
         util.exportExcel(response, list, "辅导员综合评价状态数据");
     }

srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java

@@ -8,7 +8,7 @@ import lombok.Data;
 
 /**
  * 辅导员综合评价状态对象 teacher_evaluation_status
- * 
+ *
  * @author srs
  * @date 2024-01-20
  */
@@ -53,19 +53,26 @@ public class TeacherEvaluationStatus extends BaseEntity {
     private String stuYearName;
 
     /** 是否完成综合测评 */
-    @Excel(name = "是否完成综合测评")
     private Boolean isCompleted;
 
+    /** 是否完成综合测评 */
+    @Excel(name = "是否完成综合测评")
+    private String completed;
+
     /** 待办事项数量 */
     @Excel(name = "待办事项数量")
     @TableField(exist = false)
     private Integer todoCount;
 
     /** 成绩是否已导入 */
-    @Excel(name = "成绩是否已导入")
     @TableField(exist = false)
     private Boolean scoreImported;
 
+    /** 成绩是否已导入 */
+    @Excel(name = "成绩是否已导入")
+    @TableField(exist = false)
+    private String isScoreImported;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
@@ -177,4 +184,4 @@ public class TeacherEvaluationStatus extends BaseEntity {
     public void setLastUpdateTime(String lastUpdateTime) {
         this.lastUpdateTime = lastUpdateTime;
     }
-}
+}

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java

@@ -468,9 +468,9 @@ public class CphTeacherServiceImpl implements ICphTeacherService
             String zgh = (String) map.get("zgh");
             String xm=(String) map.get("xm");
             String xb=(String) map.get("xb");
-            String yxdm=(String) map.get("yxdm");
+            String ksh=(String) map.get("ksh");
             QgzxTeacher qgzxTeacher = qgzxTeacherMapper.selectQgzxTeacherByEmployeeId(zgh);
-            Long deptId = qgzxTeacherMapper.selectDeptCode(yxdm);
+            Long deptId = qgzxTeacherMapper.selectDeptCode(ksh);
             QgzxTeacher entity=new QgzxTeacher();
             entity.setEmployeeId(zgh);
             entity.setName(xm);
@@ -483,8 +483,8 @@ public class CphTeacherServiceImpl implements ICphTeacherService
             if(qgzxTeacher==null){
                 qgzxTeacherMapper.insertQgzxTeacher(entity);
             }else{
-                entity.setTeacherId(qgzxTeacher.getTeacherId());
+                entity.setEmployeeId(zgh);
-                qgzxTeacherMapper.updateQgzxTeacher(entity);
+                qgzxTeacherMapper.updateQgzxTeacherNew(entity);
             }
         }
 

srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java

@@ -45,6 +45,7 @@ public interface QgzxTeacherMapper extends BaseMapper<QgzxTeacher> {
      * @return 结果
      */
     int updateQgzxTeacher(QgzxTeacher qgzxTeacher);
+    int updateQgzxTeacherNew(QgzxTeacher qgzxTeacher);
 
     /**
      * 删除教职工信息

srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml

@@ -108,6 +108,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where teacher_id = #{teacherId}
     </update>
 
+    <update id="updateQgzxTeacherNew" parameterType="QgzxTeacher">
+        update qgzx_teacher
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="gender != null and gender != ''">gender = #{gender},</if>
+            age = #{age},
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            phone_number = #{phoneNumber},
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where employee_id = #{employeeId}
+    </update>
+
     <delete id="deleteQgzxTeacherByTeacherId" parameterType="Long">
         delete from qgzx_teacher where teacher_id = #{teacherId}
     </delete>