From 35ee8fa998efd94733b479307256f32136671ed2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 三月 2025 13:54:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/layouts/TableLayout.vue | 3 +
admin/src/views/statistics/platformRecord.vue | 9 +++-
admin/src/views/business/reportRecord.vue | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 6 +-
admin/src/layouts/TableLayout1.vue | 5 +-
admin/src/assets/style/style.scss | 3 +
admin/src/views/system/smsMessage.vue | 4 +-
admin/src/views/vehicle/driver.vue | 7 +++
admin/src/views/task/index.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java | 3 +
server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java | 4 +-
admin/src/views/system/publicMsg.vue | 5 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 44 ++++++++++++++++++----
admin/src/components/common/Pagination.vue | 3 +
14 files changed, 75 insertions(+), 26 deletions(-)
diff --git a/admin/src/assets/style/style.scss b/admin/src/assets/style/style.scss
index f6a469f..e61bce8 100644
--- a/admin/src/assets/style/style.scss
+++ b/admin/src/assets/style/style.scss
@@ -239,6 +239,9 @@
.mb20 {
margin-bottom: 20px;
}
+.mb40 {
+ margin-bottom: 40px;
+}
.red{
color: red !important;
}
diff --git a/admin/src/components/common/Pagination.vue b/admin/src/components/common/Pagination.vue
index 26d4093..85eb7ad 100644
--- a/admin/src/components/common/Pagination.vue
+++ b/admin/src/components/common/Pagination.vue
@@ -40,7 +40,8 @@
</script>
<style lang="scss" scoped>
.table-pagination {
- padding: 16px 0;
+ margin-left: -16px;
+ padding: 16px 0px 16px 25px;
text-align: left;
display: block;
z-index: 100;
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index 9a2e9b6..c14a67a 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/admin/src/layouts/TableLayout.vue
@@ -157,7 +157,8 @@
}
// 鍒嗛〉
.table-pagination {
- padding: 16px 0;
+ margin-left: -16px;
+ padding: 16px 0px 16px 25px;
text-align: left;
display: block;
z-index: 100;
diff --git a/admin/src/layouts/TableLayout1.vue b/admin/src/layouts/TableLayout1.vue
index 461cc85..246c4cc 100644
--- a/admin/src/layouts/TableLayout1.vue
+++ b/admin/src/layouts/TableLayout1.vue
@@ -158,8 +158,9 @@
}
// 鍒嗛〉
.table-pagination {
- padding: 16px 0;
- text-align: left;
+ margin-left: -16px;
+ padding: 16px 0px 16px 25px;
+ text-align: left;
display: block;
z-index: 100;
width: -webkit-fill-available;
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index 2776e4a..5fe8440 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -237,7 +237,8 @@
<style lang="scss" scoped>
.table-pagination {
- padding: 16px 0;
+ margin-left: -16px;
+ padding: 16px 0px 16px 25px;
text-align: left;
display: block;
z-index: 100;
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index 729cf99..ca316b0 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -1,7 +1,7 @@
<template>
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
- <el-table v-loading="loading" :data="list" stripe>
+ <el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="platformName" label="鏈堝彴鍚嶇О" min-width="100" show-overflow-tooltip />
<el-table-column prop="platformGroupName" label="鏈堝彴缁�" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞﹀墠鐗岀収鍙�" min-width="100" show-overflow-tooltip />
@@ -143,4 +143,9 @@
}
</script>
-<style></style>
+<style scoped>
+::v-deep .el-table{
+ margin-bottom: 60px;
+}
+
+</style>
diff --git a/admin/src/views/system/publicMsg.vue b/admin/src/views/system/publicMsg.vue
index 136d910..259257b 100644
--- a/admin/src/views/system/publicMsg.vue
+++ b/admin/src/views/system/publicMsg.vue
@@ -157,4 +157,7 @@
color: #000000;
margin-bottom: 15px;
}
-</style>
\ No newline at end of file
+ ::v-deep .el-table{
+ margin-bottom: 60px;
+ }
+</style>
diff --git a/admin/src/views/system/smsMessage.vue b/admin/src/views/system/smsMessage.vue
index 0dbf752..4e60443 100644
--- a/admin/src/views/system/smsMessage.vue
+++ b/admin/src/views/system/smsMessage.vue
@@ -6,7 +6,7 @@
<el-button type="primary" @click="batchStatus(0)" v-permissions="['business:platformjob:update']">鎵归噺鍚敤</el-button>
<el-button @click="batchStatus(1)" v-permissions="['business:platformjob:update']">鎵归噺绂佺敤</el-button>
</div>
- <el-table @selection-change="handleSelectionChange" class="mb20" v-loading="loading" :data="list" stripe>
+ <el-table @selection-change="handleSelectionChange" class="mb40" v-loading="loading" :data="list" stripe>
<el-table-column align="center" type="selection" width="55">
</el-table-column>
<el-table-column prop="name" label="娑堟伅鏍囬" min-width="160" show-overflow-tooltip />
@@ -157,4 +157,4 @@
color: #000000;
margin-bottom: 15px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index c67b513..6597ea4 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -33,7 +33,7 @@
</template>
</el-tab-pane>
</el-tabs>
- <el-table v-loading="loading" :data="dataList" stripe row-key="id" class="mb20" default-expand-all>
+ <el-table v-loading="loading" :data="dataList" stripe row-key="id" class="mb40" default-expand-all>
<el-table-column label="澶勭悊浜嬮」" min-width="160">
<template slot-scope="{ row }"> {{ row.title }}
</template>
diff --git a/admin/src/views/vehicle/driver.vue b/admin/src/views/vehicle/driver.vue
index cf19c1e..c8c0915 100644
--- a/admin/src/views/vehicle/driver.vue
+++ b/admin/src/views/vehicle/driver.vue
@@ -79,4 +79,9 @@
}
</script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+::v-deep .el-table{
+ margin-bottom: 60px;
+}
+
+</style>
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
index 219829c..a697a59 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
@@ -78,7 +78,7 @@
@ExcelColumn(name="鍏宠仈瀵硅薄鍚嶇О")
private String objName;
- @ApiModelProperty(value = "绫诲瀷 0璁垮瀹℃壒 1璁垮鎶ュ 2鐢ㄨ溅瀹℃壒 3闅愭偅澶勭悊 4鐗╂祦杞﹀鎵� 5绯荤粺绯荤粺 6鍏ュ洯鍘熷洜 7娴峰悍鑰冨嫟浠ｅ姙")
+ @ApiModelProperty(value = "绫诲瀷 0璁垮瀹℃壒 1璁垮鎶ュ 2鐢ㄨ溅瀹℃壒 3闅愭偅澶勭悊 4鐗╂祦杞﹀鎵� 5绯荤粺绯荤粺 6鍏ュ洯鍘熷洜 7娴峰悍鑰冨嫟浠ｅ姙")
@ExcelColumn(name="绫诲瀷 0璁垮瀹℃壒 1璁垮鎶ュ 2鐢ㄨ溅瀹℃壒 3闅愭偅澶勭悊 4鐗╂祦杞﹀鎵� 5绯荤粺绯荤粺 6鍏ュ洯鍘熷洜 7娴峰悍鑰冨嫟浠ｅ姙")
private Integer type;
@@ -143,7 +143,7 @@
/**
*
- * @param noticeType 娑堟伅绫诲瀷
+ * @param noticeObjectType 娑堟伅绫诲瀷
* @param palt 鏁版嵁骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅
* @param objId 鍏宠仈瀵硅薄涓婚敭
* @param content
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
index ec0f02f..9ffdd9b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
@@ -2,12 +2,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Approve;
+import com.github.yulichang.base.MPJBaseMapper;
/**
* @author 姹熻箘韫�
* @date 2023/12/28 14:09
*/
-public interface ApproveMapper extends BaseMapper<Approve> {
+public interface ApproveMapper extends MPJBaseMapper<Approve> {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index e994fcc..eb3ebc8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1828,7 +1828,7 @@
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getOpenid,openId)
.in(SystemUser::getType,Constants.memberType.internal)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
@@ -1857,7 +1857,7 @@
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getOpenid,openId)
.in(SystemUser::getType,Constants.memberType.internal,Constants.memberType.driver)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
@@ -1889,7 +1889,7 @@
.eq(SystemUser::getOpenid,openId)
.eq(SystemUser::getType,source)
// .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 2d7c9bf..87eb2ef 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -85,6 +85,8 @@
@Autowired
private ApproveMapper approveMapper;
@Autowired
+ private NoticesJoinMapper noticesJoinMapper;
+ @Autowired
private ApproveParamMapper approveParamMapper;
@Autowired
private DeviceRoleMapper deviceRoleMapper;
@@ -118,8 +120,6 @@
private SystemUserMapper systemUserMapper;
@Autowired
private ApproveService approveService;
- @Autowired
- private NoticesJoinMapper noticesJoinMapper;
@Autowired
private InoutDayCountMapper inoutDayCountMapper;
@Autowired
@@ -1887,22 +1887,50 @@
@Override
public void visitNoCheckCancel(){
List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
- .eq(Visits::getIsdeleted,Constants.ONE)
+ .eq(Visits::getIsdeleted,Constants.ZERO)
.eq(Visits::getStatus,Constants.VisitStatus.waitCheck)
.apply(" now() >= ENDTIME ")
);
if(visitsList!=null){
Date date =new Date();
for(Visits s :visitsList){
- visitsMapper.update(null,new UpdateWrapper<Visits>().lambda()
- .set(Visits::getIsdeleted,Constants.VisitStatus.cancel)
- .set(Visits::getEditDate,date)
- .set(Visits::getRemark,"棰勭害鎴鏃堕棿宸茶繃鏈鎵癸紝绯荤粺鑷姩鍙栨秷")
- .eq(Visits::getId,s.getId()));
+ dealAutoCancelBiz(s,date);
}
}
}
+ @Transactional
+ private void dealAutoCancelBiz(Visits s, Date date) {
+ visitsMapper.update(null,new UpdateWrapper<Visits>().lambda()
+ .set(Visits::getStatus,Constants.VisitStatus.cancel)
+ .set(Visits::getEditDate,date)
+ .set(Visits::getRemark,"棰勭害鎴鏃堕棿宸茶繃鏈鎵癸紝绯荤粺鑷姩鍙栨秷")
+ .eq(Visits::getId,s.getId()));
+ //鏇存柊瀹℃壒涓殑璁板綍涓哄彇娑�
+ approveMapper.update(null,
+ new UpdateWrapper<Approve>().lambda()
+ .set(Approve::getEditDate,date)
+ .set(Approve::getStatus,Constants.approveStatus.cancel)
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .eq(Approve::getStatusInfo,"宸插彇娑�")
+ .eq(Approve::getCheckInfo,"璁块棶鏃堕棿宸茶繃锛岀郴缁熻嚜鍔ㄥ彇娑�")
+ .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,s.getId())
+ .eq(Approve::getObjType,s.getType()));
+ noticesJoinMapper.update(null,
+ new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getEditDate,date)
+ .set(Notices::getInfo,"宸插彇娑�")
+// .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getParam2,Constants.FOUR)//宸插彇娑�
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getStatus,Constants.ZERO)
+ .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞�
+ .eq(Notices::getObjId,s.getId())
+ .eq(Notices::getObjType,Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
+ );
+ }
+
}
--
Gitblit v1.9.3