debug

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/MainExamEvaluation.java

@@ -26,7 +26,7 @@ public class MainExamEvaluation extends TenantEntity {
 
     private String evaluationName;
     private String grade;
-    private String position;
+    private Long positionId;
     private String positionType;
     private String tags;
     private Long mainImage;

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/bo/MainExamEvaluationBo.java

@@ -28,7 +28,7 @@ public class MainExamEvaluationBo extends BaseEntity {
     private String evaluationName;
 
     private String grade;
-    private String position;
+    private Long positionId;
     private String positionType;
     private String tags;
     private Long mainImage;

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/vo/MainExamEvaluationVo.java

@@ -38,7 +38,10 @@ public class MainExamEvaluationVo implements Serializable {
     private String grade;
 
     @ExcelProperty(value = "岗位")
-    private String position;
+    private Long positionId;
+
+    @ExcelProperty(value = "岗位名称")
+    private String positionName;
 
     @ExcelProperty(value = "岗位类型", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "main_position_type")

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainExamEvaluationServiceImpl.java

@@ -88,7 +88,7 @@ public class MainExamEvaluationServiceImpl implements IMainExamEvaluationService
         // 1. 测评名称搜索
         lqw.like(StringUtils.isNotBlank(bo.getEvaluationName()), "e.evaluation_name", bo.getEvaluationName());
         lqw.eq(StringUtils.isNotBlank(bo.getGrade()), "e.grade", bo.getGrade());
-        lqw.eq(StringUtils.isNotBlank(bo.getPosition()), "e.position", bo.getPosition());
+        lqw.eq(bo.getPositionId() != null, "e.position_id", bo.getPositionId());
         lqw.eq(StringUtils.isNotBlank(bo.getPositionType()), "e.position_type", bo.getPositionType());
 
         // 2. 业务状态搜索逻辑

ruoyi-modules/ruoyi-main/src/main/resources/mapper/MainExamEvaluationMapper.xml

@@ -8,7 +8,7 @@
         <result property="id" column="id"/>
         <result property="evaluationName" column="evaluation_name"/>
         <result property="grade" column="grade"/>
-        <result property="position" column="position"/>
+        <result property="positionId" column="position_id"/>
         <result property="positionType" column="position_type"/>
         <result property="tags" column="tags"/>
         <result property="mainImage" column="main_image"/>
@@ -30,6 +30,7 @@
 
     <resultMap type="org.dromara.main.domain.vo.MainExamEvaluationVo" id="MainExamEvaluationVoResult" extends="MainExamEvaluationResult">
         <result property="mainImageUrl" column="main_image_url"/>
+        <result property="positionName" column="position_name"/>
         <collection property="abilityConfigs"
                     ofType="org.dromara.main.domain.MainAbilityConfig"
                     select="org.dromara.main.mapper.MainAbilityConfigMapper.selectByEvaluationId"
@@ -38,14 +39,16 @@
 
     <sql id="selectMainExamEvaluationVo">
         SELECT
-            e.id, e.evaluation_name, e.grade, e.position, e.position_type,
+            e.id, e.evaluation_name, e.grade, e.position_id, e.position_type,
             e.tags, e.main_image, e.image_album, e.detail, e.price,
             e.on_time, e.down_time, e.status,
             e.tenant_id, e.create_dept, e.create_by, e.create_time,
             e.update_by, e.update_time, e.remark, e.del_flag,
-            oss.url AS main_image_url
+            oss.url AS main_image_url,
+            p.post_name AS position_name
         FROM main_exam_evaluation e
                  LEFT JOIN sys_oss oss ON e.main_image = oss.oss_id
+                 LEFT JOIN main_position p ON e.position_id = p.id
     </sql>
 
     <select id="selectVoByIdWithImages" resultMap="MainExamEvaluationVoResult">