pipIrr-SV.git - Gitblit

			@@ -1,23 +1,32 @@
			package com.dy.pipIrrApp.workOrder;

			import com.alibaba.fastjson2.JSON;
			import com.alibaba.fastjson2.JSONArray;
			import com.dy.common.webUtil.QueryResultVo;
			import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
			import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
			import com.dy.pipIrrGlobal.daoOp.OpeApproveResultMapper;
			import com.dy.pipIrrGlobal.daoOp.OpeProcessingResultMapper;
			import com.dy.pipIrrGlobal.daoOp.OpeTaskTypeMapper;
			import com.dy.pipIrrGlobal.daoOp.OpeWorkOrderMapper;
			import com.dy.pipIrrGlobal.pojoOp.OpeApproveResult;
			import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
			import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
			import com.dy.pipIrrGlobal.voBa.VoRoleSimple;
			import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
			import com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp;
			import com.dy.pipIrrGlobal.voOp.VoTaskType;
			import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.dubbo.common.utils.PojoUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.Optional;

			/**
			* @author ZhuBaoMin
			@@ -37,6 +46,12 @@

			@Autowired
			private OpeApproveResultMapper opeApproveResultMapper;

			@Autowired
			private OpeTaskTypeMapper opeTaskTypeMapper;

			@Autowired
			private BaUserMapper baUserMapper;

			/**
			* 添加工单记录
			@@ -172,7 +187,18 @@
			* @return
			*/
			public VoProcessingResult getProResultById(Long proResultId) {
			return opeProcessingResultMapper.getProResultById(proResultId);
			VoProcessingResult_temp result_temp = opeProcessingResultMapper.getProResultById(proResultId);
			VoProcessingResult result = new VoProcessingResult();
			BeanUtils.copyProperties(result_temp, result);

			JSONArray images_array = Optional.ofNullable(JSON.parseArray(result_temp.getImages())).orElse(new JSONArray());
			JSONArray audios_array = Optional.ofNullable(JSON.parseArray(result_temp.getAudios())).orElse(new JSONArray());
			JSONArray videos_array = Optional.ofNullable(JSON.parseArray(result_temp.getVideos())).orElse(new JSONArray());
			result.setImages(images_array);
			result.setAudios(audios_array);
			result.setVideos(videos_array);

			return result;
			}

			/**
			@@ -227,4 +253,21 @@

			return "success";
			}

			/**
			* 获取任务类型列表
			* @return
			*/
			public List<VoTaskType> getTaskTypes() {
			return opeTaskTypeMapper.getTaskTypes();
			}

			/**
			* 获取巡检员列表
			* @param inspector
			* @return
			*/
			public List<VoRoleSimple> getInspectors(String inspector) {
			return baUserMapper.getInspectors(inspector);
			}
			}