From 7e5aa35f29a8e89cf7b8e11fcb2898820cb65c2a Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期四, 06 三月 2025 15:57:50 +0800
Subject: [PATCH] feat: 合同增加多状态查询参数

---
 ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml              |    6 ++++++
 ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java          |    3 +++
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java |    3 ++-
 3 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
index f5a3a67..0cb2c3a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
@@ -24,4 +24,7 @@
     @NotBlank(message = "租户id不可为空")
     @ApiModelProperty(value = "租户id")
     private String tenantId;
+    @ApiModelProperty(value = "查询多个状态")
+    private List<Integer> statuses;
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index 362d630..f1c6fb0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -395,7 +395,8 @@
             TBill save = new TBill();
             save.setId(bill.getId());
             try {
-                smsUtil.sendSms(bill.getPhone(), "2365726", new String[]{bill.getPartyTwoName()});
+                String name = bill.getPartyTwoName().length()>5?bill.getPartyTwoName().substring(0,5):bill.getPartyTwoName();
+                smsUtil.sendSms(bill.getPhone(), "2365726", new String[]{name});
                 save.setSmsStatus(1);
             }catch (ServiceException e){
                 failNum++;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml
index fa366f5..66ccabf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml
@@ -62,6 +62,12 @@
             <if test="query.tenantId != null">
                 and t1.tenant_id = #{query.tenantId}
             </if>
+            <if test="query.statuses != null and query.statuses.size()>0">
+                and t1.status in
+                <foreach collection="query.statuses" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
         </where>
         order by t1.create_time desc

--
Gitblit v1.7.1