From 2fe0118dc3cffa42d929609e45653c7af6523911 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 29 八月 2024 20:31:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java index 4a2bca7..bd272b2 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java @@ -2,10 +2,12 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.platform.domain.entity.WorkOrder; +import com.ycl.platform.domain.entity.WorkOrderAuditingRecord; import com.ycl.platform.domain.form.*; import com.ycl.platform.domain.query.*; import com.ycl.platform.domain.vo.DeviceInfoVO; import com.ycl.platform.domain.vo.DistributeWorkOrderVO; +import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO; import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO; import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO; import com.ycl.system.Result; @@ -133,14 +135,14 @@ * @param workOrderNo 宸ュ崟鍙� * @return 宸ュ崟杩愮淮鎯呭喌 */ - Result selectYwConditionByYwId(String workOrderNo); + List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo); /** * 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍 * @param workOrderNo 宸ュ崟鍙� * @return 宸ュ崟杩愮淮瀹℃牳璁板綍 */ - Result selectYwAuditingListByYwId(String workOrderNo); + List<WorkOrderAuditingRecord> selectYwAuditingListByYwId(String workOrderNo); /** * 鎵归噺涓嬪彂 @@ -203,4 +205,12 @@ * @return 鏁版嵁 */ void updateImgById(Integer workOrderId, String imgPath); + + /** + * 宸ュ崟杩囩▼鍥� + * + * @param workOrderNo + * @return + */ + Result processImg(String workOrderNo); } -- Gitblit v1.8.0