联动单位-救援装备

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RescueEquipmentDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -15,10 +16,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="RescueEquipmentDto", description="救援装备")
-public class RescueEquipmentDto  extends BaseDto {
+@ApiModel(value = "RescueEquipmentDto", description = "救援装备")
+public class RescueEquipmentDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "车辆类型")
@@ -39,4 +40,7 @@ public class RescueEquipmentDto  extends BaseDto {
     @ApiModelProperty(value = "单位id")
     private Long companyId;
 
+    @ApiModelProperty(value = "更新人名称")
+    private String recUserName;
+
 }

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

@@ -103,11 +103,11 @@ public class RescueEquipmentController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "救援装备分页查询", notes = "救援装备分页查询")
     public ResponseModel<Page<RescueEquipmentDto>> queryForPage(@RequestParam(value = "current") int current,
                                                                 @RequestParam(value = "size") int size,
-                                                                String vehicleCode) {
+                                                                String vehicleTypeCode) {
         Page<RescueEquipmentDto> page = new Page<RescueEquipmentDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentPage(page, vehicleCode));
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentPage(page, vehicleTypeCode));
     }
 
     /**

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

@@ -34,8 +34,8 @@ public class RescueEquipmentServiceImpl extends BaseService<RescueEquipmentDto,
      * 分页查询
      */
     public Page<RescueEquipmentDto> queryForRescueEquipmentPage(Page<RescueEquipmentDto> page,
-                                                                @Condition(Operator.eq) String vehicleCode) {
-        return this.queryForPage(page, null, false, vehicleCode);
+                                                                @Condition(Operator.eq) String vehicleTypeCode) {
+        return this.queryForPage(page, null, false, vehicleTypeCode);
     }
 
     /**