From f66dc30060a34526e0603f698aba0e2dfc30f206 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 16:16:32 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 17 +++++++++++++++--
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 8 ++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java | 1 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 6 ++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 5 +++++
5 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
index 171aca8..c90161c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
@@ -139,4 +139,10 @@
* @return
*/
Long getIntakeIdByName(String intakeName);
+
+ /**
+ * 寰楀埌鎵�鏈夌殑鍙栨按鍙ｅ悕绉�
+ * @return
+ */
+ List<String> getIntakeName();
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 363e4e2..1ce5038 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -442,4 +442,9 @@
<select id="getIntakeIdByName" resultType="java.lang.Long">
SELECT id AS intakeId FROM pr_intake WHERE `name` = #{intakeName}
</select>
+
+ <!--寰楀埌鎵�鏈夌殑鍙栨按鍙ｅ悕绉�-->
+ <select id="getIntakeName" resultType="java.lang.String">
+ SELECT `name` FROM pr_intake WHERE deleted = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 6d73906..9bbdea9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -147,7 +147,13 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
-
+ List<String> intakeNameList = intakeSv.getIntakeName();
+ for (int i = 0; i < intakeNameList.size(); i++) {
+ String intakeName = intakeNameList.get(i);
+ if (intakeName.equals(po.getName())) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
+ }
+ }
Date operateTime = new Date();
po.setOperateDt(operateTime);
po.setDeleted((byte)0);
@@ -179,13 +185,20 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ List<String> intakeNameList = intakeSv.getIntakeName();
+ for (int i = 0; i < intakeNameList.size(); i++) {
+ String intakeName = intakeNameList.get(i);
+ if (intakeName.equals(po.getName())) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
+ }
+ }
int count;
Date operateTime = new Date();
po.setOperateDt(operateTime);
try {
count = this.intakeSv.update(po);
} catch (Exception e) {
- log.error("淇濆瓨鍒嗘按鍙ｅ紓甯�", e);
+ log.error("淇濆瓨鍙栨按鍙ｅ紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
}
if (count <= 0) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index 6e3d971..2a9bf1e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -286,4 +286,12 @@
}
return response.getBody();
}
+
+ /**
+ * 寰楀埌鎵�鏈夊彇姘村彛鍚嶇О
+ * @return
+ */
+ public List<String> getIntakeName() {
+ return prIntakeMapper.getIntakeName();
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
index e2f42c4..a2d188a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
@@ -29,6 +29,7 @@
PLEASE_INPUT_INTAKE_ID(20004, "鍙栨按鍙ｇ紪鍙蜂笉涓虹┖"),
DELETE_INTAKE_FAIL(20005, "鍙栨按鍙ｅ垹闄ゅけ璐�"),
NO_BINDING_INTAKE(20006, "娌℃湁鏈粦瀹氱殑鍙栨按鍙�"),
+ INTAKE_NAME_EXIST(20006, "鍙栨按鍙ｅ悕绉板凡瀛樺湪"),
/**
* 鎺у埗鍣�
--
Gitblit v1.8.0