增加接口

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

@@ -66,6 +66,9 @@ public class PowerTransferCompanyResources extends BaseEntity {
 
 
     @ApiModelProperty(value = "随车人员")
+    private String carUser;
+
+    @ApiModelProperty(value = "随车人员")
     @TableField(exist = false)
     private String pw;
 

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

@@ -477,6 +477,22 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                 powerTransferCompanyResources.setStatus(FireCarStatusEnum.执行中.getCode());
                 // 资源状态
                 powerTransferCompanyResources.setCarStatus(FireCarStatusEnum.出动.getCode());
+                //车辆随车人员（车辆今日值班人数）
+                List<Map<String, Object>> equipmentList = iDutyCarService.getDutyCaruser(Long.valueOf(powerTransferCompanyResources.getResourcesId()));
+
+                if (!ValidationUtil.isEmpty(equipmentList)) {
+                    String str = "";
+                    String newStr = "";
+                    for (int i = 0; i < equipmentList.size(); i++) {
+                        if (i == equipmentList.size() - 1) {
+                            newStr =newStr+ str.concat(equipmentList.get(i).get("userName") + "");
+                        } else {
+                            newStr = newStr+str.concat(equipmentList.get(i).get("userName") + ",");
+                        }
+                    }
+                    powerTransferCompanyResources.setCarUser(newStr);
+                }
+
                 powerTransferCompanyResourcesList.add(powerTransferCompanyResources);
             }
             return powerTransferCompanyResourcesList;

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3260,6 +3260,18 @@
     </changeSet>
 
 
+    <changeSet author="tw" id="2022-08-09-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_power_transfer_company_resources"/>
+        </preConditions>
+        <comment>增加随车人员</comment>
+        <sql>
+            ALTER TABLE `jc_power_transfer_company_resources` add car_user varchar(2550) DEFAULT NULL COMMENT '增加随车人员'
+        </sql>
+    </changeSet>
+
+
+
 
 </databaseChangeLog>