From f1ff089bcdf109092458e771b573e7ab5d614d48 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十二月 2024 14:56:03 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java | 2 +-
admin/src/api/business/tmsFactoryParam.js | 12 ++++++------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java | 14 +++++++-------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/admin/src/api/business/tmsFactoryParam.js b/admin/src/api/business/tmsFactoryParam.js
index cba0950..822b341 100644
--- a/admin/src/api/business/tmsFactoryParam.js
+++ b/admin/src/api/business/tmsFactoryParam.js
@@ -2,14 +2,14 @@
// 鏌ヨ
export function fetchList (data) {
- return request.post('/visitsAdmin/cloudService/tmsFactoryParam/page', data, {
+ return request.post('/visitsAdmin/cloudService/business/tmsFactoryParam/page', data, {
trim: true
})
}
// 瀵煎嚭Excel
export function exportExcel (data) {
- return request.post('/visitsAdmin/cloudService/tmsFactoryParam/exportExcel', data, {
+ return request.post('/visitsAdmin/cloudService/business/tmsFactoryParam/exportExcel', data, {
trim: true,
download: true
})
@@ -17,22 +17,22 @@
// 鍒涘缓
export function create (data) {
- return request.post('/visitsAdmin/cloudService/tmsFactoryParam/create', data)
+ return request.post('/visitsAdmin/cloudService/business/tmsFactoryParam/create', data)
}
// 淇敼
export function updateById (data) {
- return request.post('/visitsAdmin/cloudService/tmsFactoryParam/updateById', data)
+ return request.post('/visitsAdmin/cloudService/business/tmsFactoryParam/updateById', data)
}
// 鍒犻櫎
export function deleteById (id) {
- return request.get(`/visitsAdmin/cloudService/tmsFactoryParam/delete/${id}`)
+ return request.get(`/visitsAdmin/cloudService/business/tmsFactoryParam/delete/${id}`)
}
// 鎵归噺鍒犻櫎
export function deleteByIdInBatch (ids) {
- return request.get('/visitsAdmin/cloudService/tmsFactoryParam/delete/batch', {
+ return request.get('/visitsAdmin/cloudService/business/tmsFactoryParam/delete/batch', {
params: {
ids
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java
index ad533e7..fb059d7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java
@@ -17,7 +17,7 @@
* 鍒涘缓
*
* @param tmsFactoryParam 瀹炰綋瀵硅薄
- * @return Integer
+ * @return IntegerC
*/
Integer create(TmsFactoryParam tmsFactoryParam);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
index a026c36..c60d1f6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
@@ -60,6 +60,7 @@
try {
List<String> users = new ArrayList<>();
users.add(username);
+
List<Integer> userIds = new ArrayList<>();
List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.in(Member::getPhone,users)
@@ -70,6 +71,12 @@
userIds.add(tu.getId());
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鏃犳晥璐﹀彿~");
+ }
+ if(userIds.size()>0){
+ //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
+ noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
+ .eq(Notices::getType, Constants.noticesObjectType.hknotice)
+ .in(Notices::getUserId, userIds));
}
Date date = new Date();
List<GetTodoListResponse> allHkList = new ArrayList<>();
@@ -143,13 +150,6 @@
noticesJoinMapper.insert(list);//鎵归噺鎻掑叆璁板綍
}
}
- if(userIds.size()>0){
- //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
- noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
- .eq(Notices::getType, Constants.noticesObjectType.hknotice)
- .in(Notices::getUserId, userIds));
- }
-
}catch (Exception e){
e.printStackTrace();
}finally {
--
Gitblit v1.9.3