[修改]关联数据新增路径字段和查询参数

common/src/main/java/com/keymobile/governworkorder/common/bo/WorkOrderDataVO.java

@@ -38,6 +38,12 @@ public class WorkOrderDataVO {
      */
     @Schema(description = "资产中文名称")
     private String cnName;
+
+    /**
+     * 名称路径
+     */
+    @Schema(description = "名称路径")
+    private String namePath;
     /**
      * 资产编号
      */

core/src/main/java/com/keymobile/governworkorder/core/api/WorkOrderApi.java

@@ -80,8 +80,10 @@ public class WorkOrderApi {
 
     @RequestMapping(value = "/getData", method = {RequestMethod.GET})
     @Operation(summary = "根据工单id获取关联数据", description = "")
-    public List<WorkOrderDataVO> getData(@RequestParam String workOrderId) {
-        return workOrderService.getData(workOrderId);
+    public List<WorkOrderDataVO> getData(@RequestParam String workOrderId,
+                                         @RequestParam(required = false) String namePath,
+                                         @RequestParam(required = false) String keyword) {
+        return workOrderService.getData(workOrderId, namePath, keyword);
     }
 
     @RequestMapping(value = "/getProcesses", method = {RequestMethod.GET})

core/src/main/java/com/keymobile/governworkorder/core/persistence/model/WorkOrderData.java

@@ -36,6 +36,12 @@ public class WorkOrderData {
      * 资产中文名称
      */
     private String cnName;
+
+    /**
+     * 名称路径
+     */
+    private String namePath;
+
     /**
      * 资产编号
      */

core/src/main/java/com/keymobile/governworkorder/core/service/WorkOrderService.java

@@ -32,7 +32,7 @@ public interface WorkOrderService {
 
     void delete(String workOrderId, boolean force);
 
-    List<WorkOrderDataVO> getData (String workOrderId);
+    List<WorkOrderDataVO> getData (String workOrderId, String namePath, String keyword);
 
     List<WorkOrderProcessVO> getProcesses(String workOrderId);
 

core/src/main/java/com/keymobile/governworkorder/core/service/impl/WorkOrderServiceImpl.java

@@ -270,10 +270,20 @@ public class WorkOrderServiceImpl implements WorkOrderService {
     }
 
     @Override
-    public List<WorkOrderDataVO> getData(String workOrderId) {
+    public List<WorkOrderDataVO> getData(String workOrderId, String namePath, String keyword) {
         WorkOrderInfo workOrder = mongoTemplate.findById(workOrderId, WorkOrderInfo.class);
         Assert.notNull(workOrder, "找不到对应工单");
         Query query = Query.query(Criteria.where("workOrderId").is(workOrderId));
+        if (StringUtils.isNotBlank(namePath)) {
+            query.addCriteria(Criteria.where("namePath").regex(namePath));
+        }
+        if (StringUtils.isNotBlank(keyword)) {
+            query.addCriteria(new Criteria().orOperator(
+                    Criteria.where("name").regex(keyword),
+                    Criteria.where("cnName").regex(keyword),
+                    Criteria.where("code").regex(keyword),
+                    Criteria.where("desc").regex(keyword)));
+        }
         List<WorkOrderData> list = mongoTemplate.find(query, WorkOrderData.class);
         return list.stream().map(e -> BeanUtil.map(e, WorkOrderDataVO.class)).collect(Collectors.toList());
     }