From 2db6f9b0ac86d4dad8ccc05dbb8ad335dff16615 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 28 Apr 2025 14:51:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BA=BA=E8=84=B8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/hard/api/vo/HardBroadcastVo.java    |  2 +-
 .../controller/HardBroadcastController.java     |  2 +-
 .../resources/mapper/HardBroadcastMapper.xml    |  3 ++-
 .../pjcloud/admin/api/dto/SysUserFaceDto.java   |  7 +++++++
 .../main/resources/mapper/SysUserFaceMapper.xml | 17 +++++++++++++++--
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java
index 6fd8326a4..a6b7ea75f 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java
@@ -39,7 +39,7 @@ public class HardBroadcastVo extends HardBroadcastEntity implements BaseHardInte
 
     private String productDesc;
 
-    private String payPrice;
+    private Integer payPrice;
 
 
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardBroadcastController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardBroadcastController.java
index 11b3d9b92..788a365a2 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardBroadcastController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardBroadcastController.java
@@ -48,7 +48,7 @@ public class HardBroadcastController {
         HardBroadcastDto dto = new HardBroadcastDto();
         DataScope dataScope = null;
         LocalDate today = LocalDate.now();
-        dto.setIsDone(YesNoEnum.YES.getCode());
+        dto.setIsDone(YesNoEnum.NO.getCode());
         dto.setCreateTimeList(new LocalDate[]{today, today.plusDays(1)});
         return R.ok(hardBroadcastService.scopePageJoin(page, dto, dataScope));
     }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml
index acae8298c..35d7a595a 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml
@@ -49,7 +49,7 @@
     <sql id="whereA">
         a.del_flag = '0'
         <if test="dto.userId != null">
-            and a.userId = #{dto.userId}
+            and a.user_id = #{dto.userId}
         </if>
         <if test="dto.hardId != null">
             and a.hard_id = #{dto.hardId}
@@ -84,5 +84,6 @@
         <where>
             <include refid="whereA"/>
         </where>
+        order by a.create_time desc, a.id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java
index c4d9eddc9..96b976f53 100644
--- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java
+++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java
@@ -29,4 +29,11 @@ public class SysUserFaceDto extends SysUserFaceEntity implements BaseIsIncludeTr
     private Boolean isInclude;
 
     private Boolean isFindCheckUser = false;
+
+    /**
+     * 用户相关
+     */
+    private String username;
+
+    private String phone;
 }
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml
index 52cdbec25..01080759f 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml
@@ -15,13 +15,19 @@
     </resultMap>
 
     <sql id="selectA">
-        select a.user_id,
+        select a.id,
+               a.auto_code,
+               a.user_id,
+               a.process_id,
+               a.process_status,
                a.face_img,
                a.create_by,
                a.create_time,
+               a.update_by,
                a.update_time,
                a.del_flag,
                a.tenant_id,
+               a.process_time,
     </sql>
 
     <sql id="whereA">
@@ -29,7 +35,8 @@
         <if test="pa.userId != null">
             and a.user_id = #{pa.userId}
         </if>
-        <if test="pa.userId != null">
+        <if test="pa.processStatus != null">
+            and a.process_status = #{pa.processStatus}
         </if>
     </sql>
 
@@ -43,6 +50,12 @@
         left join sys_user u on u.user_id = a.user_id
         <where>
             <include refid="whereA"/>
+            <if test="pa.username != null">
+                and u.name LIKE CONCAT('%', #{pa.username}, '%')
+            </if>
+            <if test="pa.phone != null">
+                and u.phone LIKE CONCAT('%', #{pa.phone}, '%')
+            </if>
         </where>
     </select>