全量同步流程优化（部分字段调整）

app/Models/DrugReportInfo.php

@@ -13,8 +13,8 @@ use Illuminate\Support\Facades\DB;
  * App\Models\DrugReportInfo
  *
  * @property int $id
- * @property string $drug_report_id 报告ID（来源于querydrugreport）
- * @property string $report_id 报告ID
+ * @property string $report_id 报告ID（来源于querydrugreport.drug_report_id）
+ * @property string $report_v2_id 报告ID（来源querysealdrugreport.drug_report_v2_id）
  * @property string $report_name 报告名称
  * @property string $report_no 报告编号
  * @property string $report_date 报告日期
@@ -37,7 +37,8 @@ use Illuminate\Support\Facades\DB;
  * @property string $ass_ref_ent_id 委托企业ID
  * @property string $from_ref_ent_id 发货企业ID
  * @property string $from_ent_name 发货企业
- * @property string $sealed_report_url 盖章报告URL
+ * @property string $report_url 报告URL
+ * @property string $seal_report_url 盖章报告URL
  * @property string $report_sign_status 报告签收状态(0-待发送、2-待签收、3-已签收、4-已拒绝、7-对方已签收/更正待处理、13-对方已拒绝/更正待签收）
  * @property array|null $raw_data 报告待签收原始数据（来源querydrugreport）
  * @property array|null $seal_raw_data 报告已签收原始数据（来源querysealdrugreport）
@@ -62,7 +63,6 @@ use Illuminate\Support\Facades\DB;
  * @method static Builder|DrugReportInfo whereCreateTime($value)
  * @method static Builder|DrugReportInfo whereDrugId($value)
  * @method static Builder|DrugReportInfo whereDrugName($value)
- * @method static Builder|DrugReportInfo whereDrugReportId($value)
  * @method static Builder|DrugReportInfo whereFromEntName($value)
  * @method static Builder|DrugReportInfo whereFromRefEntId($value)
  * @method static Builder|DrugReportInfo whereId($value)
@@ -83,8 +83,10 @@ use Illuminate\Support\Facades\DB;
  * @method static Builder|DrugReportInfo whereReportName($value)
  * @method static Builder|DrugReportInfo whereReportNo($value)
  * @method static Builder|DrugReportInfo whereReportSignStatus($value)
+ * @method static Builder|DrugReportInfo whereReportUrl($value)
+ * @method static Builder|DrugReportInfo whereReportV2Id($value)
  * @method static Builder|DrugReportInfo whereSealRawData($value)
- * @method static Builder|DrugReportInfo whereSealedReportUrl($value)
+ * @method static Builder|DrugReportInfo whereSealReportUrl($value)
  * @method static Builder|DrugReportInfo whereUpdateTime($value)
  * @mixin \Eloquent
  */
@@ -110,7 +112,6 @@ class DrugReportInfo extends Model
     protected $hidden = [
         'create_time',
         'update_time',
-        'drug_report_id',
         'pkg_ratio_list',
         'raw_data',
         'seal_raw_data',

app/Services/SyncSealDrugReportService.php

@@ -269,8 +269,7 @@ class SyncSealDrugReportService
     {
         return array_map(function ($item) {
             return [
-                'drug_report_id' => $item['drug_report_id'] ?? '',
-                'report_name' => $item['file_name'] ?? '',
+                'report_id' => $item['drug_report_id'] ?? '',
                 'batch_no' => $item['produce_batch_no'] ?? '',
                 'drug_id' => $item['drug_id'] ?? '',
                 'drug_name' => $item['physic_name'] ?? '',
@@ -288,7 +287,8 @@ class SyncSealDrugReportService
                 'ass_ref_ent_id' => $item['ass_ref_ent_id'] ?? '',
                 'from_ref_ent_id' => $item['from_ref_ent_id'] ?? '',
                 'from_ent_name' => $item['from_ent_name'] ?? '',
-                'sealed_report_url' => $item['sealed_report_url'] ?? '',
+                'report_url' => $item['sealed_report_url'] ?? '',
+//                'file_name' => $item['file_name'] ?? '',
                 'report_sign_status' => $item['drug_report_sign_status'] ?? '',
                 'raw_data' => json_encode($item ?? [], JSON_UNESCAPED_UNICODE),
             ];
@@ -304,7 +304,7 @@ class SyncSealDrugReportService
     {
         return array_map(function ($item) {
             return [
-                'report_id' => $item['report_id'] ?? '',
+                'report_v2_id' => $item['drug_report_v2_id'] ?? '',
                 'report_name' => $item['drug_report_name'] ?? '',
                 'report_no' => $item['report_no'] ?? '',
                 'report_date' => $item['report_date'] ?? '',
@@ -315,7 +315,7 @@ class SyncSealDrugReportService
                 'pkg_spec' => $item['pkg_spec'] ?? '',
                 'prepn_spec' => $item['prepn_spec'] ?? '',
                 'pkg_ratio_list' => json_encode($item['pkg_ratio_list'] ?? [], JSON_UNESCAPED_UNICODE),
-                'sealed_report_url' => $item['sealed_report_url'] ?? '',
+                'seal_report_url' => $item['sealed_report_url'] ?? '',
                 'seal_raw_data' => json_encode($item ?? [], JSON_UNESCAPED_UNICODE),
             ];
         }, $data);
@@ -329,6 +329,8 @@ class SyncSealDrugReportService
     protected function correctDrugReportOptHistory(array $data): array
     {
         return array_map(function ($item) {
+
+
             return [
                 'batch_no' => $item['batch_no'] ?? '',
                 'drug_id' => $item['drug_id'] ?? '',