source mod

yamato-admin/src/main/java/com/yamato/YamatoBbibApplication.java

@@ -15,8 +15,7 @@ import java.util.TimeZone;
  * @author yamato
  */
 @SpringBootApplication(
-        exclude = {DataSourceAutoConfiguration.class},
-        scanBasePackages = {"com.yamato"} // 显式添加扫描包
+        exclude = {DataSourceAutoConfiguration.class}
 )
 public class YamatoBbibApplication {
     public static void main(String[] args) {

yamato-admin/src/main/resources/application-prod.yml

@@ -7,9 +7,9 @@ yamato:
     # 団体ユーザーのURL
     organizationUrl: https://gradelinkingtest.double-std.com/bbib/password/less/verify/redirect?sessionToken={}
     # 「生涯学習アカウント会員規約」のURL
-    linkAccountTermsUrl: https://www.eiken.or.jp/lifelong-learner/lifelong-learner-account_kiyaku.pdf
+    linkAccountTermsUrl: https://www.yamato.or.jp/lifelong-learner/lifelong-learner-account_kiyaku.pdf
     # 「英検ポータル利用規約」のURL
-    linkPortalTermsUrl: https://www.eiken.or.jp/eiken.yamato-portal_kiyaku.pdf
+    linkPortalTermsUrl: https://www.yamato.or.jp/yamato.yamato-portal_kiyaku.pdf
     # 団体ユーザーのログイントークン有効時間（分）
     organizationTokenExpirationMin: 60
     # 団体ユーザーの自動更新トークン有効時間（分）
@@ -46,7 +46,7 @@ spring:
   mail:
     host: email-smtp.ap-northeast-3.amazonaws.com
     port: 2587
-    fromEmail: noreply-lifelong-learner@sub.eiken.or.jp
+    fromEmail: noreply-lifelong-learner@sub.yamato.or.jp
     username: AKIAWI6FTCEK2FGV5Q52
     password: BPK43gu/znx1Hx/B2/Jvs7e6BBxJ91CGcZAqygNa9WQX
 

yamato-admin/src/main/resources/application-stg1.yml

@@ -7,9 +7,9 @@ yamato:
     # 団体ユーザーのURL
     organizationUrl: https://gradelinkingtest-stg1.double-std.com/bbib/password/less/verify/redirect?sessionToken={}
     # 「生涯学習アカウント会員規約」のURL
-    linkAccountTermsUrl: https://www.eiken.or.jp/lifelong-learner/lifelong-learner-account_kiyaku.pdf
+    linkAccountTermsUrl: https://www.yamato.or.jp/lifelong-learner/lifelong-learner-account_kiyaku.pdf
     # 「英検ポータル利用規約」のURL
-    linkPortalTermsUrl: https://www.eiken.or.jp/eiken.yamato-portal_kiyaku.pdf
+    linkPortalTermsUrl: https://www.yamato.or.jp/yamato.yamato-portal_kiyaku.pdf
     # 団体ユーザーのログイントークン有効時間（分）
     organizationTokenExpirationMin: 60
     # 団体ユーザーの自動更新トークン有効時間（分）
@@ -46,7 +46,7 @@ spring:
   mail:
     host: email-smtp.ap-northeast-3.amazonaws.com
     port: 2587
-    fromEmail: noreply-lifelong-learner@sub.eiken.or.jp
+    fromEmail: noreply-lifelong-learner@sub.yamato.or.jp
     username: AKIAWI6FTCEK2FGV5Q52
     password: BPK43gu/znx1Hx/B2/Jvs7e6BBxJ91CGcZAqygNa9WQX
 

yamato-admin/src/main/resources/application-stg2.yml

@@ -7,9 +7,9 @@ yamato:
     # 団体ユーザーのURL
     organizationUrl: https://gradelinkingtest-stg2.double-std.com/bbib/password/less/verify/redirect?sessionToken={}
     # 「生涯学習アカウント会員規約」のURL
-    linkAccountTermsUrl: https://www.eiken.or.jp/lifelong-learner/lifelong-learner-account_kiyaku.pdf
+    linkAccountTermsUrl: https://www.yamato.or.jp/lifelong-learner/lifelong-learner-account_kiyaku.pdf
     # 「英検ポータル利用規約」のURL
-    linkPortalTermsUrl: https://www.eiken.or.jp/eiken.yamato-portal_kiyaku.pdf
+    linkPortalTermsUrl: https://www.yamato.or.jp/yamato.yamato-portal_kiyaku.pdf
     # 団体ユーザーのログイントークン有効時間（分）
     organizationTokenExpirationMin: 60
     # 団体ユーザーの自動更新トークン有効時間（分）
@@ -46,7 +46,7 @@ spring:
   mail:
     host: email-smtp.ap-northeast-3.amazonaws.com
     port: 2587
-    fromEmail: noreply-lifelong-learner@sub.eiken.or.jp
+    fromEmail: noreply-lifelong-learner@sub.yamato.or.jp
     username: AKIAWI6FTCEK2FGV5Q52
     password: BPK43gu/znx1Hx/B2/Jvs7e6BBxJ91CGcZAqygNa9WQX
 

yamato-admin/src/main/resources/application-test.yml

@@ -29,5 +29,5 @@ server:
 spring:
   datasource:
     url: jdbc:sqlserver://172.14.1.239:1433;DataBaseName.yamato-bbib;encrypt=true;trustServerCertificate=true;serverTimezone=Asia/Tokyo;
-    username: eiken
-    password: eiken123$
+    username: yamato
+    password: yamato123$

yamato-admin/src/main/resources/application.yml

@@ -24,9 +24,9 @@ yamato:
     # 団体ユーザーのURL
     organizationUrl: http://localhost:81/bbib/password/less/verify/redirect?sessionToken={}
     # 「生涯学習アカウント会員規約」のURL
-    linkAccountTermsUrl: https://www.eiken.or.jp/lifelong-learner/lifelong-learner-account_kiyaku.pdf
+    linkAccountTermsUrl: https://www.yamato.or.jp/lifelong-learner/lifelong-learner-account_kiyaku.pdf
     # 「英検ポータル利用規約」のURL
-    linkPortalTermsUrl: https://www.eiken.or.jp/eiken.yamato-portal_kiyaku.pdf
+    linkPortalTermsUrl: https://www.yamato.or.jp/yamato.yamato-portal_kiyaku.pdf
     # 団体ユーザーのログイントークン有効時間（分）
     organizationTokenExpirationMin: 60
     # 団体ユーザーの自動更新トークン有効時間（分）

yamato-bbib/pom.xml

@@ -12,7 +12,7 @@
     <artifactId>yamato-bbib</artifactId>
 
     <description>
-        成績紐付モジュール
+        配車発注管理モジュール
     </description>
 
     <dependencies>
@@ -20,6 +20,7 @@
         <dependency>
             <groupId>com.yamato</groupId>
             <artifactId>yamato-common</artifactId>
+                <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.yamato</groupId>

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

@@ -25,12 +25,12 @@ import com.yamato.common.core.page.TableDataInfo;
 
 /**
  * 発注管理Controller
- * 
+ *
  * @author kuronekoyamato
  * @date 2025-05-28
  */
 @RestController
-@RequestMapping("/yamato/order")
+@RequestMapping("/bbib/order")
 public class TBaseOrderController extends BaseController
 {
     @Autowired
@@ -61,6 +61,16 @@ public class TBaseOrderController extends BaseController
     }
 
     /**
+     * 查询アクション履歴
+     */
+    @PreAuthorize("@ss.hasPermi('yamato:order:query')")
+    @PostMapping("/action")
+    public AjaxResult getActionInfo(@RequestBody TBaseOrder tBaseOrder) {
+
+        return success(tBaseOrderService.selectTActionHistoryList(tBaseOrder));
+    }
+
+    /**
      * 获取発注管理指示書編集
      */
     @PreAuthorize("@ss.hasPermi('yamato:order:query')")
@@ -76,10 +86,10 @@ public class TBaseOrderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('yamato:order:add')")
     @Log(title = "発注管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TBaseOrder tBaseOrder)
-    {
-        return toAjax(tBaseOrderService.insertTBaseOrder(tBaseOrder));
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody TBaseOrder tBaseOrder) {
+        TBaseOrder insertedOrder = tBaseOrderService.insertTBaseOrder(tBaseOrder);
+        return AjaxResult.success("新增成功", insertedOrder);
     }
 
     /**
@@ -101,7 +111,7 @@ public class TBaseOrderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('yamato:order:remove')")
     @Log(title = "発注管理", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{orderIds}")
+    @DeleteMapping("/{orderIds}")
     public AjaxResult remove(@PathVariable String[] orderIds)
     {
         return toAjax(tBaseOrderService.deleteTBaseOrderByOrderIds(orderIds));

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 成績詳細情報（非構造テーブル）Controller
  *
- * @author yamato
+ * @author kuronekoyamato
  * @date 2025-01-01
  */
 @RestController

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

@@ -0,0 +1,110 @@
+package com.yamato.bbib.controller;
+
+import com.yamato.common.annotation.Log;
+import com.yamato.common.core.controller.BaseController;
+import com.yamato.common.core.domain.AjaxResult;
+import com.yamato.common.core.page.TableDataInfo;
+import com.yamato.common.enums.BusinessType;
+import com.yamato.bbib.domain.TVehicleResults;
+import com.yamato.bbib.service.ITVehicleResultsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 実績管理Controller
+ * 
+ * @author kuronekoyamato
+ * @date 2025-06-13
+ */
+@RestController
+@RequestMapping("/bbib/result")
+public class TVehicleResultsController extends BaseController
+{
+
+    @Autowired
+    private ITVehicleResultsService tVehicleResultsService;
+
+    /**
+     * 查询実績管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('yamato:result:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TVehicleResults tVehicleResults)
+    {
+        startPage();
+        List<TVehicleResults> list = tVehicleResultsService.selectTVehicleResults(tVehicleResults);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取実績管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('yamato:result:query')")
+    @PostMapping("/id")
+    public AjaxResult getInfo(@RequestBody TVehicleResults tVehicleResults)
+    {
+        return success(tVehicleResultsService.selectTBaseOrderByOrderId(tVehicleResults));
+    }
+
+    /**
+     * 查询アクション履歴
+     */
+    @PreAuthorize("@ss.hasPermi('yamato:result:query')")
+    @PostMapping("/action")
+    public AjaxResult getActionInfo(@RequestBody TVehicleResults tVehicleResults) {
+
+        return success(tVehicleResultsService.selectTActionHistoryList(tVehicleResults));
+    }
+
+    /**
+     * 获取実績管理指示書編集
+     */
+    @PreAuthorize("@ss.hasPermi('yamato:result:query')")
+    @PostMapping("/Compilation")
+    public AjaxResult getCompilation(@RequestBody TVehicleResults tVehicleResults)
+    {
+        List<TVehicleResults> orderList = tVehicleResultsService.selectTBaseOrderByCompilation(tVehicleResults);
+        return success(orderList);
+    }
+
+    /**
+     * 新增実績管理
+     */
+    @PreAuthorize("@ss.hasPermi('yamato:result:add')")
+    @Log(title = "実績管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody TVehicleResults tVehicleResults) {
+        TVehicleResults insertedOrder = tVehicleResultsService.insertTBaseOrder(tVehicleResults);
+        return AjaxResult.success("新增成功", insertedOrder);
+    }
+
+    /**
+     * 修改実績管理
+     */
+    @PreAuthorize("@ss.hasPermi('yamato:result:edit')")
+    @Log(title = "実績管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/batch")
+    public AjaxResult edit(@RequestBody List<TVehicleResults> tVehicleResults) {
+        int count = 0;
+        for (TVehicleResults order : tVehicleResults) {
+            count += tVehicleResultsService.updateTBaseOrder(order);
+        }
+        return toAjax(count);
+    }
+
+    /**
+     * 删除実績管理
+     */
+    @PreAuthorize("@ss.hasPermi('yamato:result:remove')")
+    @Log(title = "実績管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{orderIds}")
+    public AjaxResult remove(@PathVariable String[] orderIds)
+    {
+        return toAjax(tVehicleResultsService.deleteTBaseOrderByOrderIds(orderIds));
+    }
+}

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

@@ -92,7 +92,7 @@ public class TBaseOrder extends BaseEntity
 
     /** ステータス */
     @Excel(name = "ステータス")
-    private Integer status;
+    private Integer orderStatus;
 
     private List<Integer> statusList;
 
@@ -119,6 +119,30 @@ public class TBaseOrder extends BaseEntity
     @Excel(name = "削除フラグ")
     private Integer delFlg;
 
+    /** アクションID */
+    private String actionId;
+
+    /** アクションコード */
+    @Excel(name = "アクションコード")
+    private String actionCode;
+
+    /** 発生日 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "発生日", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    private Date actionDate;
+
+    /** アクション種別 */
+    private String actionKind;
+
+    /** アクションタイプ */
+    private String actionType;
+
+    /** アクションタイトル */
+    private String actionTitle;
+
+    /** アクションコメント */
+    private String actionComment;
+
     public void setOrderId(String orderId)
     {
         this.orderId = orderId;
@@ -129,6 +153,62 @@ public class TBaseOrder extends BaseEntity
         return orderId;
     }
 
+    public void setActionId(String actionId) {
+        this.actionId = actionId;
+    }
+
+    public String getActionId() {
+        return actionId;
+    }
+
+    public void setActionCode(String actionCode) {
+        this.actionCode = actionCode;
+    }
+
+    public String getActionCode() {
+        return actionCode;
+    }
+
+    public void setActionDate(Date actionDate) {
+        this.actionDate = actionDate;
+    }
+
+    public Date getActionDate() {
+        return actionDate;
+    }
+
+    public void setActionKind(String actionKind) {
+        this.actionKind = actionKind;
+    }
+
+    public String getActionKind() {
+        return actionKind;
+    }
+
+    public void setActionType(String actionType) {
+        this.actionType = actionType;
+    }
+
+    public String getActionType() {
+        return actionType;
+    }
+
+    public void setActionTitle(String actionTitle) {
+        this.actionTitle = actionTitle;
+    }
+
+    public String getActionTitle() {
+        return actionTitle;
+    }
+
+    public void setActionComment(String actionComment) {
+        this.actionComment = actionComment;
+    }
+
+    public String getActionComment() {
+        return actionComment;
+    }
+
     public void setPartnerCode(String partnerCode)
     {
         this.partnerCode = partnerCode;
@@ -366,12 +446,12 @@ public class TBaseOrder extends BaseEntity
 
     public void setStatus(Integer status)
     {
-        this.status = status;
+        this.orderStatus = status;
     }
 
     public Integer getStatus()
     {
-        return status;
+        return orderStatus;
     }
 
     public void setInstructionDeliveryDate(Date instructionDeliveryDate)

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

@@ -0,0 +1,517 @@
+package com.yamato.bbib.domain;
+
+import com.yamato.common.annotation.Excel;
+import com.yamato.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 発注管理对象 t_vehicle_results
+ * 
+ * @author kuronekoyamato
+ * @date 2025-06-13
+ */
+public class TVehicleResults extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 実績ID */
+    private String resultId;
+
+    /** 輸送パートナーコード */
+    @Excel(name = "輸送パートナーコード")
+    private String partnerCode;
+
+    private String sectionTypeText;
+
+    private String areaText;
+
+    private String statusText;
+
+    /** 年月度 */
+    @Excel(name = "年月度")
+    private String monthYear;
+
+    /** バージョン */
+    private String version;
+
+    /** 輸送パートナー名 */
+    private String partnerName;
+
+    /** 線便ID */
+    private String lineId;
+
+    /** 入庫場所 */
+    private String wareHouseLocation;
+
+    /** 使用車両(トン) */
+    private String vehicleTon;
+
+    /** 月間計画ID */
+    private String monthPlanId;
+
+    /** 運行指示日 */
+    private String runDay;
+
+    /** 運行日曜 */
+    private Integer runWeekDay; // 原始数字字段
+    private String runWeekDayStr; // 转换后的字符串字段
+
+    /** 発ベース */
+    private String departureCode;
+
+    /** 着ベース */
+    private String arrivalCode;
+
+    /** システムコード */
+    private String systemCode;
+
+    /** 線便名 */
+    private String lineName;
+
+    /** 元のデータ */
+    private String originalData;
+
+    /** 変更有無フラグ */
+    private String changeFlag;
+
+    /** 変更後のデータ */
+    private String newData;
+
+    /** エリア */
+    @Excel(name = "エリア")
+    private String area;
+
+    /** 区間種別 */
+    @Excel(name = "区間種別")
+    private Long sectionType;
+
+    /** ステータス */
+    @Excel(name = "ステータス")
+    private Integer resultStatus;
+
+    private List<Integer> statusList;
+
+    private List<Integer> sectionTypeList;
+
+    private List<Integer> areaList;
+
+    /** 指示書送付日 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "指示書送付日", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date instructionDeliveryDate;
+
+    /** 入庫時間 */
+    @JsonFormat(pattern = "HH:mm")
+    @Excel(name = "入庫時間", width = 30, dateFormat = "HH:mm")
+    private Date wareHouseTime;
+
+    /** 承諾日 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "承諾日", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date commitDate;
+
+    /** 削除フラグ */
+    @Excel(name = "削除フラグ")
+    private Integer delFlg;
+
+    /** アクションID */
+    private String actionId;
+
+    /** アクションコード */
+    @Excel(name = "アクションコード")
+    private String actionCode;
+
+    /** 発生日 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "発生日", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    private Date actionDate;
+
+    /** アクション種別 */
+    private String actionKind;
+
+    /** アクションタイプ */
+    private String actionType;
+
+    /** アクションタイトル */
+    private String actionTitle;
+
+    /** アクションコメント */
+    private String actionComment;
+
+    public void setresultId(String resultId)
+    {
+        this.resultId = resultId;
+    }
+
+    public String getresultId()
+    {
+        return resultId;
+    }
+
+    public void setActionId(String actionId) {
+        this.actionId = actionId;
+    }
+
+    public String getActionId() {
+        return actionId;
+    }
+
+    public void setActionCode(String actionCode) {
+        this.actionCode = actionCode;
+    }
+
+    public String getActionCode() {
+        return actionCode;
+    }
+
+    public void setActionDate(Date actionDate) {
+        this.actionDate = actionDate;
+    }
+
+    public Date getActionDate() {
+        return actionDate;
+    }
+
+    public void setActionKind(String actionKind) {
+        this.actionKind = actionKind;
+    }
+
+    public String getActionKind() {
+        return actionKind;
+    }
+
+    public void setActionType(String actionType) {
+        this.actionType = actionType;
+    }
+
+    public String getActionType() {
+        return actionType;
+    }
+
+    public void setActionTitle(String actionTitle) {
+        this.actionTitle = actionTitle;
+    }
+
+    public String getActionTitle() {
+        return actionTitle;
+    }
+
+    public void setActionComment(String actionComment) {
+        this.actionComment = actionComment;
+    }
+
+    public String getActionComment() {
+        return actionComment;
+    }
+
+    public void setPartnerCode(String partnerCode)
+    {
+        this.partnerCode = partnerCode;
+    }
+
+    public String getPartnerCode()
+    {
+        return partnerCode;
+    }
+
+    public void setMonthYear(String monthYear)
+    {
+        this.monthYear = monthYear;
+    }
+
+    public String getMonthYear()
+    {
+        return monthYear;
+    }
+
+    public void setVersion(String version)
+    {
+        this.version = version;
+    }
+
+    public String getVersion()
+    {
+        return version;
+    }
+
+    public List<Integer> getStatusList() { return statusList; }
+    public void setStatusList(List<Integer> statusList) { this.statusList = statusList; }
+
+    public List<Integer> getSectionTypeList() { return sectionTypeList; }
+    public void setSectionTypeList(List<Integer> sectionTypeList) { this.sectionTypeList = sectionTypeList; }
+
+    public List<Integer> getAreaList() { return areaList; }
+    public void setAreaList(List<Integer> areaList) { this.areaList = areaList; }
+
+    public void setpartnerName(String partnerName)
+    {
+        this.partnerName = partnerName;
+    }
+
+    public String getpartnerName()
+    {
+        return partnerName;
+    }
+
+    public void setlineId(String lineId)
+    {
+        this.lineId = lineId;
+    }
+
+    public String getlineId()
+    {
+        return lineId;
+    }
+
+    public void setwareHouseLocation(String wareHouseLocation)
+    {
+        this.wareHouseLocation = wareHouseLocation;
+    }
+
+    public String getwareHouseLocation()
+    {
+        return wareHouseLocation;
+    }
+
+    public void setvehicleTon(String vehicleTon)
+    {
+        this.vehicleTon = vehicleTon;
+    }
+
+    public String getvehicleTon()
+    {
+        return vehicleTon;
+    }
+
+    public void setmonthPlanId(String monthPlanId)
+    {
+        this.monthPlanId = monthPlanId;
+    }
+
+    public String getmonthPlanId()
+    {
+        return monthPlanId;
+    }
+
+    public void setrunDay(String runDay)
+    {
+        this.runDay = runDay;
+    }
+
+    public String getrunDay()
+    {
+        return runDay;
+    }
+
+    public Integer getRunWeekDay() {
+        return runWeekDay;
+    }
+
+    public void setRunWeekDay(Integer runWeekDay) {
+        this.runWeekDay = runWeekDay;
+    }
+
+    public String getRunWeekDayStr() {
+        return runWeekDayStr;
+    }
+
+    public void setRunWeekDayStr(String runWeekDayStr) {
+        this.runWeekDayStr = runWeekDayStr;
+    }
+
+    public void setdepartureCode(String departureCode)
+    {
+        this.departureCode = departureCode;
+    }
+
+    public String getdepartureCode()
+    {
+        return departureCode;
+    }
+
+    public void setarrivalCode(String arrivalCode)
+    {
+        this.arrivalCode = arrivalCode;
+    }
+
+    public String getarrivalCode()
+    {
+        return arrivalCode;
+    }
+
+    public void setsystemCode(String systemCode)
+    {
+        this.systemCode = systemCode;
+    }
+
+    public String getsystemCode()
+    {
+        return systemCode;
+    }
+
+    public void setlineName(String lineName)
+    {
+        this.lineName = lineName;
+    }
+
+    public String getlineName()
+    {
+        return lineName;
+    }
+
+    public void setoriginalData(String originalData)
+    {
+        this.originalData = originalData;
+    }
+
+    public String getoriginalData()
+    {
+        return originalData;
+    }
+
+    public void setchangeFlag(String changeFlag)
+    {
+        this.changeFlag = changeFlag;
+    }
+
+    public String getchangeFlag()
+    {
+        return changeFlag;
+    }
+
+    public void setnewData(String newData)
+    {
+        this.newData = newData;
+    }
+
+    public String getnewData()
+    {
+        return newData;
+    }
+
+    public void setSectionTypeText(String sectionTypeText)
+    {
+        this.sectionTypeText = sectionTypeText;
+    }
+
+    public String getSectionTypeText()
+    {
+        return sectionTypeText;
+    }
+
+    public void setAreaText(String areaText)
+    {
+        this.areaText = areaText;
+    }
+
+    public String getAreaText()
+    {
+        return areaText;
+    }
+
+    public void setStatusText(String statusText)
+    {
+        this.statusText = statusText;
+    }
+
+    public String getStatusText()
+    {
+        return statusText;
+    }
+
+    public void setArea(String area)
+    {
+        this.area = area;
+    }
+
+    public String getArea()
+    {
+        return area;
+    }
+
+    public void setSectionType(Long sectionType)
+    {
+        this.sectionType = sectionType;
+    }
+
+    public Long getSectionType()
+    {
+        return sectionType;
+    }
+
+    public void setStatus(Integer status)
+    {
+        this.resultStatus = status;
+    }
+
+    public Integer getStatus()
+    {
+        return resultStatus;
+    }
+
+    public void setInstructionDeliveryDate(Date instructionDeliveryDate)
+    {
+        this.instructionDeliveryDate = instructionDeliveryDate;
+    }
+
+    public Date getInstructionDeliveryDate()
+    {
+        return instructionDeliveryDate;
+    }
+
+    public void setCommitDate(Date commitDate)
+    {
+        this.commitDate = commitDate;
+    }
+
+    public Date getCommitDate()
+    {
+        return commitDate;
+    }
+
+    public void setWareHouseTime(Date wareHouseTime)
+    {
+        this.wareHouseTime = wareHouseTime;
+    }
+
+    public Date getWareHouseTime()
+    {
+        return wareHouseTime;
+    }
+
+    public void setDelFlg(Integer delFlg)
+    {
+        this.delFlg = delFlg;
+    }
+
+    public Integer getDelFlg()
+    {
+        return delFlg;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("orderId", getresultId())
+            .append("partnerCode", getPartnerCode())
+            .append("monthYear", getMonthYear())
+            .append("version", getVersion())
+            .append("area", getArea())
+            .append("sectionType", getSectionType())
+            .append("status", getStatus())
+            .append("instructionDeliveryDate", getInstructionDeliveryDate())
+            .append("commitDate", getCommitDate())
+            .append("delFlg", getDelFlg())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -2,6 +2,7 @@ package com.yamato.bbib.mapper;
 
 import java.util.List;
 import com.yamato.bbib.domain.TBaseOrder;
+import com.yamato.bbib.domain.TVehicleResults;
 
 /**
  * 発注管理Mapper接口
@@ -20,6 +21,14 @@ public interface TBaseOrderMapper
     public TBaseOrder selectTBaseOrderByOrderId(TBaseOrder tBaseOrder);
 
     /**
+     * 查询アクション履歴
+     *
+     * @param tBaseOrder アクション履歴
+     * @return アクション履歴
+     */
+    List<TBaseOrder> selectTActionHistoryList(TBaseOrder tBaseOrder);
+
+    /**
      * 查询発注管理列表
      * 
      * @param tBaseOrder 発注管理

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

@@ -0,0 +1,71 @@
+package com.yamato.bbib.mapper;
+
+import java.util.List;
+import com.yamato.bbib.domain.TVehicleResults;
+
+/**
+ * 実績管理Mapper接口
+ * 
+ * @author kuronekoyamato
+ * @date 2025-06-13
+ */
+public interface TVehicleResultsMapper
+{
+    /**
+     * 查询実績管理
+     * 
+     * @param tVehicleResults 実績管理主键
+     * @return 実績管理
+     */
+    public TVehicleResults selectTBaseOrderByOrderId(TVehicleResults tVehicleResults);
+
+    /**
+     * 查询アクション履歴
+     *
+     * @param tVehicleResults アクション履歴
+     * @return アクション履歴
+     */
+    List<TVehicleResults> selectTActionHistoryList(TVehicleResults tVehicleResults);
+
+    /**
+     * 查询実績管理列表
+     * 
+     * @param tVehicleResults 実績管理
+     * @return 実績管理集合
+     */
+    public List<TVehicleResults>  selectTVehicleResults(TVehicleResults tVehicleResults);
+
+    List<TVehicleResults> selectTBaseOrderCompilationList(TVehicleResults tVehicleResults);
+
+    /**
+     * 新增実績管理
+     * 
+     * @param tVehicleResults 実績管理
+     * @return 结果
+     */
+    public int insertTBaseOrder(TVehicleResults tVehicleResults);
+
+    /**
+     * 修改実績管理
+     * 
+     * @param tVehicleResults 実績管理
+     * @return 结果
+     */
+    public int updateTBaseOrder(TVehicleResults tVehicleResults);
+
+    /**
+     * 删除実績管理
+     * 
+     * @param orderId 実績管理主键
+     * @return 结果
+     */
+    public int deleteTBaseOrderByOrderId(String orderId);
+
+    /**
+     * 批量删除実績管理
+     * 
+     * @param orderIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBaseOrderByOrderIds(String[] orderIds);
+}

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

@@ -5,15 +5,15 @@ import com.yamato.bbib.domain.TBaseOrder;
 
 /**
  * 発注管理Service接口
- * 
+ *
  * @author kuronekoyamato
  * @date 2025-05-28
  */
-public interface ITBaseOrderService 
+public interface ITBaseOrderService
 {
     /**
      * 查询発注管理
-     * 
+     *
      * @param tBaseOrder 発注管理主键
      * @return 発注管理
      */
@@ -21,8 +21,17 @@ public interface ITBaseOrderService
 
 
     /**
+     * 查询アクション履歴
+     *
+     * @param tBaseOrder アクション履歴
+     * @return アクション履歴
+     */
+    List<TBaseOrder> selectTActionHistoryList(TBaseOrder tBaseOrder);
+
+
+    /**
      * 查询発注管理列表
-     * 
+     *
      * @param tBaseOrder 発注管理
      * @return 発注管理集合
      */
@@ -32,15 +41,15 @@ public interface ITBaseOrderService
 
     /**
      * 新增発注管理
-     * 
+     *
      * @param tBaseOrder 発注管理
      * @return 结果
      */
-    public int insertTBaseOrder(TBaseOrder tBaseOrder);
+    public TBaseOrder insertTBaseOrder(TBaseOrder tBaseOrder);
 
     /**
      * 修改発注管理
-     * 
+     *
      * @param tBaseOrder 発注管理
      * @return 结果
      */
@@ -48,7 +57,7 @@ public interface ITBaseOrderService
 
     /**
      * 批量删除発注管理
-     * 
+     *
      * @param orderIds 需要删除的発注管理主键集合
      * @return 结果
      */
@@ -56,7 +65,7 @@ public interface ITBaseOrderService
 
     /**
      * 删除発注管理信息
-     * 
+     *
      * @param orderId 発注管理主键
      * @return 结果
      */

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

@@ -0,0 +1,74 @@
+package com.yamato.bbib.service;
+
+import com.yamato.bbib.domain.TVehicleResults;
+
+import java.util.List;
+
+/**
+ * 実績管理Service接口
+ * 
+ * @author kuronekoyamato
+ * @date 2025-06-13
+ */
+public interface ITVehicleResultsService
+{
+    /**
+     * 查询実績管理
+     * 
+     * @param tVehicleResults 実績管理主键
+     * @return 実績管理
+     */
+    public TVehicleResults selectTBaseOrderByOrderId(TVehicleResults tVehicleResults);
+
+
+    /**
+     * 查询アクション履歴
+     *
+     * @param tVehicleResults アクション履歴
+     * @return アクション履歴
+     */
+    List<TVehicleResults> selectTActionHistoryList(TVehicleResults tVehicleResults);
+
+
+    /**
+     * 查询実績管理列表
+     * 
+     * @param tVehicleResults 実績管理
+     * @return 実績管理集合
+     */
+    public List<TVehicleResults> selectTVehicleResults(TVehicleResults tVehicleResults);
+
+    public List<TVehicleResults> selectTBaseOrderByCompilation(TVehicleResults tVehicleResults);
+
+    /**
+     * 新增実績管理
+     * 
+     * @param tVehicleResults 実績管理
+     * @return 结果
+     */
+    public TVehicleResults insertTBaseOrder(TVehicleResults tVehicleResults);
+
+    /**
+     * 修改実績管理
+     * 
+     * @param tVehicleResults 実績管理
+     * @return 结果
+     */
+    public int updateTBaseOrder(TVehicleResults tVehicleResults);
+
+    /**
+     * 批量删除実績管理
+     * 
+     * @param orderIds 需要删除的実績管理主键集合
+     * @return 结果
+     */
+    public int deleteTBaseOrderByOrderIds(String[] orderIds);
+
+    /**
+     * 删除実績管理信息
+     * 
+     * @param orderId 実績管理主键
+     * @return 结果
+     */
+    public int deleteTBaseOrderByOrderId(String orderId);
+}

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

@@ -1,17 +1,18 @@
 package com.yamato.bbib.service.impl;
 
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
+import com.yamato.common.constant.IdPrefixConstants;
 import com.yamato.common.utils.DateUtils;
+import com.yamato.common.utils.uuid.IdUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yamato.bbib.mapper.TBaseOrderMapper;
 import com.yamato.bbib.domain.TBaseOrder;
 import com.yamato.bbib.service.ITBaseOrderService;
 
+import static com.yamato.common.utils.DateUtils.getNowDate;
+
 /**
  * 発注管理Service业务层处理
  * 
@@ -69,10 +70,114 @@ public class TBaseOrderServiceImpl implements ITBaseOrderService
             order.setStatusText(convertStatusToText(Math.toIntExact(order.getStatus())));
         }
 
+        // 用于记录已出现过的 area 值
+        Set<String> seenAreas = new HashSet<>();
+        // 用于记录每个 area 下已出现过的 partnerName 值
+        Map<String, Set<String>> areaPartnerMap = new HashMap<>();
+
+        // 用于记录每个 area+partnerName 组合下已出现过的 orderId 值
+        Map<String, Set<Long>> areaPartnerOrderIds = new HashMap<>();
+        // 用于记录每个 area+partnerName+orderId 组合下已出现过的 sectionType 值
+        Map<String, Set<Long>> areaPartnerOrderSectionTypes = new HashMap<>();
+        // 用于记录每个 area+partnerName+orderId+sectionType 组合下已出现过的 status 值
+        Map<String, Set<Long>> areaPartnerOrderSectionStatuses = new HashMap<>();
+
+        for (TBaseOrder order : orders) {
+            String area = order.getArea();
+            String partnerName = order.getpartnerName();
+            Long orderId = Long.valueOf(order.getOrderId());
+            Long sectionType = order.getSectionType();
+            Long status = Long.valueOf(order.getStatus());
+
+            // 构建组合键
+            String areaPartnerKey = area + "|" + partnerName;
+            String areaPartnerOrderKey = areaPartnerKey + "|" + orderId;
+            String areaPartnerOrderSectionKey = areaPartnerOrderKey + "|" + sectionType;
+
+            // 处理 area 重复值
+            if (seenAreas.contains(area)) {
+                // 如果 area 已出现过，将其设为空
+                order.setArea("");
+                order.setAreaText("");
+            } else {
+                // 第一次出现的 area，记录下来
+                seenAreas.add(area);
+                // 初始化该 area 对应的 partnerName 集合
+                areaPartnerMap.put(area, new HashSet<>());
+            }
+
+            // 处理同一 area 下的 partnerName 重复值
+            if (areaPartnerMap.containsKey(area)) {
+                Set<String> seenPartners = areaPartnerMap.get(area);
+                if (seenPartners.contains(partnerName)) {
+                    // 如果在该 area 下 partnerName 已出现过，将其设为空
+                    order.setpartnerName("");
+                } else {
+                    // 第一次出现的 partnerName，记录下来
+                    seenPartners.add(partnerName);
+                }
+            }
+
+            // 处理 orderId 重复值（在相同 area 和 partnerName 组合下）
+            if (areaPartnerOrderIds.containsKey(areaPartnerKey)) {
+                Set<Long> seenOrderIds = areaPartnerOrderIds.get(areaPartnerKey);
+                if (seenOrderIds.contains(orderId)) {
+                    order.setOrderId(null);
+                } else {
+                    seenOrderIds.add(orderId);
+                }
+            } else {
+                Set<Long> seenOrderIds = new HashSet<>();
+                seenOrderIds.add(orderId);
+                areaPartnerOrderIds.put(areaPartnerKey, seenOrderIds);
+            }
+
+            // 处理 sectionType 重复值（在相同 area、partnerName 和 orderId 组合下）
+            if (areaPartnerOrderSectionTypes.containsKey(areaPartnerOrderKey)) {
+                Set<Long> seenSectionTypes = areaPartnerOrderSectionTypes.get(areaPartnerOrderKey);
+                if (seenSectionTypes.contains(sectionType)) {
+                    order.setSectionType(null);
+                    order.setSectionTypeText("");
+                } else {
+                    seenSectionTypes.add(sectionType);
+                }
+            } else {
+                Set<Long> seenSectionTypes = new HashSet<>();
+                seenSectionTypes.add(sectionType);
+                areaPartnerOrderSectionTypes.put(areaPartnerOrderKey, seenSectionTypes);
+            }
+
+            // 处理 status 重复值（在相同 area、partnerName、orderId 和 sectionType 组合下）
+            if (areaPartnerOrderSectionStatuses.containsKey(areaPartnerOrderSectionKey)) {
+                Set<Long> seenStatuses = areaPartnerOrderSectionStatuses.get(areaPartnerOrderSectionKey);
+                if (seenStatuses.contains(status)) {
+                    order.setStatus(null);
+                    order.setStatusText("");
+                } else {
+                    seenStatuses.add(status);
+                }
+            } else {
+                Set<Long> seenStatuses = new HashSet<>();
+                seenStatuses.add(status);
+                areaPartnerOrderSectionStatuses.put(areaPartnerOrderSectionKey, seenStatuses);
+            }
+        }
+
         return orders;
     }
 
     /**
+     * 查询アクション履歴
+     *
+     * @param tBaseOrder アクション履歴
+     * @return アクション履歴
+     */
+    @Override
+    public List<TBaseOrder> selectTActionHistoryList(TBaseOrder tBaseOrder) {
+        return tBaseOrderMapper.selectTActionHistoryList(tBaseOrder);
+    }
+
+    /**
      * 查询発注管理列表
      *
      * @param tBaseOrder 発注管理
@@ -109,10 +214,40 @@ public class TBaseOrderServiceImpl implements ITBaseOrderService
      * @return 结果
      */
     @Override
-    public int insertTBaseOrder(TBaseOrder tBaseOrder)
-    {
-        tBaseOrder.setCreateTime(DateUtils.getNowDate());
-        return tBaseOrderMapper.insertTBaseOrder(tBaseOrder);
+    public TBaseOrder insertTBaseOrder(TBaseOrder tBaseOrder) {
+        tBaseOrder.setActionDate(getNowDate());
+        String uuid = IdUtils.nextIdStr(IdPrefixConstants.ACTION_ID);
+        tBaseOrder.setActionId(uuid);
+        tBaseOrder.setActionKind(String.valueOf(1));
+
+        switch (tBaseOrder.getActionType()) {
+            case "10":
+                tBaseOrder.setActionTitle("指示書連携");
+                break;
+            case "11":
+                tBaseOrder.setActionTitle("コメント登録");
+                break;
+            case "12":
+                tBaseOrder.setActionTitle("コメント受領");
+                break;
+            case "13":
+                tBaseOrder.setActionTitle("コメント送付");
+                break;
+            case "14":
+                tBaseOrder.setActionTitle("指示書送付");
+                break;
+            case "15":
+                tBaseOrder.setActionTitle("キャンセル連絡");
+                break;
+            case "16":
+                tBaseOrder.setActionTitle("メモ登録");
+                break;
+        }
+
+        tBaseOrderMapper.insertTBaseOrder(tBaseOrder);
+
+        // 返回完整的实体对象（包含所有字段）
+        return tBaseOrder;
     }
 
     /**
@@ -124,7 +259,7 @@ public class TBaseOrderServiceImpl implements ITBaseOrderService
     @Override
     public int updateTBaseOrder(TBaseOrder tBaseOrder)
     {
-        tBaseOrder.setUpdateTime(DateUtils.getNowDate());
+        tBaseOrder.setUpdateTime(getNowDate());
         return tBaseOrderMapper.updateTBaseOrder(tBaseOrder);
     }
 

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

@@ -0,0 +1,319 @@
+package com.yamato.bbib.service.impl;
+
+import com.yamato.common.constant.IdPrefixConstants;
+import com.yamato.common.utils.uuid.IdUtils;
+import com.yamato.bbib.mapper.TVehicleResultsMapper;
+import com.yamato.bbib.domain.TVehicleResults;
+import com.yamato.bbib.service.ITVehicleResultsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+import static com.yamato.common.utils.DateUtils.getNowDate;
+
+/**
+ * 実績管理Service业务层处理
+ * 
+ * @author kuronekoyamato
+ * @date 2025-06-13
+ */
+@Service
+public class TVehicleRssultsImpl implements ITVehicleResultsService
+{
+    @Autowired
+    private TVehicleResultsMapper tVehicleResultsMapper;
+
+    /**
+     * 查询実績管理
+     * 
+     * @param tVehicleResults 実績管理主键
+     * @return 実績管理
+     */
+    @Override
+    public TVehicleResults selectTBaseOrderByOrderId(TVehicleResults tVehicleResults) {
+        TVehicleResults order = tVehicleResultsMapper.selectTBaseOrderByOrderId(tVehicleResults);
+
+        if (order != null) {
+            // 转换状态字段为文本描述
+            if (order.getSectionType() != null) {
+                order.setSectionTypeText(convertSectionTypeToText(Math.toIntExact(order.getSectionType())));
+            }
+
+            if (order.getArea() != null) {
+                order.setAreaText(convertAreaToText(Integer.parseInt(order.getArea())));
+            }
+
+            if (order.getStatus() != null) {
+                order.setStatusText(convertStatusToText(Math.toIntExact(order.getStatus())));
+            }
+        }
+
+        return order;
+    }
+
+
+    /**
+     * 查询実績管理列表
+     * 
+     * @param tVehicleResults 実績管理
+     * @return 実績管理
+     */
+    @Override
+    public List<TVehicleResults> selectTVehicleResults(TVehicleResults tVehicleResults) {
+        List<TVehicleResults> orders = tVehicleResultsMapper.selectTVehicleResults(tVehicleResults);
+
+        for (TVehicleResults order : orders) {
+            order.setSectionTypeText(convertSectionTypeToText(Math.toIntExact(order.getSectionType())));
+            order.setAreaText(convertAreaToText(Integer.parseInt(order.getArea())));
+            order.setStatusText(convertStatusToText(Math.toIntExact(order.getStatus())));
+        }
+
+        // 用于记录已出现过的 area 值
+        Set<String> seenAreas = new HashSet<>();
+        // 用于记录每个 area 下已出现过的 partnerName 值
+        Map<String, Set<String>> areaPartnerMap = new HashMap<>();
+
+        // 用于记录每个 area+partnerName 组合下已出现过的 orderId 值
+        Map<String, Set<Long>> areaPartnerOrderIds = new HashMap<>();
+        // 用于记录每个 area+partnerName+orderId 组合下已出现过的 sectionType 值
+        Map<String, Set<Long>> areaPartnerOrderSectionTypes = new HashMap<>();
+        // 用于记录每个 area+partnerName+orderId+sectionType 组合下已出现过的 status 值
+        Map<String, Set<Long>> areaPartnerOrderSectionStatuses = new HashMap<>();
+
+        for (TVehicleResults order : orders) {
+            String area = order.getArea();
+            String partnerName = order.getpartnerName();
+            Long orderId = Long.valueOf(order.getresultId());
+            Long sectionType = order.getSectionType();
+            Long status = Long.valueOf(order.getStatus());
+
+            // 构建组合键
+            String areaPartnerKey = area + "|" + partnerName;
+            String areaPartnerOrderKey = areaPartnerKey + "|" + orderId;
+            String areaPartnerOrderSectionKey = areaPartnerOrderKey + "|" + sectionType;
+
+            // 处理 area 重复值
+            if (seenAreas.contains(area)) {
+                // 如果 area 已出现过，将其设为空
+                order.setArea("");
+                order.setAreaText("");
+            } else {
+                // 第一次出现的 area，记录下来
+                seenAreas.add(area);
+                // 初始化该 area 对应的 partnerName 集合
+                areaPartnerMap.put(area, new HashSet<>());
+            }
+
+            // 处理同一 area 下的 partnerName 重复值
+            if (areaPartnerMap.containsKey(area)) {
+                Set<String> seenPartners = areaPartnerMap.get(area);
+                if (seenPartners.contains(partnerName)) {
+                    // 如果在该 area 下 partnerName 已出现过，将其设为空
+                    order.setpartnerName("");
+                } else {
+                    // 第一次出现的 partnerName，记录下来
+                    seenPartners.add(partnerName);
+                }
+            }
+
+            // 处理 orderId 重复值（在相同 area 和 partnerName 组合下）
+            if (areaPartnerOrderIds.containsKey(areaPartnerKey)) {
+                Set<Long> seenOrderIds = areaPartnerOrderIds.get(areaPartnerKey);
+                if (seenOrderIds.contains(orderId)) {
+                    order.setresultId(null);
+                } else {
+                    seenOrderIds.add(orderId);
+                }
+            } else {
+                Set<Long> seenOrderIds = new HashSet<>();
+                seenOrderIds.add(orderId);
+                areaPartnerOrderIds.put(areaPartnerKey, seenOrderIds);
+            }
+
+            // 处理 sectionType 重复值（在相同 area、partnerName 和 orderId 组合下）
+            if (areaPartnerOrderSectionTypes.containsKey(areaPartnerOrderKey)) {
+                Set<Long> seenSectionTypes = areaPartnerOrderSectionTypes.get(areaPartnerOrderKey);
+                if (seenSectionTypes.contains(sectionType)) {
+                    order.setSectionType(null);
+                    order.setSectionTypeText("");
+                } else {
+                    seenSectionTypes.add(sectionType);
+                }
+            } else {
+                Set<Long> seenSectionTypes = new HashSet<>();
+                seenSectionTypes.add(sectionType);
+                areaPartnerOrderSectionTypes.put(areaPartnerOrderKey, seenSectionTypes);
+            }
+
+            // 处理 status 重复值（在相同 area、partnerName、orderId 和 sectionType 组合下）
+            if (areaPartnerOrderSectionStatuses.containsKey(areaPartnerOrderSectionKey)) {
+                Set<Long> seenStatuses = areaPartnerOrderSectionStatuses.get(areaPartnerOrderSectionKey);
+                if (seenStatuses.contains(status)) {
+                    order.setStatus(null);
+                    order.setStatusText("");
+                } else {
+                    seenStatuses.add(status);
+                }
+            } else {
+                Set<Long> seenStatuses = new HashSet<>();
+                seenStatuses.add(status);
+                areaPartnerOrderSectionStatuses.put(areaPartnerOrderSectionKey, seenStatuses);
+            }
+        }
+
+        return orders;
+    }
+
+    /**
+     * 查询アクション履歴
+     *
+     * @param tVehicleResults アクション履歴
+     * @return アクション履歴
+     */
+    @Override
+    public List<TVehicleResults> selectTActionHistoryList(TVehicleResults tVehicleResults) {
+        return tVehicleResultsMapper.selectTActionHistoryList(tVehicleResults);
+    }
+
+    /**
+     * 查询実績管理列表
+     *
+     * @param tVehicleResults 実績管理
+     * @return 実績管理
+     */
+    @Override
+    public List<TVehicleResults> selectTBaseOrderByCompilation(TVehicleResults tVehicleResults) {
+        List<TVehicleResults> orderList  = tVehicleResultsMapper.selectTBaseOrderCompilationList(tVehicleResults);
+
+        Map<Integer, String> weekDayMap = new HashMap<>();
+        weekDayMap.put(1, "月");
+        weekDayMap.put(2, "火");
+        weekDayMap.put(3, "水");
+        weekDayMap.put(4, "木");
+        weekDayMap.put(5, "金");
+        weekDayMap.put(6, "土");
+        weekDayMap.put(7, "日");
+
+        for (TVehicleResults order : orderList) {
+            Integer runWeekDay = order.getRunWeekDay();
+            if (runWeekDay != null && weekDayMap.containsKey(runWeekDay)) {
+                order.setRunWeekDayStr(weekDayMap.get(runWeekDay));
+            } else {
+                order.setRunWeekDayStr(runWeekDay != null ? String.valueOf(runWeekDay) : "");
+            }
+        }
+        return orderList;
+    }
+
+    /**
+     * 新增実績管理
+     * 
+     * @param tVehicleResults 実績管理
+     * @return 结果
+     */
+    @Override
+    public TVehicleResults insertTBaseOrder(TVehicleResults tVehicleResults) {
+        tVehicleResults.setActionDate(getNowDate());
+        String uuid = IdUtils.nextIdStr(IdPrefixConstants.ACTION_ID);
+        tVehicleResults.setActionId(uuid);
+        tVehicleResults.setActionKind(String.valueOf(1));
+
+        switch (tVehicleResults.getActionType()) {
+            case "10":
+                tVehicleResults.setActionTitle("指示書連携");
+                break;
+            case "11":
+                tVehicleResults.setActionTitle("コメント登録");
+                break;
+            case "12":
+                tVehicleResults.setActionTitle("コメント受領");
+                break;
+            case "13":
+                tVehicleResults.setActionTitle("コメント送付");
+                break;
+            case "14":
+                tVehicleResults.setActionTitle("指示書送付");
+                break;
+            case "15":
+                tVehicleResults.setActionTitle("キャンセル連絡");
+                break;
+            case "16":
+                tVehicleResults.setActionTitle("メモ登録");
+                break;
+        }
+
+        tVehicleResultsMapper.insertTBaseOrder(tVehicleResults);
+
+        // 返回完整的实体对象（包含所有字段）
+        return tVehicleResults;
+    }
+
+    /**
+     * 修改実績管理
+     * 
+     * @param tVehicleResults 実績管理
+     * @return 结果
+     */
+    @Override
+    public int updateTBaseOrder(TVehicleResults tVehicleResults)
+    {
+        tVehicleResults.setUpdateTime(getNowDate());
+        return tVehicleResultsMapper.updateTBaseOrder(tVehicleResults);
+    }
+
+    /**
+     * 批量删除実績管理
+     * 
+     * @param orderIds 需要删除的実績管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBaseOrderByOrderIds(String[] orderIds)
+    {
+        return tVehicleResultsMapper.deleteTBaseOrderByOrderIds(orderIds);
+    }
+
+    /**
+     * 删除実績管理信息
+     * 
+     * @param orderId 実績管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBaseOrderByOrderId(String orderId)
+    {
+        return tVehicleResultsMapper.deleteTBaseOrderByOrderId(orderId);
+    }
+
+    // 转换方法
+    private String convertSectionTypeToText(Integer sectionType) {
+        if (sectionType == null) return null;
+        switch (sectionType) {
+            case 1: return "横持";
+            case 2: return "輸送";
+            default: return String.valueOf(sectionType);
+        }
+    }
+
+    private String convertAreaToText(Integer area) {
+        if (area == null) return null;
+        switch (area) {
+            case 11: return "関東";
+            case 12: return "関西";
+            case 13: return "中部";
+            default: return String.valueOf(area);
+        }
+    }
+
+    private String convertStatusToText(Integer status) {
+        if (status == null) return null;
+        switch (status) {
+            case 1: return "日別傭車費用データ未受領";
+            case 2: return "日別傭車費用データ受領済";
+            case 3: return "輸送パートナー未承諾";
+            case 4: return "輸送パートナー確認済";
+            default: return String.valueOf(status);
+        }
+    }
+}

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

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="version"    column="version"    />
         <result property="area"    column="area"    />
         <result property="sectionType"    column="section_type"    />
-        <result property="status"    column="status"    />
+        <result property="orderStatus"    column="order_status"    />
         <result property="instructionDeliveryDate"    column="instruction_delivery_date"    />
         <result property="commitDate"    column="commit_date"    />
         <result property="delFlg"    column="del_flg"    />
@@ -35,10 +35,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lineName" column="line_name" />
         <result property="changeFlag" column="change_flag" />
         <result property="newData" column="new_data" />
+        <result property="actionId" column="action_id" />
+        <result property="actionCode" column="action_code" />
+        <result property="actionDate" column="action_date" />
+        <result property="actionKind" column="action_kind" />
+        <result property="actionType" column="action_type" />
+        <result property="actionTitle" column="action_title" />
+        <result property="actionComment" column="action_comment" />
     </resultMap>
 
     <sql id="selectTBaseOrderVo">
-        select order_id, partner_code, month_year, version, area, section_type, status, instruction_delivery_date, commit_date, del_flg, create_by, create_time, update_by, update_time, remark from t_base_order
+        select order_id, partner_code, month_year, version, area, section_type, order_status, instruction_delivery_date, commit_date, del_flg, create_by, create_time, update_by, update_time, remark from t_base_order
     </sql>
 
     <sql id="selectTBaseOrderParamVo">
@@ -49,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tb.version,
             tb.area,
             tb.section_type,
-            tb.status,
+            tb.order_status,
             tb.instruction_delivery_date,
             tb.commit_date,
             tb.del_flg,
@@ -71,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tb.version,
             tb.area,
             tb.section_type,
-            tb.status,
+            tb.order_status,
             tb.instruction_delivery_date,
             tb.commit_date,
             tb.del_flg,
@@ -88,6 +95,7 @@ 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,
@@ -98,6 +106,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join m_line_code mlc on tbi.line_id = mlc.line_id
     </sql>
 
+    <select id="selectTActionHistoryList" parameterType="TBaseOrder" resultMap="TBaseOrderResult">
+        select action_date,
+              action_title,
+               action_type,
+              action_comment
+        from t_action_history
+        where
+            action_code = #{orderId}
+    </select>
+
     <select id="selectTBaseOrderList" parameterType="TBaseOrder" resultMap="TBaseOrderResult">
         <include refid="selectTBaseOrderParamVo"/>
         <where>
@@ -115,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
             <if test="statusList != null and !statusList.isEmpty()">
-                and status in
+                and order_status in
                 <foreach collection="statusList" item="statusItem" open="(" separator="," close=")">
                     #{statusItem}
                 </foreach>
@@ -123,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderId != null "> and order_id = #{orderId}</if>
             <if test="partnerCode != null "> and tb.partner_code = #{partnerCode}</if>
         </where>
+        order by tb.area asc
     </select>
 
     <select id="selectTBaseOrderCompilationList" parameterType="TBaseOrder" resultMap="TBaseOrderResult">
@@ -136,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
@@ -151,17 +171,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertTBaseOrder" parameterType="TBaseOrder">
-        insert into t_base_order
+        insert into t_action_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="orderId != null">order_id,</if>
-            <if test="partnerCode != null and partnerCode != ''">partner_code,</if>
-            <if test="monthYear != null">month_year,</if>
-            <if test="version != null">version,</if>
-            <if test="area != null">area,</if>
-            <if test="sectionType != null">section_type,</if>
-            <if test="status != null">status,</if>
-            <if test="instructionDeliveryDate != null">instruction_delivery_date,</if>
-            <if test="commitDate != null">commit_date,</if>
+            <if test="actionId != null">action_id,</if>
+            <if test="actionCode != null and partnerCode != ''">action_code,</if>
+            <if test="actionDate != null">action_date,</if>
+            <if test="actionKind != null">action_kind,</if>
+            <if test="actionType != null">action_type,</if>
+            <if test="actionTitle != null">action_title,</if>
+            <if test="actionComment != null">action_comment,</if>
             <if test="delFlg != null">del_flg,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -170,15 +188,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="orderId != null">#{orderId},</if>
-            <if test="partnerCode != null and partnerCode != ''">#{partnerCode},</if>
-            <if test="monthYear != null">#{monthYear},</if>
-            <if test="version != null">#{version},</if>
-            <if test="area != null">#{area},</if>
-            <if test="sectionType != null">#{sectionType},</if>
-            <if test="status != null">#{status},</if>
-            <if test="instructionDeliveryDate != null">#{instructionDeliveryDate},</if>
-            <if test="commitDate != null">#{commitDate},</if>
+            <if test="actionId != null">#{actionId},</if>
+            <if test="actionCode != null and actionCode != ''">#{actionCode},</if>
+            <if test="actionDate != null">#{actionDate},</if>
+            <if test="actionKind != null">#{actionKind},</if>
+            <if test="actionType != null">#{actionType},</if>
+            <if test="actionTitle != null">#{actionTitle},</if>
+            <if test="actionComment != null">#{actionComment},</if>
             <if test="delFlg != null">#{delFlg},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>

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

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yamato.bbib.mapper.TVehicleResultsMapper">
+    
+    <resultMap type="TVehicleResults" id="TVehicleResult">
+        <result property="resultId"    column="result_id"    />
+        <result property="partnerCode"    column="partner_code"    />
+        <result property="monthYear"    column="month_year"    />
+        <result property="area"    column="area"    />
+        <result property="sectionType"    column="section_type"    />
+        <result property="resultStatus"    column="result_status"    />
+        <result property="delFlg"    column="del_flg"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="partnerName" column="partner_name" />
+        <result property="lineId" column="line_id" />
+        <result property="wareHouseLocation" column="ware_house_location" />
+        <result property="wareHouseTime" column="ware_house_time" />
+        <result property="vehicleTon" column="vehicle_ton" />
+        <result property="monthPlanId" column="month_plan_id" />
+        <result property="runDay" column="run_day" />
+        <result property="runWeekDay" column="run_week_day" />
+        <result property="originalData" column="original_data" />
+        <result property="departureCode" column="departure_code" />
+        <result property="arrivalCode" column="arrival_code" />
+        <result property="systemCode" column="system_code" />
+        <result property="lineName" column="line_name" />
+        <result property="changeFlag" column="change_flag" />
+        <result property="newData" column="new_data" />
+        <result property="actionId" column="action_id" />
+        <result property="actionCode" column="action_code" />
+        <result property="actionDate" column="action_date" />
+        <result property="actionKind" column="action_kind" />
+        <result property="actionType" column="action_type" />
+        <result property="actionTitle" column="action_title" />
+        <result property="actionComment" column="action_comment" />
+    </resultMap>
+
+    <sql id="selectTVehicleResultsVo">
+        select result_id, partner_code, month_year, area, section_type, order_status, del_flg, create_by, create_time, update_by, update_time, remark from t_vehicle_results
+    </sql>
+
+    <sql id="selectTVehicleResultsParamVo">
+        select
+            tb.result_id,
+            tb.partner_code,
+            tb.month_year,
+            tb.area,
+            tb.section_type,
+            tb.result_status,
+            tb.del_flg,
+            tb.create_by,
+            tb.create_time,
+            tb.update_by,
+            tb.update_time,
+            tb.remark,
+            mtp.partner_name
+        from t_vehicle_results tb
+                 left join m_transport_partner mtp on tb.partner_code = mtp.partner_code
+    </sql>
+
+    <sql id="selectTVehicleResultsCompilationParamVo">
+        select
+            tb.result_id,
+            tb.partner_code,
+            tb.month_year,
+            tb.area,
+            tb.section_type,
+            tb.order_status,
+            tb.del_flg,
+            tb.create_by,
+            tb.create_time,
+            tb.update_by,
+            tb.update_time,
+            tb.remark,
+            tbi.vehicle_router,
+            tbi.line_name,
+            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
+        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
+    </sql>
+
+    <select id="selectTActionHistoryList" parameterType="TVehicleResults" resultMap="TVehicleResult">
+        select action_date,
+              action_title,
+               action_type,
+              action_comment
+        from t_action_history
+        where
+            action_code = #{orderId}
+    </select>
+
+    <select id="selectTVehicleResults" parameterType="TVehicleResults" resultMap="TVehicleResult">
+        <include refid="selectTVehicleResultsParamVo"/>
+        <where>
+            <if test="monthYear != null  and monthYear != ''"> and month_year = #{monthYear}</if>
+            <if test="sectionTypeList != null and !sectionTypeList.isEmpty()">
+                and section_type in
+                <foreach collection="sectionTypeList" item="sectionTypeItem" open="(" separator="," close=")">
+                    #{sectionTypeItem}
+                </foreach>
+            </if>
+            <if test="areaList != null and !areaList.isEmpty()">
+                and area in
+                <foreach collection="areaList" item="areaItem" open="(" separator="," close=")">
+                    #{areaItem}
+                </foreach>
+            </if>
+            <if test="statusList != null and !statusList.isEmpty()">
+                and result_status in
+                <foreach collection="statusList" item="statusItem" open="(" separator="," close=")">
+                    #{statusItem}
+                </foreach>
+            </if>
+            <if test="resultId != null "> and result_id = #{resultId}</if>
+            <if test="partnerCode != null "> and tb.partner_code = #{partnerCode}</if>
+        </where>
+        order by tb.area asc
+    </select>
+
+    <select id="selectTBaseOrderCompilationList" 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="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>
+        </where>
+        order by tmp.run_day asc
+    </select>
+    
+    <select id="selectTBaseOrderByOrderId" parameterType="TVehicleResults" resultMap="TVehicleResult">
+        <include refid="selectTVehicleResultsParamVo"/>
+        where order_id = #{orderId}
+    </select>
+
+    <insert id="insertTBaseOrder" parameterType="TVehicleResults">
+        insert into t_action_history
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="actionId != null">action_id,</if>
+            <if test="actionCode != null and partnerCode != ''">action_code,</if>
+            <if test="actionDate != null">action_date,</if>
+            <if test="actionKind != null">action_kind,</if>
+            <if test="actionType != null">action_type,</if>
+            <if test="actionTitle != null">action_title,</if>
+            <if test="actionComment != null">action_comment,</if>
+            <if test="delFlg != null">del_flg,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="actionId != null">#{actionId},</if>
+            <if test="actionCode != null and actionCode != ''">#{actionCode},</if>
+            <if test="actionDate != null">#{actionDate},</if>
+            <if test="actionKind != null">#{actionKind},</if>
+            <if test="actionType != null">#{actionType},</if>
+            <if test="actionTitle != null">#{actionTitle},</if>
+            <if test="actionComment != null">#{actionComment},</if>
+            <if test="delFlg != null">#{delFlg},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBaseOrder" parameterType="TVehicleResults">
+        update t_month_plan
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="changeFlag != null">change_flag = #{changeFlag},</if>
+            <if test="newData != null">new_data = #{newData},</if>
+        </trim>
+        where month_plan_id = #{monthPlanId}
+        and run_day = #{runDay}
+        and run_week_day = #{runWeekDay}
+    </update>
+
+    <delete id="deleteTBaseOrderByOrderId" parameterType="String">
+        delete from t_base_order where order_id = #{orderId}
+    </delete>
+
+    <delete id="deleteTBaseOrderByOrderIds" parameterType="String">
+        delete from t_base_order where order_id in 
+        <foreach item="orderId" collection="array" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+    </delete>
+</mapper>

yamato-common/src/main/java/com/yamato/common/constant/IdPrefixConstants.java

@@ -18,4 +18,9 @@ public class IdPrefixConstants {
      * トークンシーケンスタイプ
      */
     public static final String TOKEN_ID = "T";
+
+    /**
+     * アクション履歴ンスタイプ
+     */
+    public static final String ACTION_ID = "A";
 }