productDev/dmvisit.git

			@@ -264,6 +264,7 @@
			.eq(pageWrap.getModel().getCode() != null, PlatformJob::getCode, pageWrap.getModel().getCode())
			.eq(pageWrap.getModel().getBillCode() != null, PlatformJob::getBillCode, pageWrap.getModel().getBillCode())
			.eq(pageWrap.getModel().getDriverId() != null, PlatformJob::getDriverId, pageWrap.getModel().getDriverId())
			.eq(pageWrap.getModel().getReasonId() != null, PlatformBooks::getReasonId, pageWrap.getModel().getReasonId())
			.eq(pageWrap.getModel().getDriverName() != null, PlatformJob::getDriverName, pageWrap.getModel().getDriverName())
			.eq(pageWrap.getModel().getPlateNum() != null, PlatformJob::getPlateNum, pageWrap.getModel().getPlateNum())
			.eq(pageWrap.getModel().getDrivierPhone() != null, PlatformJob::getDrivierPhone, pageWrap.getModel().getDrivierPhone())
			@@ -688,20 +689,23 @@
			savePlatformLog(Constants.PlatformJobLogType.SIGN.getKey(),oldPlatformJob,platformJob,
			Constants.PlatformJobLogType.SIGN.getInfo());
			//签到微信通知 2025年3月26日14:25:00
			if(!Constants.equalsInteger(platformJob.getSingType(),Constants.TWO)&&StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers())){
			logger.info("签到微信通知=========================>开始====签到类型=>"+signInDTO.getSignType()+"===>人员主键=>"+platformGroup.getSignInNoticeUsers());
			if(!Constants.equalsInteger(signInDTO.getSignType(),Constants.TWO)&&
			StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers())){
			logger.info("签到微信通知=========================>进入");
			List<SystemUser> systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
			.eq(SystemUser::getDeleted,Constants.ZERO).eq(SystemUser::getStatus,Constants.ZERO).isNotNull(SystemUser::getOpenid)
			.in(SystemUser::getId,Arrays.asList(platformGroup.getSignInNoticeUsers().split(",")))
			.in(SystemUser::getMemberId,Arrays.asList(platformGroup.getSignInNoticeUsers().split(",")))
			);
			if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(systemUserList)) {
			WxPlatNotice wxPlatNotice = new WxPlatNotice();
			wxPlatNotice.sendPlatformJobSignNotice(wxNoticeConfigMapper, platformJob,
			wxPlatNotice.sendPlatformJobSignNotice(systemDictDataBiz,wxNoticeConfigMapper, platformJob,
			WxPlatConstants.platformJobContent.platformGroupSignIn,
			systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
			systemUserList.stream().map(i->i.getOpenid()).collect(Collectors.toList())
			);
			}
			}
			logger.info("签到微信通知=========================>结束");
			}


			@@ -731,18 +735,17 @@
			Set<Integer> setList = new HashSet<>(platformGroupId);
			for (Integer groupId:setList) {
			PlatformGroup platformGroup = platformGroupMapper.selectById(groupId);
			if(Objects.nonNull(platformGroup)){
			if(Objects.nonNull(platformGroup)&&StringUtils.isNotBlank(platformGroup.getUnFinishNoticeUsers())){
			List<SystemUser> systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
			.eq(SystemUser::getDeleted,Constants.ZERO).eq(SystemUser::getStatus,Constants.ZERO).isNotNull(SystemUser::getOpenid)
			.in(SystemUser::getId,Arrays.asList(platformGroup.getUnFinishNoticeUsers().split(",")))
			.in(SystemUser::getMemberId,Arrays.asList(platformGroup.getUnFinishNoticeUsers().split(",")))
			);
			if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(systemUserList)) {
			WxPlatNotice wxPlatNotice = new WxPlatNotice();
			wxPlatNotice.sendUnFinishNotice(
			wxPlatNotice.sendUnFinishNotice(systemDictDataBiz,
			wxNoticeConfigMapper,
			platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformGroupId(),groupId)).collect(Collectors.toList()).size(),
			WxPlatConstants.platformJobContent.unFinishNotice,
			systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
			systemUserList.stream().map(i->i.getOpenid()).collect(Collectors.toList())
			);
			}
			@@ -1021,7 +1024,6 @@
			wxPlatNotice.sendPlatformJobTemplateNotice(systemDictDataBiz,
			wxNoticeConfigMapper, p,
			objCode,
			systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
			Arrays.asList(driver.getOpenid().split(","))
			);
			}
			@@ -1652,7 +1654,7 @@
			platformJob.setPlatformName(platform.getName());
			this.broadcastAndLEed(platformJob,
			//Constants.PlatformLedContent.DONE.getInfo(),
			Constants.PlatformLedContent.IDEL_CONTNET.getInfo(),
			StringUtils.isBlank(platform.getLedContent())?Constants.PlatformLedContent.IDEL_CONTNET.getInfo():platform.getLedContent(),
			Constants.PlatformBroadcastContent.DONE.getInfo());
			return platformJob;
			}
			@@ -2426,5 +2428,34 @@
			}


			/**
			* 手动完成作业
			* @param jobIdList
			*/
			@Override
			public void dealJobFinish(List<Integer> jobIdList){
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jobIdList)){
			List<PlatformJob> platformJobList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda()
			.eq(PlatformJob::getIsdeleted,Constants.ZERO)
			.in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()
			,Constants.PlatformJobStatus.WART_SIGN_IN.getKey()
			,Constants.PlatformJobStatus.WAIT_CALL.getKey())
			.in(PlatformJob::getId,jobIdList)
			);
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){

			platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
			.set(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey())
			.set(PlatformJob::getDoneDate,new Date())
			.in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())
			.eq(PlatformJob::getIsdeleted,Constants.ZERO)
			.in(PlatformJob::getId,platformJobList.stream().map(i->i.getId()).collect(Collectors.toList())));
			}

			}


			}


			}