费控问题处理

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

@@ -34,6 +34,8 @@ public class AccountSubjectsServiceImpl extends ServiceImpl<AccountSubjectsMappe
 
         wrapper.keyword(dto.getKeyword(), new SqlField("asu.subjects_name"), new SqlField("calculate_item_name"));
 
+        wrapper.orderByAsc("asu", AccountSubjects::getSort);
+
         wrapper.orderByDesc("asu", AccountSubjects::getId);
         List<AccountSubjectsVo> list = this.baseMapper.getList(wrapper);
         return list;
@@ -45,6 +47,8 @@ public class AccountSubjectsServiceImpl extends ServiceImpl<AccountSubjectsMappe
 
         wrapper.keyword(dto.getKeyword(), new SqlField("asu.subjects_name"), new SqlField("calculate_item_name"));
 
+        wrapper.orderByAsc("asu", AccountSubjects::getSort);
+
         wrapper.orderByDesc("asu", AccountSubjects::getId);
         Page<AccountSubjectsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;

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

@@ -7,6 +7,7 @@ import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.flow.enums.NodeTypeEnum;
 import com.fjhx.form.entity.cost.dto.CostControlDto;
 import com.fjhx.form.entity.cost.po.CostControl;
 import com.fjhx.form.entity.cost.po.CostControlDetail;
@@ -121,4 +122,14 @@ public class CostControlFlow extends FlowDelegate {
         costControlService.cancellation(businessId);
     }
 
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, NodeTypeEnum handleNodeType, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.defaultMethod(flowId, businessId, handleNodeType, flowStatus, submitData);
+
+        //修改数据
+        CostControlDto costControlDto = submitData.toJavaObject(CostControlDto.class);
+        if (ObjectUtil.isNotEmpty(costControlDto) && ObjectUtil.isNotEmpty(costControlDto.getId())) {
+            costControlService.addOrEdit(costControlDto);
+        }
+    }
 }

hx-form/src/main/java/com/fjhx/form/service/cost/impl/CostControlServiceImpl.java

@@ -217,9 +217,13 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
 
             //保存核算项目
             List<CalculateItem> calculateItemList = costControlDetailDto.getCalculateItemList();
+            if (calculateItemList == null) {
+                calculateItemList = new ArrayList<>();
+            }
             calculateItemList.forEach(item -> item.setCostControlDetailId(costControlDetailDto.getId()));
             calculateItemService.editLinked(calculateItemList, CalculateItem::getCostControlDetailId, costControlDetailDto.getId());
 
+
             //标记流水为结算中
             String stockJournalDetailsIds = costControlDetailDto.getStockJournalDetailsIds();
             if (ObjectUtil.isNotEmpty(stockJournalDetailsIds)) {