admin/src/assets/style/style.scss
@@ -239,6 +239,9 @@ .mb20 { margin-bottom: 20px; } .mb40 { margin-bottom: 40px; } .red{ color: red !important; } 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; 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; 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; 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; 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> admin/src/views/system/publicMsg.vue
@@ -157,4 +157,7 @@ color: #000000; margin-bottom: 15px; } </style> ::v-deep .el-table{ margin-bottom: 60px; } </style> 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> </style> 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> 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> 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 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> {
@@ -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)){ 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) ); } }
