瀏覽代碼

1. 添加搜索条件

785834757 7 月之前
父節點
當前提交
db03ad745f

+ 4 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -233,6 +233,10 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
                 params.put("source",sysAmountAuditingVo.getSource());
             }
 
+            if(StringUtils.isNotBlank(sysAmountAuditingVo.getAuditingUserName())){
+                params.put("auditingUserName",sysAmountAuditingVo.getAuditingUserName());
+            }
+
             List<SysAmountAuditingEntity> list = baseMapper.queryPageOrderNew(params);
             pageHelper=new PageInfo(list);
             BasePageResult<SysAmountAuditingEntity> pageResult=new BasePageResult<SysAmountAuditingEntity>(sysAmountAuditingVo.getPageNum(), sysAmountAuditingVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list);

+ 6 - 0
src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementProductCostsNew.java

@@ -246,6 +246,12 @@ public class PtlAgreementProductCostsNew {
     @TableField(exist = false)
     private boolean effective;
 
+    @ApiModelProperty(value = "审核起始时间 ")
+    private String auditStartTime;
+
+    @ApiModelProperty(value = "审核终止时间")
+    private String auditEndTime;
+
     /**
      * 插入之前id存储
      */

+ 4 - 0
src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductQueryVo.java

@@ -81,6 +81,10 @@ public class AgreementProductQueryVo extends PageRequest {
     @ApiModelProperty("审核人id")
     private String auditPerson;
 
+    @ApiModelProperty("审核开始时间")
+    private String auditStartTime;
 
+    @ApiModelProperty("审核结束时间")
+    private String auditEndTime;
 
 }

+ 5 - 0
src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -152,6 +152,7 @@
                 and a.approval != 1
             </if>
             -->
+
             <if test="amountStatus !=null  and amountStatus != ''">
                 and a.amount_status=#{amountStatus}
             </if>
@@ -188,6 +189,10 @@
                     #{item}
                 </foreach>
             </if>
+
+            <if test="auditingUserName != null and auditingUserName != ''">
+                and a.auditing_user_id = #{auditingUserName}
+            </if>
         </where>
         order by a.create_time desc
     </select>

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

@@ -58,6 +58,10 @@
         <if test="params.auditPerson != null and params.auditPerson!= ''">
             AND papcn.audit_person = #{params.auditPerson}
         </if>
+        <if test="params.auditStartTime != null and params.auditStartTime != ''">
+            AND papcn.audit_time BETWEEN #{params.auditStartTime} and #{params.auditEndTime}
+        </if>
+
 
     </select>