瀏覽代碼

添加了产品看板

wxf 2 年之前
父節點
當前提交
b3c6b8d2ee

+ 35 - 0
hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountRequestFundsSelectDto.java

@@ -75,4 +75,39 @@ public class AccountRequestFundsSelectDto extends BaseSelectDto {
      */
     private Integer writeOffStatus;
 
+    /**
+     * 归属部门ID
+     */
+    private Long departmentId;
+
+    /**
+     * 归属公司ID
+     */
+    private Long corporationId;
+
+    /**
+     * 申请人ID
+     */
+    private Long createUser;
+
+    /**
+     * 币种
+     */
+    private String currency;
+
+    /**
+     * 交易开始金额
+     */
+    private BigDecimal startAmount;
+
+    /**
+     * 交易结束金额
+     */
+    private BigDecimal endAmount;
+
+    /**
+     * 款项说明
+     */
+    private String paymentRemark;
+
 }

+ 1 - 1
hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountPaymentServiceImpl.java

@@ -25,9 +25,9 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;

+ 10 - 0
hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsDetailServiceImpl.java

@@ -82,4 +82,14 @@ public class AccountRequestFundsDetailServiceImpl extends ServiceImpl<AccountReq
         return baseMapper.listByAccountRequestFundsId(accountRequestFundsId);
     }
 
+    /**
+     * 获取到请款明细信息
+     * @param eq
+     * @return
+     */
+    @Override
+    public List<AccountRequestFundsDetail> getList(LambdaQueryWrapper<AccountRequestFundsDetail> eq) {
+        return baseMapper.getList(eq);
+    }
+
 }

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

@@ -60,6 +60,9 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
     @Autowired
     private FlowExampleService flowExampleService;
 
+    @Autowired
+    private AccountManagementService accountManagementService;
+
     /**
      * 查询请款列表
      *