Merge branch 'main' of http://git.51dayu.com.cn/liuyiliang/smart-om-system

src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java

@@ -247,5 +247,13 @@ public class InspectionTasksController extends DafController {
 		EasyExcel.write(response.getOutputStream(), InspectionTasksExcel.class).sheet("巡检任务").doWrite(list);
 	}
 
+	@GetMapping("/getListByToolsCodeId")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "通过工器具编码获取巡检任务", notes = "通过工器具编码获取巡检任务")
+	public R<List<InspectionTasks>> getListByToolsCodeId(String toolsCodeId) {
+		List<InspectionTasks> pages = inspectionTasksService.getListByToolsCodeId(toolsCodeId);
+		return R.data(pages);
+	}
+
 
 }

src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java

@@ -39,4 +39,6 @@ public interface InspectionTasksMapper extends BaseMapper<InspectionTasks> {
 	 */
 	String getMaxTaskNO(String date);
 
+	List<InspectionTasks> getListByToolsCodeId(String toolsCodeId);
+
 }

src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml

@@ -71,4 +71,18 @@
         FROM i_inspection_tasks where task_no like ${date}
     </select>
 
+    <select id="getListByToolsCodeId" resultMap="inspectionTasksResultMap">
+        select
+            task.*
+        from
+            i_inspection_tasks task
+        inner join i_inspection_object obj
+            on obj.object_type = '工器具'
+            and obj.object_no = task.object_no
+            and obj.is_deleted = '0'
+        where
+            task.is_deleted = '0'
+            and obj.kks_no = #{toolsCodeId}
+    </select>
+
 </mapper>

src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java

@@ -42,4 +42,6 @@ public interface IInspectionTasksService extends BaseService<InspectionTasks> {
 	 */
 	String getMaxTaskNo(String date);
 
+	List<InspectionTasks> getListByToolsCodeId(String toolsCodeId);
+
 }

src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java

@@ -45,4 +45,10 @@ public class InspectionTasksServiceImpl extends BaseServiceImpl<InspectionTasksM
 		return maxTakNo;
 	}
 
+	@Override
+	public List<InspectionTasks> getListByToolsCodeId(String toolsCodeId) {
+		List<InspectionTasks> list = baseMapper.getListByToolsCodeId(toolsCodeId);
+		return list;
+	}
+
 }