productDev/funingyunwei.git

			@@ -8,9 +8,12 @@
			import com.doumee.core.model.PageData;
			import com.doumee.core.model.PageWrap;
			import com.doumee.core.utils.Constants;
			import com.doumee.core.utils.DateUtil;
			import com.doumee.core.utils.Utils;
			import com.doumee.dao.business.*;
			import com.doumee.dao.business.dto.YwWorkorderDataDTO;
			import com.doumee.dao.business.model.*;
			import com.doumee.dao.business.vo.YwWorkorderDataVO;
			import com.doumee.dao.system.MultifileMapper;
			import com.doumee.dao.system.SystemUserMapper;
			import com.doumee.dao.system.model.Multifile;
			@@ -29,6 +32,7 @@
			import org.springframework.util.CollectionUtils;

			import java.util.*;
			import java.util.stream.Collectors;

			/**
			* 运维工单信息表Service实现
			@@ -383,6 +387,7 @@
			.selectAs(YwFloor::getName,YwWorkorder::getFloorName)
			.selectAs(YwBuilding::getName,YwWorkorder::getBuildingName)
			.selectAs(YwProject::getName,YwWorkorder::getProjectName)
			.selectAs(YwProblem::getId,YwWorkorder::getProblemId)
			.leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDealUserId)
			.leftJoin(Category.class,Category::getId,YwWorkorder::getCateId)
			.leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
			@@ -390,6 +395,7 @@
			.leftJoin(YwFloor.class,YwFloor::getId,YwWorkorder::getFloorId)
			.leftJoin(YwBuilding.class,YwBuilding::getId,YwWorkorder::getBuildingId)
			.leftJoin(YwProject.class,YwProject::getId,YwBuilding::getProjectId)
			.leftJoin(YwProblem.class,YwProblem::getWorkorderId,YwWorkorder::getId)
			.apply(StringUtils.isNotBlank(pageWrap.getModel().getQueryStatus())," find_in_set(t.DEAL_STATUS ,'"+pageWrap.getModel().getQueryStatus()+"') ");
			pageWrap.getModel().setIsdeleted(Constants.ZERO);
			Utils.MP.blankToNull(pageWrap.getModel());
			@@ -406,6 +412,9 @@
			}
			if (pageWrap.getModel().getCreator() != null) {
			queryWrapper.eq(YwWorkorder::getCreator, pageWrap.getModel().getCreator());
			}
			if (pageWrap.getModel().getOrigin() != null) {
			queryWrapper.eq(YwWorkorder::getOrigin, pageWrap.getModel().getOrigin());
			}
			if (pageWrap.getModel().getCreateDate() != null) {
			queryWrapper.ge(YwWorkorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
			@@ -528,4 +537,27 @@
			QueryWrapper<YwWorkorder> wrapper = new QueryWrapper<>(ywWorkorder);
			return ywWorkorderMapper.selectCount(wrapper);
			}



			@Override
			public YwWorkorderDataVO getDataVO(YwWorkorderDataDTO dto){
			YwWorkorderDataVO ywWorkorderDataVO = new YwWorkorderDataVO();

			List<YwWorkorder> list = ywWorkorderMapper.selectList(new QueryWrapper<YwWorkorder>().lambda()
			.eq(YwWorkorder::getIsdeleted,Constants.ZERO)
			.eq(Constants.equalsInteger(dto.getQueryType(),Constants.ONE),YwWorkorder::getProjectId,dto.getQueryId())
			.eq(Constants.equalsInteger(dto.getQueryType(),Constants.TWO),YwWorkorder::getFloorId,dto.getQueryId())
			.eq(Constants.equalsInteger(dto.getQueryType(),Constants.THREE),YwWorkorder::getRoomId,dto.getQueryId()));
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
			ywWorkorderDataVO.setAmount(list.size());
			ywWorkorderDataVO.setMonthAmount(list.stream().filter(i-> DateUtil.formatDate(i.getSubmitDate(),"yyyy-MM").equals(DateUtil.formatDate(new Date(),"yyyy-MM"))).collect(Collectors.toList()).size());
			ywWorkorderDataVO.setWaitDealAmount(list.stream().filter(i-> Constants.equalsInteger(i.getDealStatus(),Constants.ONE)).collect(Collectors.toList()).size());
			ywWorkorderDataVO.setWaitAssignAmount(list.stream().filter(i-> Constants.equalsInteger(i.getDealStatus(),Constants.ZERO)).collect(Collectors.toList()).size());
			}
			return ywWorkorderDataVO;
			}



			}