请款搜索条件临时提交

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsServiceImpl.java

@@ -81,8 +81,23 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         wrapper.orderByAsc("case arf.status when 10 then 1 when 30 then 2 else 3 END");
         // 同状态按发起时间倒序排序
         wrapper.orderByDesc("arf.create_time");
-        //添加权限自己看自己
+        // 添加权限自己看自己
         wrapper.eq("arf.create_user", SecurityUtils.getUserId());
+
+        // 归属公司
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCorporationId()), "arf.corporation_id", dto.getCorporationId());
+        // 归属部门
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getDepartmentId()), "arf.department_id", dto.getDepartmentId());
+        // 请款人
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCreateUser()), "arf.create_user", dto.getCreateUser());
+        // 币种
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "arf.currency", dto.getCurrency());
+        // 请款时间
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()), "arf.create_time", dto.getBeginTime());
+        wrapper.le(ObjectUtil.isNotEmpty(dto.getEndTime()), "arf.create_time", dto.getEndTime());
+        // 请款金额
+
+
         Page<AccountRequestFundsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         List<AccountRequestFundsVo> records = page.getRecords();

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlow.java

@@ -56,6 +56,7 @@ public class PurchaseFlow extends FlowDelegate {
 
     @Autowired
     private CodingRuleService codingRuleService;
+
     @Autowired
     private PurchaseOtherFeeService purchaseOtherFeeService;