From 9cca98d3f486495767ef745f7ada20042571f58d Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 21 五月 2025 12:12:55 +0800
Subject: [PATCH] 补充标准焊缝数据数据查询接口，新增适用plant（适用工厂）字段
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java | 9 +++++++++
1 files changed, 9 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..e2b1ddd 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;
@@ -50,11 +52,13 @@
List<ApsGasPipelineCapacityPlan> list = apsGasPipelineCapacityPlanService.selectApsGasPipelineCapacityPlanList(apsGasPipelineCapacityPlan);
ApsStandardProcess apsStandardProcess = new ApsStandardProcess();
apsStandardProcess.setMajor(apsGasPipelineCapacityPlan.getMajor());
+ apsStandardProcess.setPlant(apsGasPipelineCapacityPlan.getOrgCode());
List<ApsStandardProcess> processList = apsStandardProcessService.selectApsStandardProcessListAll(apsStandardProcess);
if(list.isEmpty()){
for(ApsStandardProcess apsStandardProcessTemp : processList){
ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlanTemp = new ApsGasPipelineCapacityPlan();
apsGasPipelineCapacityPlanTemp.setProcessName(apsStandardProcessTemp.getProcessName());
+ apsGasPipelineCapacityPlanTemp.setOrgCode(apsStandardProcessTemp.getPlant());
list.add(apsGasPipelineCapacityPlanTemp);
}
}
@@ -78,6 +82,7 @@
list.add(apsGasPipelineCapacityPlanTemp);
}
}
+ list.sort((a, b)->a.getProcessName().compareTo(b.getProcessName()));
return getDataTable(list);
}
@@ -117,8 +122,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