productDev/dmvisit.git

			@@ -335,8 +335,14 @@
			.ge(pageWrap.getModel().getBeginDoneDateStart() != null, PlatformJob::getDoneDate, Utils.Date.getStart(pageWrap.getModel().getBeginDoneDateStart()))
			.le(pageWrap.getModel().getBeginDoneDateEnd() != null, PlatformJob::getDoneDate, Utils.Date.getEnd(pageWrap.getModel().getBeginDoneDateEnd()))

			.isNotNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
			.isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
			// .isNotNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()),
			// PlatformJob::getContractNum)
			// .isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)

			.exists(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()),
			"select 1 from platform_wms_detail tt where tt.isdeleted=0 and tt.job_id=t.id")
			.notExists(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()),
			"select 1 from platform_wms_detail tt where tt.isdeleted=0 and tt.job_id=t.id")
			.exists(StringUtils.isNotBlank(pageWrap.getModel().getWmsContractNum()),
			"select tt.id from platform_wms_detail tt where tt.isdeleted=0 and tt.contract_num='"+pageWrap.getModel().getWmsContractNum()+"' and tt.job_id=t.id");
			queryWrapper.orderByDesc(PlatformJob::getCreateDate);
			@@ -699,9 +705,8 @@
			);
			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())
			);
			}
			@@ -738,16 +743,16 @@
			PlatformGroup platformGroup = platformGroupMapper.selectById(groupId);
			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)
			.eq(SystemUser::getDeleted,Constants.ZERO).eq(SystemUser::getStatus,Constants.ZERO)
			.isNotNull(SystemUser::getOpenid)
			.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())
			);
			}
			@@ -755,12 +760,7 @@
			}
			}
			}



			}




			public void distanceSignIn(SignInDTO signInDTO , PlatformJob platformJob){
			@@ -1026,7 +1026,6 @@
			wxPlatNotice.sendPlatformJobTemplateNotice(systemDictDataBiz,
			wxNoticeConfigMapper, p,
			objCode,
			systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
			Arrays.asList(driver.getOpenid().split(","))
			);
			}
			@@ -2440,7 +2439,9 @@
			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,Constants.PlatformJobStatus.WART_SIGN_IN)
			.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)){
			@@ -2448,10 +2449,9 @@
			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,Constants.PlatformJobStatus.WART_SIGN_IN)
			.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())));

			}

			}