From a73593d70d59af01bc6afcd55ba817e319d228df Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:26:18 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/vo/message/MessageVO.java | 3 +++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 18 ++++++++++++++++++
ycl-platform/src/main/resources/mapper/message/MessageMapper.xml | 3 ++-
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 1 +
4 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index ca8d45e..829e41f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -271,6 +271,24 @@
return CommonResult.success("success");
}
+ @ApiOperation(value = "璋冨害绠＄悊-鎵归噺鍒犻櫎")
+ @DeleteMapping("/batch_case_delete")
+ public CommonResult batchCaseDelete(@RequestParam List<Long> ids){
+ ids.forEach(
+ item->{
+ BaseCase baseCase = baseCaseService.getOne(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getId, item));
+ if (baseCase.getCategory()==1){
+ violationsService.removeById(item);
+ baseCaseService.removeById(item);
+ }else {
+ illegalBuildingService.removeById(item);
+ baseCaseService.removeById(item);
+ }
+ }
+ );
+ return CommonResult.success("success");
+ }
+
/**
* @return com.ycl.api.CommonResult
* @Description reset case
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index 6eccd73..6411a96 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -102,6 +102,7 @@
sendMessage.setSendTime(new Date());
sendMessage.setTargetTo(receive);
sendMessage.setSendTime(new Date());
+ sendMessage.setPhoneNumber(umsAdminMapper.selectById(receive).getMobile());
this.save(sendMessage);
ids.add(sendMessage.getId());
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/message/MessageVO.java b/ycl-platform/src/main/java/com/ycl/vo/message/MessageVO.java
index a86f6cf..3d0e261 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/message/MessageVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/message/MessageVO.java
@@ -94,4 +94,7 @@
@ApiModelProperty(value = "娑堟伅绫诲瀷")
private Integer messageType;
+
+ @ApiModelProperty(value = "鎵嬫満鍙风爜")
+ private String phoneNumber;
}
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
index be8b16f..8affb6f 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
@@ -48,7 +48,8 @@
t1.target_to,
t1.message_type,
t1.channel_code,
- t4.username as createUser
+ t4.username as createUser,
+ t1.phone_number
FROM
`ums_message` t1
left join ums_admin t4 on t1.create_user = t4.id
--
Gitblit v1.8.0