From dbbb114c25b2406b6d1fd52019d2f2228ffcacd0 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 27 十一月 2024 18:04:16 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java index 0773844..25c5761 100644 --- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java @@ -155,23 +155,25 @@ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO(); serviceSubtaskVO.setPatid(patid); serviceSubtaskVO.setTaskid(taskid); - List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO); - //鏌ヨ鎮h�呮槸鍚﹂噸瑕嗗仛棰� - if (CollectionUtils.isEmpty(selectServiceSubtaskList)) { - Long submit = selectServiceSubtaskList.get(0).getSubmit(); - if (submit == 1L) { - map.put("submit", "1"); - return map; - } - } +// List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO); +// //鏌ヨ鎮h�呮槸鍚﹂噸瑕嗗仛棰� +// if (CollectionUtils.isEmpty(selectServiceSubtaskList)) { +// Long submit = selectServiceSubtaskList.get(0).getSubmit(); +// if (submit == 1L) { +// map.put("submit", "1"); +// return map; +// } +// } //閫氳繃浠诲姟ID鑾峰彇妯℃澘ID ServiceTask serviceTask = selectServiceTaskByTaskid(taskid); List info = new ArrayList(); if (serviceTask.getType().equals("1")) { //闅忚 + log.error("鏂囨湰闅忚闂"); info = sfInfo(serviceTask, patid); } else if (serviceTask.getType().equals("2")) { //闂嵎 + log.error("鏂囨湰闂嵎闂"); info = wjInfo(serviceTask, patid, isFinish); } else { //瀹f暀 -- Gitblit v1.9.3