Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/CheckRecordOrderByEnum.java

@@ -5,15 +5,15 @@ import java.util.stream.Collectors;
 
 /**
  * @author DELL
- * 维保任务排序
+ * 维保记录排序
  */
 
 public enum CheckRecordOrderByEnum {
     /**
      * 维保记录排序
      */
-    DATE_DESC("维保记录时间倒序", "1", "checkDate desc"),
-    DATE_ASC("维保记录时间正序", "2", "checkDate asc");
+    DATE_DESC("时间倒序", "1", "checkDate desc"),
+    DATE_ASC("时间正序", "2", "checkDate asc");
 
     /**
      * 名字

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -5,10 +5,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
-import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -26,11 +22,17 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+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.biz.constats.Constants;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -61,15 +63,7 @@ public class FailureDetailsController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<Object> save(@RequestBody FailureDetailsDto model )  {
-	  	Object result;
-		try {
-			result = failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo());
-			 return ResponseHelper.buildResponse(result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			// TODO Auto-generated catch block
-			 return ResponseHelper.buildResponse("error");
-		}
+			 return ResponseHelper.buildResponse( failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo()));
 	}
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureMaintainController.java

@@ -128,9 +128,6 @@ public class FailureMaintainController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "设备故障报修单详情-报修日志",   notes = "设备故障报修单详情-报修日志")
 	@GetMapping(value = "/getProcessHistory/{sequenceNbr}")
 	public ResponseModel<List<Object>> getProcessHistory(@PathVariable Long sequenceNbr ) {
-		if(sequenceNbr==null) {
-			 return ResponseHelper.buildResponse(null);
-		}
 	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.getProcessHistoryList(sequenceNbr));
 	}
 }

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

@@ -48,7 +48,6 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
  * @date 2021-08-04
  */
 @Service
-@Transactional
 public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, FailureDetails, FailureDetailsMapper>
 		implements IFailureDetailsService {
 
@@ -73,8 +72,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	@Autowired
 	IFailureRepairlogService failureRepairlog;
 
-
-
 	public static String EMERGENCY_COMMAND = "应急指挥科";
 	public static String[] PROCESS_NAME = {"提交维修单","审核","维修","验收"};
 
@@ -181,6 +178,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 				status = list.get(i).getName();
 			};
 		}
+		/*FailureStatuEnum[] failureStatuEnums = new FailureStatuEnum []{};*/
 		QueryWrapper<FailureDetails> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("current_status", status).orderByDesc("submission_time");
 		return baseMapper.selectList(queryWrapper);
@@ -394,7 +392,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		map.put("checkFlag", false);
 		FailureDetailsDto failureDetailsDto = this.queryBySeq(sequenceNbr);
 		// 获取送达部门的ID
-		Integer failureEquipmentId = failureDetailsDto.getFailureEquipmentId();
+		Long failureEquipmentId = failureDetailsDto.getSubmissionBranchId();
 		// 获取上一级操作部门的Id
 		FailureDetails details = this.baseMapper.selectById(sequenceNbr);
 		String procressId = details.getProcessId();
@@ -527,16 +525,16 @@ 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.endsWith(PROCESS_NAME[1])) { //提交维修单
+			if(buttonValueString.endsWith(PROCESS_NAME[0])) { //提交维修单
 				flag=1;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {  //审核
-				if(buttonValueString.startsWith(PROCESS_NAME[3])) {
+			}else if(buttonValueString.endsWith(PROCESS_NAME[1])) {  //审核
+				if(buttonValueString.startsWith(PROCESS_NAME[2])) {
 					flag=3;
 				}
 				flag=2;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//维修
+			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {//维修
 				flag=4;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[4])) {//验收
+			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//验收
 				flag=5;
 			}
 		 }

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

@@ -172,7 +172,7 @@ public class ESAlertCalledService {
         currentTime = currentTime - 120*60*1000;
         BoolQueryBuilder qb1 = QueryBuilders.boolQuery()
         		.must(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
-        boolMust.should(qb1);
+        boolMust.must(qb1);
         //报警电话一致
         if (!ValidationUtil.isEmpty(alertCalled.getEmergencyCall()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone()))
 		{
@@ -191,13 +191,13 @@ public class ESAlertCalledService {
         //警情类型一致
         BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
         		.must(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
-        boolMust.should(qb4);
+        boolMust.must(qb4);
         //使用单位名称一致
         if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))
 		{
         	BoolQueryBuilder qb5 = QueryBuilders.boolQuery()
         			.must(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit()));
-        	boolMust.should(qb5);
+        	boolMust.must(qb5);
 		}
         //电梯识别码一致
         if(!ValidationUtil.isEmpty(alertCalled.getDeviceId())) {