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 からダウンロードして確認できます。
This commit is contained in:
Akira
2026-02-17 15:27:14 +09:00
parent 85362d40c9
commit d70b5ee551
13 changed files with 584 additions and 192 deletions

View File

@@ -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()