From cc8bf2663afaf34aef48d7bda688d95c92d83ae9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 15 Mar 2024 19:56:30 +0800
Subject: [PATCH] 堤防普查，白蚁普查修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
index 145a28b..8c20540 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
@@ -5,6 +5,7 @@
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbResGeneralInvestigationService;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
+import cn.gistack.sm.sjztmd.vo.TbResGeneralInvestigationParam;
import cn.gistack.sm.sjztmd.wrapper.AttResBaseWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -60,6 +61,10 @@
queryWrapper.like("\"res_guid\"", param.getResGuid());
if (!StringUtil.isBlank(param.getCreateUser()))
queryWrapper.like("\"create_user\"", param.getCreateUser());
+ if (null != param.getTbYear())
+ queryWrapper.like("\"tb_year\"", param.getTbYear());
+ if (!StringUtil.isBlank(param.getTbQuarter()))
+ queryWrapper.like("\"tb_quarter\"", param.getTbQuarter());
return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query), queryWrapper));
}
@@ -88,14 +93,30 @@
if (tbResGeneralInvestigation.getGuid() == null) {
tbResGeneralInvestigation.setCreateTime(new Date());
}
- return R.status(tbResGeneralInvestigationService.saveOrUpdate(tbResGeneralInvestigation));
+ return tbResGeneralInvestigationService.saveOrUpdateBy(tbResGeneralInvestigation);
+ }
+
+ @ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
+ @PostMapping(value = "/submitBatch")
+ public R submit(@RequestBody TbResGeneralInvestigationParam tbResGeneralInvestigationParam) {
+
+ return tbResGeneralInvestigationService.saveOrUpdateByBatch(tbResGeneralInvestigationParam);
}
@PostMapping("/remove")
@ApiOperation(value = "物理删除", notes = "传入id")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String id) {
return R.status(tbResGeneralInvestigationService.removeById(id));
+ }
+ @PostMapping("/getInvestigationListByStateId")
+ @ApiOperation(value = "根据状态id获取普查集合", notes = "传入id")
+ public R getInvestigationListByStateId(String stateId){
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("\"tb_state_id\"",stateId);
+
+ List<TbResGeneralInvestigation> list = tbResGeneralInvestigationService.list(queryWrapper);
+ return R.data(list);
}
}
--
Gitblit v1.9.3