打款更换数据所属人

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

@@ -122,5 +122,8 @@ public class AccountPayment extends BasePo {
      */
     private BigDecimal incomeAmount;
 
-
+    /**
+     * 数据所属人
+     */
+    private Long dataUser;
 }

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

@@ -135,7 +135,7 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         accountPayment.setOpeningBank(accountRequestFunds.getOpeningBank());
         accountPayment.setAccountOpening(accountRequestFunds.getAccountOpening());
         accountPayment.setInterbankNumber(accountRequestFunds.getInterbankNumber());
-        accountPayment.setCreateUser(accountRequestFunds.getCreateUser());
+        accountPayment.setDataUser(accountRequestFunds.getCreateUser());
 
         // 如果是核销 核销数据审批通过后，根据“核销总额 - 预支总额”生成“待打款”数据
         if ("3".equals(accountRequestFunds.getType())) {

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

@@ -108,7 +108,7 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         });
 
         // 赋值用户名称
-        UserUtil.assignmentNickName(records, BasePo::getCreateUser, AccountPaymentVo::setUserName);
+        UserUtil.assignmentNickName(records, AccountPayment::getDataUser, AccountPaymentVo::setUserName);
 
         // 赋值部门名称
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);

hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

@@ -111,7 +111,7 @@ public class PayFlow extends FlowDelegate {
         payment.setAmount(pay.getAmount());
         payment.setIncomeAmount(pay.getAmount());
         payment.setName(pay.getName());
-        payment.setCreateUser(pay.getCreateUser());
+        payment.setDataUser(pay.getCreateUser());
         payment.setBusinessManagementId(pay.getAccountManagementId());
         payment.setOpeningBank(pay.getOpeningBank());
         payment.setBusinessCurrency(pay.getCurrency());

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -255,4 +255,13 @@ public class ContractController {
         return contractService.getAccountRunningWaterByContractId(dto.getId());
     }
 
+    /**
+     * 根据合同id获取合同的资金流水信息
+     */
+    @PostMapping("/111")
+    public void tt111(@RequestBody ContractDto dto) {
+        dto.setCreateUser(133333333333333L);
+        contractService.save(dto);
+    }
+
 }