[列装] 编辑排序接口bug

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -457,11 +457,13 @@ public class PackingController {
         }
         List<PackingLibrary> packingLibraries = new ArrayList<>();
         if (packingLibrary.getShowOrder()>packingModelEdit.getShowOrder()){
+            String model=" ";
             for (int i = packingModelEdit.getShowOrder();i<packingLibrary.getShowOrder();i++){
-                if (packingLibraryDao.findByShowOrder(i)!=null){
-                    PackingLibrary packingLibrary1 = packingLibraryDao.findByShowOrder(i);
+                if (packingLibraryDao.findByShowOrderAndModelNot(i,model)!=null){
+                    PackingLibrary packingLibrary1 = packingLibraryDao.findByShowOrderAndModelNot(i,model);
                     packingLibrary1.setShowOrder(i+1);
                     packingLibraries.add(packingLibrary1);
+                    model=packingLibrary1.getModel();
                 }
                 else {
                     break;
@@ -502,7 +504,7 @@ public class PackingController {
         else {
             throw new ApiException("传入的列装id不是型号");
         }
-        return ResponseEntity.ok("编辑成功");
+        return ResponseEntity.ok(ResponseEntity.ok(packingModelEdit));
     }
 
     @ApiOperation(value = "编辑列装装备")

dev-packing/src/main/java/com/tykj/dev/device/packing/repository/PackingLibraryDao.java

@@ -19,6 +19,8 @@ public interface PackingLibraryDao extends JpaRepository<PackingLibrary, Integer
 
     PackingLibrary findByShowOrder(Integer showOrder);
 
+    PackingLibrary findByShowOrderAndModelNot(Integer showOrder,String model);
+
     List<PackingLibrary> findAllByIsRootAndPackingStatus(Integer isRoot,Integer packingStatus);
 
     List<PackingLibrary> findAllByPartParentIdAndMatchingRangeAndPackingStatusAndName(Integer partParentId,Integer matchingRange,Integer packingStatus,String name);