电子报聘审批列表查询查询条件修改

yd-api/src/main/java/com/yd/api/agms/vo/hiring/PractitionerHiringListRequestVO.java

@@ -7,7 +7,11 @@ import com.yd.dal.entity.agms.hiring.PractitionerHiringListInfo;
  * @author xxy
  * @author xxy
  */
  */
 public class PractitionerHiringListRequestVO {
 public class PractitionerHiringListRequestVO {
-    private PractitionerHiringListInfo params;
+    private Long branchId;
+    private Long deptId;
+    private Long subsystemId;
+    private Long name;
+    private Long status;
     private PageInfo<PractitionerHiringListInfo> pageInfo;
     private PageInfo<PractitionerHiringListInfo> pageInfo;
 
 
     public PageInfo<PractitionerHiringListInfo> getPageInfo() {
     public PageInfo<PractitionerHiringListInfo> getPageInfo() {
@@ -25,11 +29,43 @@ public class PractitionerHiringListRequestVO {
                 '}';
                 '}';
     }
     }
 
 
-    public PractitionerHiringListInfo getParams() {
-        return params;
+    public Long getBranchId() {
+        return branchId;
     }
     }
 
 
-    public void setParams(PractitionerHiringListInfo params) {
-        this.params = params;
+    public void setBranchId(Long branchId) {
+        this.branchId = branchId;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public Long getSubsystemId() {
+        return subsystemId;
+    }
+
+    public void setSubsystemId(Long subsystemId) {
+        this.subsystemId = subsystemId;
+    }
+
+    public Long getName() {
+        return name;
+    }
+
+    public void setName(Long name) {
+        this.name = name;
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
     }
     }
 }
 }

yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsHiringMapper.java

 package com.yd.dal.mapper.agms;
 package com.yd.dal.mapper.agms;
 
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
-import com.github.pagehelper.PageInfo;
+import com.yd.api.agms.vo.hiring.PractitionerHiringListRequestVO;
 import com.yd.dal.entity.agms.hiring.*;
 import com.yd.dal.entity.agms.hiring.*;
 
 
 import java.util.List;
 import java.util.List;
@@ -56,8 +56,8 @@ public interface AgmsHiringMapper {
 
 
     /**
     /**
      * 经纪人报聘列表查询
      * 经纪人报聘列表查询
-     * @param params 查询条件
+     * @param requestVO 查询条件
      * @return 列表结果
      * @return 列表结果
      */
      */
-    Page<PractitionerHiringListInfo> practitionerHiringList(PractitionerHiringListInfo params);
+    Page<PractitionerHiringListInfo> practitionerHiringList(PractitionerHiringListRequestVO requestVO);
 }
 }

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

@@ -65,7 +65,7 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
         String orderBy = "id desc";
         String orderBy = "id 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.getParams());
+        Page<PractitionerHiringListInfo> destList = agmsHiringMapper.practitionerHiringList(requestVO);
         pageInfo = new PageInfo<>(destList);
         pageInfo = new PageInfo<>(destList);
         return pageInfo;
         return pageInfo;
     }
     }

yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml

@@ -167,14 +167,14 @@
                      ) r
                      ) r
                      on b.id = r.hiring_basic_info_id
                      on b.id = r.hiring_basic_info_id
         where 1=1
         where 1=1
-        <if test="branch != null">
-            and m.branch = #{branch}
+        <if test="branchId != null">
+            and m.branch = #{branchId}
         </if>
         </if>
         <if test="deptId != null">
         <if test="deptId != null">
             and sys.dept_id = #{deptId}
             and sys.dept_id = #{deptId}
         </if>
         </if>
-        <if test="subsystem != null">
-            and m.subsystem = #{subsystem}
+        <if test="subsystemId != null">
+            and m.subsystem = #{subsystemId}
         </if>
         </if>
         <if test="name != null">
         <if test="name != null">
             and b.name = #{name}
             and b.name = #{name}

yd-api/src/main/resources/mapper/customer/AclPractitionerHiringBasicInfoMapper.xml

@@ -287,7 +287,7 @@
         `name` = #{name,jdbcType=VARCHAR},
         `name` = #{name,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="mobileNo != null">
       <if test="mobileNo != null">
-        mobile_no = #{mobileNo,jdbcType=VARCHAR},
+        mobile_no = #{mobileNo,jdbcType=VARCHAR,typeHandler=com.yd.util.deshandler.DESTypeHandler},
       </if>
       </if>
       <if test="idTypeId != null">
       <if test="idTypeId != null">
         id_type_id = #{idTypeId,jdbcType=BIGINT},
         id_type_id = #{idTypeId,jdbcType=BIGINT},
@@ -296,7 +296,7 @@
         id_type = #{idType,jdbcType=VARCHAR},
         id_type = #{idType,jdbcType=VARCHAR},
       </if>
       </if>
       <if test="idNo != null">
       <if test="idNo != null">
-        id_no = #{idNo,jdbcType=VARCHAR},
+        id_no = #{idNo,jdbcType=VARCHAR,typeHandler=com.yd.util.deshandler.DESTypeHandler},
       </if>
       </if>
       <if test="gender != null">
       <if test="gender != null">
         gender = #{gender,jdbcType=INTEGER},
         gender = #{gender,jdbcType=INTEGER},
@@ -379,10 +379,10 @@
     set practitioner_potential_id = #{practitionerPotentialId,jdbcType=BIGINT},
     set practitioner_potential_id = #{practitionerPotentialId,jdbcType=BIGINT},
       invitee_practitioner_id = #{inviteePractitionerId,jdbcType=BIGINT},
       invitee_practitioner_id = #{inviteePractitionerId,jdbcType=BIGINT},
       `name` = #{name,jdbcType=VARCHAR},
       `name` = #{name,jdbcType=VARCHAR},
-      mobile_no = #{mobileNo,jdbcType=VARCHAR},
+      mobile_no = #{mobileNo,jdbcType=VARCHAR,typeHandler=com.yd.util.deshandler.DESTypeHandler},
       id_type_id = #{idTypeId,jdbcType=BIGINT},
       id_type_id = #{idTypeId,jdbcType=BIGINT},
       id_type = #{idType,jdbcType=VARCHAR},
       id_type = #{idType,jdbcType=VARCHAR},
-      id_no = #{idNo,jdbcType=VARCHAR},
+      id_no = #{idNo,jdbcType=VARCHAR,typeHandler=com.yd.util.deshandler.DESTypeHandler},
       gender = #{gender,jdbcType=INTEGER},
       gender = #{gender,jdbcType=INTEGER},
       practitioner_birthdate = #{practitionerBirthdate,jdbcType=DATE},
       practitioner_birthdate = #{practitionerBirthdate,jdbcType=DATE},
       province_id = #{provinceId,jdbcType=BIGINT},
       province_id = #{provinceId,jdbcType=BIGINT},