个贷问题优化

biz-base/src/main/java/com/dayou/controller/PersonalController.java

@@ -158,8 +158,8 @@ public class PersonalController extends BaseController {
      * @return
      */
     @GetMapping("/waitingAllot")
-    public RestResponse<Page<PersonalVO>> waitingAllotOrderPage(Page page){
-        Page<PersonalVO> ret = personalService.waitingAllotOrderPage(page);
+    public RestResponse<Page<PersonalVO>> waitingAllotOrderPage(Page page,String keyword){
+        Page<PersonalVO> ret = personalService.waitingAllotOrderPage(page,keyword);
         return RestResponse.data(ret);
     }
 

dao/src/main/java/com/dayou/mapper/PersonalMapper.java

@@ -32,7 +32,7 @@ public interface PersonalMapper extends CustomBaseMapper<Personal> {
 
     Page<PersonalVO> myOrder(Page page, @Param("personal")PersonalVO personal ,@Param("keyword") String keyword);
 
-    Page<PersonalVO> waitingAllotOrderPage(Page page);
+    Page<PersonalVO> waitingAllotOrderPage(Page page,@Param("keyword") String keyword);
 
     void batchUpdateOutWardStaffId(@Param("userId") Long userId, @Param("list") List<Long> orderIds);
 }

dao/src/main/resources/mapper/PersonalMapper.xml

@@ -115,6 +115,8 @@
             or cc1.name like concat('%',#{keyword},'%')
             or cc2.name like concat('%',#{keyword},'%')
             or cl1.name like concat('%',#{keyword},'%')
+            or p.bailorA_tel like concat('%',#{keyword},'%')
+            or p.bailorB_tel like concat('%',#{keyword},'%')
             )
         </if>
         <if test="personal!=null and personal.startDate!=null and personal.startDate!=''">
@@ -225,6 +227,8 @@
             or p.order_id like concat('%',#{keyword},'%')
             or cc1.name like concat('%',#{keyword},'%')
             or cc2.name like concat('%',#{keyword},'%')
+            or p.bailorA_tel like concat('%',#{keyword},'%')
+            or p.bailorB_tel like concat('%',#{keyword},'%')
             )
         </if>
     </select>
@@ -274,6 +278,8 @@
             or p.bailorB like concat('%',#{keyword},'%')
             or cc1.name like concat('%',#{keyword},'%')
             or cc2.name like concat('%',#{keyword},'%')
+            or p.bailorA_tel like concat('%',#{keyword},'%')
+            or p.bailorB_tel like concat('%',#{keyword},'%')
             )
         </if>
         <if test="personal!=null and personal.startDate!=null and personal.startDate!=''">
@@ -346,6 +352,8 @@
             or cc1.name like concat('%',#{keyword},'%')
             or cc2.name like concat('%',#{keyword},'%')
             or cl.name like concat('%',#{keyword},'%')
+            or p.bailorA_tel like concat('%',#{keyword},'%')
+            or p.bailorB_tel like concat('%',#{keyword},'%')
             )
         </if>
         <if test="personal!=null and personal.startDate!=null and personal.startDate!=''">
@@ -391,6 +399,20 @@
                 LEFT JOIN `user` u ON u.id = p.client_manager_id
         WHERE
             p.deleted = 0
+        <if test="keyword!=null and keyword!='' ">
+            and (
+            p.location like concat ('%',#{keyword},'%')
+            or p.order_id like concat('%',#{keyword},'%')
+            or p.agent like concat('%',#{keyword},'%')
+            or p.bailorA like concat('%',#{keyword},'%')
+            or p.bailorB like concat('%',#{keyword},'%')
+            or cc1.name like concat('%',#{keyword},'%')
+            or cc2.name like concat('%',#{keyword},'%')
+            or cl1.name like concat('%',#{keyword},'%')
+            or p.bailorA_tel like concat('%',#{keyword},'%')
+            or p.bailorB_tel like concat('%',#{keyword},'%')
+            )
+        </if>
         order by p.created DESC
     </select>
 

dao/src/main/resources/mapper/WorkTaskRecordMapper.xml

@@ -320,6 +320,8 @@
             or cc.name like concat('%',#{keyword},'%')
             or cc1.name like concat('%',#{keyword},'%')
             or cl.name like concat('%',#{keyword},'%')
+            or p.bailorA_tel like concat('%',#{keyword},'%')
+            or p.bailorB_tel like concat('%',#{keyword},'%')
             )
         </if>
         <if test="personal!=null and personal.startDate!=null and personal.startDate!=''">
@@ -393,6 +395,8 @@
                 or p.order_id like concat('%',#{keyword},'%')
                 or p.clientName like concat('%',#{keyword},'%')
                 or p.clientSubName like concat('%',#{keyword},'%')
+                or p.bailoraTel like concat('%',#{keyword},'%')
+                or p.bailorbTel like concat('%',#{keyword},'%')
                 )
             </if>
             <if test="todoVO!=null and todoVO.nodeName!=null and todoVO.nodeName!='' ">

domain/src/main/java/com/dayou/entity/Personal.java

@@ -146,6 +146,7 @@ public class Personal extends BaseEntity {
     @TableField("bailorA_tel")
     @ImportCell
     @ExportCell(columnName = "委托人1电话")
+    @LuceneSearchable("bailorA_tel")
     private String bailoraTel;
 
     /**
@@ -154,6 +155,7 @@ public class Personal extends BaseEntity {
     @TableField("bailorB_tel")
     @ImportCell
     @ExportCell(columnName = "委托人2电话")
+    @LuceneSearchable("bailorB_tel")
     private String bailorbTel;
 
     /**

service/src/main/java/com/dayou/service/IPersonalService.java

@@ -55,7 +55,7 @@ public interface IPersonalService extends IService<Personal> {
 
     Boolean doPersonalAllotRealAmount(List<OrderReportDTO> claimOrders);
 
-    Page<PersonalVO> waitingAllotOrderPage(Page page);
+    Page<PersonalVO> waitingAllotOrderPage(Page page,String keyword);
 
     Boolean doAllotOrder(PersonalAllotOrderDTO dto);
 

service/src/main/java/com/dayou/service/impl/PersonalServiceImpl.java

@@ -372,8 +372,8 @@ public class PersonalServiceImpl extends ServiceImpl<PersonalMapper, Personal> i
     }
 
     @Override
-    public Page<PersonalVO> waitingAllotOrderPage(Page page) {
-        return personalMapper.waitingAllotOrderPage(page);
+    public Page<PersonalVO> waitingAllotOrderPage(Page page,String keyword) {
+        return personalMapper.waitingAllotOrderPage(page,keyword);
     }
 
     @Transactional