diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/mapper/EbikeBikeInfoMapper.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/mapper/EbikeBikeInfoMapper.java index 6f1b0d78..835fb943 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/mapper/EbikeBikeInfoMapper.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/mapper/EbikeBikeInfoMapper.java @@ -3,6 +3,7 @@ package com.cdzy.ebikemaintenance.mapper; import com.mybatisflex.core.BaseMapper; import com.cdzy.ebikemaintenance.model.pojo.EbikeBikeInfo; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.List; @@ -54,4 +55,20 @@ public interface EbikeBikeInfoMapper extends BaseMapper { }) int vehicleLeaveWarehouse(@Param("bikeCodes") List bikeCodes, @Param("status") String status, @Param("reginId") String reginId); + + @Select({ + "SELECT COUNT(1) FROM ebike_bike_order a " + + "LEFT JOIN ebike_bike_info b ON a.bike_id = b.bike_id " + + "WHERE a.order_type = 1 " + + "AND a.handle_state = 0 " + + "AND a.is_deleted = 0 " + + "AND b.bike_code = #{bikeCode}" + }) + int selectOrderCount(@Param("bikeCode") String bikeCode); + + @Select({ + "SELECT count(1) as sl FROM ebike_bike_faultreport where " + + "ifnull(handle_state,0)=0 AND bike_code = #{bikeCode}" + }) + int selectReportCount(@Param("bikeCode") String bikeCode); } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java index 75602cb7..41541885 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java @@ -20,17 +20,17 @@ public class EbikeComponentController { @Autowired EbikeComponentService ebikeComponentService; /** - * 中控设备部件(入库,暂存) (stockInType 0或空 表示暂存,1 表示入库。 + * 设备部件(入库,暂存) (stockInType 0或空 表示暂存,1 表示入库。 * @param params * @return */ - @PostMapping("/ecuStorageSave") + @PostMapping("/componentInventoryEnterbound") public JsonResult ecuStorageSave(@RequestBody ReqComponentEnterRecordDto params) { return ebikeComponentService.ecuStorageSave(params); } /** - * 设备部件作废 (通用 + * 设备部件入库作废 (通用 * @param componentEnterRecordId * @return */ @@ -39,7 +39,7 @@ public class EbikeComponentController { return ebikeComponentService.invalidateDevicePart(componentEnterRecordId); } /** - * 设备部件取消(通用) + * 设备部件入库取消(通用) * @param componentEnterRecordId * @return */