From 463d5af55ede6f06b984cfe6abbb14c214e31c40 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 31 Oct 2024 19:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/baotou/controller/MilestoneController.java | 1 + .../baotou/controller/WorkerAdmissionController.java | 3 ++- .../baotou/service/impl/MilestoneServiceImpl.java | 10 +++++++++- .../basicdata/service/impl/SystemUserServiceImpl.java | 9 +++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MilestoneController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MilestoneController.java index 1b6d8e8d9..0f64773c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MilestoneController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MilestoneController.java @@ -67,6 +67,7 @@ public class MilestoneController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "timeAsc", value = "1时间正序排序", paramType = "query", required = false, dataType = "Integer"), }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java index ca636fd75..bd86e4614 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java @@ -140,6 +140,7 @@ public class WorkerAdmissionController { } } if (CollUtil.isNotEmpty(existNums)) { + existNums = existNums.stream().distinct().collect(Collectors.toList()); throw new OpenAlertException("【" + StrUtil.join(",", existNums) + "】编号已存在"); } } @@ -150,7 +151,7 @@ public class WorkerAdmissionController { List existWorkerIdCards = workerInfoService.list(new LambdaQueryWrapper() .in(WorkerInfo::getIdCard, ids).eq(WorkerInfo::getProjectSn, projectSn)).stream().map(WorkerInfo::getIdCard).collect(Collectors.toList()); existDetailIdCards.addAll(existWorkerIdCards); - existDetailIdCards.stream().distinct(); + existDetailIdCards = existDetailIdCards.stream().distinct().collect(Collectors.toList()); if (CollUtil.isNotEmpty(existDetailIdCards)) { throw new OpenAlertException("【" + StrUtil.join(",", existDetailIdCards) + "】身份证号已存在"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MilestoneServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MilestoneServiceImpl.java index 72c610d77..4ca14e0e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MilestoneServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MilestoneServiceImpl.java @@ -4,6 +4,7 @@ import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.baotou.entity.Milestone; import com.zhgd.xmgl.modules.baotou.mapper.MilestoneMapper; import com.zhgd.xmgl.modules.baotou.service.IMilestoneService; +import org.apache.commons.collections.MapUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -13,6 +14,8 @@ import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.HashMap; import java.util.List; +import java.util.Objects; + import com.zhgd.xmgl.util.RefUtil; import org.springframework.transaction.annotation.Transactional; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +47,12 @@ public class MilestoneServiceImpl extends ServiceImpl getQueryWrapper(HashMap param) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(Milestone.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(Milestone::getId)); + Integer timeAsc = MapUtils.getInteger(param, "timeAsc"); + if (Objects.equals(timeAsc, 1)) { + queryWrapper.orderByAsc(RefUtil.fieldNameUlc(Milestone::getMilestoneTime)); + } else { + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(Milestone::getId)); + } return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 66c7d7028..01b6fdbee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -405,7 +405,6 @@ public class SystemUserServiceImpl extends ServiceImpl workerInfoList = workerInfoService.selectWorkerInfoList(new MapBuilder().put("id", result.get("workerId")).build()); + String postWorkTypeName = ""; + if (CollUtil.isNotEmpty(workerInfoList.getRecords())) { + postWorkTypeName = workerInfoList.getRecords().get(0).getPostWorkTypeName(); + } + result.put("postWorkTypeName", postWorkTypeName); + return result; } /**