费控问题处理

hx-form/src/main/java/com/fjhx/form/entity/RemitDetailVo.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @Setter
 @ExcelIgnoreUnannotated
 public class RemitDetailVo {
-    @ColumnWidth(15)
+    @ColumnWidth(20)
     @ExcelProperty("交易时间")
     private Date transactionTime;
     @ColumnWidth(15)
@@ -76,7 +76,7 @@ public class RemitDetailVo {
     @ColumnWidth(20)
     @ExcelProperty("银行科目名称")
     private String bankSubjectName;
-    @ColumnWidth(25)
+    @ColumnWidth(30)
     @ExcelProperty("合并科目核算项目名称")
     private String subjectCalculateItemStr;
     @ColumnWidth(15)

hx-form/src/main/java/com/fjhx/form/flow/CostControlFlow.java

@@ -156,7 +156,7 @@ public class CostControlFlow extends FlowDelegate {
             //添加一条资金流水
             AccountRunningWater accountRunningWater = new AccountRunningWater();
             accountRunningWater.setCompanyId(Long.parseLong(costControl.getCompanyId()));
-            accountRunningWater.setAccountManagementId(null);
+            accountRunningWater.setAccountManagementId(costControl.getPaymentAccountId());
             accountRunningWater.setStatus("10");// 收入
             accountRunningWater.setBusinessId(costControl.getId());
             accountRunningWater.setAmount(costControl.getAmount());

hx-form/src/main/resources/mapper/FinanceReportMapper.xml

@@ -22,22 +22,24 @@
                sum(IF(MONTH ( t1.expenses_time )= 12, t1.tradeAmount, 0)) AS month12_amount
         FROM (SELECT ccd.id,
                      ccd.account_subjects_id,
-                     IF(cc.trade_type = 10, cc.apply_time, ap.expenses_time)                                   AS expenses_time,
-                     IF(cc.trade_type = 10, ccd.money, IF(ap.`status` != 20, ap.amount, 0))                    AS tradeAmount,
+                     IF(cc.trade_type = 10, cc.apply_time, ap.expenses_time) AS expenses_time,
+                     IF(cc.trade_type = 10, ccd.money, -ccd.money)           AS tradeAmount,
                      asj.subjects_code,
                      asj.subjects_name,
+                     asj.sort,
                      CONCAT(asj.subjects_name, ' - ', IFNULL(ccd.calculate_item_name1, ''),
                             IF(ccd.calculate_item_name2 is null, '',
-                               CONCAT(' - ', ccd.calculate_item_name2)))                                       as calculate_item_str
+                               CONCAT(' - ', ccd.calculate_item_name2)))     as calculate_item_str
               FROM cost_control cc
                        JOIN cost_control_detail ccd ON ccd.cost_control_id = cc.id
                        LEFT JOIN account_payment ap ON ap.business_id = cc.id
                        LEFT JOIN account_subjects asj ON ccd.account_subjects_id = asj.id
-              WHERE ap.`status` = 10
-              ORDER BY asj.sort ASC) t1
+              WHERE (cc.trade_type = 10 OR ap.`status` = 10)
+                AND cc.`status` IN (10, 30)) t1
             ${ew.customSqlSegment}
         GROUP BY
             calculate_item_str
+        ORDER BY t1.sort ASC
     </select>
     <select id="getRemitDetailPage" resultType="com.fjhx.form.entity.RemitDetailVo">
         SELECT arw.transaction_time                 AS transactionTime,