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/personal/controller/LawsStandardCollectionController.java
+4 -3
View File
@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
@@ -87,7 +88,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
if (count > 0){ if (count > 0){
return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES)); return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES));
} }
lawsStandardCollection.setSource("1"); lawsStandardCollection.setSource(CommonConstant.STANDARD_SOURCE_1);
lawsStandardCollectionService.add(lawsStandardCollection); lawsStandardCollectionService.add(lawsStandardCollection);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
@@ -126,7 +127,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
if (count > 0){ if (count > 0){
return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES)); return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES));
} }
lawsStandardCollection.setSource("2"); lawsStandardCollection.setSource(CommonConstant.STANDARD_SOURCE_2);
lawsStandardCollectionService.add(lawsStandardCollection); lawsStandardCollectionService.add(lawsStandardCollection);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
@@ -165,7 +166,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
if (count > 0){ if (count > 0){
return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES)); return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES));
} }
lawsStandardCollection.setSource("3"); lawsStandardCollection.setSource(CommonConstant.STANDARD_SOURCE_3);
lawsStandardCollectionService.add(lawsStandardCollection); lawsStandardCollectionService.add(lawsStandardCollection);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardQaController.java
+2 -1
View File
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.modules.personal.entity.LawsStandardQa; import com.jero.modules.personal.entity.LawsStandardQa;
import com.jero.modules.personal.entity.LawsStandardQuestions; import com.jero.modules.personal.entity.LawsStandardQuestions;
@@ -78,7 +79,7 @@ public class LawsStandardQaController extends JeroController<LawsStandardQa, ILa
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//说明是提问人发的消息 //说明是提问人发的消息
lawsStandardQa.setRecordType(sysUser.getId().equals(questions.getQuestionerId()) ? "1" : "2"); lawsStandardQa.setRecordType(sysUser.getId().equals(questions.getQuestionerId()) ? "1" : "2");
lawsStandardQa.setReadingStatus("1"); lawsStandardQa.setReadingStatus(CommonConstant.READING_STATUS_1);
lawsStandardQa.setRecoveryTime(date); lawsStandardQa.setRecoveryTime(date);
lawsStandardQa.setAnswererId(sysUser.getId()); lawsStandardQa.setAnswererId(sysUser.getId());
lawsStandardQa.setAnswererName(sysUser.getRealname()); lawsStandardQa.setAnswererName(sysUser.getRealname());
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+7 -6
View File
@@ -3,6 +3,7 @@ package com.jero.modules.personal.controller;
import java.util.*; import java.util.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
@@ -107,7 +108,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
List<String> recipientIdList = Arrays.asList(recipientId.split(",")); List<String> recipientIdList = Arrays.asList(recipientId.split(","));
for (int i = 0; i < recipientIdList.size(); i++) { for (int i = 0; i < recipientIdList.size(); i++) {
LawsStandardSharing sharing = new LawsStandardSharing(); LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource("1"); sharing.setSource(CommonConstant.STANDARD_SOURCE_1);
sharing.setStandardId(lawsStandardSharing.getStandardId()); sharing.setStandardId(lawsStandardSharing.getStandardId());
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId()); LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName()); sharing.setStandardName(standard.getStandardName());
@@ -120,7 +121,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
sharing.setSharingTime(date); sharing.setSharingTime(date);
sharing.setShareDescription(lawsStandardSharing.getShareDescription()); sharing.setShareDescription(lawsStandardSharing.getShareDescription());
sharing.setReadingStatus("1"); sharing.setReadingStatus("1");
sharing.setDelFlag("0"); sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
sharings.add(sharing); sharings.add(sharing);
} }
lawsStandardSharingService.saveBatch(sharings); lawsStandardSharingService.saveBatch(sharings);
@@ -142,7 +143,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
List<String> recipientIdList = Arrays.asList(recipientId.split(",")); List<String> recipientIdList = Arrays.asList(recipientId.split(","));
for (int i = 0; i < recipientIdList.size(); i++) { for (int i = 0; i < recipientIdList.size(); i++) {
LawsStandardSharing sharing = new LawsStandardSharing(); LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource("2"); sharing.setSource(CommonConstant.STANDARD_SOURCE_2);
sharing.setStandardId(lawsStandardSharing.getStandardId()); sharing.setStandardId(lawsStandardSharing.getStandardId());
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId()); LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName()); sharing.setStandardName(standard.getStandardName());
@@ -155,7 +156,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
sharing.setSharingTime(date); sharing.setSharingTime(date);
sharing.setShareDescription(lawsStandardSharing.getShareDescription()); sharing.setShareDescription(lawsStandardSharing.getShareDescription());
sharing.setReadingStatus("1"); sharing.setReadingStatus("1");
sharing.setDelFlag("0"); sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
sharings.add(sharing); sharings.add(sharing);
} }
lawsStandardSharingService.saveBatch(sharings); lawsStandardSharingService.saveBatch(sharings);
@@ -177,7 +178,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
List<String> recipientIdList = Arrays.asList(recipientId.split(",")); List<String> recipientIdList = Arrays.asList(recipientId.split(","));
for (int i = 0; i < recipientIdList.size(); i++) { for (int i = 0; i < recipientIdList.size(); i++) {
LawsStandardSharing sharing = new LawsStandardSharing(); LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource("3"); sharing.setSource(CommonConstant.STANDARD_SOURCE_3);
sharing.setStandardId(lawsStandardSharing.getStandardId()); sharing.setStandardId(lawsStandardSharing.getStandardId());
LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId()); LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName()); sharing.setStandardName(standard.getStandardName());
@@ -190,7 +191,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
sharing.setSharingTime(date); sharing.setSharingTime(date);
sharing.setShareDescription(lawsStandardSharing.getShareDescription()); sharing.setShareDescription(lawsStandardSharing.getShareDescription());
sharing.setReadingStatus("1"); sharing.setReadingStatus("1");
sharing.setDelFlag("0"); sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
sharings.add(sharing); sharings.add(sharing);
} }
lawsStandardSharingService.saveBatch(sharings); lawsStandardSharingService.saveBatch(sharings);
laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
+4 -3
View File
@@ -2,6 +2,7 @@ package com.jero.modules.personal.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.EnterpriseStandardService; import com.jero.modules.laws.standard.service.EnterpriseStandardService;
@@ -64,7 +65,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
for (LawsStandardCollection collection : list) { for (LawsStandardCollection collection : list) {
String standardId = collection.getStandardId(); String standardId = collection.getStandardId();
String source = collection.getSource(); String source = collection.getSource();
if ("1".equals(source)){ if (CommonConstant.STANDARD_SOURCE_1.equals(source)){
//查询国内标准数据，赋值给collection //查询国内标准数据，赋值给collection
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId); LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId);
if (standard != null){ if (standard != null){
@@ -73,7 +74,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
collection.setReleaseDate(standard.getReleaseDate()); collection.setReleaseDate(standard.getReleaseDate());
} }
} }
if ("2".equals(source)){ if (CommonConstant.STANDARD_SOURCE_2.equals(source)){
//查询海外标准数据，赋值给collection //查询海外标准数据，赋值给collection
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId); LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId);
if (standard != null){ if (standard != null){
@@ -82,7 +83,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
collection.setReleaseDate(standard.getReleaseDate()); collection.setReleaseDate(standard.getReleaseDate());
} }
} }
if ("3".equals(source)){ if (CommonConstant.STANDARD_SOURCE_3.equals(source)){
//查询企业标准数据，赋值给collection //查询企业标准数据，赋值给collection
LawsEnterpriseStandard standard = enterpriseStandardService.getById(standardId); LawsEnterpriseStandard standard = enterpriseStandardService.getById(standardId);
if (standard != null){ if (standard != null){
laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
+3 -2
View File
@@ -3,6 +3,7 @@ package com.jero.modules.personal.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.modules.personal.entity.LawsStandardCollection; import com.jero.modules.personal.entity.LawsStandardCollection;
import com.jero.modules.personal.entity.LawsStandardSharing; import com.jero.modules.personal.entity.LawsStandardSharing;
@@ -44,7 +45,7 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getSource()), LawsStandardSharing::getSource, lawsStandardSharing.getSource()); wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getSource()), LawsStandardSharing::getSource, lawsStandardSharing.getSource());
wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getStandardId()), LawsStandardSharing::getSharerId, sysUser.getId()); wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getStandardId()), LawsStandardSharing::getSharerId, sysUser.getId());
wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getRecipientId()), LawsStandardSharing::getRecipientId, sysUser.getId()); wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getRecipientId()), LawsStandardSharing::getRecipientId, sysUser.getId());
wrapper.eq(LawsStandardSharing::getDelFlag, "0"); wrapper.eq(LawsStandardSharing::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
if (StringUtils.isNotBlank(lawsStandardSharing.getTitle())){ if (StringUtils.isNotBlank(lawsStandardSharing.getTitle())){
wrapper.last(" AND (standard_number LIKE " + "'%" + lawsStandardSharing.getTitle() + "%'" + " OR standard_name LIKE " + "'%" + lawsStandardSharing.getTitle() + "%'" + ")"); wrapper.last(" AND (standard_number LIKE " + "'%" + lawsStandardSharing.getTitle() + "%'" + " OR standard_name LIKE " + "'%" + lawsStandardSharing.getTitle() + "%'" + ")");
} }
@@ -80,7 +81,7 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
public void deleteByIds(List<String> ids) { public void deleteByIds(List<String> ids) {
LambdaUpdateWrapper<LawsStandardSharing> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<LawsStandardSharing> wrapper = new LambdaUpdateWrapper<>();
wrapper.in(LawsStandardSharing::getId, ids); wrapper.in(LawsStandardSharing::getId, ids);
wrapper.set(LawsStandardSharing::getDelFlag, "1"); wrapper.set(LawsStandardSharing::getDelFlag, CommonConstant.DEL_FLAG_1.toString());
update(wrapper); update(wrapper);
} }
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
+8 -7
View File
@@ -11,6 +11,7 @@ import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter; import cn.hutool.poi.excel.ExcelWriter;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
@@ -71,7 +72,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
if (StringUtils.isBlank(projectId)){ if (StringUtils.isBlank(projectId)){
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
} }
lawsAssess.setDelFlag("0"); lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
IPage<LawsAssess> pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req); IPage<LawsAssess> pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req);
this.assignment(pageList.getRecords()); this.assignment(pageList.getRecords());
return Result.OK(pageList); return Result.OK(pageList);
@@ -80,7 +81,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
for (LawsAssess assess : records) { for (LawsAssess assess : records) {
String standardId = assess.getStandardId(); String standardId = assess.getStandardId();
String source = assess.getSource(); String source = assess.getSource();
if ("1".equals(source)){ if (CommonConstant.STANDARD_SOURCE_1.equals(source)){
//查询国内标准数据，赋值给collection //查询国内标准数据，赋值给collection
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId); LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId);
assess.setStandardEnglishName(standard.getStandardEnglishName()); assess.setStandardEnglishName(standard.getStandardEnglishName());
@@ -91,7 +92,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
assess.setEvaluationResults("这里要用额外方法查询"); assess.setEvaluationResults("这里要用额外方法查询");
assess.setResponsibleDepartment(standard.getResponsibleDepartment()); assess.setResponsibleDepartment(standard.getResponsibleDepartment());
} }
if ("2".equals(source)){ if (CommonConstant.STANDARD_SOURCE_2.equals(source)){
//查询海外标准数据，赋值给collection //查询海外标准数据，赋值给collection
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId); LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId);
assess.setStandardEnglishName(standard.getStandardEnglishName()); assess.setStandardEnglishName(standard.getStandardEnglishName());
@@ -137,14 +138,14 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
if (allByProjectIdDeletedIdList.contains(id)){ if (allByProjectIdDeletedIdList.contains(id)){
//如果已删除则恢复未删除状态 //如果已删除则恢复未删除状态
LawsAssess lawsAssess = lawsAssessService.getById(id); LawsAssess lawsAssess = lawsAssessService.getById(id);
lawsAssess.setDelFlag("0"); lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
lawsAssess.setCreateTime(now); lawsAssess.setCreateTime(now);
lawsAssess.setUpdateTime(now); lawsAssess.setUpdateTime(now);
lawsAssessService.updateById(lawsAssess); lawsAssessService.updateById(lawsAssess);
continue; continue;
} }
LawsAssess lawsAssess = new LawsAssess(); LawsAssess lawsAssess = new LawsAssess();
lawsAssess.setSource("1"); lawsAssess.setSource(CommonConstant.STANDARD_SOURCE_1);
lawsAssess.setProjectId(lawsAssessAddVo.getProjectId()); lawsAssess.setProjectId(lawsAssessAddVo.getProjectId());
lawsAssess.setStandardId(id); lawsAssess.setStandardId(id);
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(id); LawsDomesticStandard standard = lawsDomesticStandardService.queryById(id);
@@ -166,7 +167,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
if (allByProjectIdDeletedIdList.contains(id)){ if (allByProjectIdDeletedIdList.contains(id)){
//如果已删除则恢复未删除状态 //如果已删除则恢复未删除状态
LawsAssess lawsAssess = lawsAssessService.getById(id); LawsAssess lawsAssess = lawsAssessService.getById(id);
lawsAssess.setDelFlag("0"); lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
lawsAssess.setCreateTime(now); lawsAssess.setCreateTime(now);
lawsAssess.setUpdateTime(now); lawsAssess.setUpdateTime(now);
lawsAssessService.updateById(lawsAssess); lawsAssessService.updateById(lawsAssess);
@@ -217,7 +218,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
if (allByProjectIdDeletedIdList.contains(standardId)){ if (allByProjectIdDeletedIdList.contains(standardId)){
//如果已删除则恢复未删除状态 //如果已删除则恢复未删除状态
LawsAssess assess = lawsAssessService.getById(standardId); LawsAssess assess = lawsAssessService.getById(standardId);
assess.setDelFlag("0"); assess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
assess.setCreateTime(now); assess.setCreateTime(now);
assess.setUpdateTime(now); assess.setUpdateTime(now);
lawsAssessService.updateById(assess); lawsAssessService.updateById(assess);
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java
+4 -3
View File
@@ -12,6 +12,7 @@ import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter; import cn.hutool.poi.excel.ExcelWriter;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
@@ -63,7 +64,7 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
lawsProjectLibrary.setDelFlag("0"); lawsProjectLibrary.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
IPage<LawsProjectLibrary> pageList = lawsProjectLibraryService.queryPage(lawsProjectLibrary, pageNo, pageSize, req); IPage<LawsProjectLibrary> pageList = lawsProjectLibraryService.queryPage(lawsProjectLibrary, pageNo, pageSize, req);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -76,7 +77,7 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
@ApiOperation(value="项目库-添加", notes="项目库-添加") @ApiOperation(value="项目库-添加", notes="项目库-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<T> add(@Validated @RequestBody LawsProjectLibrary lawsProjectLibrary) { public Result<T> add(@Validated @RequestBody LawsProjectLibrary lawsProjectLibrary) {
lawsProjectLibrary.setDelFlag("0"); lawsProjectLibrary.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
lawsProjectLibraryService.add(lawsProjectLibrary); lawsProjectLibraryService.add(lawsProjectLibrary);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
@@ -158,7 +159,7 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
if (StringUtils.isNotBlank(selections)){ if (StringUtils.isNotBlank(selections)){
dos = lawsProjectLibraryService.listByIds(Arrays.asList(selections.split(","))); dos = lawsProjectLibraryService.listByIds(Arrays.asList(selections.split(",")));
}else { }else {
lawsProjectLibrary.setDelFlag("0"); lawsProjectLibrary.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
QueryWrapper<LawsProjectLibrary> queryWrapper = QueryGenerator.initQueryWrapper(lawsProjectLibrary, request.getParameterMap()); QueryWrapper<LawsProjectLibrary> queryWrapper = QueryGenerator.initQueryWrapper(lawsProjectLibrary, request.getParameterMap());
dos = lawsProjectLibraryService.list(queryWrapper); dos = lawsProjectLibraryService.list(queryWrapper);
} }
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
+4 -3
View File
@@ -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.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.entity.LawsAssess;
import com.jero.modules.projectLibrary.mapper.LawsAssessMapper; import com.jero.modules.projectLibrary.mapper.LawsAssessMapper;
import com.jero.modules.projectLibrary.service.ILawsAssessService; import com.jero.modules.projectLibrary.service.ILawsAssessService;
@@ -96,7 +97,7 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
@Override @Override
public void deleteById(String id) { public void deleteById(String id) {
LawsAssess lawsAssess = getById(id); LawsAssess lawsAssess = getById(id);
lawsAssess.setDelFlag("1"); lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
updateById(lawsAssess); updateById(lawsAssess);
} }
@@ -118,7 +119,7 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
} }
LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsAssess::getProjectId, projectId); wrapper.eq(LawsAssess::getProjectId, projectId);
wrapper.eq(LawsAssess::getDelFlag, "0"); wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
return list(wrapper); return list(wrapper);
} }
@@ -129,7 +130,7 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
} }
LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsAssess::getProjectId, projectId); wrapper.eq(LawsAssess::getProjectId, projectId);
wrapper.eq(LawsAssess::getDelFlag, "1"); wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_1.toString());
return list(wrapper); return list(wrapper);
} }
} }
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java
+3 -2
View File
@@ -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.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.entity.LawsProjectLibrary;
import com.jero.modules.projectLibrary.mapper.LawsProjectLibraryMapper; import com.jero.modules.projectLibrary.mapper.LawsProjectLibraryMapper;
import com.jero.modules.projectLibrary.service.ILawsProjectLibraryService; import com.jero.modules.projectLibrary.service.ILawsProjectLibraryService;
@@ -87,7 +88,7 @@ public class LawsProjectLibraryServiceImpl extends ServiceImpl<LawsProjectLibrar
@Override @Override
public void deleteById(String id) { public void deleteById(String id) {
LawsProjectLibrary projectLibrary = getById(id); LawsProjectLibrary projectLibrary = getById(id);
projectLibrary.setDelFlag("1"); projectLibrary.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
updateById(projectLibrary); updateById(projectLibrary);
} }
@@ -98,7 +99,7 @@ public class LawsProjectLibraryServiceImpl extends ServiceImpl<LawsProjectLibrar
public void deleteByIds(List<String> ids) { public void deleteByIds(List<String> ids) {
LambdaUpdateWrapper<LawsProjectLibrary> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<LawsProjectLibrary> wrapper = new LambdaUpdateWrapper<>();
wrapper.in(LawsProjectLibrary::getId, ids); wrapper.in(LawsProjectLibrary::getId, ids);
wrapper.set(LawsProjectLibrary::getDelFlag, "1"); wrapper.set(LawsProjectLibrary::getDelFlag, CommonConstant.DEL_FLAG_1.toString());
update(wrapper); update(wrapper);
} }
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.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.constant.ResultCommon;
@@ -89,7 +89,7 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
}else { }else {
lawsWorkingGroup.setLevel(1); lawsWorkingGroup.setLevel(1);
} }
lawsWorkingGroup.setDelFlag("0"); lawsWorkingGroup.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
lawsWorkingGroupService.add(lawsWorkingGroup); lawsWorkingGroupService.add(lawsWorkingGroup);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
@@ -128,7 +128,7 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
if (ids.size() > 0){ if (ids.size() > 0){
LambdaUpdateWrapper<LawsWorkingGroup> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<LawsWorkingGroup> wrapper = new LambdaUpdateWrapper<>();
wrapper.in(LawsWorkingGroup::getId, ids); wrapper.in(LawsWorkingGroup::getId, ids);
wrapper.set(LawsWorkingGroup::getDelFlag, "1"); wrapper.set(LawsWorkingGroup::getDelFlag, CommonConstant.DEL_FLAG_1.toString());
lawsWorkingGroupService.update(wrapper); lawsWorkingGroupService.update(wrapper);
} }
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); 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 cn.hutool.poi.excel.ExcelWriter;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon; 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="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
lawsWorkingGroupUser.setDelFlag("0"); lawsWorkingGroupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
IPage<LawsWorkingGroupUser> pageList = lawsWorkingGroupUserService.queryPage(lawsWorkingGroupUser, pageNo, pageSize, req); IPage<LawsWorkingGroupUser> pageList = lawsWorkingGroupUserService.queryPage(lawsWorkingGroupUser, pageNo, pageSize, req);
lawsWorkingGroupUserService.userAssignment(pageList.getRecords()); lawsWorkingGroupUserService.userAssignment(pageList.getRecords());
return Result.OK(pageList); return Result.OK(pageList);
@@ -80,7 +81,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
@ApiOperation(value="内部工作组人员关联表-列表查询", notes="内部工作组人员关联表-列表查询") @ApiOperation(value="内部工作组人员关联表-列表查询", notes="内部工作组人员关联表-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<LawsWorkingGroupUser>> queryList(LawsWorkingGroupUser lawsWorkingGroupUser, HttpServletRequest req) { 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); List<LawsWorkingGroupUser> list = lawsWorkingGroupUserService.queryList(lawsWorkingGroupUser, req);
lawsWorkingGroupUserService.userAssignment(list); lawsWorkingGroupUserService.userAssignment(list);
return Result.OK(list); return Result.OK(list);
@@ -102,7 +103,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
String userId = lawsWorkingGroupUser.getUserId(); String userId = lawsWorkingGroupUser.getUserId();
List<String> asList = Arrays.asList(userId.split(",")); List<String> asList = Arrays.asList(userId.split(","));
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>(); 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.in(LawsWorkingGroupUser::getUserId, asList);
wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, lawsWorkingGroupUser.getWorkingGroupId()); wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, lawsWorkingGroupUser.getWorkingGroupId());
List<LawsWorkingGroupUser> list = lawsWorkingGroupUserService.list(wrapper); List<LawsWorkingGroupUser> list = lawsWorkingGroupUserService.list(wrapper);
@@ -124,7 +125,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
LawsWorkingGroupUser workingGroupUser = new LawsWorkingGroupUser(); LawsWorkingGroupUser workingGroupUser = new LawsWorkingGroupUser();
workingGroupUser.setWorkingGroupId(lawsWorkingGroupUser.getWorkingGroupId()); workingGroupUser.setWorkingGroupId(lawsWorkingGroupUser.getWorkingGroupId());
workingGroupUser.setUserId(id); workingGroupUser.setUserId(id);
workingGroupUser.setDelFlag("0"); workingGroupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
groupUsers.add(workingGroupUser); groupUsers.add(workingGroupUser);
} }
lawsWorkingGroupUserService.saveBatch(groupUsers); lawsWorkingGroupUserService.saveBatch(groupUsers);
@@ -143,7 +144,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
} }
LawsWorkingGroupUser groupUser = lawsWorkingGroupUserService.getById(map.get("id")); LawsWorkingGroupUser groupUser = lawsWorkingGroupUserService.getById(map.get("id"));
groupUser.setDelFlag("1"); groupUser.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
lawsWorkingGroupUserService.updateById(groupUser); lawsWorkingGroupUserService.updateById(groupUser);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
@@ -195,7 +196,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
SysUser userByWorkNo = sysUserService.getUserByWorkNo(userWorkNo); SysUser userByWorkNo = sysUserService.getUserByWorkNo(userWorkNo);
groupUser.setUserId(userByWorkNo.getId()); groupUser.setUserId(userByWorkNo.getId());
groupUser.setWorkingGroupId(workingGroupId); groupUser.setWorkingGroupId(workingGroupId);
groupUser.setDelFlag("0"); groupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
} }
lawsWorkingGroupUserService.saveBatch(all); lawsWorkingGroupUserService.saveBatch(all);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
@@ -269,7 +270,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
if (!ids.isEmpty()) { if (!ids.isEmpty()) {
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, workingGroupId); wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, workingGroupId);
wrapper.eq(LawsWorkingGroupUser::getDelFlag, "0"); wrapper.eq(LawsWorkingGroupUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
wrapper.in(LawsWorkingGroupUser::getUserId, ids); wrapper.in(LawsWorkingGroupUser::getUserId, ids);
list = lawsWorkingGroupUserService.list(wrapper); list = lawsWorkingGroupUserService.list(wrapper);
} }
@@ -278,7 +279,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
private List<LawsWorkingGroupUser> queryDataByTree(String workingGroupId) { private List<LawsWorkingGroupUser> queryDataByTree(String workingGroupId) {
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, workingGroupId); wrapper.eq(LawsWorkingGroupUser::getWorkingGroupId, workingGroupId);
wrapper.eq(LawsWorkingGroupUser::getDelFlag, "0"); wrapper.eq(LawsWorkingGroupUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
return lawsWorkingGroupUserService.list(wrapper); 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; package com.jero.modules.sys.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.sys.entity.LawsEnterpriseStandardLevel; 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.mapper.LawsEnterprisestandardLevelMapper;
import com.jero.modules.sys.service.ILawsEnterpriseStandardLevelService; import com.jero.modules.sys.service.ILawsEnterpriseStandardLevelService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List; 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; package com.jero.modules.sys.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.entity.LawsWorkingGroup;
import com.jero.modules.sys.mapper.LawsWorkingGroupMapper; import com.jero.modules.sys.mapper.LawsWorkingGroupMapper;
import com.jero.modules.sys.service.ILawsWorkingGroupService; import com.jero.modules.sys.service.ILawsWorkingGroupService;
@@ -31,7 +32,7 @@ public class LawsWorkingGroupServiceImpl extends ServiceImpl<LawsWorkingGroupMap
@Override @Override
public List<LawsWorkingGroup> queryList() { public List<LawsWorkingGroup> queryList() {
LambdaQueryWrapper<LawsWorkingGroup> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsWorkingGroup> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroup::getDelFlag, "0"); wrapper.eq(LawsWorkingGroup::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
return list(wrapper); return list(wrapper);
} }
@@ -98,7 +99,7 @@ public class LawsWorkingGroupServiceImpl extends ServiceImpl<LawsWorkingGroupMap
@Override @Override
public List<LawsWorkingGroup> realList() { public List<LawsWorkingGroup> realList() {
LambdaQueryWrapper<LawsWorkingGroup> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsWorkingGroup> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsWorkingGroup::getDelFlag, "0"); wrapper.eq(LawsWorkingGroup::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
List<LawsWorkingGroup> list = list(wrapper); List<LawsWorkingGroup> list = list(wrapper);
return list; 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.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.entity.LawsWorkingGroupUser;
import com.jero.modules.sys.mapper.LawsWorkingGroupUserMapper; import com.jero.modules.sys.mapper.LawsWorkingGroupUserMapper;
import com.jero.modules.sys.service.ILawsWorkingGroupUserService; import com.jero.modules.sys.service.ILawsWorkingGroupUserService;
@@ -67,7 +68,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
} }
LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsWorkingGroupUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(workingGroupId), LawsWorkingGroupUser::getWorkingGroupId, workingGroupId); 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); wrapper.in(LawsWorkingGroupUser::getUserId, ids);
return page(page, wrapper); return page(page, wrapper);
} }