diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java index 6e35a4b2..8aca9a04 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java @@ -58,6 +58,9 @@ public class BsSgcDfSafeJbxxController extends BaseController { @Autowired private BsSgcDfSafeJbxxService bsSgcSzSafeJbxxService; + @Autowired + private BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService; + @Autowired private SysXzqhService sysXzqhService; @@ -192,27 +195,27 @@ public class BsSgcDfSafeJbxxController extends BaseController { if (bsSgcSzSafeJbxx.getStatus().equals("4")) { String id = bsSgcSzSafeJbxx.getId(); //获取未修改的数据 - BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id); + BsSgcDfSafeJbxx byId = bsSgcDfSafeJbxxService.getById(id); //将未修改的数据插入数据库 byId.setExprDate(new Date()); byId.setId(UUID.randomUUID().toString()); - bsSgcSzSafeJbxxService.save(byId); + bsSgcDfSafeJbxxService.save(byId); //生成新的数据 bsSgcSzSafeJbxx.setEffDate(new Date()); bsSgcSzSafeJbxx.setExprDate(null); - return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); + return toAjax(bsSgcDfSafeJbxxService.updateById(bsSgcSzSafeJbxx)); } if (bsSgcSzSafeJbxx.getStatus().equals("5")) { - List list = bsSgcSzSafeJbxxService.list(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) + List list = bsSgcDfSafeJbxxService.list(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) .eq(BsSgcDfSafeJbxx::getDikeCode, bsSgcSzSafeJbxx.getDikeCode()) .isNull(BsSgcDfSafeJbxx::getEffDate) .orderByDesc(BsSgcDfSafeJbxx::getExprDate)); - bsSgcSzSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId()); + bsSgcDfSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId()); BsSgcDfSafeJbxx bsSgcDfSafeJbxx = list.get(0); bsSgcDfSafeJbxx.setExprDate(null); - return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcDfSafeJbxx)); + return toAjax(bsSgcDfSafeJbxxService.updateById(bsSgcDfSafeJbxx)); } - return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); + return toAjax(bsSgcDfSafeJbxxService.updateById(bsSgcSzSafeJbxx)); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java index f5579aa6..ec0b4466 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java @@ -5,7 +5,11 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.sz.domain.BsSgcSzGcjg; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -48,6 +52,9 @@ public class BsSgcSzCxjlController extends BaseController @Autowired private BsSgcSzCxjlService bsSgcSzCxjlService; + @Autowired + private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; + /** * 查询出险记录列表 @@ -56,7 +63,11 @@ public class BsSgcSzCxjlController extends BaseController @ApiOperation("出险记录列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzCxjlService.selectPage(sp); + Page page = bsSgcSzCxjlService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzCxjl.class) + .eq(BsSgcSzCxjl::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzCxjl::getExprDate)); + return page; } /** @@ -103,11 +114,16 @@ public class BsSgcSzCxjlController extends BaseController public AjaxResult edit(@RequestBody BsSgcSzCxjl bsSgcSzCxjl) { + String wagaCode = bsSgcSzCxjl.getWagaCode(); + BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); + byId.setStatus("4"); + bsSgcSzSafeJbxxService.updateById(byId); String id = bsSgcSzCxjl.getId(); - BsSgcSzCxjl byId = bsSgcSzCxjlService.getById(id); - byId.setExprDate(new Date()); - byId.setId(UUID.randomUUID().toString()); - bsSgcSzCxjlService.save(byId); + BsSgcSzCxjl dfhdm = bsSgcSzCxjlService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzCxjlService.save(dfhdm); bsSgcSzCxjl.setEffDate(new Date()); bsSgcSzCxjl.setExprDate(null); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java index febbeceb..ad6d8222 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java @@ -5,7 +5,12 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sz.domain.BsSgcSzCxjl; +import com.kms.yg.sz.domain.BsSgcSzGctx; +import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -49,6 +54,10 @@ public class BsSgcSzGcjgController extends BaseController private BsSgcSzGcjgService bsSgcSzGcjgService; + @Autowired + private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; + + /** * 查询工程结构列表 */ @@ -56,7 +65,11 @@ public class BsSgcSzGcjgController extends BaseController @ApiOperation("工程结构列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzGcjgService.selectPage(sp); + Page page = bsSgcSzGcjgService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzGcjg.class) + .eq(BsSgcSzGcjg::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzGcjg::getExprDate)); + return page; } /** @@ -103,11 +116,16 @@ public class BsSgcSzGcjgController extends BaseController public AjaxResult edit(@RequestBody BsSgcSzGcjg bsSgcSzGcjg) { + String wagaCode = bsSgcSzGcjg.getWagaCode(); + BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); + byId.setStatus("4"); + bsSgcSzSafeJbxxService.updateById(byId); String id = bsSgcSzGcjg.getId(); - BsSgcSzGcjg byId = bsSgcSzGcjgService.getById(id); - byId.setExprDate(new Date()); - byId.setId(UUID.randomUUID().toString()); - bsSgcSzGcjgService.save(byId); + BsSgcSzGcjg dfhdm = bsSgcSzGcjgService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzGcjgService.save(dfhdm); bsSgcSzGcjg.setEffDate(new Date()); bsSgcSzGcjg.setExprDate(null); return toAjax(bsSgcSzGcjgService.updateById(bsSgcSzGcjg)); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java index c41b6023..33510a8f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java @@ -5,7 +5,12 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sz.domain.BsSgcSzGcjg; +import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.BsSgcSzXlnl; +import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -48,6 +53,9 @@ public class BsSgcSzGctxController extends BaseController @Autowired private BsSgcSzGctxService bsSgcSzGctxService; + @Autowired + private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; + /** * 查询工程特性列表 @@ -56,7 +64,11 @@ public class BsSgcSzGctxController extends BaseController @ApiOperation("工程特性列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzGctxService.selectPage(sp); + Page page = bsSgcSzGctxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzGctx.class) + .eq(BsSgcSzGctx::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzGctx::getExprDate)); + return page; } /** @@ -102,11 +114,16 @@ public class BsSgcSzGctxController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BsSgcSzGctx bsSgcSzGctx) { + String wagaCode = bsSgcSzGctx.getWagaCode(); + BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); + byId.setStatus("4"); + bsSgcSzSafeJbxxService.updateById(byId); String id = bsSgcSzGctx.getId(); - BsSgcSzGctx byId = bsSgcSzGctxService.getById(id); - byId.setExprDate(new Date()); - byId.setId(UUID.randomUUID().toString()); - bsSgcSzGctxService.save(byId); + BsSgcSzGctx dfhdm = bsSgcSzGctxService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzGctxService.save(dfhdm); bsSgcSzGctx.setEffDate(new Date()); bsSgcSzGctx.setExprDate(null); return toAjax(bsSgcSzGctxService.updateById(bsSgcSzGctx)); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java index 729c520a..9620013c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java @@ -10,6 +10,7 @@ import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzBzbp; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.dto.HistogramDto; @@ -177,14 +178,29 @@ public class BsSgcSzSafeJbxxController extends BaseController { @PutMapping public AjaxResult edit(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) { // bsSgcSzSafeJbxx.setStatus("4"); - String id = bsSgcSzSafeJbxx.getId(); - BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id); - byId.setExprDate(new Date()); - byId.setId(UUID.randomUUID().toString()); - bsSgcSzSafeJbxxService.save(byId); - bsSgcSzSafeJbxx.setEffDate(new Date()); - bsSgcSzSafeJbxx.setExprDate(null); - + if (bsSgcSzSafeJbxx.getStatus().equals("4")) { + String id = bsSgcSzSafeJbxx.getId(); + //获取未修改的数据 + BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id); + //将未修改的数据插入数据库 + byId.setExprDate(new Date()); + byId.setId(UUID.randomUUID().toString()); + bsSgcSzSafeJbxxService.save(byId); + //生成新的数据 + bsSgcSzSafeJbxx.setEffDate(new Date()); + bsSgcSzSafeJbxx.setExprDate(null); + return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); + } + if (bsSgcSzSafeJbxx.getStatus().equals("5")) { + List list = bsSgcSzSafeJbxxService.list(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(BsSgcSzSafeJbxx::getWagaCode, bsSgcSzSafeJbxx.getWagaCode()) + .isNull(BsSgcSzSafeJbxx::getEffDate) + .orderByDesc(BsSgcSzSafeJbxx::getExprDate)); + bsSgcSzSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId()); + BsSgcSzSafeJbxx bsSgcDfSafeJbxx = list.get(0); + bsSgcDfSafeJbxx.setExprDate(null); + return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcDfSafeJbxx)); + } return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java index df5a5a64..27f4d980 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java @@ -1,11 +1,15 @@ package com.kms.yg.sz.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.UUID; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfSwtz; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzSjcs; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; @@ -62,7 +66,11 @@ public class BsSgcSzSjcsController extends BaseController @ApiOperation("设计参数列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzSjcsService.selectPage(sp); + Page page = bsSgcSzSjcsService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzSjcs.class) + .eq(BsSgcSzSjcs::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzSjcs::getExprDate)); + return page; } /** @@ -102,6 +110,13 @@ public class BsSgcSzSjcsController extends BaseController .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); byId.setStatus("4"); bsSgcSzSafeJbxxService.updateById(byId); + String id = bsSgcSzSjcs.getId(); + BsSgcSzSjcs dfhdm = bsSgcSzSjcsService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzSjcsService.save(dfhdm); + bsSgcSzSjcs.setEffDate(new Date()); + bsSgcSzSjcs.setExprDate(null); return toAjax(bsSgcSzSjcsService.save(bsSgcSzSjcs)); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java index 794152b8..08e00b37 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java @@ -1,12 +1,16 @@ package com.kms.yg.sz.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.UUID; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.BsSgcSzSjcs; import com.kms.yg.sz.domain.BsSgcSzXlnl; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.kms.yg.sz.service.BsSgcSzXlnlService; @@ -67,7 +71,11 @@ public class BsSgcSzXlnlController extends BaseController @ApiOperation("泄流能力列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzXlnlService.selectPage(sp); + Page page = bsSgcSzXlnlService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzXlnl.class) + .eq(BsSgcSzXlnl::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzXlnl::getExprDate)); + return page; } /** @@ -123,6 +131,13 @@ public class BsSgcSzXlnlController extends BaseController .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); byId.setStatus("4"); bsSgcSzSafeJbxxService.updateById(byId); + String id = bsSgcSzXlnl.getId(); + BsSgcSzXlnl dfhdm = bsSgcSzXlnlService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzXlnlService.save(dfhdm); + bsSgcSzXlnl.setEffDate(new Date()); + bsSgcSzXlnl.setExprDate(null); return toAjax(bsSgcSzXlnlService.updateById(bsSgcSzXlnl)); }