From 6fb3ff6f17e6097a0cfb8f232af1ff4c4ea93a7c Mon Sep 17 00:00:00 2001 From: caozhen <18736171426@139.com> Date: Mon, 11 Sep 2023 14:03:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B1=E6=96=87=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsWorkingGroupController.java | 19 ++++--- .../LawsWorkingGroupUserController.java | 51 ++++++++++++------- 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java index 96788a10..b7828430 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java @@ -7,6 +7,8 @@ import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.util.MessageUtils; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.sys.entity.LawsWorkingGroup; import com.jero.modules.sys.service.ILawsWorkingGroupService; import lombok.extern.slf4j.Slf4j; @@ -57,7 +59,7 @@ public class LawsWorkingGroupController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { LawsWorkingGroup lawsWorkingGroup = lawsWorkingGroupService.queryById(id); if(lawsWorkingGroup==null) { - return Result.error("未找到对应数据"); + return Result.error(MessageUtils.getLanguage().equals("EN") ? "No corresponding data found" : "未找到对应数据"); } // 通过递归查找所有子节点数据 List list = lawsWorkingGroupService.realList(); @@ -82,7 +84,7 @@ public class LawsWorkingGroupController extends JeroController edit(@Validated @RequestBody LawsWorkingGroup lawsWorkingGroup) { lawsWorkingGroupService.editById(lawsWorkingGroup); - return Result.OK("操作成功!"); + return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!"); } /** @@ -104,9 +106,14 @@ public class LawsWorkingGroupController extends JeroController delete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); + return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); } - List ids = new ArrayList<>(); + //不能删除根节点 + LawsWorkingGroup group = lawsWorkingGroupService.getById(map.get("id")); + if (StringUtils.isBlank(group.getPid())){ + return Result.error(MessageUtils.getLanguage().equals("EN") ? "The top-level group cannot be deleted!" : "最高级组别不能删除!"); + } + List ids = new ArrayList<>(); List list = lawsWorkingGroupService.realList(); ids = lawsWorkingGroupService.allChildIdById(list, map.get("id"), ids); if (ids.size() > 0){ @@ -115,7 +122,7 @@ public class LawsWorkingGroupController extends JeroController add(@Validated @RequestBody LawsWorkingGroupUser lawsWorkingGroupUser) { if (StringUtils.isBlank(lawsWorkingGroupUser.getWorkingGroupId()) || StringUtils.isBlank(lawsWorkingGroupUser.getUserId())){ - return Result.error("请选择人员和工作组!"); + return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select personnel and workgroup" : "请选择人员和工作组!"); } + String userId = lawsWorkingGroupUser.getUserId(); + List asList = Arrays.asList(userId.split(",")); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LawsWorkingGroupUser::getDelFlag, "0"); - wrapper.eq(LawsWorkingGroupUser::getUserId, lawsWorkingGroupUser.getUserId()); + wrapper.in(LawsWorkingGroupUser::getUserId, asList); wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, lawsWorkingGroupUser.getWorkingGroupId()); List list = lawsWorkingGroupUserService.list(); if (list.size() > 0){ - String workNo = list.get(0).getUserWorkNo(); - return Result.error("工号" + workNo + "已存在!"); + String workNo; + List collect = list.stream().map(LawsWorkingGroupUser::getUserId).distinct().collect(Collectors.toList()); + StringJoiner joiner = new StringJoiner(","); + for (String id : collect) { + SysUser sysUser = sysUserService.getById(id); + if (sysUser != null && StringUtils.isNotBlank(sysUser.getWorkNo())) { + joiner.add(sysUser.getWorkNo()); + } + } + workNo = joiner.toString(); + return Result.error(MessageUtils.getLanguage().equals("EN") ? "Job number" + workNo + "already exists!" : "工号" + workNo + "已存在!"); } lawsWorkingGroupUser.setDelFlag("0"); lawsWorkingGroupUserService.add(lawsWorkingGroupUser); - return Result.OK("操作成功!"); + return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!"); } /** @@ -114,12 +127,12 @@ public class LawsWorkingGroupUserController extends JeroController delete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); + return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); } LawsWorkingGroupUser groupUser = lawsWorkingGroupUserService.getById(map.get("id")); groupUser.setDelFlag("1"); lawsWorkingGroupUserService.updateById(groupUser); - return Result.OK("删除成功!"); + return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!"); } @@ -133,14 +146,14 @@ public class LawsWorkingGroupUserController extends JeroController all; @@ -148,15 +161,15 @@ public class LawsWorkingGroupUserController extends JeroController> maps = excelReader.readAll(); if (maps.size() < 1) { - return Result.error("导入数据不能为空！"); + return Result.error(MessageUtils.getLanguage().equals("EN") ? "Import data cannot be empty!" : "导入数据不能为空！"); } // 校验表头，同时映射对象字段 if (!validateHeader(excelReader)) { - return Result.error("导入失败，表头与模板不一致"); + return Result.error(MessageUtils.getLanguage().equals("EN") ? "Import failed, header inconsistent with template" : "导入失败，表头与模板不一致"); } all = excelReader.readAll(LawsWorkingGroupUser.class); } catch (Exception e) { - return Result.error("导入失败，数据格式未按照示例规范导入！"); + return Result.error(MessageUtils.getLanguage().equals("EN") ? "Import failed, data format not imported according to sample specifications!" : "导入失败，数据格式未按照示例规范导入！"); } //校验导入正确性，msg是错误信息 String msg = importExcelCheck(all); @@ -171,7 +184,7 @@ public class LawsWorkingGroupUserController extends JeroController template(@RequestBody LawsWorkingGroupUser lawsWorkingGroupUser, HttpServletResponse response) { String workingGroupId = lawsWorkingGroupUser.getWorkingGroupId(); if (StringUtils.isBlank(workingGroupId)) { - return Result.error("请选择工作组进行导出！"); + return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select a workgroup for export" : "请选择工作组进行导出！"); } - String outFileName = "内部工作组人员表" + System.currentTimeMillis() + ".xlsx"; + String outFileName = MessageUtils.getLanguage().equals("EN") ? "Internal Work Group Personnel Table" + System.currentTimeMillis() + ".xlsx" : "内部工作组人员表" + System.currentTimeMillis() + ".xlsx"; String ENCODING = "UTF-8"; ExcelWriter writer = ExcelUtil.getWriter(true); @@ -282,13 +295,13 @@ public class LawsWorkingGroupUserController extends JeroController error != null).collect(Collectors.toList());