24282 1 month ago
parent
commit
2f4e404953

+ 1 - 0
jy-business/src/main/java/com/jy/business/payment/dao/PaymentRequestsDao.java

@@ -135,6 +135,7 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
                 .leftJoin(su).on(pr.createUser.eq(su.id))
                 .leftJoin(ca).on(pr.capitalAccountId.eq(ca.id))
                 .where(
+                        pr.totalAmount.like(dto.getKeyword()).or(pr.useRemark.like(dto.getKeyword())),
                         pr.createUser.in(authService.getUserPermissionSet()),
                         pr.approvalStatus.eq(FlowStatusEnum.PASS.getKey()),
                         pr.corporationId.eq(dto.getCorporationId()),

+ 5 - 0
jy-business/src/main/java/com/jy/business/payment/model/dto/PaymentRequestsSelectDto.java

@@ -44,4 +44,9 @@ public class PaymentRequestsSelectDto extends BaseSelectDto {
      */
     private Integer paymentStatus;
 
+    /**
+     * 关键词
+     */
+    private String keyword;
+
 }

+ 5 - 0
jy-ui/src/views/business/payment/remit/index.vue

@@ -40,6 +40,11 @@ const rowData = ref<StrAnyObj>({})
 
 const queryConfig: FormConfigType[] = [
   {
+    type: 'input',
+    prop: 'keyword',
+    label: '关键词'
+  },
+  {
     type: 'select',
     prop: 'corporationId',
     label: '归属公司',