Merge branch 'v2020morge-graphql' of http://gitlab.suvalue.com/zry/performance…

Merge branch 'v2020morge-graphql' of http://gitlab.suvalue.com/zry/performance into v2020morge-graphql

# Conflicts:
#	Performance.Subsidy/Performance.Subsidy.Api/Controllers/SubsidyController.cs
#	Performance.Subsidy/Performance.Subsidy.Services/SubsidyService.cs

Performance.Subsidy/Performance.Subsidy.Api/Controllers/SubsidyController.cs

@@ -54,27 +54,30 @@ public class SubsidyController : ControllerBase
             var jobTitle = await _service.GetJobTitle(allotId, hospitalId);
             return new ApiResponse(Status.Ok, jobTitle);
         }
-
+        //1
         // 职称标准保存
-        [HttpPost("{allotId}/jobtitle")]
-        public async Task SaveJobTitle(int allotId,List<sub_jobtitle> jobtitles)
+        [HttpPost("{allotId}/jobtitle")]        
+        public ApiResponse SaveJobTitle(int allotId,[FromBody]List<sub_jobtitle> sub_Jobtitle)
         {
-            _service.SaveJobTitle(allotId,jobtitles);
-            throw new NotImplementedException();
+            bool a =_service.SaveJobTitle(allotId, sub_Jobtitle);
+            return new ApiResponse(Status.Ok, a);
         }
 
         // 个人职称补贴结果查询
         [HttpGet("{allotId}/jobtitle/subsidy")]
-        public Task<ApiResponse> GetJobTitleSubsidy(int allotId)
+        public ApiResponse GetJobTitleSubsidy(int allotId)
         {
-            throw new NotImplementedException();
+           List<sub_subsidy> a=_service.GetJobTitleSubsidy(allotId);
+
+            return new ApiResponse(Status.Ok, a);
         }
 
         // 个人职称补贴结果保存
         [HttpPost("{allotId}/jobtitle/subsidy")]
-        public async Task SaveJobTitleSubsidy(int allotId)
+        public ApiResponse SaveJobTitleSubsidy(int allotId, [FromBody] List<sub_subsidy> subsidys)
         {
-            throw new NotImplementedException();
+            bool a = _service.SaveJobTitleSubsidy(allotId, subsidys);
+            return new ApiResponse(Status.Ok, a); 
         }
     }
 }

Performance.Subsidy/Performance.Subsidy.Services/Performance.Subsidy.Services.csproj

@@ -6,7 +6,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Dapper" Version="2.0.90" />
+		<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.7" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
 		<PackageReference Include="MySql.Data" Version="8.0.24" />
 		<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />

Performance.Subsidy/Performance.Subsidy.Services/SubsidyService.cs

 using Dapper;
 using Performance.Subsidy.Services.Repository;
 using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Linq;
-using AutoMapper;
 using System;
+using System.Web.Http;
 
 namespace Performance.Subsidy.Services
 {
@@ -125,5 +128,29 @@ public bool SaveSubsidy(int allotId, List<sub_subsidy> subsidys)
         }
         */
         #endregion
+
+        public bool SaveJobTitle(int allotId, List<sub_jobtitle> jobtitle)
+        {
+            var CreateDefault = _factory.CreateDefault();
+            var result = jobtitle.Select(t => new { AllotID = allotId, t.BasicPerforFee, t.JobTitle });
+            var modify= CreateDefault.Execute($" update `sub_jobtitle` set BasicPerforFee =@BasicPerforFee WHERE AllotID=@allotId and  JobTitle=@JobTitle; ", result);
+            var storedProcedure= CreateDefault.Execute("call proc_performance_subsidy(@allotId) ;", result);
+            return modify>0 && storedProcedure>0;
+            
+        }
+
+        public List<sub_subsidy> GetJobTitleSubsidy(int allotId)
+        {
+            IEnumerable<sub_subsidy> _Subsidies = _factory.CreateDefault().Query<sub_subsidy>(@"
+					 select*from sub_subsidy where RealAmount is not null and AllotID=@allotId and  RealAmount is not null ", new { allotId });
+            return _Subsidies?.ToList();
+        }
+
+        public bool SaveJobTitleSubsidy(int allotId, List<sub_subsidy> subsidys)
+        {
+            var result = subsidys.Select(t => new {  t.RealAmount, AllotID = allotId, t.PersonnelNumber });
+            return _factory.CreateDefault().Execute(@$"update  sub_subsidy set 
+            GiveAmount = Attendance * BasicPerforFee, RealAmount = @RealAmount  where  AllotID=@allotId and PersonnelNumber=@PersonnelNumber;",result)>0;
+        }
     }
 }