diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java index 85e6c263..f89dfa88 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java @@ -2,9 +2,9 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; +import com.kms.yxgh.common.dto.CommonCheckingTreeDto; import com.kms.yxgh.df.domain.DfChecking; import com.kms.yxgh.df.dto.DfCheckingDetailDto; -import com.kms.yxgh.common.dto.CommonCheckingTreeDto; import com.kms.yxgh.df.dto.SimpleDfCheckingDto; import com.kms.yxgh.df.service.DfCheckingService; import com.kms.yxgh.util.BeanCopyUtils; @@ -77,6 +77,13 @@ public class DfCheckingController { return Response.ok(dfCheckingService.update(dfChecking)); } + //检验是否被使用 + @ApiOperation("检查是否被使用") + @GetMapping("/check-use/{id}") + public Response checkUse(@PathVariable("id") String id) { + return Response.ok(dfCheckingService.isUsed(id)); + } + /** * 删除堤防巡视检查 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index b6218580..8e611ad8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -164,7 +164,7 @@ public class DfCheckingService extends BaseService return rt; } - private boolean isUsed(String id) { + public Boolean isUsed(String id) { return dfPlanMapper.selectCount(Wrappers.lambdaQuery() .eq(DfPlan::getXcId, id)) > 0 || dfProjectCheckingRelMapper.selectCount(Wrappers.lambdaQuery() diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java index 076932f7..2db0b5a2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java @@ -3,9 +3,9 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; import com.kms.yxgh.common.dto.CommonCheckingTreeDto; -import com.kms.yxgh.sz.dto.SzCheckingDetailDto; -import com.kms.yxgh.sz.dto.SimpleSzCheckingDto; import com.kms.yxgh.sz.domain.SzChecking; +import com.kms.yxgh.sz.dto.SimpleSzCheckingDto; +import com.kms.yxgh.sz.dto.SzCheckingDetailDto; import com.kms.yxgh.sz.service.SzCheckingService; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.annotation.Log; @@ -13,16 +13,10 @@ import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.List; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * @ClassName: CheckingController @@ -38,67 +32,74 @@ import org.springframework.web.bind.annotation.RestController; public class SzCheckingController { - private final SzCheckingService szCheckingService; - - /** - * 查询水闸巡视检查列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查列表") - public IPage list(@RequestBody SearchParam sp) { - return szCheckingService.selectPage(sp); - } - - @PostMapping("/list-simple") - @ApiOperation("水闸巡视检查列表-简略信息") - public Response> listSimple(SearchParam sp) { - return Response.ok( - BeanCopyUtils.copyList(szCheckingService.selectSimple(sp), SimpleSzCheckingDto.class)); - } - - - /** - * 获取水闸巡视检查详细信息 - */ - @ApiOperation(" 水闸巡视检查详情") - @GetMapping(value = "/{id}") - public Response getInfo(@PathVariable("id") String id) { - return Response.ok(szCheckingService.getDetailById(id)); - } - - @ApiOperation("水闸巡视检查新增") - @Log(title = "水闸巡视检查新增", businessType = BusinessType.INSERT) - @PostMapping - public Response add(@RequestBody SzCheckingDetailDto SzChecking) { - return Response.ok(szCheckingService.add(SzChecking)); - } - - /** - * 修改水闸巡视检查 - */ - @ApiOperation("水闸巡视检查修改") - @Log(title = "水闸巡视检查修改", businessType = BusinessType.UPDATE) - @PutMapping - public Response edit(@RequestBody SzCheckingDetailDto SzChecking) { - return Response.ok(szCheckingService.update(SzChecking)); - } - - /** - * 删除水闸巡视检查 - */ - @ApiOperation("水闸巡视检查删除") - @Log(title = "水闸巡视检查删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") String id) { - return Response.ok(szCheckingService.deleteById(id)); - } - - - @ApiOperation("检查项树数组") - @GetMapping("/tree") - public Response> checkingItemTree() { - return Response.ok(szCheckingService.checkingItems()); - } + private final SzCheckingService szCheckingService; + + /** + * 查询水闸巡视检查列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查列表") + public IPage list(@RequestBody SearchParam sp) { + return szCheckingService.selectPage(sp); + } + + @PostMapping("/list-simple") + @ApiOperation("水闸巡视检查列表-简略信息") + public Response> listSimple(SearchParam sp) { + return Response.ok( + BeanCopyUtils.copyList(szCheckingService.selectSimple(sp), SimpleSzCheckingDto.class)); + } + + + /** + * 获取水闸巡视检查详细信息 + */ + @ApiOperation(" 水闸巡视检查详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(szCheckingService.getDetailById(id)); + } + + @ApiOperation("水闸巡视检查新增") + @Log(title = "水闸巡视检查新增", businessType = BusinessType.INSERT) + @PostMapping + public Response add(@RequestBody SzCheckingDetailDto SzChecking) { + return Response.ok(szCheckingService.add(SzChecking)); + } + + //检验是否被使用 + @ApiOperation("检查是否被使用") + @GetMapping("/check-use/{id}") + public Response checkUse(@PathVariable("id") String id) { + return Response.ok(szCheckingService.isUsed(id)); + } + + /** + * 修改水闸巡视检查 + */ + @ApiOperation("水闸巡视检查修改") + @Log(title = "水闸巡视检查修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody SzCheckingDetailDto SzChecking) { + return Response.ok(szCheckingService.update(SzChecking)); + } + + /** + * 删除水闸巡视检查 + */ + @ApiOperation("水闸巡视检查删除") + @Log(title = "水闸巡视检查删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") String id) { + return Response.ok(szCheckingService.deleteById(id)); + } + + + @ApiOperation("检查项树数组") + @GetMapping("/tree") + public Response> checkingItemTree() { + return Response.ok(szCheckingService.checkingItems()); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java index b0e035a4..133b1be4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -164,7 +164,7 @@ public class SzCheckingService extends BaseService return rt; } - private boolean isUsed(String id) { + public Boolean isUsed(String id) { return szPlanMapper.selectCount(Wrappers.lambdaQuery() .eq(SzPlan::getXcId, id)) > 0 || szProjectCheckingRelMapper.selectCount(Wrappers.lambdaQuery()