From e3270141db2dd6c755e6a7b40930dcfa24585cb4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 08 七月 2025 15:01:14 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
index 89c086e..64770f0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
@@ -460,6 +460,11 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+
+ // 鍏堝垽鏂〃鍐呮槸鍚﹀瓨鍦ㄧ浉鍚岀殑 groupCode
+ if (irrigateGroupSv.existsByGroupCode(po.getGroupCode())) {
+ return BaseResponseUtils.buildFail(IrrigateResultCode.GROUP_CODE_ALREADY_EXISTS.getMessage());
+ }
Map map_result = irrigateGroupSv.addIrrigateGroup(po);
if(map_result.get("success").equals(false)) {
@@ -505,6 +510,11 @@
if(po.getGroupId() == null) {
return BaseResponseUtils.buildErrorMsg("杞亴缁処D涓嶈兘涓虹┖");
}
+
+ // 鍏堝垽鏂〃鍐呮槸鍚﹀瓨鍦ㄧ浉鍚岀殑 groupCode锛堟帓闄ゅ綋鍓嶆鍦ㄤ慨鏀圭殑璁板綍锛�
+ if (irrigateGroupSv.existsByGroupCodeExcludeId(po.getGroupCode(), po.getGroupId())) {
+ return BaseResponseUtils.buildFail(IrrigateResultCode.GROUP_CODE_ALREADY_EXISTS.getMessage());
+ }
Map map_result = irrigateGroupSv.updateIrrigateGroup(po);
if(map_result.get("success").equals(false)) {
@@ -531,6 +541,26 @@
}
/**
+ * 鑾峰彇椤圭洰涓嬭疆鐏岀粍
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getGroupsByProjectId")
+ @SsoAop()
+ public BaseResponse<List<VoGroupSimple>> getGroupsByProjectId(QoGroup qo) {
+ if(qo.getProjectId() == null) {
+ return BaseResponseUtils.buildErrorMsg("璇烽�夋嫨椤圭洰");
+ }
+
+ try {
+ return BaseResponseUtils.buildSuccess(irrigateGroupSv.getGroupsByProjectId(qo));
+ } catch (Exception e) {
+ log.error("鑾峰彇杞亴缁勮褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
* 鑾峰彇鍏ㄩ儴杞亴缁勶紝鏂颁唬鐮�
* @return
*/
--
Gitblit v1.8.0