h5/pages.json
@@ -359,7 +359,7 @@ { "path": "pages/driver/reservedDetail", "style": { "navigationBarTitleText": "访客审批", "navigationBarTitleText": "入园审批", "enablePullDownRefresh": false } }, h5/pages/driver/notice.vue
@@ -93,7 +93,7 @@ margin-bottom: 10rpx; } .content { height: calc(100% - 170rpx); height: calc(100% - 130rpx); .title { color: #333333; font-weight: 600; h5/pages/login/login.vue
@@ -41,7 +41,7 @@ export default { data() { return { code: '' code: '111' } }, onLoad(option) { h5/pages/notice/notice.vue
@@ -1,8 +1,5 @@ <template> <view class="container"> <!-- <video src="https://vdept3.bdstatic.com/mda-nj7gwfue9kdnbtsh/sc/cae_h264/1665488517815949255/mda-nj7gwfue9kdnbtsh.mp4?v_from_s=hkapp-haokan-hbe&auth_key=1715141591-0-0-6dfdf4d4c3d94b60b9adeb53368a72f3&bcevod_channel=searchbox_feed&pd=1&cr=2&cd=0&pt=3&logid=0791905773&vid=13790089500387859718&klogid=0791905773&abtest=" ></video> --> <scroll-view scroll-y class="content"> <view> <view v-html="content"></view> @@ -102,13 +99,8 @@ box-sizing: border-box; display: flex; flex-direction: column; video { width: 690rpx; height: 388rpx; margin-bottom: 10rpx; } .content { height: calc(100% - 170rpx); height: calc(100% - 130rpx); .title { color: #333333; font-weight: 600; h5/pages/staff/index.vue
@@ -144,7 +144,7 @@ } else if (yw == 7) { this.jump('/pages/staff/task/driver?id=' + ywinfo.ywid) } else if (yw == 5) { this.jump('/pages/staff/vehicle/index') this.jump('/pages/staff/vehicle/sendACarDetail') } }, 100) } h5/utils/config.js
@@ -1,8 +1,8 @@ // export const baseUrl = 'zhyq_interface/' export const baseUrl = 'zhyq_interface/' // export const baseUrl = 'http://192.168.0.173/gateway_interface/' // export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/' export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/' // export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/' export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
@@ -999,7 +999,7 @@ font-weight: 500; margin-right: 6px; font-size: 13px; width: 64px; width: 68px; } .num { server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -192,6 +192,10 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage()); } if(Objects.nonNull(bookings.getId())){ return; } SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); String gsDate = format1.format(bookings.getStartTime()); @@ -371,11 +375,18 @@ if(dbBookings.getStatus().equals(MeetConstants.ONE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "本次操作失败,预约状态已流转"); } Rooms rooms = roomsMapper.selectById(dbBookings.getRoomId()); if(rooms==null ){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该会议室暂时无法预约"); } bookings.setRoomName(rooms.getName()); LoginUserInfo user = bookings.getLoginUserInfo(); isCreateParamValid(bookings, user); bookings.setEditDate(new Date()); bookings.setEditor(user.getId()); bookingsMapper.updateById(bookings); bookings.setManagerInfo(user.getRealname()); bookings.setCreator(dbBookings.getCreator()); //更新会议室预定时间段 updateBookingTimes(bookings, user); //添加管理人员 @@ -386,7 +397,7 @@ //发送会议通知 if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){ this.sendNotice(bookings, MeetConstants.TWO); SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId()); SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator()); this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO); } } @@ -1054,12 +1065,13 @@ } bookingsMapper.updateById(bookings); //取消会议 发送取消通知 // if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){ if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){ // this.sendNotice(bookings, 3); // } SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator()); bookings.setManagerInfo(systemUser.getRealname()); this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE); SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator()); bookings.setManagerInfo(systemUser.getRealname()); this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE); } } @@ -1378,6 +1390,32 @@ } } } //给创建人发送短信信息 SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator()); if(Objects.nonNull(systemUser)){ if(userRelList.stream().filter(i->Constants.equalsInteger(i.getUserId(),systemUser.getId())).collect(Collectors.toList()).size()==Constants.ZERO){ if (smsConfig!=null && Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){ SmsEmail smsEmail = new SmsEmail(); //{参会人员姓名}，您好！您有一个新的会议，会议主题：{会议主题}，会议地点：{会议室名称}，会议时间：{会议时间段}，请按时参加 String timeInfo =DateUtil.getFomartDate( bookings.getStartTime(),"MM/dd HH:mm")+"-" +DateUtil.getFomartDate( bookings.getEndTime(),"HH:mm"); smsEmail.setPhone(systemUser.getMobile()); smsEmail.setRemark("等待发送"); smsEmail.setStatus(Constants.TWO);// smsEmail.setIsdeleted(Constants.ZERO); smsEmail.setType(Constants.ZERO); smsEmail.setObjId(bookings.getId()); smsEmail.setCreateDate(new Date()); smsEmail.setTitle("会议室申请参会通知"); smsEmail.setContent(StringUtils.defaultString(smsConfig.getContent(),"") .replace("{参会人员姓名}",StringUtils.defaultString(systemUser.getRealname(),"")) .replace("{会议主题}",StringUtils.defaultString(bookings.getName(),"")) .replace("{会议室名称}",StringUtils.defaultString(bookings.getRoomName(),"")) .replace("{会议时间段}",StringUtils.defaultString(timeInfo,""))); smsEmailList.add(smsEmail); } } } //给参会人员插入 Notices notices = new Notices(noticeObjectType,bookings.getId(),noticeObjectType.getInfo(),bookings.getCreator(), Constants.ZERO); noticeList.add(notices); server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -437,6 +437,7 @@ paramMap.put("touser", openId); paramMap.put("data", dataMap); String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap)); log.warn("·==++--·推送微信模板信息：{}", JSONObject.toJSONString(paramMap)); if(StringUtils.isBlank(response)){ log.warn("·==++--·推送微信模板信息：{}·--++==·", "失败"); }else{ server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
@@ -177,6 +177,9 @@ @ApiModelProperty(value = "申请人电话") @TableField(exist = false) private String memberMobile; @ApiModelProperty(value = "通知描述") @TableField(exist = false) private String info; @ApiModelProperty(value = "审批信息数据") @TableField(exist = false) private ApproveDataVO approveDateVO; server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
@@ -98,6 +98,8 @@ @ExcelColumn(name="入园原因",index = 1,width = 12) private String inReason; @ApiModelProperty(value = "入园原因主键") private Integer reasonId; @@ -139,6 +141,11 @@ @TableField(exist = false) private String auditTime; @ApiModelProperty(value = "通知描述") @TableField(exist = false) private String info; @ApiModelProperty(value = "审批信息数据") @TableField(exist = false) private ApproveDataVO approveDateVO; server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -320,6 +320,10 @@ @TableField(exist = false) private LoginUserInfo loginUserInfo; @ApiModelProperty(value = "通知描述") @TableField(exist = false) private String info; @ApiModelProperty(value = "审批信息数据") @TableField(exist = false) private ApproveDataVO approveDateVO; server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -248,6 +248,22 @@ approveList.add(approve); } model.setApproveDateVO(approveDataVO); Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda() .eq(Notices::getObjId,id) .eq(Notices::getType,Constants.noticesObjectType.useCar) .eq(Notices::getUserId,memberId) .eq(Notices::getSendacopy,Constants.ZERO) .orderByDesc(Notices::getId).last(" limit 1 ")); if(Objects.nonNull(notices)){ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){ model.setInfo("待我处理"); }else{ model.setInfo(notices.getInfo()); } } return model; }
@@ -21,6 +21,7 @@ import com.doumee.dao.system.SystemUserMapper; import com.doumee.dao.system.join.NoticesJoinMapper; import com.doumee.dao.system.model.Notices; import com.doumee.dao.system.model.SystemUser; import com.doumee.dao.web.reqeust.PlatformBooksApplyDTO; import com.doumee.dao.web.reqeust.PlatformBooksCheckNumDTO; @@ -392,6 +393,20 @@ approve.setCheckDate(model.getCancelTime()); approveList.add(approve); } Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda() .eq(Notices::getObjId,id) .eq(Notices::getType,Constants.noticesObjectType.reason) .eq(Notices::getUserId,memberId) .eq(Notices::getSendacopy,Constants.ZERO) .orderByDesc(Notices::getId).last(" limit 1 ")); if(Objects.nonNull(notices)){ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){ model.setInfo("待我处理"); }else{ model.setInfo(notices.getInfo()); } } return model; }
@@ -1220,6 +1220,22 @@ result.setBusinessStatus(result.getStatus()); } Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda() .eq(Notices::getObjId,id) .eq(Notices::getType,Constants.equalsInteger(result.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit) .eq(Notices::getUserId,memberId) .eq(Notices::getSendacopy,Constants.ZERO) .orderByDesc(Notices::getId).last(" limit 1 ")); if(Objects.nonNull(notices)){ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){ result.setInfo("待我处理"); }else{ result.setInfo(notices.getInfo()); } } return result; } @@ -1422,30 +1438,21 @@ memberId) ); // } if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)){ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId()) .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit) .eq(Notices::getUserId,memberId) .eq(Notices::getSendacopy,Constants.ZERO) .last(" limit 1 ") ); visitDetailVO.setInfoStatus(1); if(Objects.nonNull(notices)){ visitDetailVO.setInfo(notices.getInfo()); }else{ visitDetailVO.setInfo("暂无"); } }else if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.noPass)){ visitDetailVO.setInfoStatus(Constants.VisitStatus.noPass); visitDetailVO.setInfo("审批未通过"); }else if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.cancel)){ visitDetailVO.setInfoStatus(Constants.VisitStatus.cancel); visitDetailVO.setInfo("已取消"); }else{ visitDetailVO.setInfoStatus(Constants.VisitStatus.pass); visitDetailVO.setInfo("审批已通过"); Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda() .eq(Notices::getObjId,id) .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit) .eq(Notices::getUserId,memberId) .eq(Notices::getSendacopy,Constants.ZERO) .orderByDesc(Notices::getId).last(" limit 1 ")); if(Objects.nonNull(notices)){ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){ visitDetailVO.setInfo("待我处理"); }else{ visitDetailVO.setInfo(notices.getInfo()); } } return visitDetailVO; }
