Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -519,6 +519,7 @@ AND instance_id = (
 				jc_user_car
 			WHERE
 				car_id = #{carId}
+				and is_delete = 0
 		)
 ) and field_code='telephone'
 	) ss

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.velocity.runtime.directive.Break;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -158,7 +159,16 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 			}
 			resultList.add(detailMap);
 		});
-		result.add(resultList.get(0));
+		for (int i = 0; i < resultList.size(); i++) {
+
+				if (resultList.get(i).size() == 4){
+					result.add(resultList.get(i));
+				}
+				if (result.size()>0){
+					break;
+				}
+		}
+
 		return result;
 	}
 

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

@@ -323,6 +323,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
         // 发起主表流程 并添加至报修日志
         failureDetailsDto.setSubmissionTime(new Date());
+        failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_AUDIT.getCode());
         FailureDetailsDto model = this.updateWithModel(failureDetailsDto);
 
         if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {

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

@@ -85,10 +85,15 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
 
-        if (byfaultId.size() != 0) {
+        if (byfaultId.size() != 0 && status.getCode().equals(FailureStatuEnum.FINISH.getCode())) {
             failureDetailsDto.setCurrentStatus(status.getCode());
         }
 
+        if (condition ==  AuditResultEnum.REFUSE.getCode()){
+            failureDetailsDto.setCurrentStatus(status.getCode());
+        }
+
+
         failureDetailsDto.setSequenceNbr(model.getFaultId());
         failureDetailsService.updateWithModel(failureDetailsDto);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -123,6 +123,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
         }
 
         videoBySpeId.forEach(action -> {
+            action.setVedioFormat(vedioFormat);
             action.setUrl(videoService.getVideoUrl(action.getName(), action.getPresetPosition(), action.getUrl(), action.getCode()));
         });
         res.put("data", specificAlarm);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -119,7 +119,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         equipmentDetail.setEquPropertyList(equPropertyList);
         ManufacturerInfo manufacturerInfo = manufacturerInfoMapper.selectById(equipmentDetail.getManufacturerId());
         if (manufacturerInfo != null) {
-            manufacturerInfo.setImg(fileServer + manufacturerInfo.getImg());
+            manufacturerInfo.setImg(manufacturerInfo.getImg());
         }
         equipmentDetail.setManufacturerInfo(manufacturerInfo);
         equipmentDetail.setImg(getEquipFileList(id, FileTypeEnum.image.toString()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java

@@ -121,7 +121,11 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
         String aircraft = "";
         List<AlertFormValue> list1 =  list.stream().filter(formValue -> formValue.getFieldCode().equals("aircraft") || formValue.getFieldCode().equals("aircraftModel")).collect(Collectors.toList());
         if(list1.size() > 0) {
-            aircraft = list1.get(0).getFieldValueCode();
+            if(ValidationUtil.isEmpty(list1.get(0).getFieldValue())) {
+                aircraft = list1.get(0).getFieldValue();
+            } else {
+                aircraft = list1.get(0).getFieldValueCode();
+            }
         }
 
         LambdaQueryWrapper<Aircraft> queryWrapper = new LambdaQueryWrapper<>();

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

@@ -640,11 +640,19 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 			/*
 			 * if(null == valueCode) { valueCode = alertFormValue.getFieldValue(); }
 			 */
-//			if("flightNumber".equals(alertFormValue.getFieldCode()) || "aircraftModel".equals(alertFormValue.getFieldCode())) {
-//				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
-//			} else  {
-				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
-//			}
+			if("flightNumber".equals(alertFormValue.getFieldCode())) {
+				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(),  alertFormValue.getFieldValueCode()));
+			} else {
+				if( "aircraftModel".equals(alertFormValue.getFieldCode())) {
+					if(ValidationUtil.isEmpty(valueCode)) {
+						listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
+					} else {
+						listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+					}
+				} else  {
+					listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+				}
+			}
 		});
 		map.put("data", listdate);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -1491,7 +1491,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                         if (designatedDriver) {
                             // 发送单个车辆的信息数据到客户
                             smsParams.put("resourcesNum",
-                                    resourcesNum.toString().substring(resourcesNum.toString().length() - 2));
+                                    resourcesNum.toString());
                             List<AlertSubmittedObject> alertSubmittedObjectListSub = Lists.newArrayList();
                             Map<String, Object> map = dynamicFormInstanceMapper
                                     .getCurentCarIsUserPhone(Long.parseLong(i.getResourcesId()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -543,10 +543,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             responseLevel = list1.get(0).getFieldValue();
         }
 
-        definitions.put("rescueGrid", alertCalled.getAddress());
+        definitions.put("rescueGrid", ValidationUtil.isEmpty(alertCalled.getAddress() ) ? "" : alertCalled.getAddress());
         definitions.put("type", alertCalled.getAlertType());
-        definitions.put("contactUser", alertCalled.getContactUser());
-        definitions.put("contactPhone", alertCalled.getContactPhone());
+        definitions.put("contactUser", ValidationUtil.isEmpty(alertCalled.getContactUser() ) ? "" : alertCalled.getContactUser());
+        definitions.put("contactPhone", ValidationUtil.isEmpty(alertCalled.getContactPhone() ) ? "" : alertCalled.getContactPhone());
         definitions.put("replaceContent", replaceContent);
         definitions.put("responseLevel", responseLevel);
         definitions.put("callTime",