From 8bb52031470caf07ab8b8d2ed2cd5129c819ddfa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 三月 2025 11:50:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java | 2 +-
business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java | 7 +++++++
business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java | 8 ++++----
business/src/main/resources/mapper/HiddenAdminMapper.xml | 1 +
business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java | 8 ++++++++
business/src/main/java/com/ycl/controller/HiddenAdminController.java | 1 -
business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java | 3 ++-
business/src/main/java/com/ycl/service/ProjectUnitRegistrationInfoService.java | 2 ++
8 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/HiddenAdminController.java b/business/src/main/java/com/ycl/controller/HiddenAdminController.java
index ffd4d08..bf5e30a 100644
--- a/business/src/main/java/com/ycl/controller/HiddenAdminController.java
+++ b/business/src/main/java/com/ycl/controller/HiddenAdminController.java
@@ -49,7 +49,6 @@
@ApiOperation(value = "鎵归噺淇敼", notes = "鎵归噺淇敼")
@PreAuthorize("@ss.hasPermi('hiddenAdmin:edit')")
public Result updateList(@RequestBody List<HiddenAdminForm> forms){
- System.out.println(forms + "==============");
return hiddenAdminService.updateList(forms);
}
diff --git a/business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java b/business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java
index a975aaa..47e710a 100644
--- a/business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java
@@ -80,4 +80,11 @@
public Result list() {
return projectUnitRegistrationInfoService.all();
}
+
+ @PostMapping("/getUnitRegistrationInfoByName")
+ @ApiOperation(value = "鏇村叿鍗曚綅鍚嶈幏寰楁暟鎹簱宸插瓨鍦ㄤ俊鎭�", notes = "鏇村叿鍗曚綅鍚嶈幏寰楁暟鎹簱宸插瓨鍦ㄤ俊鎭�")
+ public Result getUnitRegistrationInfoByName(@RequestBody ProjectUnitRegistrationInfoForm form){
+
+ return projectUnitRegistrationInfoService.getUnitRegistrationInfoByName(form.getProjectUnit());
+ }
}
diff --git a/business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java b/business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java
index fbc60ce..67eaadf 100644
--- a/business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java
+++ b/business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java
@@ -30,7 +30,7 @@
@TableField("sort")
/** */
- private String sort;
+ private Long sort;
@TableField("columns")
/** */
diff --git a/business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java b/business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java
index c0d0c21..e5212e1 100644
--- a/business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java
@@ -28,15 +28,15 @@
@ApiModelProperty("涓氫富鍗曚綅")
private String display;
- /** */
+ /** 鎺掑簭*/
@ApiModelProperty("")
- private String sort;
+ private Long sort;
- /** */
+ /** 鍒楀悕*/
@ApiModelProperty("")
private String columns;
- /** */
+ /** 鍓嶇鎻掓Ы鐢ㄥ垪鍚� 鍙兘涓虹┖*/
@ApiModelProperty("")
private String slotName;
diff --git a/business/src/main/java/com/ycl/service/ProjectUnitRegistrationInfoService.java b/business/src/main/java/com/ycl/service/ProjectUnitRegistrationInfoService.java
index 6e92ad5..9637beb 100644
--- a/business/src/main/java/com/ycl/service/ProjectUnitRegistrationInfoService.java
+++ b/business/src/main/java/com/ycl/service/ProjectUnitRegistrationInfoService.java
@@ -62,4 +62,6 @@
* @return
*/
Result all();
+
+ Result getUnitRegistrationInfoByName(String name);
}
diff --git a/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java b/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java
index 356b1d0..d7fc228 100644
--- a/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.util.Assert;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -128,6 +129,7 @@
List<HiddenAdmin> entities = baseMapper.selectList(null);
List<HiddenAdminVO> vos = entities.stream()
.map(entity -> HiddenAdminVO.getVoByEntity(entity, null))
+ .sorted(Comparator.comparing(HiddenAdminVO:: getSort))
.collect(Collectors.toList());
return Result.ok().data(vos);
}
@@ -135,7 +137,6 @@
@Override
public Result updateList(List<HiddenAdminForm> forms) {
baseMapper.updateList(forms);
-// this.saveBatch(forms);
return Result.ok("淇敼鎴愬姛");
}
}
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java
index 8bd303d..7720701 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java
@@ -140,4 +140,12 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result getUnitRegistrationInfoByName(String name) {
+ List<ProjectUnitRegistrationInfo> entity = new LambdaQueryChainWrapper<>(baseMapper)
+ .like(ProjectUnitRegistrationInfo::getProjectUnit,name)
+ .list();
+ return Result.ok().data(entity);
+ }
}
diff --git a/business/src/main/resources/mapper/HiddenAdminMapper.xml b/business/src/main/resources/mapper/HiddenAdminMapper.xml
index dd3d0c7..180fe3f 100644
--- a/business/src/main/resources/mapper/HiddenAdminMapper.xml
+++ b/business/src/main/resources/mapper/HiddenAdminMapper.xml
@@ -45,6 +45,7 @@
t_hidden_admin THA
WHERE
THA.deleted = 0
+ order by THA.sort
</select>
--
Gitblit v1.8.0