From c8abec662e3c634365a9aeeda5c57e0f0e51cb41 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 16:44:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java | 12 +-
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml | 3
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java | 188 +++++++++++++++++++++++-----------------------
4 files changed, 104 insertions(+), 103 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 0b08b15..9547d84 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
@@ -50,7 +50,7 @@
* 鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃
*/
@Operation(summary = "鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃", description = "鍒嗛〉鏌ヨ")
-// @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
+ @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
@GetMapping("/list")
public TableDataInfo list(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) {
// startPage();
@@ -66,8 +66,8 @@
apsGasPipelineCapacityPlanTemp.setProcessName(apsStandardProcessTemp.getProcessName());
apsGasPipelineCapacityPlanTemp.setOrgCode(apsStandardProcessTemp.getPlant());
apsGasPipelineCapacityPlanTemp.setWorkshop(apsShops.stream()
- .filter(shop -> Objects.equals(shop.getShopName(), apsStandardProcessTemp.getWorkShop()))
- .map(ApsShop::getShopCode)
+ .filter(shop -> Objects.equals(shop.getShopCode(), apsStandardProcessTemp.getWorkShop()))
+ .map(ApsShop::getShopName)
.findFirst()
.orElse(null));
list.add(apsGasPipelineCapacityPlanTemp);
@@ -105,8 +105,8 @@
apsGasPipelineCapacityPlanTemp.setProcessName(process.getProcessName());
apsGasPipelineCapacityPlanTemp.setOrgCode(process.getPlant());
apsGasPipelineCapacityPlanTemp.setWorkshop(apsShops.stream()
- .filter(shop -> Objects.equals(shop.getShopName(), process.getWorkShop()))
- .map(ApsShop::getShopCode)
+ .filter(shop -> Objects.equals(shop.getShopCode(), process.getWorkShop()))
+ .map(ApsShop::getShopName)
.findFirst()
.orElse(null));
list.add(apsGasPipelineCapacityPlanTemp);
@@ -134,7 +134,7 @@
* 澶嶅埗姘斾綋绠¤矾浜ц兘瑙勫垝
*/
@Operation(summary = "澶嶅埗姘斾綋绠¤矾浜ц兘瑙勫垝", description = "澶嶅埗")
-// @RequiresPermissions("aps:gasPipelineCapacityPlan:copy")
+ @RequiresPermissions("aps:gasPipelineCapacityPlan:copy")
@Log(title = "澶嶅埗姘斾綋绠¤矾浜ц兘瑙勫垝", businessType = BusinessType.INSERT)
@PutMapping("/copy")
public AjaxResult copy(
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
index e6f7157..298e489 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
@@ -14,14 +14,13 @@
/**
* 鏍囧噯宸ュ簭瀵硅薄 aps_standard_process
- *
+ *
* @author hjy
* @date 2025-04-23
*/
@Schema(description = "鏍囧噯宸ュ簭瀹炰綋")
-public class ApsStandardProcess extends BaseEntity
-{
+public class ApsStandardProcess extends BaseEntity {
private static final long serialVersionUID = 1L;
@Id
@@ -32,75 +31,102 @@
@Schema(description = "涓婚敭id", type = "Long")
private Long id;
- /** 宸ュ簭缂栫爜 */
+ /**
+ * 宸ュ簭缂栫爜
+ */
@Schema(description = "宸ュ簭缂栫爜", type = "String")
@Excel(name = "宸ュ簭缂栫爜")
private String processNumber;
- /** 宸ュ簭鍚嶇О */
+ /**
+ * 宸ュ簭鍚嶇О
+ */
@Schema(description = "宸ュ簭鍚嶇О", type = "String")
@Excel(name = "宸ュ簭鍚嶇О")
private String processName;
- /** 璧勬簮缁� */
+ /**
+ * 璧勬簮缁�
+ */
@Schema(description = "璧勬簮缁�", type = "String")
@Excel(name = "璧勬簮缁�")
private String resourceGroupName;
- /** 涓撲笟 */
+ /**
+ * 涓撲笟
+ */
@Schema(description = "涓撲笟", type = "String")
@Excel(name = "涓撲笟")
private String major;
- /** 浜ц兘妯″瀷: 鐙崰/鍚堟壒 */
+ /**
+ * 浜ц兘妯″瀷: 鐙崰/鍚堟壒
+ */
@Schema(description = "浜ц兘妯″瀷", type = "String")
@Excel(name = "浜ц兘妯″瀷")
private String model;
- /** 璁捐浜ц兘 */
+ /**
+ * 璁捐浜ц兘
+ */
@Schema(description = "璁捐浜ц兘", type = "String")
@Excel(name = "璁捐浜ц兘")
private BigDecimal designCapacity;
- /** 宸ュ巶Id */
+ /**
+ * 宸ュ巶Id
+ */
@Schema(description = "宸ュ巶Id", type = "String")
// @Excel(name = "宸ュ巶Id")
private String plantId;
- /** 宸ュ巶 */
+ /**
+ * 宸ュ巶
+ */
@Schema(description = "閫傜敤宸ュ巶", type = "String")
@Excel(name = "閫傜敤宸ュ巶")
private String plant;
- /** 杞﹂棿Id */
+ /**
+ * 杞﹂棿Id
+ */
@Schema(description = "杞﹂棿Id", type = "String")
// @Excel(name = "杞﹂棿Id")
private String workShopId;
- /** 杞﹂棿 */
+ /**
+ * 杞﹂棿
+ */
@Schema(description = "閫傜敤杞﹂棿", type = "String")
@Excel(name = "閫傜敤杞﹂棿")
private String workShop;
- /** 鏃ュ巻Id */
+ /**
+ * 鏃ュ巻Id
+ */
@Schema(description = "鏃ュ巻Id", type = "Long")
// @Excel(name = "鏃ュ巻Id")
private Long workCalenderId;
- /** 鏃ュ巻鎻忚堪 */
+ /**
+ * 鏃ュ巻鎻忚堪
+ */
@Schema(description = "鏃ュ巻鎻忚堪", type = "String")
@Excel(name = "鏃ュ巻鎻忚堪")
private String workCalender;
- /** 浜ц兘妯″瀷Id */
+ /**
+ * 浜ц兘妯″瀷Id
+ */
@Schema(description = "浜ц兘妯″瀷Id", type = "Long")
// @Excel(name = "浜ц兘妯″瀷Id")
private Long modelId;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
@Schema(description = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�", type = "String")
private String delFlag;
-
public String getMajor() {
@@ -111,168 +137,140 @@
this.major = major;
}
- public void setId(Long id)
- {
+ public void setId(Long id) {
this.id = id;
}
- public Long getId()
- {
+ public Long getId() {
return id;
}
- public void setProcessNumber(String processNumber)
- {
+ public void setProcessNumber(String processNumber) {
this.processNumber = processNumber;
}
- public String getProcessNumber()
- {
+ public String getProcessNumber() {
return processNumber;
}
- public void setProcessName(String processName)
- {
+ public void setProcessName(String processName) {
this.processName = processName;
}
- public String getProcessName()
- {
+ public String getProcessName() {
return processName;
}
- public void setResourceGroupName(String resourceGroupName)
- {
+ public void setResourceGroupName(String resourceGroupName) {
this.resourceGroupName = resourceGroupName;
}
- public String getResourceGroupName()
- {
+ public String getResourceGroupName() {
return resourceGroupName;
}
- public void setModel(String model)
- {
+ public void setModel(String model) {
this.model = model;
}
- public String getModel()
- {
+ public String getModel() {
return model;
}
- public void setDesignCapacity(BigDecimal designCapacity)
- {
+ public void setDesignCapacity(BigDecimal designCapacity) {
this.designCapacity = designCapacity;
}
- public BigDecimal getDesignCapacity()
- {
+ public BigDecimal getDesignCapacity() {
return designCapacity;
}
- public void setPlantId(String plantId)
- {
+ public void setPlantId(String plantId) {
this.plantId = plantId;
}
- public String getPlantId()
- {
+ public String getPlantId() {
return plantId;
}
- public void setPlant(String plant)
- {
+ public void setPlant(String plant) {
this.plant = plant;
}
- public String getPlant()
- {
+ public String getPlant() {
return plant;
}
- public void setWorkShopId(String workShopId)
- {
+ public void setWorkShopId(String workShopId) {
this.workShopId = workShopId;
}
- public String getWorkShopId()
- {
+ public String getWorkShopId() {
return workShopId;
}
- public void setWorkShop(String workShop)
- {
+ public void setWorkShop(String workShop) {
this.workShop = workShop;
}
- public String getWorkShop()
- {
+ public String getWorkShop() {
return workShop;
}
- public void setWorkCalenderId(Long workCalenderId)
- {
+ public void setWorkCalenderId(Long workCalenderId) {
this.workCalenderId = workCalenderId;
}
- public Long getWorkCalenderId()
- {
+ public Long getWorkCalenderId() {
return workCalenderId;
}
- public void setDelFlag(String delFlag)
- {
+ public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
- public String getDelFlag()
- {
+ public String getDelFlag() {
return delFlag;
}
- public void setModelId(Long modelId)
- {
+ public void setModelId(Long modelId) {
this.modelId = modelId;
}
- public Long getModelId()
- {
+ public Long getModelId() {
return modelId;
}
- public void setWorkCalender(String workCalender)
- {
+ public void setWorkCalender(String workCalender) {
this.workCalender = workCalender;
}
- public String getWorkCalender()
- {
+ public String getWorkCalender() {
return workCalender;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("processNumber", getProcessNumber())
- .append("processName", getProcessName())
- .append("resourceGroupName", getResourceGroupName())
- .append("model", getModel())
- .append("designCapacity", getDesignCapacity())
- .append("plantId", getPlantId())
- .append("plant", getPlant())
- .append("workShopId", getWorkShopId())
- .append("workShop", getWorkShop())
- .append("workCalenderId", getWorkCalenderId())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("modelId", getModelId())
- .append("workCalender", getWorkCalender())
- .append("major", getMajor())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("processNumber", getProcessNumber())
+ .append("processName", getProcessName())
+ .append("resourceGroupName", getResourceGroupName())
+ .append("model", getModel())
+ .append("designCapacity", getDesignCapacity())
+ .append("plantId", getPlantId())
+ .append("plant", getPlant())
+ .append("workShopId", getWorkShopId())
+ .append("workShop", getWorkShop())
+ .append("workCalenderId", getWorkCalenderId())
+ .append("delFlag", getDelFlag())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("modelId", getModelId())
+ .append("workCalender", getWorkCalender())
+ .append("major", getMajor())
+ .toString();
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
index 8102872..248f120 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
@@ -1744,7 +1744,7 @@
// 浣跨敤涓撶敤鏌ヨ鏂规硶鏌ヨ璁捐浜ц兘鏁版嵁
// 鎸夋枃妗ｈ姹傦細鏍规嵁process_name鍜宲lant鍘籥ps_gas_pipeline_capacity_plan琛ㄤ腑鏌ヨ
capacityPlans = apsGasPipelineCapacityPlanMapper.selectDesignCapacityForInterface2(
- processName.trim(), year, month, null, plant);
+ processName.trim(), year, month, major, plant);
// 灏嗙粨鏋滃瓨鍏ョ紦瀛�
capacityPlanCache.put(cacheKey, capacityPlans);
@@ -1811,7 +1811,7 @@
// 浣跨敤涓撶敤鏌ヨ鏂规硶鏌ヨ璁捐浜ц兘鏁版嵁
// 鎸夋枃妗ｈ姹傦細鏍规嵁process_name鍜宲lant鍘籥ps_gas_pipeline_capacity_plan琛ㄤ腑鏌ヨ
capacityPlans = apsGasPipelineCapacityPlanMapper.selectDesignCapacityForInterface2(
- processName, year, month, null, plant);
+ processName, year, month, major, plant);
// 灏嗙粨鏋滃瓨鍏ョ紦瀛�
capacityPlanCache.put(cacheKey, capacityPlans);
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
index b41970a..9cf0dc8 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
@@ -160,6 +160,9 @@
<if test="month != null and month != ''">
and CAST(month AS INTEGER) = CAST(#{month} AS INTEGER)
</if>
+ <if test="major != null and major != ''">
+ and major = #{major}
+ </if>
<if test="orgCode != null and orgCode != ''">
and org_code = #{orgCode}
</if>
--
Gitblit v1.9.3