From 877e64ea7a23472297ba93027210bb1d4c4a8c4f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 01 Jul 2023 17:23:12 +0800
Subject: [PATCH] 短信导入发送数据返回提示修改，告警短信发送修改（新增市县水利部人员查询并放入短信中）
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
index 057fa54..a79b3b3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -5,10 +5,12 @@
import cn.gistack.sm.sjztmd.entity.AttResBase;
import cn.gistack.sm.sjztmd.mapper.AttResBaseMapper;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
+import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
import cn.gistack.sm.sjztmd.vo.ManagePersonVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tool.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
@@ -53,14 +55,46 @@
* @return
*/
@Override
- public IPage<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
- List<String> list = new ArrayList<>();
+ public Object getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
+
Object adCode = params.get("adCode");
- if (null != adCode && !adCode.equals("")) {
- list = callTaskMapper.getAllChildrenAreaByAreaCode(adCode.toString());
+ Object adGrad = params.get("adGrad");
+ String ad_code = "";
+ String p_ad_code = "";
+ String code = adCode.toString();
+ if (adGrad.toString().equals("1")) {
+ p_ad_code = code.substring(0,2);
+ } else if (adGrad.toString().equals("2")) {
+ p_ad_code = code.substring(0,4);
+ } else if (adGrad.toString().equals("3")) {
+ p_ad_code = code.substring(0,7);
+ } else {
+ ad_code = code;
}
- List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,list,params);
+
+ Object isExport = params.get("isExport");
+ // 判断是否导出，导出不分页
+ if (null != isExport && !isExport.equals("")) {
+ return baseMapper.getAttResBaseUserPage(null,ad_code,p_ad_code,params);
+ }
+ List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,ad_code,p_ad_code,params);
// 返回数据
return page.setRecords(attResBaseUserDTOList);
}
+
+ @Override
+ public Boolean updateResBaseByGuid(AttResBase attResBase) {
+ attResBase.setUpdateTime(DateUtil.now());
+ return baseMapper.updateResBaseByGuid(attResBase);
+ }
+
+ /**
+ * 查询当前水库对应的市级编号和县区编号
+ * @param res_cd
+ * @return
+ */
+ @Override
+ public AttResBaseVO getCityCountyCodeByResGuid(String res_cd) {
+ return baseMapper.getCityCountyCodeByResGuid(res_cd);
+ }
}
--
Gitblit v1.9.3