优化

ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java

@@ -71,7 +71,7 @@ public interface MydoJobMapper
     void InvalidMydoJob(HashMap<String, Object> map);
 
     MydoJob selectMydoJobByExitList(@Param("exitList") List<String> exitList );
-    MydoJob selectMydoJobByExitList1(@Param("exitList") List<String> exitList ,@Param("roadwayId") String roadwayId);
+    MydoJob selectMydoJobByExitList1(@Param("exitId") String exitId ,@Param("roadwayId") String roadwayId);
 
     void insertHistory(String jobId);
 
@@ -88,4 +88,8 @@ public interface MydoJobMapper
     MydoJob selectJobByTaskNo(String taskNo);
 
     MydoJob selectMydoJobByEntranceList1(@Param("entranceId") String entranceId);
+
+    List<MydoJob> getInJobByEntranceId(@Param("entranceId") String exitId);
+
+    MydoJob selectMydoJobByExitId(@Param("exitId") String exitId);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java

@@ -68,7 +68,7 @@ public interface IMydoJobService
     boolean InvalidMydoJob(Long rwh, Integer id);
 
     MydoJob selectMydoJobByExitList(List<String> exitList);
-    MydoJob selectMydoJobByExitList1(List<String> exitList,String roadwayId);
+    MydoJob selectMydoJobByExitList1(String exitId,String roadwayId);
 
     void insertHistory(String jobId);
 
@@ -87,4 +87,8 @@ public interface IMydoJobService
     MydoJob selectMydoJobByEntranceList1(String entranceId);
 
     AjaxResult OuthandFinish(String[] jobIds);
+
+    List<MydoJob> getInJobByEntranceId(String exitId);
+
+    MydoJob selectMydoJobByExitId(String exitId);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java

@@ -76,6 +76,8 @@ public class MydoJobServiceImpl implements IMydoJobService
     @Override
     public int updateMydoJob(MydoJob mydoJob)
     {
+        long priority = mydoJob.getPriority();
+        mydoJob.setPriority(Math.abs(priority));
         return mydoJobMapper.updateMydoJob(mydoJob);
     }
 
@@ -144,8 +146,8 @@ public class MydoJobServiceImpl implements IMydoJobService
     }
 
     @Override
-    public MydoJob selectMydoJobByExitList1(List<String> exitList ,String roadwayId) {
-        return mydoJobMapper.selectMydoJobByExitList1(exitList,roadwayId);
+    public MydoJob selectMydoJobByExitList1(String exitId ,String roadwayId) {
+        return mydoJobMapper.selectMydoJobByExitList1(exitId,roadwayId);
     }
 
     @Override
@@ -190,6 +192,16 @@ public class MydoJobServiceImpl implements IMydoJobService
         return AjaxResult.success("操作成功");
     }
 
+    @Override
+    public List<MydoJob> getInJobByEntranceId(String exitId) {
+        return mydoJobMapper.getInJobByEntranceId(exitId);
+    }
+
+    @Override
+    public MydoJob selectMydoJobByExitId(String exitId) {
+        return mydoJobMapper.selectMydoJobByExitId(exitId);
+    }
+
     @Override
     public List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob) {
         return mydoJobMapper.selectMydoJobFinishList(mydoJob);