Merge remote-tracking branch 'origin/test' into test

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -1361,8 +1361,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         queryWrapper.eq(StringUtils.isNotBlank(fortuneBizType), "fortune_biz_type", fortuneBizType);
         // 根据投保人名称查询
         if (StringUtils.isNotBlank(policyHolder)) {
-            queryWrapper.apply("EXISTS (SELECT 1 FROM policy_follow f WHERE f.policy_no = expected_fortune.policy_no AND (f.policy_holder like concat('%', ?, '%') or f.policy_holder_en like concat('%', ?, '%')))",
-                    policyHolder, policyHolder);
+            queryWrapper.apply("EXISTS (SELECT 1 FROM policy_follow f WHERE f.policy_no = expected_fortune.policy_no AND (f.policy_holder like CONCAT('%', {0}, '%') or f.policy_holder_en like CONCAT('%', {0}, '%')))",
+                    policyHolder);
         }
 
         queryWrapper.in(ObjectUtils.isNotEmpty(request.getPolicyNoList()), "policy_no", request.getPolicyNoList());

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java

@@ -1050,6 +1050,9 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
             newFortune.setExpectedFortuneBizId(newExpectedFortuneBizId);
 
+            // 应付款编号
+            newFortune.setPayableNo(payableNo);
+
             // 赋值分期出账信息
             BeanUtils.copyProperties(splitDto, newFortune);
             // 特殊字段

yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml

@@ -266,7 +266,7 @@
             </if>
         </where>
 
-        ORDER BY type ASC, create_time ASC
+        ORDER BY type ASC, create_time ASC, payable_no ASC
         LIMIT #{pageSize} OFFSET #{offset}
     </select>