eims-master.git

			@@ -21,7 +21,9 @@
			import org.dromara.common.satoken.utils.LoginHelper;
			import org.dromara.eims.domain.EimsMaintPlan;
			import org.dromara.eims.domain.bo.EimsMaintPlanBo;
			import org.dromara.eims.domain.vo.EimsEquVo;
			import org.dromara.eims.domain.vo.MaintOrdeGroupVo;
			import org.dromara.eims.mapper.EimsEquMapper;
			import org.dromara.eims.mapper.EimsMaintPlanMapper;
			import org.dromara.system.domain.SysDept;
			import org.dromara.system.domain.vo.SysDeptVo;
			@@ -49,6 +51,7 @@
			private final EimsMaintOrderMapper baseMapper;
			private final EimsMaintPlanMapper planMapper;
			private final SysDeptMapper sysDeptMapper;
			private final EimsEquMapper equMapper;

			/**
			* 查询保养工单
			@@ -58,7 +61,13 @@
			*/
			@Override
			public EimsMaintOrderVo queryById(Long id){
			return baseMapper.selectVoById(id);
			EimsMaintOrderVo orderVo = baseMapper.selectVoById(id);
			EimsEquVo equVo = equMapper.selectVoById(orderVo.getEquId());
			if(equVo!=null){
			orderVo.setEquName(equVo.getEquName());
			orderVo.setAssetNo(equVo.getAssetNo());
			}
			return orderVo;
			}

			/**
			@@ -112,6 +121,8 @@
			qw.eq(bo.getStatus() != null, "mo.status", bo.getStatus());
			qw.eq(bo.getPlanTime()!=null,
			"mo.plan_time", bo.getPlanTime());
			qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null,
			"mo.plan_time", params.get("beginPlanTime"), params.get("endPlanTime"));
			qw.orderByDesc("mo.create_time");
			return qw;
			}
			@@ -174,6 +185,8 @@
			lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EimsMaintOrder::getStatus, bo.getStatus());
			lqw.eq(bo.getPlanTime() != null, EimsMaintOrder::getPlanTime, bo.getPlanTime());
			lqw.eq(bo.getPlanId() != null, EimsMaintOrder::getPlanId, bo.getPlanId());
			// 按创建时间倒序
			lqw.orderByDesc(EimsMaintOrder::getCreateTime);
			return lqw;
			}