From d749cdabc88a274373c110f742f05a6266cf1934 Mon Sep 17 00:00:00 2001
From: b110212000 <b110212000@gmail.com>
Date: Wed, 22 Sep 2021 14:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20-=20=E4=BD=9C=E6=A5=AD?=
 =?UTF-8?q?=E7=B4=80=E9=8C=84=E5=BB=BA=E7=AB=8B=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/Models/Operation.cs                         | 2 +-
 SolarPower/Quartz/Jobs/OperationScheduleJob.cs         | 2 +-
 SolarPower/Repository/Implement/OperationRepository.cs | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SolarPower/Models/Operation.cs b/SolarPower/Models/Operation.cs
index fcbb6c9..f10b710 100644
--- a/SolarPower/Models/Operation.cs
+++ b/SolarPower/Models/Operation.cs
@@ -99,11 +99,11 @@ namespace SolarPower.Models
         public string UpdatedAt { get { return Convert.ToDateTime(updatedAt).ToString("yyyy-MM-dd HH:mm:ss"); } set { updatedAt = value; } } //修改時間
         private string lastCreateTime;
         public string LastCreateTime { get { return Convert.ToDateTime(lastCreateTime).ToString("yyyy-MM-dd HH:mm:ss"); } set { lastCreateTime = value; } }
+        public string PowerStationName { get; set; }
     }
     public class OperationPlanTable : OperationCreatePlan
     {
         public string TypeName { get; set; }
-        public string PowerStationName { get; set; }
         public string Schedule { get; set; }
         public string EmailTypeName { get; set; }
         public string CreatedPerson { get; set; }
diff --git a/SolarPower/Quartz/Jobs/OperationScheduleJob.cs b/SolarPower/Quartz/Jobs/OperationScheduleJob.cs
index c527148..cba78bf 100644
--- a/SolarPower/Quartz/Jobs/OperationScheduleJob.cs
+++ b/SolarPower/Quartz/Jobs/OperationScheduleJob.cs
@@ -158,7 +158,7 @@ namespace SolarPower.Quartz.Jobs
                     {
                         //Get所有運維人員
                         var personal = await operationRepository.GetOperationPersonnel(a.PowerStationId);
-                        var Title = $@"編號:{a.PlanId} - {WorkType}單 - 作業紀錄建立通知";
+                        var Title = $@"電站:{a.PowerStationName} - {WorkType}單 - 編號:{a.PlanId}";
                         var content = $@" {noticeName}  {Environment.NewLine} 內容描述:{a.Description}";
                         await operationRepository.InsertNoticeSchedule(personal, Title, content);
 
diff --git a/SolarPower/Repository/Implement/OperationRepository.cs b/SolarPower/Repository/Implement/OperationRepository.cs
index c752ecf..0e6435c 100644
--- a/SolarPower/Repository/Implement/OperationRepository.cs
+++ b/SolarPower/Repository/Implement/OperationRepository.cs
@@ -604,7 +604,8 @@ namespace SolarPower.Repository.Implement
             {
                 try
                 {
-                    var sql = @$"SELECT * FROM operation_plan_create opc 
+                    var sql = @$"SELECT opc.*,ps.Name AS PowerStationName FROM operation_plan_create opc 
+                                LEFT JOIN power_station ps ON opc.PowerStationId = ps.Id
                                 WHERE opc.Deleted = 0";
                     result = (await conn.QueryAsync<OperationCreatePlan>(sql)).ToList();
                 }