E-1 完了サマリー

実施内容
#	変更内容	ファイル
1	OfficialChusankanField に 11 フィールド追加（17列化）	models.py
2	中山間インポート: 17 列すべて読み込み対応	views.py
3	共済インポート: 面積カラム名不一致バグ修正 + a→m2 変換(×100)	views.py
4	シリアライザに 11 フィールド追加	serializers.py
5	共済 PDF: A4 縦、表形式、@page 設定、ページ番号、中国語除去	kyosai_template.html
6	中山間 PDF: A4 横、表形式、@page 設定、ページ番号、中国語除去	chusankan_template.html
7	PDF 生成ロジック: フラットテーブル、null 安全、prefetch_related	reports/views.py
8	既存データ再インポート（共済面積修正 + 中山間 17 列埋め）	—
9	Playwright E2E テスト 11 件全 PASS	verify-fixes.spec.ts
追加発見・修正したバグ
共済 ODS の 本地面積 (m2) カラム名にスペースが含まれ、インポート時に面積が全件 0 になっていた
面積の単位がアール(a)であることが判明。m2 への変換 (×100) を追加
PDF は http://localhost:3000/reports からダウンロードして確認できます。

backend/apps/fields/migrations/0006_e1c_chusankan_17_fields.py

@@ -0,0 +1,78 @@
+# Generated by Django 5.0 on 2026-02-17 06:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fields', '0005_c2_kyosai_unique_together_c4_area_to_m2_integer'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='base_amount',
+            field=models.IntegerField(blank=True, null=True, verbose_name='基本金額'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='branch_num',
+            field=models.CharField(blank=True, max_length=20, null=True, verbose_name='枝番'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='chusankan_flag',
+            field=models.CharField(blank=True, max_length=10, null=True, verbose_name='中山間フラグ'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='land_type',
+            field=models.CharField(blank=True, max_length=20, null=True, verbose_name='地目'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='manager',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='協定管理者'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='original_crop',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='作付け品目'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='owner',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='所有者'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='planting_area',
+            field=models.IntegerField(blank=True, null=True, verbose_name='植栽面積(m2)'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='slope',
+            field=models.CharField(blank=True, max_length=20, null=True, verbose_name='傾斜度'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='smart_agri_addition',
+            field=models.IntegerField(blank=True, null=True, verbose_name='スマート農業加算額'),
+        ),
+        migrations.AddField(
+            model_name='officialchusankanfield',
+            name='steep_slope_addition',
+            field=models.IntegerField(blank=True, null=True, verbose_name='超急傾斜加算額'),
+        ),
+        migrations.AlterField(
+            model_name='officialchusankanfield',
+            name='area',
+            field=models.IntegerField(default=0, verbose_name='農地面積(m2)'),
+        ),
+        migrations.AlterField(
+            model_name='officialchusankanfield',
+            name='payment_amount',
+            field=models.IntegerField(blank=True, null=True, verbose_name='交付金額'),
+        ),
+    ]

backend/apps/fields/models.py

@@ -20,11 +20,22 @@ class OfficialKyosaiField(models.Model):
 
 class OfficialChusankanField(models.Model):
     c_id = models.CharField(max_length=20, unique=True, verbose_name="中山間ID")
+    chusankan_flag = models.CharField(max_length=10, blank=True, null=True, verbose_name="中山間フラグ")
     oaza = models.CharField(max_length=100, verbose_name="大字")
     aza = models.CharField(max_length=100, verbose_name="字")
     chiban = models.CharField(max_length=50, verbose_name="地番")
-    area = models.IntegerField(default=0, verbose_name="面積(m2)")
-    payment_amount = models.IntegerField(blank=True, null=True, verbose_name="支払金額")
+    branch_num = models.CharField(max_length=20, blank=True, null=True, verbose_name="枝番")
+    land_type = models.CharField(max_length=20, blank=True, null=True, verbose_name="地目")
+    area = models.IntegerField(default=0, verbose_name="農地面積(m2)")
+    planting_area = models.IntegerField(blank=True, null=True, verbose_name="植栽面積(m2)")
+    original_crop = models.CharField(max_length=100, blank=True, null=True, verbose_name="作付け品目")
+    manager = models.CharField(max_length=100, blank=True, null=True, verbose_name="協定管理者")
+    owner = models.CharField(max_length=100, blank=True, null=True, verbose_name="所有者")
+    slope = models.CharField(max_length=20, blank=True, null=True, verbose_name="傾斜度")
+    base_amount = models.IntegerField(blank=True, null=True, verbose_name="基本金額")
+    steep_slope_addition = models.IntegerField(blank=True, null=True, verbose_name="超急傾斜加算額")
+    smart_agri_addition = models.IntegerField(blank=True, null=True, verbose_name="スマート農業加算額")
+    payment_amount = models.IntegerField(blank=True, null=True, verbose_name="交付金額")
 
     class Meta:
         verbose_name = "中山間マスタ"

backend/apps/fields/serializers.py

@@ -11,7 +11,10 @@ class OfficialKyosaiFieldSerializer(serializers.ModelSerializer):
 class OfficialChusankanFieldSerializer(serializers.ModelSerializer):
     class Meta:
         model = OfficialChusankanField
-        fields = ['id', 'c_id', 'oaza', 'aza', 'chiban', 'area', 'payment_amount']
+        fields = ['id', 'c_id', 'chusankan_flag', 'oaza', 'aza', 'chiban', 'branch_num',
+                  'land_type', 'area', 'planting_area', 'original_crop', 'manager', 'owner',
+                  'slope', 'base_amount', 'steep_slope_addition', 'smart_agri_addition',
+                  'payment_amount']
 
 
 class FieldSerializer(serializers.ModelSerializer):

backend/apps/fields/views.py

@@ -32,21 +32,33 @@ def import_kyosai_master(request):
     try:
         df = pd.read_excel(ods_file, engine='odf')
         df.columns = df.columns.str.strip()
-        
+
+        # ODS カラム名 "本地面積 (m2)" のスペース有無に対応
+        area_col = None
+        for col in df.columns:
+            if '本地面積' in col:
+                area_col = col
+                break
+
         created_count = 0
         updated_count = 0
 
         for _, row in df.iterrows():
             k_num = str(row.get('耕地番号', '')).strip() if pd.notna(row.get('耕地番号')) else ''
             s_num = str(row.get('分筆番号', '')).strip() if pd.notna(row.get('分筆番号')) else ''
-            
+
             if not k_num:
                 continue
 
+            area_val = 0
+            if area_col and pd.notna(row.get(area_col)):
+                # ODS の値はアール(a)単位。m2 に変換 (1a = 100m2)
+                area_val = int(float(row.get(area_col)) * 100)
+
             defaults = {
                 'address': str(row.get('地名 地番', '')).strip() if pd.notna(row.get('地名 地番')) else '',
                 'kanji_name': str(row.get('漢字地名', '')).strip() if pd.notna(row.get('漢字地名')) else '',
-                'area': int(float(row.get('本地面積(m2)', 0))) if pd.notna(row.get('本地面積(m2)')) else 0,
+                'area': area_val,
             }
 
             obj, created = OfficialKyosaiField.objects.update_or_create(
@@ -169,37 +181,50 @@ def import_chusankan_master(request):
 
     ods_file = request.FILES['file']
 
+    def safe_str(val, default=''):
+        return str(val).strip() if pd.notna(val) else default
+
+    def safe_int(val, default=None):
+        if pd.isna(val):
+            return default
+        try:
+            return int(float(val))
+        except (ValueError, TypeError):
+            return default
+
     try:
         df = pd.read_excel(ods_file, engine='odf')
         df.columns = df.columns.str.strip()
-        
+
         created_count = 0
         updated_count = 0
 
         for _, row in df.iterrows():
             raw_id = row.get('ID')
             c_id = str(raw_id).strip() if pd.notna(raw_id) else ''
-            
+
             if not c_id:
                 continue
             if not any(char.isdigit() for char in c_id):
                 continue
 
-            try:
-                payment_amount_val = row.get('交付金額')
-                if pd.notna(payment_amount_val):
-                    payment_amount = int(payment_amount_val)
-                else:
-                    payment_amount = None
-            except (ValueError, TypeError):
-                payment_amount = None
-
             defaults = {
-                'oaza': str(row.get('大字', '')).strip() if pd.notna(row.get('大字')) else '',
-                'aza': str(row.get('字', '')).strip() if pd.notna(row.get('字')) else '',
-                'chiban': str(row.get('地番', '')).strip() if pd.notna(row.get('地番')) else '',
-                'area': int(float(row.get('農地面積', 0))) if pd.notna(row.get('農地面積')) else 0,
-                'payment_amount': payment_amount,
+                'chusankan_flag': safe_str(row.get('中山間')) or None,
+                'oaza': safe_str(row.get('大字')),
+                'aza': safe_str(row.get('字')),
+                'chiban': safe_str(row.get('地番')),
+                'branch_num': safe_str(row.get('枝番')) or None,
+                'land_type': safe_str(row.get('地目')) or None,
+                'area': safe_int(row.get('農地面積'), 0),
+                'planting_area': safe_int(row.get('植栽面積')),
+                'original_crop': safe_str(row.get('作付け品目')) or None,
+                'manager': safe_str(row.get('協定管理者')) or None,
+                'owner': safe_str(row.get('所有者')) or None,
+                'slope': safe_str(row.get('傾斜度')) or None,
+                'base_amount': safe_int(row.get('基本金額')),
+                'steep_slope_addition': safe_int(row.get('超急傾斜加算額')),
+                'smart_agri_addition': safe_int(row.get('スマート農業加算額')),
+                'payment_amount': safe_int(row.get('交付金額')),
             }
 
             obj, created = OfficialChusankanField.objects.update_or_create(

backend/apps/reports/templates/reports/chusankan_template.html

@@ -2,107 +2,84 @@
 <html lang="ja">
 <head>
     <meta charset="UTF-8">
-    <title>中山間地域直接支払申请书</title>
+    <title>中山間地域等直接支払交付金（{{ year }}年度）</title>
     <style>
+        @page {
+            size: A4 landscape;
+            margin: 10mm;
+            @bottom-center {
+                content: counter(page) " / " counter(pages);
+                font-size: 8pt;
+                color: #666;
+            }
+        }
         body {
             font-family: "Noto Sans CJK JP", "Hiragino Kaku Gothic ProN", sans-serif;
-            font-size: 10pt;
-            line-height: 1.5;
+            font-size: 8pt;
+            line-height: 1.3;
+            margin: 0;
         }
         h1 {
             text-align: center;
-            font-size: 14pt;
-            margin-bottom: 20pt;
-        }
-        h2 {
-            font-size: 12pt;
-            border-bottom: 1px solid #333;
-            margin-top: 15pt;
+            font-size: 13pt;
+            margin: 0 0 8pt 0;
         }
         table {
             width: 100%;
             border-collapse: collapse;
-            margin-bottom: 10pt;
         }
         th, td {
             border: 1px solid #333;
-            padding: 5pt;
-            text-align: left;
+            padding: 2pt 4pt;
             vertical-align: top;
         }
         th {
             background-color: #f0f0f0;
+            font-size: 7pt;
+            text-align: center;
+            white-space: nowrap;
         }
-        .info-row {
-            display: flex;
-            margin-bottom: 5pt;
+        td {
+            font-size: 7.5pt;
         }
-        .info-label {
-            font-weight: bold;
-            width: 100pt;
+        .num {
+            text-align: right;
         }
-        .crop-table th {
-            width: 30%;
-        }
-        .crop-table td {
-            width: 70%;
+        .empty {
+            color: #999;
         }
     </style>
 </head>
 <body>
-    <h1>中山間地域直接支払申请书 - {{ year }}年度</h1>
-    
-    {% for item in data %}
-    <h2>{{ item.chusankan.c_id }} - {{ item.chusankan.oaza }}{{ item.chusankan.aza }}</h2>
-    
-    <div class="info-row">
-        <span class="info-label">大字:</span>
-        <span>{{ item.chusankan.oaza }}</span>
-    </div>
-    <div class="info-row">
-        <span class="info-label">字:</span>
-        <span>{{ item.chusankan.aza }}</span>
-    </div>
-    <div class="info-row">
-        <span class="info-label">地番:</span>
-        <span>{{ item.chusankan.chiban }}</span>
-    </div>
-    <div class="info-row">
-        <span class="info-label">面積:</span>
-        <span>{{ item.chusankan.area }} ha</span>
-    </div>
-    <div class="info-row">
-        <span class="info-label">支払金額:</span>
-        <span>{{ item.chusankan.payment_amount|default:"-" }} 円</span>
-    </div>
-    <div class="info-row">
-        <span class="info-label">関連圃場数:</span>
-        <span>{{ item.field_count }}</span>
-    </div>
-    <div class="info-row">
-        <span class="info-label">作付面積合計:</span>
-        <span>{{ item.total_area|floatformat:4 }} 反</span>
-    </div>
-    
-    {% if item.crops %}
-    <table class="crop-table">
+    <h1>中山間地域等直接支払交付金（{{ year }}年度）</h1>
+
+    <table>
         <thead>
             <tr>
+                <th>所在地</th>
+                <th>植栽面積(m2)</th>
+                <th>作付品目(元)</th>
+                <th>協定管理者</th>
+                <th>所有者</th>
                 <th>作物</th>
                 <th>品種</th>
+                <th>圃場名称</th>
             </tr>
         </thead>
         <tbody>
-            {% for crop in item.crops %}
+            {% for row in rows %}
             <tr>
-                <td>{{ crop.name }}</td>
-                <td>{{ crop.variety }}</td>
+                <td>{{ row.location }}</td>
+                <td class="num">{{ row.planting_area|default:"—" }}</td>
+                <td>{{ row.original_crop|default:"—" }}</td>
+                <td>{{ row.manager|default:"—" }}</td>
+                <td>{{ row.owner|default:"—" }}</td>
+                <td>{% if row.crop %}{{ row.crop }}{% else %}<span class="empty">—</span>{% endif %}</td>
+                <td>{% if row.variety %}{{ row.variety }}{% else %}<span class="empty">—</span>{% endif %}</td>
+                <td>{% if row.field_name %}{{ row.field_name }}{% else %}<span class="empty">—</span>{% endif %}</td>
             </tr>
             {% endfor %}
         </tbody>
     </table>
-    {% endif %}
-    
-    {% endfor %}
 </body>
 </html>

backend/apps/reports/templates/reports/kyosai_template.html

@@ -2,95 +2,80 @@
 <html lang="ja">
 <head>
     <meta charset="UTF-8">
-    <title>水稲共済申请书</title>
+    <title>水稲共済細目書（{{ year }}年度）</title>
     <style>
+        @page {
+            size: A4 portrait;
+            margin: 15mm;
+            @bottom-center {
+                content: counter(page) " / " counter(pages);
+                font-size: 8pt;
+                color: #666;
+            }
+        }
         body {
             font-family: "Noto Sans CJK JP", "Hiragino Kaku Gothic ProN", sans-serif;
-            font-size: 10pt;
-            line-height: 1.5;
+            font-size: 9pt;
+            line-height: 1.4;
+            margin: 0;
         }
         h1 {
             text-align: center;
             font-size: 14pt;
-            margin-bottom: 20pt;
-        }
-        h2 {
-            font-size: 12pt;
-            border-bottom: 1px solid #333;
-            margin-top: 15pt;
+            margin: 0 0 10pt 0;
         }
         table {
             width: 100%;
             border-collapse: collapse;
-            margin-bottom: 10pt;
         }
         th, td {
             border: 1px solid #333;
-            padding: 5pt;
-            text-align: left;
+            padding: 3pt 5pt;
             vertical-align: top;
         }
         th {
             background-color: #f0f0f0;
+            font-size: 8pt;
+            text-align: center;
+            white-space: nowrap;
         }
-        .info-row {
-            display: flex;
-            margin-bottom: 5pt;
+        td {
+            font-size: 8.5pt;
         }
-        .info-label {
-            font-weight: bold;
-            width: 100pt;
+        .num {
+            text-align: right;
         }
-        .crop-table th {
-            width: 30%;
-        }
-        .crop-table td {
-            width: 70%;
+        .empty {
+            color: #999;
         }
     </style>
 </head>
 <body>
-    <h1>水稲共済申请书 - {{ year }}年度</h1>
-    
-    {% for item in data %}
-    <h2>{{ item.kyosai.k_num }} - {{ item.kyosai.kanji_name }}</h2>
-    
-    <div class="info-row">
-        <span class="info-label">住所:</span>
-        <span>{{ item.kyosai.address }}</span>
-    </div>
-    <div class="info-row">
-        <span class="info-label">面積:</span>
-        <span>{{ item.kyosai.area }} ha</span>
-    </div>
-    <div class="info-row">
-        <span class="info-label">関連圃場数:</span>
-        <span>{{ item.field_count }}</span>
-    </div>
-    <div class="info-row">
-        <span class="info-label">作付面積合計:</span>
-        <span>{{ item.total_area|floatformat:4 }} 反</span>
-    </div>
-    
-    {% if item.crops %}
-    <table class="crop-table">
+    <h1>水稲共済細目書（{{ year }}年度）</h1>
+
+    <table>
         <thead>
             <tr>
-                <th>作物</th>
+                <th>漢字地名</th>
+                <th>耕地-分筆</th>
+                <th>本地面積(m2)</th>
+                <th>作付品目</th>
                 <th>品種</th>
+                <th>圃場名称</th>
             </tr>
         </thead>
         <tbody>
-            {% for crop in item.crops %}
+            {% for row in rows %}
             <tr>
-                <td>{{ crop.name }}</td>
-                <td>{{ crop.variety }}</td>
+                <td>{{ row.kanji_name }}</td>
+                <td>{{ row.k_s_num }}</td>
+                <td class="num">{{ row.area|default:"—" }}</td>
+                <td>{% if row.crop %}{{ row.crop }}{% else %}<span class="empty">—</span>{% endif %}</td>
+                <td>{% if row.variety %}{{ row.variety }}{% else %}<span class="empty">—</span>{% endif %}</td>
+                <td>{% if row.field_name %}{{ row.field_name }}{% else %}<span class="empty">—</span>{% endif %}</td>
             </tr>
             {% endfor %}
         </tbody>
     </table>
-    {% endif %}
-    
-    {% endfor %}
 </body>
 </html>

backend/apps/reports/views.py

@@ -1,42 +1,62 @@
 from django.template.loader import render_to_string
 from django.http import HttpResponse
 from weasyprint import HTML
-from apps.fields.models import OfficialKyosaiField, OfficialChusankanField, Field
+from apps.fields.models import OfficialKyosaiField, OfficialChusankanField
 from apps.plans.models import Plan
 
 
-def generate_kyosai_pdf(request, year):
-    kyosai_fields = OfficialKyosaiField.objects.all()
+def _get_plan_info(related_fields, year):
+    """共済/中山間区画に紐づく圃場群から作付け情報を集約する"""
+    plans = Plan.objects.filter(
+        field__in=related_fields, year=year
+    ).select_related('crop', 'variety', 'field')
 
-    data = []
+    crop_names = []
+    variety_names = []
+    field_names = []
+
+    for plan in plans:
+        crop_names.append(plan.crop.name if plan.crop else '未設定')
+        variety_names.append(plan.variety.name if plan.variety else '')
+        field_names.append(plan.field.name)
+
+    if not related_fields.exists():
+        return {'crop': '', 'variety': '', 'field_name': ''}
+
+    # 紐づく圃場はあるがPlanがない場合
+    if not crop_names:
+        names = [f.name for f in related_fields]
+        return {'crop': '未設定', 'variety': '', 'field_name': ', '.join(names)}
+
+    return {
+        'crop': ', '.join(crop_names),
+        'variety': ', '.join(v for v in variety_names if v),
+        'field_name': ', '.join(field_names),
+    }
+
+
+def generate_kyosai_pdf(request, year):
+    kyosai_fields = OfficialKyosaiField.objects.all().prefetch_related(
+        'fields', 'fields__plans', 'fields__plans__crop', 'fields__plans__variety'
+    ).order_by('k_num', 's_num')
+
+    rows = []
     for kyosai in kyosai_fields:
         related_fields = kyosai.fields.all()
-        plans = Plan.objects.filter(field__in=related_fields, year=year)
+        info = _get_plan_info(related_fields, year)
 
-        crops = {}
-        total_area = 0
-        for plan in plans:
-            crop_name = plan.crop.name if plan.crop else '未設定'
-            if crop_name not in crops:
-                crops[crop_name] = {
-                    'name': crop_name,
-                    'variety': plan.variety.name if plan.variety else '',
-                    'count': 0
-                }
-            crops[crop_name]['count'] += 1
-            total_area += float(plan.field.area_tan)
-
-        data.append({
-            'kyosai': kyosai,
-            'fields': related_fields,
-            'crops': list(crops.values()),
-            'total_area': total_area,
-            'field_count': related_fields.count()
+        rows.append({
+            'kanji_name': kyosai.kanji_name,
+            'k_s_num': f"{kyosai.k_num}-{kyosai.s_num}" if kyosai.s_num else kyosai.k_num,
+            'area': kyosai.area,
+            'crop': info['crop'],
+            'variety': info['variety'],
+            'field_name': info['field_name'],
         })
 
     html_string = render_to_string('reports/kyosai_template.html', {
         'year': year,
-        'data': data
+        'rows': rows,
     })
 
     pdf = HTML(string=html_string).write_pdf()
@@ -47,37 +67,35 @@ def generate_kyosai_pdf(request, year):
 
 
 def generate_chusankan_pdf(request, year):
-    chusankan_fields = OfficialChusankanField.objects.all()
+    chusankan_fields = OfficialChusankanField.objects.all().prefetch_related(
+        'fields', 'fields__plans', 'fields__plans__crop', 'fields__plans__variety'
+    ).order_by('c_id')
 
-    data = []
-    for chusankan in chusankan_fields:
-        related_fields = chusankan.fields.all()
-        plans = Plan.objects.filter(field__in=related_fields, year=year)
+    rows = []
+    for ch in chusankan_fields:
+        related_fields = ch.fields.all()
+        info = _get_plan_info(related_fields, year)
 
-        crops = {}
-        total_area = 0
-        for plan in plans:
-            crop_name = plan.crop.name if plan.crop else '未設定'
-            if crop_name not in crops:
-                crops[crop_name] = {
-                    'name': crop_name,
-                    'variety': plan.variety.name if plan.variety else '',
-                    'count': 0
-                }
-            crops[crop_name]['count'] += 1
-            total_area += float(plan.field.area_tan)
+        # 所在地: 大字 + 字 + 地番 + 枝番
+        location_parts = [ch.oaza, ch.aza, ch.chiban]
+        if ch.branch_num and ch.branch_num != '-':
+            location_parts.append(ch.branch_num)
+        location = ' '.join(p for p in location_parts if p)
 
-        data.append({
-            'chusankan': chusankan,
-            'fields': related_fields,
-            'crops': list(crops.values()),
-            'total_area': total_area,
-            'field_count': related_fields.count()
+        rows.append({
+            'location': location,
+            'planting_area': ch.planting_area,
+            'original_crop': ch.original_crop or '',
+            'manager': ch.manager or '',
+            'owner': ch.owner or '',
+            'crop': info['crop'],
+            'variety': info['variety'],
+            'field_name': info['field_name'],
         })
 
     html_string = render_to_string('reports/chusankan_template.html', {
         'year': year,
-        'data': data
+        'rows': rows,
     })
 
     pdf = HTML(string=html_string).write_pdf()