提交代码修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -31,11 +32,13 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureDetailsService;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureRepairlogService;
+import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 /**
@@ -70,6 +73,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	IFailureRepairlogService failureRepairlog;
 
 	public static String EMERGENCY_COMMAND = "应急指挥科";
+	public static String[] PROCESS_NAME = {"提交维修单","审核","维修","验收"};
 
 	private final Logger logger = LoggerFactory.getLogger(FailureDetailsServiceImpl.class);
 
@@ -129,6 +133,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
 		wrapper.eq("submission_pid",submissionPid);
 		wrapper.lt("current_status",FailureStatuEnum.REFUSE.getCode());
+		wrapper.lt("current_status",FailureStatuEnum.FINISH.getCode());
+		wrapper.lt("current_status",FailureStatuEnum.WAITING_AUDIT.getCode());
 		wrapper.orderByDesc("submission_time");
 		IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
 		return  baseMapper.selectPage(failureDetailsPage, wrapper);
@@ -145,6 +151,19 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	/**
 	 * 根据状态查询
 	 */
+
+	public FailureDetailsDto queryForOne(Long sequenceNbr){
+		FailureDetailsDto failureDetailsDto = this.queryBySeq(sequenceNbr);
+		failureDetailsDto.setCurrentStatusName(
+				Constants.currentStatusNameMap.get(failureDetailsDto.getCurrentStatus()));
+		List<SourceFile> sourceFiles = sourceFileServiceImpl.findBySourceId(sequenceNbr);
+		failureDetailsDto.setAttachment(sourceFiles);
+		return failureDetailsDto ;
+	}
+
+	/**
+	 * 根据状态查询
+	 */
 	public List<FailureDetails> queryForFailureStatus(Long currentStatus) {
 		String status = new String();
 		List<FailureStatuEnum> list = new ArrayList<>();
@@ -188,12 +207,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		List<FailureStatusCountDto> list = new ArrayList<>();
 	//	String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
 		List<String> statusName = new ArrayList<>();
-		statusName.add("待审核");
-		statusName.add("待提交");
-		statusName.add("待维修");
-		statusName.add("待验收");
-		statusName.add("已拒绝");
-		statusName.add("已完结");
+		Collections.addAll(statusName, FailureStatuEnum.WAITING_AUDIT.getName(),
+				FailureStatuEnum.WAITING_SUBMIT.getName(),
+				FailureStatuEnum.WAITING_MAINTAIN.getName(),
+				FailureStatuEnum.WAITING_ACCEPTANCE.getName(),
+				FailureStatuEnum.REFUSE.getName());
 
 		for (int i = 0; i < failureDetailsDtos.size(); i++) {
 			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_AUDIT.getCode())){
@@ -289,9 +307,15 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			return false;
 			// return CommonResponseUtil.failure("添加失败");
 		}
-		if (ObjectUtils.isNotEmpty(model)) {
-			excuteTask(instance.getString("id"), userInfo, null);
+		try{
+			if (ObjectUtils.isNotEmpty(model)) {
+				excuteTask(instance.getString("id"), userInfo, null);
+			}
+		}catch (Exception e){
+			e.printStackTrace();
+			return false;
 		}
+
 		return true;
 	}
 
@@ -499,14 +523,17 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		Map<String, Object> map = this.checkExcuteTaskAuthMap(sequenceNbr, userInfo);
 		 if(Boolean.parseBoolean(map.get("checkFlag").toString())) {
 			String  buttonValueString = map.get("name").toString();
-			if(buttonValueString.contains("提交保修单")) {
+			if(buttonValueString.endsWith(PROCESS_NAME[1])) { //提交维修单
 				flag=1;
-			}else if(buttonValueString.contains("审核") ) {
+			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {  //审核
+				if(buttonValueString.startsWith(PROCESS_NAME[3])) {
+					flag=3;
+				}
 				flag=2;
-			}else if(buttonValueString.contains("维修")) {
-				flag=3;
-			}else if(buttonValueString.contains("验收")) {
+			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//维修
 				flag=4;
+			}else if(buttonValueString.endsWith(PROCESS_NAME[4])) {//验收
+				flag=5;
 			}
 		 }
 		 FailureDetails details = this.baseMapper.selectById(sequenceNbr);
@@ -515,7 +542,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		for (Object historyDetail : array) {
 			JSONObject historyDetailJson=	JSONObject.parseObject(JSONObject.toJSONString(historyDetail));
 			if("rejected".equals(historyDetailJson.getString("activityId"))) {
-				flag=5;
+				flag=6;
 			}
 		}
 		return flag;

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -13,41 +23,15 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.tzs.api.entity.ESAlertCalled;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
-import com.yeejoin.amos.boot.module.tzs.api.entity.RepairConsult;
-import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
 import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
-import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStatusEnum;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService;
-import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.elasticsearch.core.SearchHit;
-import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 警情接警填报记录服务实现类