From 8bbe2bb92ddfeb1766eb7324a6c39acd5e2b1c5c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 10:21:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
index db7b77d..1ac259f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
@@ -1,5 +1,6 @@
package com.aps.core.controller.basicData;
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
@@ -7,6 +8,7 @@
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
+import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsGasPipelineCapacityPlan;
import com.aps.core.domain.ApsStandardProcess;
import com.aps.core.service.IApsGasPipelineCapacityPlanService;
@@ -78,6 +80,7 @@
list.add(apsGasPipelineCapacityPlanTemp);
}
}
+ list.sort((a, b)->a.getProcessName().compareTo(b.getProcessName()));
return getDataTable(list);
}
@@ -117,8 +120,12 @@
{
apsGasPipelineCapacityPlan.forEach(apsGasPipelineCapacityPlanTemp -> {
if(apsGasPipelineCapacityPlanTemp.getId()==null){
+ apsGasPipelineCapacityPlanTemp.setCreateBy(SecurityUtils.getUsername());
+ apsGasPipelineCapacityPlanTemp.setCreateTime(DateUtils.getNowDate());
apsGasPipelineCapacityPlanService.insertApsGasPipelineCapacityPlan(apsGasPipelineCapacityPlanTemp);
}else{
+ apsGasPipelineCapacityPlanTemp.setUpdateBy(SecurityUtils.getUsername());
+ apsGasPipelineCapacityPlanTemp.setUpdateTime(DateUtils.getNowDate());
apsGasPipelineCapacityPlanService.updateApsGasPipelineCapacityPlan(apsGasPipelineCapacityPlanTemp);
}
});
--
Gitblit v1.9.3