productDev/dmvisit.git

			@@ -125,7 +125,6 @@
			@Transactional(rollbackFor = {BusinessException.class, Exception.class})
			public Integer create(Bookings bookings) {
			LoginUserInfo user = bookings.getLoginUserInfo();
			user.setId(bookings.getCreator());
			isCreateParamValid(bookings, user);
			bookings.setCreateDate(new Date());
			bookings.setCreator(user.getId());
			@@ -201,7 +200,6 @@
			for (int i = 0; i < bookings.getBookingTimeList().size(); i++) {
			BookingTime s = bookings.getBookingTimeList().get(i);
			if (!Objects.isNull(bookList) && bookList.size() > MeetConstants.ZERO) {

			List<Bookings> detailDataDtoStream =
			bookList.stream().filter(a -> MeetConstants.equalsInteger(s.getTimeId(), a.getRoomTimeId())
			).collect(Collectors.toList());
			@@ -1145,7 +1143,7 @@
			page.getRecords().forEach(j->{
			j.setPrefixUrl(path);
			if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
			.exists(" select 1 from meeting_user_rel u where u.OBJ_ID = bookings.id and u.USER_ID = '"+j.getId()+"' and u.OBJ_TYPE = 1 ")
			.exists(" select 1 from meeting_user_rel u where u.OBJ_ID = meeting_book.id and u.USER_ID = '"+j.getId()+"' and u.OBJ_TYPE = 1 ")
			.and(i -> i.between("START_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
			.or().between("END_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
			)

			@@ -863,6 +863,9 @@
			.lambda()
			.eq(Approve::getObjId,approveDTO.getObjId())
			.eq(Approve::getObjType,approveDTO.getObjType())
			.eq(Approve::getChekorId,approveDTO.getLoginUserInfo().getMemberId())
			.eq(Approve::getType,Constants.ZERO)
			.eq(Approve::getStatus,Constants.approveStatus.auditIng)
			.last(" limit 1")
			);
			if(Objects.isNull(approve)){
			@@ -876,9 +879,9 @@
			approve.setStatus(approveDTO.getStatus());
			approve.setCheckInfo(approveDTO.getCheckInfo());
			approve.setCheorId(approveDTO.getLoginUserInfo().getMemberId().toString());
			approve.setCheckorName(approve.getLoginUserInfo().getRealname());
			approve.setCheckorName(approveDTO.getLoginUserInfo().getRealname());
			approve.setCheckDate(new Date());
			approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"审批通过":approveDTO.getCheckInfo());
			approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"已同意":approveDTO.getCheckInfo());
			Visits visits = new Visits();
			CarUseBook carUseBook = new CarUseBook();
			this.dealBusinessData(approveDTO,approve,visits,carUseBook);
			@@ -959,10 +962,9 @@
			}else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)\|\|approveDTO.getObjType().equals(
			Constants.approveObjectType.unCityUseCar)){
			// 市内外用车申请
			carUseBookMapper.updateById(carUseBook);
			if(dealBusinessBean){
			//TODO 发送审批通过消息

			carUseBookMapper.updateById(carUseBook);
			}else if(approveDTO.getStatus().equals(Constants.THREE)){
			//TODO 审批未通过通知

			@@ -1059,7 +1061,7 @@
			carUseBook.setEditDate(new Date());
			carUseBook.setEditor(approveDTO.getLoginUserInfo().getMemberId());
			//如果配置修改司机且入参了更换后司机信息
			if(approveDTO.getStatus()==Constants.TWO&&approve.getDriverParam().equals(Constants.ONE)){
			if(approveDTO.getStatus()==Constants.TWO&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
			CarDriver carDriver = carDriverMapper.selectById(approveDTO.getDriverId());
			if(Objects.isNull(carDriver)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到司机信息");

	server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史