+ 设计文件解析

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/cons/ConsUnitInfoController.java

@@ -95,6 +95,13 @@ public class ConsUnitInfoController extends BaseController {
         return toAjax(consUnitInfoService.insertConsUnitInfo(consUnitInfo));
     }
 
+    @Log(title = "施工单元分配施工机械", businessType = BusinessType.UPDATE)
+    @PostMapping("/assign/machine")
+    public AjaxResult assignMachine(@RequestBody ConsUnitMachine consUnitInfo) {
+        consUnitInfoService.assignMachine(consUnitInfo);
+        return success();
+    }
+
     /**
      * 修改施工单元
      */

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IConsUnitInfoService.java

@@ -44,6 +44,8 @@ public interface IConsUnitInfoService {
      */
     int updateConsUnitInfo(ConsUnitMachine consUnitInfo);
 
+    void assignMachine(ConsUnitMachine consUnitInfo);
+
     /**
      * 批量删除施工单元
      * 

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ConsUnitInfoServiceImpl.java

@@ -113,21 +113,12 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
                 updateConsUnitChildren(consUnitInfo.getId(), newAncestors, oldAncestors);
             }
         }
-        int cnt = consUnitInfoMapper.updateConsUnitInfo(consUnitInfo);
-        // 判断oldConstUnit.machineId 和 consUnitInfo.machineId不相同，才调用handleMachine(consUnitInfo);
-        if (CollectionUtils.isEmpty(oldConsUnit.getMachineId())
-            && CollectionUtils.isEmpty(consUnitInfo.getMachineId())) {
-            return cnt;
-        }
-        if (!CollectionUtils.isEmpty(oldConsUnit.getMachineId())
-            && !CollectionUtils.isEmpty(consUnitInfo.getMachineId())) {
-            if (oldConsUnit.getMachineId().equals(consUnitInfo.getMachineId())) {
-                return cnt;
-            }
-        }
+        return consUnitInfoMapper.updateConsUnitInfo(consUnitInfo);
+    }
 
+    @Override
+    public void assignMachine(ConsUnitMachine consUnitInfo) {
         handleMachine(consUnitInfo);
-        return cnt;
     }
 
     /**