AGMS增加经纪人报聘信息的查询与导出,在原有‘审批流程’页面上增加查询条件（申请开始日期，申请结束日期）

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

@@ -314,6 +314,9 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         try {
         try {
             Long loginId = requestVO.getLoginId();
             Long loginId = requestVO.getLoginId();
             String status = requestVO.getStatus();
             String status = requestVO.getStatus();
+            if (!CommonUtil.isNullOrBlank(requestVO.getName())) {
+            	requestVO.setName("%"+requestVO.getName()+"%");
+            }
 
 
             List<PractitionerHiringListInfo> list;
             List<PractitionerHiringListInfo> list;
             if ("0".equals(status)) {
             if ("0".equals(status)) {
@@ -324,7 +327,6 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
                 int pageSize = pageInfo.getPageSize();
                 int pageSize = pageInfo.getPageSize();
                 PageInfo<PractitionerHiringListInfo> page = PageInfoUtils.list2PageInfo(list, pageNum, pageSize);
                 PageInfo<PractitionerHiringListInfo> page = PageInfoUtils.list2PageInfo(list, pageNum, pageSize);
                 resp.setPractitionerHiringList(page);
                 resp.setPractitionerHiringList(page);
-
             } else {
             } else {
                 // 通过loginId查询此登入者的经纪人id
                 // 通过loginId查询此登入者的经纪人id
                 Long loginPractitionerId = agmsHiringDalService.findPractitionerIdByLoginId(loginId);
                 Long loginPractitionerId = agmsHiringDalService.findPractitionerIdByLoginId(loginId);

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

@@ -78,7 +78,8 @@ public interface AgmsHiringMapper {
                                                         @Param("name")String name
                                                         @Param("name")String name
                                                         );
                                                         );
 
 
-    List<PractitionerHiringListInfo> queryS2List(@Param("approveStatus")String approveStatus);
+    List<PractitionerHiringListInfo> queryS2List(@Param("approveStatus")String approveStatus,
+            									 @Param("name")String name);
 
 
     Page<PractitionerHiringListInfo> practitionerApplyList(@Param("approveStatus")String approveStatus,
     Page<PractitionerHiringListInfo> practitionerApplyList(@Param("approveStatus")String approveStatus,
     													   @Param("list")List<String> canAprroveGrades,
     													   @Param("list")List<String> canAprroveGrades,

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

@@ -372,7 +372,7 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
             }
             }
 
 
             if (canAprroveGrades.contains("30")) {
             if (canAprroveGrades.contains("30")) {
-                List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List(approveStatus);
+                List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List(approveStatus,requestVO.getName());
                 dataList.addAll(s2List);
                 dataList.addAll(s2List);
             }
             }
 
 
@@ -388,6 +388,7 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
 
 
     @Override
     @Override
     public List<PractitionerHiringListInfo> practitionerApplyList(PractitionerHiringListRequestVO requestVO) {
     public List<PractitionerHiringListInfo> practitionerApplyList(PractitionerHiringListRequestVO requestVO) {
+        PageHelper.clearPage();//偶然遇到了这个问题，同一个查询结果一会是10个（预期），一会是真实个数（刷新/重启应用就又变成真实个数）  查看日志，发现了问题：结果为10个时查询SQL自动加上了Limit 10
         //体系查询调整，如果体系为S3，则需要查询它下面的所有子集
         //体系查询调整，如果体系为S3，则需要查询它下面的所有子集
         PractitionerSubordinateInfo practitionerSubordinateInfo = new PractitionerSubordinateInfo();
         PractitionerSubordinateInfo practitionerSubordinateInfo = new PractitionerSubordinateInfo();
         BeanUtils.copyProperties(requestVO,practitionerSubordinateInfo);
         BeanUtils.copyProperties(requestVO,practitionerSubordinateInfo);

yd-api/src/main/java/com/yd/dal/service/practitioner/impl/PractitionerHiringDALServiceImpl.java

@@ -264,7 +264,7 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
             }
             }
 
 
             if (canAprroveGrades.contains("30")) {
             if (canAprroveGrades.contains("30")) {
-                List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List(approveStatus);
+                List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List(approveStatus,null);
                 dataList.addAll(s2List);
                 dataList.addAll(s2List);
             }
             }
         }
         }

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

@@ -253,7 +253,7 @@
             </foreach>
             </foreach>
         </if>
         </if>
         <if test="name != null">
         <if test="name != null">
-            and b.name = #{name}
+            and b.name like #{name}
         </if>
         </if>
     </select>
     </select>
 
 
@@ -300,7 +300,7 @@
             </foreach>
             </foreach>
         </if>
         </if>
         <if test="name != null">
         <if test="name != null">
-            and b.name = #{name}
+            and b.name like #{name}
         </if>
         </if>
 
 
     </select>
     </select>
@@ -324,6 +324,9 @@
         <if test="approveStatus != null">
         <if test="approveStatus != null">
             and b.approve_status = #{approveStatus}
             and b.approve_status = #{approveStatus}
         </if>
         </if>
+        <if test="name != null">
+            and b.name like #{name}
+        </if>
         and m.md_drop_option_id
         and m.md_drop_option_id
                 in (select md.id
                 in (select md.id
                     from ag_md_drop_options md
                     from ag_md_drop_options md