修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledMobDto.java

@@ -54,6 +54,12 @@ public class AlertCalledMobDto {
     @ApiModelProperty(value = "结束时间")
     String endTime;
 
+    @ApiModelProperty(value = "总人数")
+    String totalPeople;
+    @ApiModelProperty(value = "总水量")
+    String totalWater;
+    @ApiModelProperty(value = "总泡沫")
+    String totalFoam;
 
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompanyResources.java

@@ -54,6 +54,9 @@ public class PowerTransferCompanyResources extends BaseEntity {
     @ApiModelProperty(value = "任务备注")
     private String  remarks;
 
+    @ApiModelProperty(value = "车辆到场时间")
+    private String  arrivalTime;
+
     @ApiModelProperty(value = "任务状态")
     @TableField(exist = false)
     private String statusName;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertSubmittedMapper.xml

@@ -138,7 +138,8 @@
         b.company_name companyName,
         c.resources_name carName,
         c.resources_num carNum,
-		c.resources_id id
+		c.resources_id id,
+		c.arrival_time arrivalTime
     FROM
         jc_power_transfer a
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
@@ -155,7 +156,8 @@
         b.company_name companyName,
         c.resources_name carName,
         c.resources_num carNum,
-		c.resources_id id
+		c.resources_id id,
+		c.arrival_time arrivalTime
     FROM
         jc_power_transfer a
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/pom.xml

@@ -52,6 +52,12 @@
           <version>1.0.0</version>
           <scope>compile</scope>
       </dependency>
+      <dependency>
+          <groupId>com.amosframework.boot</groupId>
+          <artifactId>amos-boot-module-command-biz</artifactId>
+          <version>1.0.0</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
 
 <repositories>

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

@@ -15,7 +15,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -76,6 +78,10 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
                 // 更新所有车辆状态为执勤
                 equipFeignClient.updateCarStatus(carStatusInfoDtoList);
             } else {
+                if (FireCarStatusEnum.到场.getCode().equals(code)){
+                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    powerTransferCompanyResources.setArrivalTime(format.format(new Date()));
+                }
                 powerTransferCompanyResources.setCarStatus(code);
                 powerTransferCompanyResources.setRemarks(remarks);
                 powerTransferCompanyResourcesMapper.updateById(powerTransferCompanyResources);