diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java index 79d98305..be889d79 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java @@ -304,4 +304,4 @@ public class LawsEnterpriseStandard implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1809789807789012221L; -} \ No newline at end of file +} diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java index 1e46dc2b..9126e8b9 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletRequest; 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.system.vo.LoginUser; import com.jero.common.util.MessageUtils; @@ -87,7 +88,7 @@ public class LawsStandardCollectionController extends JeroController 0){ return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES)); } - lawsStandardCollection.setSource("1"); + lawsStandardCollection.setSource(CommonConstant.STANDARD_SOURCE_1); lawsStandardCollectionService.add(lawsStandardCollection); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -126,7 +127,7 @@ public class LawsStandardCollectionController extends JeroController 0){ return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES)); } - lawsStandardCollection.setSource("2"); + lawsStandardCollection.setSource(CommonConstant.STANDARD_SOURCE_2); lawsStandardCollectionService.add(lawsStandardCollection); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -165,7 +166,7 @@ public class LawsStandardCollectionController extends JeroController 0){ return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES)); } - lawsStandardCollection.setSource("3"); + lawsStandardCollection.setSource(CommonConstant.STANDARD_SOURCE_3); lawsStandardCollectionService.add(lawsStandardCollection); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardQaController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardQaController.java index 86315a82..e06b5ee4 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardQaController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardQaController.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Result; +import com.jero.common.constant.CommonConstant; import com.jero.common.system.vo.LoginUser; import com.jero.modules.personal.entity.LawsStandardQa; import com.jero.modules.personal.entity.LawsStandardQuestions; @@ -78,7 +79,7 @@ public class LawsStandardQaController extends JeroController recipientIdList = Arrays.asList(recipientId.split(",")); for (int i = 0; i < recipientIdList.size(); i++) { LawsStandardSharing sharing = new LawsStandardSharing(); - sharing.setSource("1"); + sharing.setSource(CommonConstant.STANDARD_SOURCE_1); sharing.setStandardId(lawsStandardSharing.getStandardId()); LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId()); sharing.setStandardName(standard.getStandardName()); @@ -120,7 +121,7 @@ public class LawsStandardSharingController extends JeroController recipientIdList = Arrays.asList(recipientId.split(",")); for (int i = 0; i < recipientIdList.size(); i++) { LawsStandardSharing sharing = new LawsStandardSharing(); - sharing.setSource("2"); + sharing.setSource(CommonConstant.STANDARD_SOURCE_2); sharing.setStandardId(lawsStandardSharing.getStandardId()); LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId()); sharing.setStandardName(standard.getStandardName()); @@ -155,7 +156,7 @@ public class LawsStandardSharingController extends JeroController recipientIdList = Arrays.asList(recipientId.split(",")); for (int i = 0; i < recipientIdList.size(); i++) { LawsStandardSharing sharing = new LawsStandardSharing(); - sharing.setSource("3"); + sharing.setSource(CommonConstant.STANDARD_SOURCE_3); sharing.setStandardId(lawsStandardSharing.getStandardId()); LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId()); sharing.setStandardName(standard.getStandardName()); @@ -190,7 +191,7 @@ public class LawsStandardSharingController extends JeroController ids) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.in(LawsStandardSharing::getId, ids); - wrapper.set(LawsStandardSharing::getDelFlag, "1"); + wrapper.set(LawsStandardSharing::getDelFlag, CommonConstant.DEL_FLAG_1.toString()); update(wrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java index 1e8586e8..2d80af26 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java @@ -11,6 +11,7 @@ import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.MessageUtils; @@ -71,7 +72,7 @@ public class LawsAssessController extends JeroController pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req); this.assignment(pageList.getRecords()); return Result.OK(pageList); @@ -80,7 +81,7 @@ public class LawsAssessController extends JeroController pageList = lawsProjectLibraryService.queryPage(lawsProjectLibrary, pageNo, pageSize, req); return Result.OK(pageList); } @@ -76,7 +77,7 @@ public class LawsProjectLibraryController extends JeroController add(@Validated @RequestBody LawsProjectLibrary lawsProjectLibrary) { - lawsProjectLibrary.setDelFlag("0"); + lawsProjectLibrary.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); lawsProjectLibraryService.add(lawsProjectLibrary); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -158,7 +159,7 @@ public class LawsProjectLibraryController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsProjectLibrary, request.getParameterMap()); dos = lawsProjectLibraryService.list(queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java index 6dc3569b..c2b4a4a3 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.projectLibrary.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.CommonConstant; import com.jero.modules.projectLibrary.entity.LawsAssess; import com.jero.modules.projectLibrary.mapper.LawsAssessMapper; import com.jero.modules.projectLibrary.service.ILawsAssessService; @@ -96,7 +97,7 @@ public class LawsAssessServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LawsAssess::getProjectId, projectId); - wrapper.eq(LawsAssess::getDelFlag, "0"); + wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); return list(wrapper); } @@ -129,7 +130,7 @@ public class LawsAssessServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LawsAssess::getProjectId, projectId); - wrapper.eq(LawsAssess::getDelFlag, "1"); + wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_1.toString()); return list(wrapper); } } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java index 622071e8..4ba54782 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.projectLibrary.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.jero.common.constant.CommonConstant; import com.jero.modules.projectLibrary.entity.LawsProjectLibrary; import com.jero.modules.projectLibrary.mapper.LawsProjectLibraryMapper; import com.jero.modules.projectLibrary.service.ILawsProjectLibraryService; @@ -87,7 +88,7 @@ public class LawsProjectLibraryServiceImpl extends ServiceImpl ids) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.in(LawsProjectLibrary::getId, ids); - wrapper.set(LawsProjectLibrary::getDelFlag, "1"); + wrapper.set(LawsProjectLibrary::getDelFlag, CommonConstant.DEL_FLAG_1.toString()); update(wrapper); } 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 817409f5..f46273c7 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 @@ -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 0){ LambdaUpdateWrapper 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)); diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java index f65a0c58..e4d0bcac 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java @@ -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 pageList = lawsWorkingGroupUserService.queryPage(lawsWorkingGroupUser, pageNo, pageSize, req); lawsWorkingGroupUserService.userAssignment(pageList.getRecords()); return Result.OK(pageList); @@ -80,7 +81,7 @@ public class LawsWorkingGroupUserController extends JeroController> queryList(LawsWorkingGroupUser lawsWorkingGroupUser, HttpServletRequest req) { - lawsWorkingGroupUser.setDelFlag("0"); + lawsWorkingGroupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); List list = lawsWorkingGroupUserService.queryList(lawsWorkingGroupUser, req); lawsWorkingGroupUserService.userAssignment(list); return Result.OK(list); @@ -102,7 +103,7 @@ public class LawsWorkingGroupUserController extends JeroController asList = Arrays.asList(userId.split(",")); LambdaQueryWrapper 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 list = lawsWorkingGroupUserService.list(wrapper); @@ -124,7 +125,7 @@ public class LawsWorkingGroupUserController extends JeroController 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 queryDataByTree(String workingGroupId) { LambdaQueryWrapper 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); } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsEnterpriseStandardLevelServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsEnterpriseStandardLevelServiceImpl.java index 15b53e2d..dc0799fb 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsEnterpriseStandardLevelServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsEnterpriseStandardLevelServiceImpl.java @@ -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; diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupServiceImpl.java index dbec72af..a05b4ba8 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupServiceImpl.java @@ -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 queryList() { LambdaQueryWrapper 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 realList() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(LawsWorkingGroup::getDelFlag, "0"); + wrapper.eq(LawsWorkingGroup::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); List list = list(wrapper); return list; } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java index 052f8ed9..86641a96 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java @@ -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 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); }