Przeglądaj źródła

更新查询救援订单接口

haoyu 2 lat temu
rodzic
commit
6420409e09

+ 2 - 2
src/main/java/com/ydtech/modules/ser/controller/SerServePriceController.java

@@ -40,13 +40,13 @@ public class SerServePriceController extends BaseController {
     }
 
     @PostMapping("update/serve")
-    @ApiOperation("新增服务")
+    @ApiOperation("修改服务")
     public HttpResult<Object> updateServe(@RequestBody ServePrice servePrice) {
         return servePriceService.updateServe(servePrice);
     }
 
     @PostMapping("delete/serve")
-    @ApiOperation("新增服务")
+    @ApiOperation("删除服务")
     public HttpResult<Object> deleteServe(@RequestBody ServePrice servePrice) {
         return servePriceService.deleteServe(servePrice);
     }

+ 8 - 1
src/main/java/com/ydtech/modules/ser/service/impl/SerRescueOrderServiceImpl.java

@@ -20,6 +20,9 @@ import com.ydtech.modules.ser.utils.PositionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Objects;
+
 @Service
 public class SerRescueOrderServiceImpl extends ServiceImpl<SerRescueOrderMapper, RescueOrder>
         implements SerRescueOrderService {
@@ -109,7 +112,11 @@ public class SerRescueOrderServiceImpl extends ServiceImpl<SerRescueOrderMapper,
             queryWrapper.eq(RescueOrder::getServeCode, rescueTypeEnum != null ? rescueTypeEnum.getDesc() : null);
         }
 
-        Page pageData = baseMapper.selectPage(page, queryWrapper);
+        Page<RescueOrder> pageData = baseMapper.selectPage(page, queryWrapper);
+        pageData.getRecords().forEach(item -> {
+            item.setOrderState(Objects.requireNonNull(OderStateEnum.getOderStateEnum(item.getOrderState())).getDesc());
+            item.setServeCode(Objects.requireNonNull(RescueTypeEnum.getRescueTypeEnum(item.getServeCode())).getDesc());
+        });
         return pageData;
     }
 }