电子报聘审批列表查询分页问题

yd-api/src/main/java/com/yd/dal/entity/meta/MdPractitionerHiringApproveSteps.java

@@ -38,7 +38,7 @@ public class MdPractitionerHiringApproveSteps  implements Serializable {
     /**
     /**
      * 总经理审批职级S2以上，FK ag_acl_practitioner_hiring_membership.md_drop_option_id
      * 总经理审批职级S2以上，FK ag_acl_practitioner_hiring_membership.md_drop_option_id
      */
      */
-    private String ceoAprroveGrade;
+    private String canAprroveGrade;
 
 
     /**
     /**
      * 0=No, 1=Yes
      * 0=No, 1=Yes

yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsHiringDALServiceImpl.java

@@ -62,7 +62,7 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
 
 
     @Override
     @Override
     public PageInfo<PractitionerHiringListInfo> practitionerHiringList(PractitionerHiringListRequestVO requestVO) {
     public PageInfo<PractitionerHiringListInfo> practitionerHiringList(PractitionerHiringListRequestVO requestVO) {
-        String orderBy = "id desc";
+        String orderBy = "hiringBasicInfoId desc";
         PageInfo<PractitionerHiringListInfo> pageInfo = requestVO.getPageInfo();
         PageInfo<PractitionerHiringListInfo> pageInfo = requestVO.getPageInfo();
         PageHelper.startPage(pageInfo.getPageNum(),pageInfo.getPageSize(),orderBy);
         PageHelper.startPage(pageInfo.getPageNum(),pageInfo.getPageSize(),orderBy);
         Page<PractitionerHiringListInfo> destList = agmsHiringMapper.practitionerHiringList(requestVO);
         Page<PractitionerHiringListInfo> destList = agmsHiringMapper.practitionerHiringList(requestVO);

yd-api/src/main/resources/mapper/meta/MdPractitionerHiringApproveStepsMapper.xml

@@ -9,7 +9,7 @@
     <result column="approve_role" jdbcType="VARCHAR" property="approveRole" />
     <result column="approve_role" jdbcType="VARCHAR" property="approveRole" />
     <result column="appointed_approve_practitioners" jdbcType="VARCHAR" property="appointedApprovePractitioners" />
     <result column="appointed_approve_practitioners" jdbcType="VARCHAR" property="appointedApprovePractitioners" />
     <result column="step_seq" jdbcType="INTEGER" property="stepSeq" />
     <result column="step_seq" jdbcType="INTEGER" property="stepSeq" />
-    <result column="ceo_aprrove_grade" jdbcType="VARCHAR" property="ceoAprroveGrade" />
+    <result column="can_aprrove_grade" jdbcType="VARCHAR" property="ceoAprroveGrade" />
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
@@ -18,7 +18,7 @@
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List">
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     <!--@mbg.generated-->
-    id, step_name, approve_role, appointed_approve_practitioners, step_seq, ceo_aprrove_grade, 
+    id, step_name, approve_role, appointed_approve_practitioners, step_seq, can_aprrove_grade, 
     is_active, created_at, created_by, updated_at, updated_by
     is_active, created_at, created_by, updated_at, updated_by
   </sql>
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -36,7 +36,7 @@
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps" useGeneratedKeys="true">
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps" useGeneratedKeys="true">
     <!--@mbg.generated-->
     <!--@mbg.generated-->
     insert into ag_md_practitioner_hiring_approve_steps (step_name, approve_role, appointed_approve_practitioners, 
     insert into ag_md_practitioner_hiring_approve_steps (step_name, approve_role, appointed_approve_practitioners, 
-      step_seq, ceo_aprrove_grade, is_active, 
+      step_seq, can_aprrove_grade, is_active, 
       created_at, created_by, updated_at, 
       created_at, created_by, updated_at, 
       updated_by)
       updated_by)
     values (#{stepName,jdbcType=VARCHAR}, #{approveRole,jdbcType=VARCHAR}, #{appointedApprovePractitioners,jdbcType=VARCHAR}, 
     values (#{stepName,jdbcType=VARCHAR}, #{approveRole,jdbcType=VARCHAR}, #{appointedApprovePractitioners,jdbcType=VARCHAR}, 
@@ -61,7 +61,7 @@
         step_seq,
         step_seq,
       </if>
       </if>
       <if test="ceoAprroveGrade != null">
       <if test="ceoAprroveGrade != null">
-        ceo_aprrove_grade,
+        can_aprrove_grade,
       </if>
       </if>
       <if test="isActive != null">
       <if test="isActive != null">
         is_active,
         is_active,
@@ -129,7 +129,7 @@
         step_seq = #{stepSeq,jdbcType=INTEGER},
         step_seq = #{stepSeq,jdbcType=INTEGER},
       </if>
       </if>
       <if test="ceoAprroveGrade != null">
       <if test="ceoAprroveGrade != null">
-        ceo_aprrove_grade = #{ceoAprroveGrade,jdbcType=VARCHAR},
+        can_aprrove_grade = #{ceoAprroveGrade,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="isActive != null">
       <if test="isActive != null">
         is_active = #{isActive,jdbcType=INTEGER},
         is_active = #{isActive,jdbcType=INTEGER},
@@ -156,7 +156,7 @@
       approve_role = #{approveRole,jdbcType=VARCHAR},
       approve_role = #{approveRole,jdbcType=VARCHAR},
       appointed_approve_practitioners = #{appointedApprovePractitioners,jdbcType=VARCHAR},
       appointed_approve_practitioners = #{appointedApprovePractitioners,jdbcType=VARCHAR},
       step_seq = #{stepSeq,jdbcType=INTEGER},
       step_seq = #{stepSeq,jdbcType=INTEGER},
-      ceo_aprrove_grade = #{ceoAprroveGrade,jdbcType=VARCHAR},
+      can_aprrove_grade = #{ceoAprroveGrade,jdbcType=VARCHAR},
       is_active = #{isActive,jdbcType=INTEGER},
       is_active = #{isActive,jdbcType=INTEGER},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       created_by = #{createdBy,jdbcType=BIGINT},
       created_by = #{createdBy,jdbcType=BIGINT},
@@ -188,7 +188,7 @@
           when id = #{item.id,jdbcType=BIGINT} then #{item.stepSeq,jdbcType=INTEGER}
           when id = #{item.id,jdbcType=BIGINT} then #{item.stepSeq,jdbcType=INTEGER}
         </foreach>
         </foreach>
       </trim>
       </trim>
-      <trim prefix="ceo_aprrove_grade = case" suffix="end,">
+      <trim prefix="can_aprrove_grade = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
         <foreach collection="list" index="index" item="item">
           when id = #{item.id,jdbcType=BIGINT} then #{item.ceoAprroveGrade,jdbcType=VARCHAR}
           when id = #{item.id,jdbcType=BIGINT} then #{item.ceoAprroveGrade,jdbcType=VARCHAR}
         </foreach>
         </foreach>
@@ -256,7 +256,7 @@
           </if>
           </if>
         </foreach>
         </foreach>
       </trim>
       </trim>
-      <trim prefix="ceo_aprrove_grade = case" suffix="end,">
+      <trim prefix="can_aprrove_grade = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
         <foreach collection="list" index="index" item="item">
           <if test="item.ceoAprroveGrade != null">
           <if test="item.ceoAprroveGrade != null">
             when id = #{item.id,jdbcType=BIGINT} then #{item.ceoAprroveGrade,jdbcType=VARCHAR}
             when id = #{item.id,jdbcType=BIGINT} then #{item.ceoAprroveGrade,jdbcType=VARCHAR}
@@ -307,7 +307,7 @@
   <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
   <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
     <!--@mbg.generated-->
     <!--@mbg.generated-->
     insert into ag_md_practitioner_hiring_approve_steps
     insert into ag_md_practitioner_hiring_approve_steps
-    (step_name, approve_role, appointed_approve_practitioners, step_seq, ceo_aprrove_grade, 
+    (step_name, approve_role, appointed_approve_practitioners, step_seq, can_aprrove_grade, 
       is_active, created_at, created_by, updated_at, updated_by)
       is_active, created_at, created_by, updated_at, updated_by)
     values
     values
     <foreach collection="list" item="item" separator=",">
     <foreach collection="list" item="item" separator=",">
@@ -331,7 +331,7 @@
         <include refid="Base_Column_List" />
         <include refid="Base_Column_List" />
         from ag_md_practitioner_hiring_approve_steps
         from ag_md_practitioner_hiring_approve_steps
         where is_active = 1
         where is_active = 1
-          and (ceo_aprrove_grade is null or find_in_set(#{practitionerLevelId,jdbcType=VARCHAR}, ceo_aprrove_grade))
+          and (can_aprrove_grade is null or find_in_set(#{practitionerLevelId,jdbcType=VARCHAR}, can_aprrove_grade))
         order by step_seq
         order by step_seq
     </select>
     </select>