fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderCheckLogQueryBo.java

@@ -42,6 +42,9 @@ public class TopOldOrderCheckLogQueryBo extends BaseEntity {
 	/** 角色ID */
 	@ApiModelProperty("角色ID")
 	private Long roleId;
+	/** 流程类型：1审核，2支付 */
+	@ApiModelProperty("流程类型：1审核，2支付")
+	private Integer type;
 	/** 审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付） */
 	@ApiModelProperty("审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付）")
 	private Integer checkStatus;
@@ -54,6 +57,9 @@ public class TopOldOrderCheckLogQueryBo extends BaseEntity {
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
+	/** 顺序 */
+	@ApiModelProperty("顺序")
+	private Integer checkSort;
 	/** 审核来源 1退款 2机构分成应付 3业务员提成 */
 	@ApiModelProperty("审核来源 1退款 2机构分成应付 3业务员提成")
 	private Integer checkFrom;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderCheckLogServiceImpl.java

@@ -41,10 +41,16 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
         LambdaQueryWrapper<TopOldOrderCheckLog> lqw = Wrappers.lambdaQuery();
         lqw.eq(StrUtil.isNotBlank(bo.getRefundSn()), TopOldOrderCheckLog::getRefundSn, bo.getRefundSn());
         lqw.eq(bo.getRoleId() != null, TopOldOrderCheckLog::getRoleId, bo.getRoleId());
+        lqw.eq(bo.getType() != null, TopOldOrderCheckLog::getType, bo.getType());
         lqw.eq(bo.getCheckStatus() != null, TopOldOrderCheckLog::getCheckStatus, bo.getCheckStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getCheckReason()), TopOldOrderCheckLog::getCheckReason, bo.getCheckReason());
         lqw.eq(bo.getCheckSign() != null, TopOldOrderCheckLog::getCheckSign, bo.getCheckSign());
         lqw.eq(bo.getStatus() != null, TopOldOrderCheckLog::getStatus, bo.getStatus());
+        lqw.eq(bo.getCheckSort() != null, TopOldOrderCheckLog::getCheckSort, bo.getCheckSort());
+        lqw.eq(bo.getCheckFrom() != null, TopOldOrderCheckLog::getCheckFrom, bo.getCheckFrom());
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), TopOldOrderCheckLog::getOrderSn, bo.getOrderSn());
+        lqw.eq(bo.getCheckTime() != null, TopOldOrderCheckLog::getCheckTime, bo.getCheckTime());
+        lqw.like(StrUtil.isNotBlank(bo.getCheckUsername()), TopOldOrderCheckLog::getCheckUsername, bo.getCheckUsername());
         return entity2Vo(this.list(lqw));
     }