ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

中英文切换补充

Browse Source
This commit is contained in:
caozhen
2023-09-18 14:16:08 +08:00
parent 3ed2cf50f8
commit 32ceaed0b0
5 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class ResultCommon {
public static final String CANNOT_DUPLICATE_FAVORITES = "cannot.duplicate.favorites"; // 不能重复收藏
public static final String PLEASE_SELECT_DATA = "please.select.data"; // 请选择数据
public static final String NO_CORRESPONDING_DATA_FOUND = "no.corresponding.data.found"; // 未找到对应数据
public static final String THE_TOPLEVEL_GROUP_CANNOT_BE_DELETED = "The.toplevel.group.cannot.be.deleted"; // 最高级组别不能删除
public static final String THE_TOPLEVEL_GROUP_CANNOT_BE_DELETED = "the.toplevel.group.cannot.be.deleted"; // 最高级组别不能删除
public static final String PLEASE_SELECT_PERSONNEL_AND_WORKGROUP = "please.select.personnel.and.workgroup"; // 请选择人员和工作组
public static final String NUMBER_WORK_NO_ALREADY_EXISTS = "number.work.no.already.exists"; // 工号已存在
public static final String NO_FILES_IMPORTED = "no.files.imported"; // 没有导入文件
@@ -33,7 +33,7 @@ public class ResultCommon {
public static final String IMPORT_DATA_CANNOT_BE_EMPTY = "import.data.cannot.be.empty"; // 导入数据不能为空
public static final String HEADER_INCONSISTENT_WITH_TEMPLATE = "header.inconsistent.with.template"; // 表头与模板不一致
public static final String PLEASE_SELECT_A_WORKGROUP_TO_EXPORT = "please.select.a.workgroup.for.export"; // 请选择工作组进行导出
public static final String THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT = "the.job.number.cannot.be.empty.EXPORT"; // 第{0}行,工号不能为空
public static final String THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT = "the.job.number.cannot.be.empty.export"; // 第{0}行,工号不能为空
public static final String JOB_NUMBER_DOES_NOT_EXIST_EXPORT = "job.number.does.not.exist.export"; // 第{0}行,工号不存在
public static final String DUPLICATE_JOB_NUMBER_EXPORT = "duplicate.job.number.export"; // 第{0}行,工号重复
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+10 -3
View File
@@ -105,7 +105,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
wrapper.eq(LawsWorkingGroupUser::getDelFlag, "0");
wrapper.in(LawsWorkingGroupUser::getUserId, asList);
wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, lawsWorkingGroupUser.getWorkingGroupId());
List<LawsWorkingGroupUser> list = lawsWorkingGroupUserService.list();
List<LawsWorkingGroupUser> list = lawsWorkingGroupUserService.list(wrapper);
if (list.size() > 0){
String workNo;
List<String> collect = list.stream().map(LawsWorkingGroupUser::getUserId).distinct().collect(Collectors.toList());
@@ -119,8 +119,15 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
workNo = joiner.toString();
throw new JeroBootException(ResultCommon.NUMBER_WORK_NO_ALREADY_EXISTS, workNo);
}
lawsWorkingGroupUser.setDelFlag("0");
lawsWorkingGroupUserService.add(lawsWorkingGroupUser);
List<LawsWorkingGroupUser> groupUsers = new ArrayList<>();
for (String id : asList) {
LawsWorkingGroupUser workingGroupUser = new LawsWorkingGroupUser();
workingGroupUser.setWorkingGroupId(lawsWorkingGroupUser.getWorkingGroupId());
workingGroupUser.setUserId(id);
workingGroupUser.setDelFlag("0");
groupUsers.add(workingGroupUser);
}
lawsWorkingGroupUserService.saveBatch(groupUsers);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}