diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java index 06f3596c..fd1fc569 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java @@ -8,6 +8,7 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.system.vo.IdsMapBody; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.apache.commons.lang3.StringUtils; @@ -99,16 +100,17 @@ public class LawsEvaluationNotMetController extends JeroController batchClose(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ + public Result batchClose(@RequestBody IdsMapBody body) { + String ids = body.getIds(); + if(StringUtils.isEmpty(ids)){ throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } - List ids = Arrays.asList(map.get("ids").split(",")); + List idList = Arrays.asList(ids.split(",")); //检查所选数据是否均是待整改状态、当前时间大于预计整改完成日期 - if (this.check(ids)) { + if (this.check(idList)) { throw new JeroBootException(ResultCommon.CANNOT_CLOSE); } - lawsEvaluationNotMetService.batchClose(ids); + lawsEvaluationNotMetService.batchClose(idList); return Result.OK(ResultCommon.OK); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java index 8970fcb1..1d23333a 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java @@ -65,9 +65,6 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl