修改了打款的列表

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

@@ -34,7 +34,7 @@ public class AccountPaymentController {
      * 打款表分页
      */
     @PostMapping("/page")
-    public Page<AccountRequestFundsVo> page(@RequestBody AccountRequestFundsSelectDto dto) {
+    public Page<AccountPaymentVo> page(@RequestBody AccountRequestFundsSelectDto dto) {
         return accountPaymentService.getPage(dto);
     }
 
@@ -54,22 +54,6 @@ public class AccountPaymentController {
         accountPaymentService.add(accountPaymentDto);
     }
 
-    /**
-     * 打款表编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody AccountPaymentDto accountPaymentDto) {
-        accountPaymentService.edit(accountPaymentDto);
-    }
-
-    /**
-     * 打款表删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        accountPaymentService.delete(dto.getId());
-    }
-
 
 
 }

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

@@ -80,4 +80,47 @@ public class AccountPayment extends BasePo {
      */
     private String paymentRemark;
 
+
+    /**
+     * 付款方式（字典funds_payment_method（多余的业务字段）
+     */
+    private String paymentMethod;
+
+    /**
+     * 户名（业务中的收款户名）（多余的业务字段）
+     */
+    private String name;
+
+    /**
+     * 开户银行（业务中的收款开户银行）（多余的业务字段）
+     */
+    private String openingBank;
+
+    /**
+     * 银行账号（业务中的收款银行账号）（多余的业务字段）
+     */
+    private String accountOpening;
+
+    /**
+     * 联行号（业务中的收款联行号）（多余的业务字段）
+     */
+    private String interbankNumber;
+
+    /**
+     * 业务中选中的付款账户表ID（多余字段）
+     */
+    private Long businessManagementId;
+
+    /**
+     * 币种（字典account_currency）（业务中的付款币种）（多余的业务字段）
+     */
+    private String businessCurrency;
+
+
+    /**
+     * 业务金额（业务中需要收款的金额）（多余字段）
+     */
+    private BigDecimal incomeAmount;
+
+
 }

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

@@ -7,11 +7,36 @@ import lombok.Setter;
 /**
  * 打款表列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-11
  */
 @Getter
 @Setter
 public class AccountPaymentVo extends AccountPayment {
 
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     *归属公司名称
+     */
+    private String corporationName;
+
+    /**
+     * 用户名称
+     */
+    private  String userName;
+
+
+    /**
+     * 实际打款的付款账户名称
+     */
+    private  String accountManagementName;
+
+    /**
+     * 业务中选中的付款账户名称
+     */
+    private  String businessManagementName;
 }

hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -116,6 +116,14 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         accountPayment.setPaymentRemark(accountRequestFundsDto.getPaymentRemarks());
         accountPayment.setDepartmentId(accountRequestFundsDto.getDepartmentId());
         accountPayment.setCorporationId(accountRequestFundsDto.getCorporationId());
+        accountPayment.setPaymentMethod(accountRequestFundsDto.getPaymentMethod());
+        accountPayment.setIncomeAmount(accountRequestFundsDto.getTotal());
+        accountPayment.setName(accountRequestFundsDto.getName());
+        accountPayment.setBusinessManagementId(accountRequestFundsDto.getAccountManagementId());
+        accountPayment.setOpeningBank(accountRequestFundsDto.getOpeningBank());
+        accountPayment.setBusinessCurrency(accountPayment.getCurrency());
+        accountPayment.setAccountOpening(accountRequestFundsDto.getAccountOpening());
+        accountPayment.setInterbankNumber(accountPayment.getInterbankNumber());
         accountPaymentService.save(accountPayment);
     }
 }

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

@@ -23,6 +23,6 @@ public interface AccountDeptRunningWaterMapper extends BaseMapper<AccountDeptRun
     /**
      * 部门-资金流水关联表分页
      */
-    Page<AccountRunningWaterVo> getPage(@Param("page") Page<Object> page, QueryWrapper<Object> wrapper);
+    Page<AccountRunningWaterVo> getPage(@Param("page") Page<Object> page,@Param("ew") QueryWrapper<Object> wrapper);
 
 }

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

@@ -23,7 +23,7 @@ public interface AccountPaymentMapper extends BaseMapper<AccountPayment> {
     /**
      * 打款表分页
      */
-    Page<AccountRequestFundsVo> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
+    Page<AccountPaymentVo> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
 
     /**
      * 查询打款详情

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

@@ -23,7 +23,7 @@ public interface AccountPaymentService extends BaseService<AccountPayment> {
     /**
      * 打款表分页
      */
-    Page<AccountRequestFundsVo> getPage(AccountRequestFundsSelectDto dto);
+    Page<AccountPaymentVo> getPage(AccountRequestFundsSelectDto dto);
 
     /**
      * 打款表明细

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
 import com.fjhx.account.entity.account.enums.PaymentTypeEnum;
+import com.fjhx.account.entity.account.po.AccountManagement;
 import com.fjhx.account.entity.account.po.AccountPayment;
 import com.fjhx.account.entity.account.po.AccountRemainder;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
@@ -63,13 +64,16 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
     @Autowired
     private AccountRunningWaterService accountRunningWaterService;
 
+    @Autowired
+    private AccountManagementService accountManagementService;
+
     @Override
-    public Page<AccountRequestFundsVo> getPage(AccountRequestFundsSelectDto dto) {
+    public Page<AccountPaymentVo> getPage(AccountRequestFundsSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()),"ap.status",dto.getPaymentStatus());
         wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()),"ap.payment_remarks",dto.getKeyword());
         wrapper.orderByDesc("ap.status","ap.payment_time","ap.create_time");
-        Page<AccountRequestFundsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        Page<AccountPaymentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         //切换数据源
         DynamicDataSourceContextHolder.push(SourceConstant.COMMON);
@@ -87,8 +91,8 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
 
 
         //赋值部门名称、归属公司名称
-        List<AccountRequestFundsVo> records = page.getRecords();
-        for (AccountRequestFundsVo record : records) {
+        List<AccountPaymentVo> records = page.getRecords();
+        for (AccountPaymentVo record : records) {
             List<SysDept> sysDepts = sysDeptMap.get(record.getDepartmentId());
             if (ObjectUtil.isNotEmpty(sysDepts)){
                 record.setDeptName(sysDepts.get(0).getDeptName());
@@ -101,7 +105,7 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         }
 
         // 赋值用户名称
-        UserUtil.assignmentNickName(records, BasePo::getCreateUser,AccountRequestFundsVo::setUserName);
+        UserUtil.assignmentNickName(records, BasePo::getCreateUser,AccountPaymentVo::setUserName);
 
         return page;
     }
@@ -113,6 +117,18 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
     public AccountPaymentVo detail(Long id) {
         AccountPayment AccountPayment = baseMapper.detail(id);
         AccountPaymentVo result = BeanUtil.toBean(AccountPayment, AccountPaymentVo.class);
+
+        if (ObjectUtil.isNotEmpty(result.getAccountManagementId())){
+            //查询实际打款的付款账户名称；
+            AccountManagement accountManagement = accountManagementService.getById(result.getAccountManagementId());
+            result.setAccountManagementName(accountManagement.getName());
+        }
+
+        if (ObjectUtil.isNotEmpty(result.getBusinessManagementId())){
+            //查询业务中选中的付款账户名称；
+            AccountManagement accountManagement = accountManagementService.getById(result.getBusinessManagementId());
+            result.setBusinessManagementName(accountManagement.getName());
+        }
         return result;
     }
 

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

@@ -1,18 +1,17 @@
 <?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.AccountPaymentMapper">
-    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRequestFundsVo">
+    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountPaymentVo">
         select
             ap.id,
             ap.tenant_id,
-            ap.payment_remark,
             ap.account_management_id,
             ap.department_id,
             ap.corporation_id,
             ap.business_id,
             ap.expenses_time,
-            ap.payment_time,
             ap.currency,
+            ap.payment_time,
             ap.amount,
             ap.status,
             ap.type,
@@ -20,7 +19,16 @@
             ap.create_user,
             ap.create_time,
             ap.update_user,
-            ap.update_time
+            ap.payment_remark,
+            ap.update_time,
+            ap.payment_method,
+            ap.income_amount,
+            ap.name,
+            ap.business_management_id,
+            ap.opening_bank,
+            ap.bussines_currency,
+            ap.account_opening,
+            ap.interbank_number
         from account_payment ap
             ${ew.customSqlSegment}
     </select>
@@ -43,8 +51,18 @@
             ap.create_time,
             ap.update_user,
             ap.payment_remark,
-            ap.update_time
+            ap.update_time,
+
+            ap.payment_method,
+            ap.income_amount,
+            ap.name,
+            ap.business_management_id,
+            ap.opening_bank,
+            ap.bussines_currency,
+            ap.account_opening,
+            ap.interbank_number
         from account_payment ap
+        where
            ap.id = #{id}
     </select>
 

hx-victoriatourist/pom.xml

@@ -32,4 +32,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>