tj

src/main/java/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.java

@@ -37,7 +37,7 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     //通过主键查询参考运距
     BigDecimal getLinePathLength(BigDecimal lineId);
     //获取符合条件运价数值列表
-    List<Map<String, Object>> getPriceValueList(BigDecimal oilTypeId);
+    List<Map<String, Object>> getPriceValueList(BigDecimal oilTypeId,BigDecimal type);
     //获取运价和吨公里数值列表
     List<Map<String, Object>> getPriceValueAndPriceTonKilometer();
     //通过主键修改吨公里数
@@ -65,5 +65,7 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
 
     Map<String, Object> getcargonameId(Map<String, Object> map);
 
+    int updateDCodd();
 
+    int updateDCnew();
 }

src/main/java/com/steerinfo/dil/service/IAmsContractTruckPriceService.java

@@ -68,4 +68,8 @@ public interface IAmsContractTruckPriceService {
     List<Map<String, Object>> getwz(Map<String, Object> map);
 
     Map<String, Object> getcargonameId(Map<String, Object> map);
+
+    int updateDCodd();
+
+    int updateDCnew();
 }

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

@@ -215,7 +215,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         //获取预执行油价
         BigDecimal newOilPrice = DataChange.dataToBigDecimal(map.get("newOilPrice"));
         //根据油品名称ID和非历史油价筛选出符合条件的运价合集
-        List<Map<String, Object>> PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId);
+        List<Map<String, Object>> PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId,type);
         for (Map<String, Object> stringObjectMap : PriceValueList) {
             stringObjectMap.put("priceDate",map.get("priceDate"));
             //获取该条单价的原油价基准
@@ -744,4 +744,14 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         return value;
     }
 
+    @Override
+    public int updateDCodd() {
+        return amsContractTruckPriceMapper.updateDCodd();
+    }
+
+    @Override
+    public int updateDCnew() {
+        return amsContractTruckPriceMapper.updateDCnew();
+    }
+
 }

src/main/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

@@ -904,12 +904,13 @@
     select LINE_PATH_LENGTH "linePathLength" from RMS_LINE where LINE_ID = #{lineId}
   </select>
 
-  <select id="getPriceValueList" resultType="java.util.LinkedHashMap">
+  <select id="getPriceValueList" resultType="java.util.Map">
     select a_t_price.PRICE_ID "priceId",
            a_t_price.PRICE_VALUE "priceValue",
            a_t_price.OILPRICE_BASE "oilpriceBase",
            a_t_price.OILPRICE_CHANGE_THRESHOLD "oilpriceChangeThreshold",
-           a_t_price.CARGONAME_ID "cargonameId"
+           a_t_price.CARGONAME_ID "cargonameId",
+           a_t_price.haul_distance "haulDistance"
     from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
     where a_t_price.OIL_TYPE_ID = #{oilTypeId} and a_t_price.DELETED = 0
   </select>
@@ -1092,4 +1093,12 @@
     left join BMSTRUCK_FORMULA bf on t.cargoname_id=bf.formula_id
     where price_id=#{priceId}
   </select>
+
+  <update id="updateDCodd">
+    update AMS_CONTRACT_TRANSPORT_PRICE set deleted =1 where capacity_type_id in (20,21,22,23,24,25,26,27,28,41,42,40) and deleted =0
+  </update>
+
+  <update id="updateDCnew">
+   update AMS_CONTRACT_TRANSPORT_PRICE set deleted =0 where capacity_type_id in (20,21,22,23,24,25,26,27,28,41,42,40) and price_date  = to_date('2022-09-26', 'yyyy-mm-dd');
+  </update>
 </mapper>