459242451@qq.com 2 years ago
parent
commit
17db579654

+ 4 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentController.java

@@ -325,7 +325,7 @@ public class IncidentController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     @Security
-    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody IncidentBo bo) {
+    public AjaxResult<Map<String, Object>> add(@Validated(AddGroup.class) @RequestBody IncidentBo bo) {
         // 新增初始化为待派发状态
         bo.setStatus(2);
         LoginUser cacheLoginUser = UserUtil.getCacheLoginUser();
@@ -342,8 +342,9 @@ public class IncidentController extends BaseController {
         save.setSource("1");
         saveJsonArray.add(save);
         RedisUtils.publish(Constants.INCIDENT_USER_BATCH, saveJsonArray);
-
-        return toAjax(true);
+        Map<String, Object> result = new HashMap<>(2);
+        result.put("incidentId", id);
+        return AjaxResult.success(result);
     }
 
     /**

+ 3 - 3
ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceDetailServiceImpl.java

@@ -86,13 +86,13 @@ public class ResourceDetailServiceImpl extends ServicePlusImpl<ResourceDetailMap
         ResourceVo voById = resourceService.getVoById(bo.getResourceId());
         if (voById != null) {
             add.setResourceType(voById.getResourceType());
-            if (bo.getResourceType() == 2) {
+            if (add.getResourceType() == 2) {
                 add.setNum(new BigDecimal(1));
                 add.setUnit("人");
-            } else if (bo.getResourceType() == 3 && "车辆".equals(bo.getCarType())) {
+            } else if (add.getResourceType() == 3 && "车辆".equals(bo.getCarType())) {
                 add.setNum(new BigDecimal(1));
                 add.setUnit("辆");
-            } else if (bo.getResourceType() == 3 && "船舶".equals(bo.getCarType())) {
+            } else if (add.getResourceType() == 3 && "船舶".equals(bo.getCarType())) {
                 add.setNum(new BigDecimal(1));
                 add.setUnit("艘");
             }