Merge remote-tracking branch 'origin/master'

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

@@ -74,8 +74,6 @@ public class AccountRequestFundsFlow extends FlowDelegate {
             //添加请款详情表的信息
             accountRequestFundsDetailService.saveBatch(accountRequestFundsDetailList);
         }
-        //删除附件
-        ObsFileUtil.removeFile(accountRequestFundsDto.getId());
         //添加附件信息
         ObsFileUtil.saveFile(accountRequestFundsDto.getFileList(),accountRequestFundsDto.getId());
 

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

@@ -138,15 +138,12 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
             this.updateById(accountPaymentDto);
         }
 
-        //删除附件
-        ObsFileUtil.removeFile(accountPaymentDto.getId());
-
         //添加附件信息
         ObsFileUtil.saveFile(accountPaymentDto.getFileList(),accountPaymentDto.getId());
 
         //修改账户-余额表的中余额
         accountRemainder.setRemainder( accountRemainder.getRemainder().subtract(accountPaymentDto.getAmount()));
-        accountRemainderService.updateById(accountRemainder);
+        accountRemainderService.add(accountRemainder);
     }
 
     @Override

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

@@ -0,0 +1,19 @@
+<?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.AccountDeptRunningWaterDetailMapper">
+    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo">
+        select
+            adrwd.id,
+            adrwd.dept_id,
+            adrwd.dept_running_water_id,
+            adrwd.amount,
+            adrwd.remarks,
+            adrwd.create_user,
+            adrwd.create_time,
+            adrwd.update_user,
+            adrwd.update_time
+        from account_dept_running_water_detail adrwd
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>