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

@@ -521,6 +521,7 @@ AND instance_id = (
 				car_id = #{carId}
 				and is_delete = 0
 		)
+		and is_delete = 0
 ) and field_code='telephone'
 	) ss
 LEFT JOIN cb_org_usr cou ON ss.instance_id = cou.sequence_nbr

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

@@ -437,7 +437,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 }
 
                 // 突发事件救援   // 漏油现场安全保障   // 专机保障  // 其他
-                if(alertTypeCode.equals(AlertStageEnums.HKJY.getCode())  || alertTypeCode.equals(AlertStageEnums.LYXC.getCode())
+                if(alertTypeCode.equals(AlertStageEnums.TFSJ.getCode())  || alertTypeCode.equals(AlertStageEnums.LYXC.getCode())
                         || alertTypeCode.equals(AlertStageEnums.ZJBZ.getCode()) || alertTypeCode.equals(AlertStageEnums.QTJQ.getCode())) {
                     if(e.containsKey("onDuty")) {
                         List<Map<String, Object>> mapList = iDutyPersonService.queryByCompanyNew(e.get("name").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/PowerTransferServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.ValidationUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -865,13 +866,13 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         double agentCountAll = totalCarList.stream().mapToDouble(
                 car -> car.get("resourceList") != null ? ((List<Map<String, Object>>) car.get("resourceList")).stream()
                         .filter(res -> equipType.equals(res.get("equipType")))
-                        .mapToDouble(c -> (double) c.get("equipCount")).sum() : 0)
+                        .mapToDouble(c -> Double.parseDouble(ValidationUtil.isEmpty(c.get("equipCount") ) ? "0" : c.get("equipCount").toString())).sum() : 0)
                 .sum();
 
         double agentCountArrived = arrivedCarList.stream().mapToDouble(
                 car -> car.get("resourceList") != null ? ((List<Map<String, Object>>) car.get("resourceList")).stream()
                         .filter(res -> equipType.equals(res.get("equipType")))
-                        .mapToDouble(c -> (double) c.get("equipCount")).sum() : 0)
+                        .mapToDouble(c -> Double.parseDouble(ValidationUtil.isEmpty(c.get("equipCount") ) ? "0" : c.get("equipCount").toString())).sum() : 0)
                 .sum();
 
         JSONObject jsonObject = new JSONObject();