Răsfoiți Sursa

查询修改

Qchen 2 ani în urmă
părinte
comite
bff4d27cdc

+ 15 - 0
src/main/java/com/ydtech/modules/admin/model/vo/SysDeptAccountWithdrawVo.java

@@ -30,6 +30,21 @@ public class SysDeptAccountWithdrawVo implements Serializable {
     @ApiModelProperty(value = "提现状态")
     private String status;
 
+    @TableField(value = "withdraw_userid")
+    @ApiModelProperty(value = "申请提现人id")
+    private String withdrawUserid;
+    @TableField(value = "withdraw_name")
+    @ApiModelProperty(value = "申请提现人姓名")
+    private String withdrawName;
+
+    @TableField(value = "audit_userid")
+    @ApiModelProperty(value = "审核人id")
+    private String auditUserid;
+
+    @TableField(value = "audit_name")
+    @ApiModelProperty(value = "审核人姓名")
+    private String auditName;
+
     @TableField(value = "remark")
     @ApiModelProperty(value = "备注")
     private String remark;

+ 8 - 0
src/main/resources/mapper/modules/admin/SysDeptAccountWithdrawMapper.xml

@@ -13,6 +13,10 @@
         <result property="createTime" column="create_date" jdbcType="TIMESTAMP"/>
         <result property="createTimeStart" column="createTimeStart" jdbcType="VARCHAR"/>
         <result property="createTimeEnd" column="createTimeEnd" jdbcType="VARCHAR"/>
+        <result property="auditName" column="audit_name" jdbcType="VARCHAR"/>
+        <result property="auditUserid" column="audit_userid" jdbcType="VARCHAR"/>
+        <result property="withdrawUserid" column="withdraw_userid" jdbcType="VARCHAR"/>
+        <result property="withdrawName" column="withdraw_name" jdbcType="VARCHAR"/>
     </resultMap>
 
 
@@ -26,6 +30,10 @@
         remark,
         voucher_id,
         pic_id,
+        withdraw_userid,
+        withdraw_name,
+        audit_userid,
+        audit_name,
         DATE(create_time) as create_date
         from sys_dept_account_withdraw
         where

+ 1 - 1
src/main/resources/mapper/modules/protocols/PtlAgreementProductCostsNewMapper.xml

@@ -32,7 +32,7 @@
             </foreach>
         </if>
         <if test="params.createStartTime != null and params.createStartTime != ''">
-            and papcn.create_time BETWEEN #{params.createStartTime} and #{params.createEndTime}
+            and DATE(papcn.create_time) BETWEEN #{params.createStartTime} and #{params.createEndTime}
         </if>
 
     </select>