Merge branch 'master' into test

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

@@ -126,6 +126,17 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
                //添加部门-资金流水关联表的信息
                accountDeptRunningWaterService.save(accountDeptRunningWater);
                accountDeptRunningWaterDetail.setDeptRunningWaterId(accountDeptRunningWater.getId());
+
+               //根据流水id获取流水金额
+               AccountRunningWater oldAccountRunningWater = accountRunningWaterService.getById(accountRunningWaterVo.getId());
+               accountDeptRunningWaterDetail.setAmount(oldAccountRunningWater.getAmount());
+
+               //调整部门删除历史调整数据
+               AccountDeptRunningWater one = accountDeptRunningWaterService.getOne(q -> q
+                       .eq(AccountDeptRunningWater::getRunningWaterId, accountRunningWaterVo.getId())
+               );
+               this.delete(one.getId());
+
                baseMapper.insert(accountDeptRunningWaterDetail);
            }
         }

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

@@ -28,15 +28,15 @@
     </select>
 
     <select id="DeptRunningWaterReport" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
-        SELECT
-            IF(ar.`status` = 10,SUM(wd.amount),0) incomeAmount,
-            IF(ar.`status` = 20,SUM(wd.amount),0) expenditureAmount,
-            wd.dept_id deptId,
-            DATE_FORMAT(ar.create_time,'%Y-%m') time,
-	        (IF(ar.`status` = 10,SUM(wd.amount),0) - IF(ar.`status` = 20,SUM(wd.amount),0)) balanceAmount
+        SELECT SUM(IF(ar.`status` = 10, wd.amount, 0)) incomeAmount,
+               SUM(IF(ar.`status` = 20, wd.amount, 0)) expenditureAmount,
+               wd.dept_id                              deptId,
+               DATE_FORMAT(ar.create_time, '%Y-%m') time,
+	        SUM(IF(ar.`status` = 10,wd.amount,0) - IF(ar.`status` = 20,wd.amount,0)) balanceAmount
         FROM
             account_dept_running_water rw
-            JOIN account_dept_running_water_detail wd  ON rw.id = wd.dept_running_water_id
+            JOIN account_dept_running_water_detail wd
+        ON rw.id = wd.dept_running_water_id
             LEFT JOIN account_running_water ar ON rw.running_water_id = ar.id
             ${ew.customSqlSegment}
     </select>