合并采购国产矿完毕

src/main/java/com/steerinfo/dil/service/impl/TmstrainLoadingResultServiceImpl.java

@@ -49,9 +49,8 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         switch (resultType.intValue()){
             case 1:
             case 2:
-                return tmstrainLoadingResultMapper.getTmsWagonLoadInfo(map);
             case 3:
-                break;
+                return tmstrainLoadingResultMapper.getTmsWagonLoadInfo(map);
             case 4:
         }
         return null;
@@ -91,17 +90,27 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             //通过发站查询发站的所属港口
             BigDecimal portId = tmstrainLoadingResultMapper.getPortIdBySendStationId(tmstrainLoadingResult.getSendStationId());
             map.put("portId", portId);
-//        wmshBoundFeign.addResult(map);
+//            wmshBoundFeign.addResult(map);
         }
 
         return tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
     }
 
+    /**
+     * 通过ID获取装车实绩数据
+     * @param resultId
+     * @return
+     */
     @Override
     public List<Map<String, Object>> getTmstrainLoadingResultByResultId(BigDecimal resultId) {
         return tmstrainLoadingResultMapper.selectByResultId(resultId);
     }
 
+    /**
+     * 修改火运装车实绩
+     * @param tmstrainLoadingResult
+     * @return
+     */
     @Override
     public int updateTmstrainLoadingResult(TmstrainLoadingResult tmstrainLoadingResult) {
         tmstrainLoadingResult.setUpdateTime(new Date());

src/main/java/com/steerinfo/dil/service/impl/TmstrainPleaseApproveResultServiceImpl.java

@@ -43,11 +43,8 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
         BigDecimal resultType = DataChange.dataToBigDecimal(mapValue.get("resultType"));
         switch (resultType.intValue()){
             case 1:
-                return tmstrainPleaseApproveResultMapper.getAllWagonPlease(mapValue);
-            case 2:
-                break;
             case 3:
-                break;
+                return tmstrainPleaseApproveResultMapper.getAllWagonPlease(mapValue);
             case 4:
         }
         return null;
@@ -63,11 +60,8 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
         BigDecimal resultType = DataChange.dataToBigDecimal(mapValue.get("resultType"));
         switch (resultType.intValue()){
             case 1:
-                return tmstrainPleaseApproveResultMapper.getAllApproveWagonPlease(mapValue);
-            case 2:
-                break;
             case 3:
-                break;
+                return tmstrainPleaseApproveResultMapper.getAllApproveWagonPlease(mapValue);
             case 4:
         }
         return null;
@@ -107,6 +101,7 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
         }
         tmstrainPleaseApproveResult.setResultPleasePlanNo(resultPleasePlanNo);
         //生成请车日期
+        tmstrainPleaseApproveResult.setInsertUsername("admin");
         tmstrainPleaseApproveResult.setResultPleaseDate(new Date());
         return tmstrainPleaseApproveResultMapper.insertSelective(tmstrainPleaseApproveResult);
     }

src/main/java/com/steerinfo/dil/service/impl/TmstrainWagonUnloadResultServiceImpl.java

@@ -44,9 +44,8 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
         switch (resultType.intValue()){
             case 1:
             case 2:
-                return tmstrainWagonUnloadResultMapper.getTmsWagonUnLoadInfo(map);
             case 3:
-                break;
+                return tmstrainWagonUnloadResultMapper.getTmsWagonUnLoadInfo(map);
             case 4:
         }
         return null;
@@ -77,9 +76,8 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
         switch (resultType.intValue()){
             case 1:
             case 2:
-                i = addTmstrainWagonLoadResult(tmstrainWagonUnloadResult);
-                break;
             case 3:
+                i = addTmstrainWagonLoadResult(tmstrainWagonUnloadResult);
                 break;
             case 4:
                 i = addTmstrainWagonLoadResultForConverted(tmstrainWagonUnloadResult);
@@ -110,16 +108,22 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
     }
 
 
-
-
-
-
+    /**
+     * 修改装车实绩
+     * @param tmstrainWagonUnloadResult
+     * @return
+     */
     @Override
     public int updateTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
         tmstrainWagonUnloadResult.setUpdateTime(new Date());
         return tmstrainWagonUnloadResultMapper.updateByPrimaryKeySelective(tmstrainWagonUnloadResult);
     }
 
+    /**
+     * 查看火运实绩
+     * @param map
+     * @return
+     */
     @Override
     public List<Map<String, Object>> getTmstrainResult(Map<String, Object> map) {
         return tmstrainWagonUnloadResultMapper.getTmstrainResult(map);