Browse Source

问题处理

yzc 11 months ago
parent
commit
cb677f13ca

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

@@ -215,6 +215,9 @@ public class CostControlFlow extends FlowDelegate {
             costControlService.addOrEdit(costControlDto);
         }
 
+        //修改数据重新刷金额
+        submitData.put("amount", costControlDto.getAmount());
+
         //执行原本的方法
         super.defaultMethod(flowId, businessId, handleNodeType, flowStatus, submitData);
     }

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

@@ -52,7 +52,7 @@
                                                     AND cci.business_id = cciv.calculate_item_id
                                   GROUP BY cci.cost_control_detail_id) t2 ON t2.cost_control_detail_id = ccd.id
               WHERE (cc.trade_type = 10 OR ap.`status` = 10)
-                AND cc.`status` IN (10, 30)) t1
+                AND cc.`status` IN (30, 60)) t1
                  LEFT JOIN calculate_item_balance cib
                            ON cib.id_str = t1.subjects_calculate_item_ids and cib.year = YEAR ( t1.expenses_time )
             ${ew.customSqlSegment}