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

修改代码中"0"、"1"等改为静态常量

Browse Source
This commit is contained in:
caozhen
2023-09-19 15:07:32 +08:00
parent 95cabb2fdb
commit cd70550f05
15 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java
+3 -3
View File
@@ -3,10 +3,10 @@ package com.jero.modules.sys.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
@@ -89,7 +89,7 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
}else {
lawsWorkingGroup.setLevel(1);
}
lawsWorkingGroup.setDelFlag("0");
lawsWorkingGroup.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
lawsWorkingGroupService.add(lawsWorkingGroup);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -128,7 +128,7 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
if (ids.size() > 0){
LambdaUpdateWrapper<LawsWorkingGroup> wrapper = new LambdaUpdateWrapper<>();
wrapper.in(LawsWorkingGroup::getId, ids);
wrapper.set(LawsWorkingGroup::getDelFlag, "1");
wrapper.set(LawsWorkingGroup::getDelFlag, CommonConstant.DEL_FLAG_1.toString());
lawsWorkingGroupService.update(wrapper);
}
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+9 -8
View File
@@ -15,6 +15,7 @@ import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
@@ -66,7 +67,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
lawsWorkingGroupUser.setDelFlag("0");
lawsWorkingGroupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
IPage<LawsWorkingGroupUser> pageList = lawsWorkingGroupUserService.queryPage(lawsWorkingGroupUser, pageNo, pageSize, req);
lawsWorkingGroupUserService.userAssignment(pageList.getRecords());
return Result.OK(pageList);
@@ -80,7 +81,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
@ApiOperation(value="内部工作组人员关联表-列表查询", notes="内部工作组人员关联表-列表查询")
@GetMapping(value = "/list")
public Result<List<LawsWorkingGroupUser>> queryList(LawsWorkingGroupUser lawsWorkingGroupUser, HttpServletRequest req) {
lawsWorkingGroupUser.setDelFlag("0");
lawsWorkingGroupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
List<LawsWorkingGroupUser> list = lawsWorkingGroupUserService.queryList(lawsWorkingGroupUser, req);
lawsWorkingGroupUserService.userAssignment(list);
return Result.OK(list);
@@ -102,7 +103,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
String userId = lawsWorkingGroupUser.getUserId();
List<String> asList = Arrays.asList(userId.split(","));
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroupUser::getDelFlag, "0");
wrapper.eq(LawsWorkingGroupUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
wrapper.in(LawsWorkingGroupUser::getUserId, asList);
wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, lawsWorkingGroupUser.getWorkingGroupId());
List<LawsWorkingGroupUser> list = lawsWorkingGroupUserService.list(wrapper);
@@ -124,7 +125,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
LawsWorkingGroupUser workingGroupUser = new LawsWorkingGroupUser();
workingGroupUser.setWorkingGroupId(lawsWorkingGroupUser.getWorkingGroupId());
workingGroupUser.setUserId(id);
workingGroupUser.setDelFlag("0");
workingGroupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
groupUsers.add(workingGroupUser);
}
lawsWorkingGroupUserService.saveBatch(groupUsers);
@@ -143,7 +144,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
}
LawsWorkingGroupUser groupUser = lawsWorkingGroupUserService.getById(map.get("id"));
groupUser.setDelFlag("1");
groupUser.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
lawsWorkingGroupUserService.updateById(groupUser);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -195,7 +196,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
SysUser userByWorkNo = sysUserService.getUserByWorkNo(userWorkNo);
groupUser.setUserId(userByWorkNo.getId());
groupUser.setWorkingGroupId(workingGroupId);
groupUser.setDelFlag("0");
groupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
}
lawsWorkingGroupUserService.saveBatch(all);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
@@ -269,7 +270,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
if (!ids.isEmpty()) {
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, workingGroupId);
wrapper.eq(LawsWorkingGroupUser::getDelFlag, "0");
wrapper.eq(LawsWorkingGroupUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
wrapper.in(LawsWorkingGroupUser::getUserId, ids);
list = lawsWorkingGroupUserService.list(wrapper);
}
@@ -278,7 +279,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
private List<LawsWorkingGroupUser> queryDataByTree(String workingGroupId) {
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, workingGroupId);
wrapper.eq(LawsWorkingGroupUser::getDelFlag, "0");
wrapper.eq(LawsWorkingGroupUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
return lawsWorkingGroupUserService.list(wrapper);
}
laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsEnterpriseStandardLevelServiceImpl.java
-3
View File
@@ -1,14 +1,11 @@
package com.jero.modules.sys.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.sys.entity.LawsEnterpriseStandardLevel;
import com.jero.modules.sys.entity.LawsWorkingGroup;
import com.jero.modules.sys.mapper.LawsEnterprisestandardLevelMapper;
import com.jero.modules.sys.service.ILawsEnterpriseStandardLevelService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupServiceImpl.java
+3 -2
View File
@@ -1,6 +1,7 @@
package com.jero.modules.sys.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.constant.CommonConstant;
import com.jero.modules.sys.entity.LawsWorkingGroup;
import com.jero.modules.sys.mapper.LawsWorkingGroupMapper;
import com.jero.modules.sys.service.ILawsWorkingGroupService;
@@ -31,7 +32,7 @@ public class LawsWorkingGroupServiceImpl extends ServiceImpl<LawsWorkingGroupMap
@Override
public List<LawsWorkingGroup> queryList() {
LambdaQueryWrapper<LawsWorkingGroup> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroup::getDelFlag, "0");
wrapper.eq(LawsWorkingGroup::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
return list(wrapper);
}
@@ -98,7 +99,7 @@ public class LawsWorkingGroupServiceImpl extends ServiceImpl<LawsWorkingGroupMap
@Override
public List<LawsWorkingGroup> realList() {
LambdaQueryWrapper<LawsWorkingGroup> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroup::getDelFlag, "0");
wrapper.eq(LawsWorkingGroup::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
List<LawsWorkingGroup> list = list(wrapper);
return list;
}
laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
+2 -1
View File
@@ -3,6 +3,7 @@ package com.jero.modules.sys.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jero.common.constant.CommonConstant;
import com.jero.modules.sys.entity.LawsWorkingGroupUser;
import com.jero.modules.sys.mapper.LawsWorkingGroupUserMapper;
import com.jero.modules.sys.service.ILawsWorkingGroupUserService;
@@ -67,7 +68,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
}
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(workingGroupId), LawsWorkingGroupUser::getWorkingGroupId, workingGroupId);
wrapper.eq(LawsWorkingGroupUser::getDelFlag, "0");
wrapper.eq(LawsWorkingGroupUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
wrapper.in(LawsWorkingGroupUser::getUserId, ids);
return page(page, wrapper);
}