eims-master.git

			@@ -18,9 +18,10 @@
			import lombok.RequiredArgsConstructor;
			import org.dromara.common.satoken.utils.LoginHelper;
			import org.dromara.eims.domain.*;
			import org.dromara.eims.domain.vo.EimsEquVo;
			import org.dromara.eims.domain.vo.EimsFixtureVo;
			import org.dromara.eims.domain.vo.EimsRepairReqVo;
			import org.dromara.eims.mapper.EimsRepairRecordMapper;
			import org.dromara.eims.mapper.EimsRepairReqMapper;
			import org.dromara.eims.mapper.*;
			import org.dromara.eims.utils.DataFilterUtil;
			import org.dromara.system.domain.SysDept;
			import org.dromara.system.domain.vo.SysDeptVo;
			@@ -29,7 +30,6 @@
			import org.springframework.stereotype.Service;
			import org.dromara.eims.domain.bo.EimsRepairResBo;
			import org.dromara.eims.domain.vo.EimsRepairResVo;
			import org.dromara.eims.mapper.EimsRepairResMapper;
			import org.dromara.eims.service.IEimsRepairResService;
			import org.springframework.transaction.annotation.Transactional;

			@@ -49,6 +49,8 @@
			private final EimsRepairReqMapper reqMapper;
			private final SysDeptMapper deptMapper;
			private final EimsRepairRecordMapper recordMapper;
			private final EimsEquMapper equMapper;
			private final EimsFixtureMapper fixtureMapper;

			/**
			* 查询维修工单
			@@ -58,7 +60,32 @@
			*/
			@Override
			public EimsRepairResVo queryById(Long id) {
			return baseMapper.selectVoById(id);
			EimsRepairResVo resVo = baseMapper.selectVoById(id);
			Long reqId = resVo.getReqId();
			if(reqId!=null){
			EimsRepairReqVo reqVo = reqMapper.selectVoById(reqId);
			resVo.setReqType(reqVo.getReqType());
			resVo.setReqCode(reqVo.getCode());

			if(reqVo.getEquId()!=null){
			EimsEquVo equVo = equMapper.selectVoById(reqVo.getEquId());
			if(equVo!=null){
			resVo.setAssetNo(equVo.getAssetNo());
			resVo.setEquName(equVo.getEquName());
			}

			}
			if(reqVo.getFixtureId()!=null){
			EimsFixtureVo fixtureVo = fixtureMapper.selectVoById(reqVo.getFixtureId());
			if(fixtureVo!=null){
			resVo.setFixtureName(fixtureVo.getFixtureName());
			resVo.setAssetNo(fixtureVo.getAssetNo());
			}
			}


			}
			return resVo;
			}

			/**
			@@ -98,6 +125,8 @@
			EimsRepairRes::getStartTime, params.get("beginStartTime"), params.get("endStartTime"));
			lqw.between(params.get("beginEndTime") != null && params.get("endEndTime") != null,
			EimsRepairRes::getEndTime, params.get("beginEndTime"), params.get("endEndTime"));
			// 按创建时间倒序
			lqw.orderByDesc(EimsRepairRes::getCreateTime);
			return lqw;
			}

			@@ -109,7 +138,7 @@
			*/
			@Transactional(rollbackFor = Exception.class)
			@Override
			public Boolean insertByBo(EimsRepairResBo bo) {
			public synchronized Boolean insertByBo(EimsRepairResBo bo) {
			EimsRepairRes add = MapstructUtils.convert(bo, EimsRepairRes.class);
			validEntityBeforeSave(add);
			boolean flag = baseMapper.insert(add) > 0;
			@@ -270,7 +299,12 @@
			qw.like(StringUtils.isNotBlank(bo.getResCode()), "res.res_code", bo.getResCode());
			qw.like(StringUtils.isNotBlank(bo.getReqCode()), "req.code", bo.getReqCode());
			qw.eq(bo.getResUser() != null, "res.res_user", bo.getResUser());
			qw.eq(bo.getReqType() != null, "req.req_type", bo.getReqType());
			qw.eq(bo.getReqUser() != null, "res.req_user", bo.getReqUser());
			qw.eq(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());

			qw.between(params.get("beginReqTime") != null && params.get("endReqTime") != null,
			"req.req_time", params.get("beginReqTime"), params.get("endReqTime"));

			List<Long> resDeptIds = getAllDescendantIds(bo.getResDept());
			qw.in(bo.getResDept() != null, "res.res_dept", resDeptIds);