From 1c247583c3f23b877a2daeb456260298c8efd670 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期二, 06 五月 2025 10:47:34 +0800 Subject: [PATCH] 订单下发接口更新 --- ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 3 ++- ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java index 2f65607..b43da6c 100644 --- a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java +++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java @@ -82,9 +82,9 @@ } } - public static List<String> errType = new ArrayList<>(List.of("OSD","ABNORMALPIC","DEVICEOFFLINE")); + public static List<String> errType = new ArrayList<>(List.of("鍥惧儚寮傚父","OSD寮傚父","璁惧绂荤嚎")); //宸ュ崟涓嬪彂瀹氭椂浠诲姟锛� 宸ュ崟鍥犱负鏇存柊瀵艰嚧 鐘舵�佸彉涓哄緟涓嬪彂锛屾牴鎹敊璇被鍨嬪皢闇�瑕佺洿鎺ヤ笅鍙戝伐鍗� - //绂荤嚎锛屽浘褰㈠紓甯革紝osd閿欒 + //绂荤嚎锛屽浘鍍忓紓甯革紝osd閿欒 public void workOrderDistribute(){ //鏌ヨ浠婃棩寰呬笅鍙戝伐鍗� Date now = new Date(); @@ -92,16 +92,20 @@ Date endDate = DateUtils.getDayEnd(now); //鑾峰緱浠婃棩宸ュ崟 List<WorkOrderVO> list = workOrderService.distributeList(startDate,endDate); + log.error("鑾峰緱宸ュ崟:{}",list); List<String> workOrderNos = new ArrayList<>(); for (WorkOrderVO workOrderVO : list){ - for (String errType : workOrderVO.getErrorTypeList()){ - if (WorkOrderTask.errType.contains(errType)){ - //鍒ゆ柇宸ュ崟鏄惁鍖呭惈errType涓殑閿欒绫诲瀷 - workOrderNos.add(workOrderVO.getWorkOrderNo()); - break; - } - } + List<String> errTypeArray = Arrays.stream(workOrderVO.getErrorType().split("銆�")).toList(); + for (String errType : errTypeArray) { + if (WorkOrderTask.errType.contains(errType)) { + //鍒ゆ柇宸ュ崟鏄惁鍖呭惈errType涓殑閿欒绫诲瀷 + workOrderNos.add(workOrderVO.getWorkOrderNo()); + break; + } + } + } + log.error("宸ュ崟鎵撳嵃{}",workOrderNos); DistributeWorkOrderQuery distributeWorkOrderQuery = new DistributeWorkOrderQuery(); distributeWorkOrderQuery.setWorkOrderNOList(workOrderNos); //涓嬪彂鎺ュ彛 diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml index f5c8a70..10c2fcd 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml @@ -162,7 +162,7 @@ p.yw_person_name ORDER BY wo.work_order_no DESC </select> - <select id="distributeList" resultMap="com.ycl.platform.domain.vo.WorkOrderVO"> + <select id="distributeList" resultType="com.ycl.platform.domain.vo.WorkOrderVO"> SELECT wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct, @@ -188,6 +188,7 @@ WHERE wo.deleted = 0 AND wo.create_time BETWEEN #{startDate} AND #{endDate} + AND wo.status = 'WAIT_DISTRIBUTE' GROUP BY wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct, -- Gitblit v1.8.0