Explorar el Código

amountAuditing/auditList接口请求参数和返回参数中:增加业务员工id字段

jiakai hace 4 meses
padre
commit
361bc372c4

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/dto/AmountAuditParam.java

@@ -11,6 +11,9 @@ import java.time.LocalDateTime;
 @Data
 public class AmountAuditParam extends PageRequest {
 
+    @Schema(description = "sys_user_jzg_info的主键")
+    private String userJzgInfoId;
+
     @Schema(description = "业务员")
     private String salesman;
 

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/vo/AmountAuditVo.java

@@ -17,6 +17,9 @@ public class AmountAuditVo  extends BaseModel {
     @Schema(description = "主键")
     private String id;
 
+    @Schema(description = "sys_user_jzg_info的主键")
+    private String userJzgInfoId;
+
     @Schema(description = "业务员姓名")
     private String name;
 

+ 4 - 1
tenant/organization/src/main/resources/mapper/SysAmountAuditingMapper.xml

@@ -46,7 +46,7 @@
         saa.id,suji.name as name, su.mobile as mobile,suji.type_attr as attrType,
         sujim.name as managerName,sum.mobile as managerMobile,saa.create_time as createTime,
         saa.amount, saa.balance_amount as balanceAmount,saa.account_name AS accountName,
-        saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum
+        saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum, suji.id as userJzgInfoId
         FROM sys_amount_auditing saa
         LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id
         LEFT JOIN sys_user su on su.id = saa.user_id
@@ -71,6 +71,9 @@
             <if test="param.auditingUser != null and param.auditingUser != ''">
                 and (sua.username = #{param.auditingUser} or sua.mobile = #{param.auditingUser})
             </if>
+            <if test="param.userJzgInfoId != null and param.userJzgInfoId != ''">
+                and suji.id = #{param.userJzgInfoId}
+            </if>
 
             <if test="param.auditingStatus != null ">
                 and saa.auditing_status = #{param.auditingStatus}