添加了账户-资金信息

hx-account/src/main/java/com/fjhx/account/controller/account/AccountRunningWaterController.java

@@ -0,0 +1,71 @@
+package com.fjhx.account.controller.account;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
+import com.fjhx.account.entity.account.dto.AccountRunningWaterSelectDto;
+import com.fjhx.account.entity.account.dto.AccountRunningWaterDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.service.account.AccountRunningWaterService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 账户资金流水表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@DS(SourceConstant.ACCOUNT)
+@RestController
+@RequestMapping("/accountRunningWater")
+public class AccountRunningWaterController {
+
+    @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
+
+    /**
+     * 账户资金流水表分页
+     */
+    @PostMapping("/page")
+    public Page<AccountRunningWaterVo> page(@RequestBody AccountRunningWaterSelectDto dto) {
+        return accountRunningWaterService.getPage(dto);
+    }
+
+    /**
+     * 账户资金流水表明细
+     */
+    @PostMapping("/detail")
+    public AccountRunningWaterVo detail(@RequestBody BaseSelectDto dto) {
+        return accountRunningWaterService.detail(dto.getId());
+    }
+
+    /**
+     * 账户资金流水表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountRunningWaterDto accountRunningWaterDto) {
+        accountRunningWaterService.add(accountRunningWaterDto);
+    }
+
+    /**
+     * 账户资金流水表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountRunningWaterDto accountRunningWaterDto) {
+        accountRunningWaterService.edit(accountRunningWaterDto);
+    }
+
+    /**
+     * 账户资金流水表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountRunningWaterService.delete(dto.getId());
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountRunningWaterDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 账户资金流水表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountRunningWaterDto extends AccountRunningWater {
+
+}

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountRunningWaterSelectDto.java

@@ -0,0 +1,30 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 账户资金流水表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountRunningWaterSelectDto extends BaseSelectDto {
+    /**
+     * 账户-管理表ID
+     */
+    private Long accountManagementId;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 收支类型：10 收入，20支出
+     */
+    private String status;
+}

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountRunningWater.java

@@ -0,0 +1,68 @@
+package com.fjhx.account.entity.account.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 账户资金流水表
+ * </p>
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+@TableName("account_running_water")
+public class AccountRunningWater extends BasePo {
+
+    /**
+     * 账户-管理表ID
+     */
+    private Long accountManagementId;
+
+    /**
+     * 收支类型：10 收入，20支出
+     */
+    private String status;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 账户名
+     */
+    private String name;
+
+    /**
+     * 开户银行
+     */
+    private String openingBank;
+
+    /**
+     * 开户账号
+     */
+    private String accountOpening;
+
+    /**
+     * 交易时间
+     */
+    private Date transactionTime;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+}

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountRunningWaterVo.java

@@ -0,0 +1,21 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 账户资金流水表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountRunningWaterVo extends AccountRunningWater {
+    /**
+     * 资金账户名称
+     */
+    private String accountManagementName;
+
+}

hx-account/src/main/java/com/fjhx/account/mapper/account/AccountRunningWaterMapper.java

@@ -0,0 +1,33 @@
+package com.fjhx.account.mapper.account;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 账户资金流水表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-04-06
+ */
+public interface AccountRunningWaterMapper extends BaseMapper<AccountRunningWater> {
+
+    /**
+     * 账户资金流水表分页
+     */
+    Page<AccountRunningWaterVo> getPage(@Param("page") Page<Object> page, @Param("ew")QueryWrapper<Object> wrapper);
+
+    /**
+     * 查询至今账户详情
+     * @param id
+     * @return
+     */
+    AccountRunningWaterVo getDetail(Long id);
+}

hx-account/src/main/java/com/fjhx/account/service/account/AccountRunningWaterService.java

@@ -0,0 +1,46 @@
+package com.fjhx.account.service.account;
+
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
+import com.fjhx.account.entity.account.dto.AccountRunningWaterSelectDto;
+import com.fjhx.account.entity.account.dto.AccountRunningWaterDto;
+
+
+/**
+ * <p>
+ * 账户资金流水表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-06
+ */
+public interface AccountRunningWaterService extends BaseService<AccountRunningWater> {
+
+    /**
+     * 账户资金流水表分页
+     */
+    Page<AccountRunningWaterVo> getPage(AccountRunningWaterSelectDto dto);
+
+    /**
+     * 账户资金流水表明细
+     */
+    AccountRunningWaterVo detail(Long id);
+
+    /**
+     * 账户资金流水表新增
+     */
+    void add(AccountRunningWaterDto accountRunningWaterDto);
+
+    /**
+     * 账户资金流水表编辑
+     */
+    void edit(AccountRunningWaterDto accountRunningWaterDto);
+
+    /**
+     * 账户资金流水表删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,61 @@
+package com.fjhx.account.service.account.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.mapper.account.AccountRunningWaterMapper;
+import com.fjhx.account.service.account.AccountRunningWaterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
+import com.fjhx.account.entity.account.dto.AccountRunningWaterSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.account.entity.account.dto.AccountRunningWaterDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 账户资金流水表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Service
+public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWaterMapper, AccountRunningWater> implements AccountRunningWaterService {
+
+    @Override
+    public Page<AccountRunningWaterVo> getPage(AccountRunningWaterSelectDto dto) {
+        QueryWrapper<Object> wrapper = Wrappers.query();
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getAccountManagementId()),"arw.accountManagementId",dto.getAccountManagementId());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()),"arw.status",dto.getStatus());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()),"arw.currency",dto.getCurrency());
+        Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public AccountRunningWaterVo detail(Long id) {
+        AccountRunningWaterVo result = baseMapper.getDetail(id);
+        return result;
+    }
+
+    @Override
+    public void add(AccountRunningWaterDto accountRunningWaterDto) {
+        this.save(accountRunningWaterDto);
+    }
+
+    @Override
+    public void edit(AccountRunningWaterDto accountRunningWaterDto) {
+        this.updateById(accountRunningWaterDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-account/src/main/resources/mapper/account/AccountRunningWaterMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.account.mapper.account.AccountRunningWaterMapper">
+    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
+        select
+            arw.id,
+            arw.account_management_id,
+            arw.status,
+            arw.amount,
+            arw.currency,
+            arw.name,
+            arw.opening_bank,
+            arw.account_opening,
+            arw.transaction_time,
+            arw.remarks,
+            arw.create_user,
+            arw.create_time,
+            arw.update_user,
+            arw.update_time,
+            am.name accountManagementName
+        from account_running_water arw
+                 left join  account_management am on arw.account_management_id = am.id
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getDetail" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
+        select
+            arw.id,
+            arw.account_management_id,
+            arw.status,
+            arw.amount,
+            arw.currency,
+            arw.name,
+            arw.opening_bank,
+            arw.account_opening,
+            arw.transaction_time,
+            arw.remarks,
+            arw.create_user,
+            arw.create_time,
+            arw.update_user,
+            arw.update_time,
+            am.name accountManagementName
+        from account_running_water arw
+                 left join  account_management am on arw.account_management_id = am.id
+            where arw.id = #{id}
+    </select>
+
+</mapper>