qu

yamato-bbib/src/main/java/com/yamato/bbib/controller/TVehicleResultsController.java

@@ -68,7 +68,7 @@ public class TVehicleResultsController extends BaseController
     @PostMapping("/Compilation")
     public AjaxResult getCompilation(@RequestBody TVehicleResults tVehicleResults)
     {
-        List<TVehicleResults> orderList = tVehicleResultsService.selectTBaseOrderByCompilation(tVehicleResults);
+        List<TVehicleResults> orderList = tVehicleResultsService.selectTVehicleResultsByCompilation(tVehicleResults);
         return success(orderList);
     }
 

yamato-bbib/src/main/java/com/yamato/bbib/domain/TVehicleResults.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 /**
  * 発注管理对象 t_vehicle_results
- * 
+ *
  * @author kuronekoyamato
  * @date 2025-06-13
  */
@@ -86,6 +86,13 @@ public class TVehicleResults extends BaseEntity
     @Excel(name = "エリア")
     private String area;
 
+    /** 運行ルート */
+    private String vehicleRouter;
+
+    /** 傭車費 */
+    private String charterFee;
+
+
     /** 区間種別 */
     @Excel(name = "区間種別")
     private Long sectionType;
@@ -185,6 +192,26 @@ public class TVehicleResults extends BaseEntity
         return actionKind;
     }
 
+    public void setvehicleRouter(String vehicleRouter)
+    {
+        this.vehicleRouter = vehicleRouter;
+    }
+
+    public String getvehicleRouter()
+    {
+        return vehicleRouter;
+    }
+
+    public void setcharterFee(String charterFee)
+    {
+        this.charterFee = charterFee;
+    }
+
+    public String getcharterFee()
+    {
+        return charterFee;
+    }
+
     public void setActionType(String actionType) {
         this.actionType = actionType;
     }

yamato-bbib/src/main/java/com/yamato/bbib/mapper/TVehicleResultsMapper.java

@@ -35,7 +35,7 @@ public interface TVehicleResultsMapper
      */
     public List<TVehicleResults>  selectTVehicleResults(TVehicleResults tVehicleResults);
 
-    List<TVehicleResults> selectTBaseOrderCompilationList(TVehicleResults tVehicleResults);
+    List<TVehicleResults> selectTVehicleResultsCompilationList(TVehicleResults tVehicleResults);
 
     /**
      * 新增実績管理

yamato-bbib/src/main/java/com/yamato/bbib/service/ITVehicleResultsService.java

@@ -38,7 +38,7 @@ public interface ITVehicleResultsService
      */
     public List<TVehicleResults> selectTVehicleResults(TVehicleResults tVehicleResults);
 
-    public List<TVehicleResults> selectTBaseOrderByCompilation(TVehicleResults tVehicleResults);
+    public List<TVehicleResults> selectTVehicleResultsByCompilation(TVehicleResults tVehicleResults);
 
     /**
      * 新增実績管理

yamato-bbib/src/main/java/com/yamato/bbib/service/impl/TVehicleRssultsImpl.java

@@ -183,8 +183,8 @@ public class TVehicleRssultsImpl implements ITVehicleResultsService
      * @return 実績管理
      */
     @Override
-    public List<TVehicleResults> selectTBaseOrderByCompilation(TVehicleResults tVehicleResults) {
-        List<TVehicleResults> orderList  = tVehicleResultsMapper.selectTBaseOrderCompilationList(tVehicleResults);
+    public List<TVehicleResults> selectTVehicleResultsByCompilation(TVehicleResults tVehicleResults) {
+        List<TVehicleResults> orderList  = tVehicleResultsMapper.selectTVehicleResultsCompilationList(tVehicleResults);
 
         Map<Integer, String> weekDayMap = new HashMap<>();
         weekDayMap.put(1, "月");

yamato-bbib/src/main/resources/mapper/bbib/TVehicleResultsMapper.xml

@@ -30,6 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="arrivalCode" column="arrival_code" />
         <result property="systemCode" column="system_code" />
         <result property="lineName" column="line_name" />
+        <result property="charterFee" column="charter_fee" />
+        <result property="vehicleRouter" column="vehicle_router" />
         <result property="changeFlag" column="change_flag" />
         <result property="newData" column="new_data" />
         <result property="actionId" column="action_id" />
@@ -71,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tb.month_year,
             tb.area,
             tb.section_type,
-            tb.order_status,
+            tb.result_status,
             tb.del_flg,
             tb.create_by,
             tb.create_time,
@@ -83,15 +85,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tmp.run_day,
             tmp.run_week_day,
             tmp.original_data,
-            tmp.new_data,
-            mlc.departure_code,
-            mlc.arrival_code,
-            mlc.system_code,
-            mlc.line_name
+            tmp.charter_fee,
+            tmp.new_data
         from t_vehicle_results tb
-                 left join t_vehicle_results_router tbi on tb.result_id = tbi.result_id
-                 left join t_month_plan tmp on tbi.month_plan_id = tmp.month_plan_id
-                 left join m_line_code mlc on tbi.line_id = mlc.line_id
+                 left join t_vehicle_results_router tbi
+                           on tb.result_id = tbi.result_id
+                 left join t_daily_charter_fee tmp
+                           on tbi.result_id = tmp.result_id
+                               and tbi.vehicle_router = tmp.vehicle_router
     </sql>
 
     <select id="selectTActionHistoryList" parameterType="TVehicleResults" resultMap="TVehicleResult">
@@ -132,25 +133,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by tb.area asc
     </select>
 
-    <select id="selectTBaseOrderCompilationList" parameterType="TVehicleResults" resultMap="TVehicleResult">
+    <select id="selectTVehicleResultsCompilationList" parameterType="TVehicleResults" resultMap="TVehicleResult">
         <include refid="selectTVehicleResultsCompilationParamVo"/>
         <where>
-            <if test="lineId != null"> and tbi.line_id = #{lineId}</if>
-            <if test="wareHouseLocation != null and wareHouseLocation != ''"> and tbi.ware_house_location = #{wareHouseLocation}</if>
-            <if test="wareHouseTime != null"> and tbi.ware_house_time = #{wareHouseTime}</if>
-            <if test="vehicleTon != null"> and tbi.vehicle_ton = #{vehicleTon}</if>
-            <if test="monthPlanId != null"> and tbi.month_plan_id = #{monthPlanId}</if>
+            <if test="vehicleRouter != null and vehicleRouter != ''"> and tbi.vehicle_router = #{vehicleRouter}</if>
+            <if test="lineName != null"> and tbi.line_name = #{lineName}</if>
             <if test="runDay != null"> and tmp.run_day = #{runDay}</if>
             <if test="runWeekDay != null"> and tmp.run_week_day = #{runWeekDay}</if>
             <if test="originalData != null and originalData != ''"> and tmp.original_data = #{originalData}</if>
             <if test="newData != null and newData != ''"> and tmp.new_data = #{newData}</if>
-            <if test="departureCode != null and departureCode != ''"> and mlc.departure_code = #{departureCode}</if>
-            <if test="arrivalCode != null and arrivalCode != ''"> and mlc.arrival_code = #{arrivalCode}</if>
-            <if test="systemCode != null and systemCode != ''"> and mlc.system_code = #{systemCode}</if>
-            <if test="lineName != null and lineName != ''"> and mlc.line_name = #{lineName}</if>
-            <if test="orderId != null"> and tb.order_id = #{orderId}</if>
+            <if test="charterFee != null and charterFee != ''"> and tmp.charter_fee = #{charterFee}</if>
+            <if test="resultId != null"> and tmp.result_id = #{resultId}</if>
         </where>
-        order by tmp.run_day asc
     </select>
     
     <select id="selectTBaseOrderByOrderId" parameterType="TVehicleResults" resultMap="TVehicleResult">