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

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

@@ -59,25 +59,25 @@ public class SubsidyController : ControllerBase
         [HttpPost("{allotId}/jobtitle")]        
         public ApiResponse SaveJobTitle(int allotId,[FromBody]List<sub_jobtitle> sub_Jobtitle)
         {
-            bool a =_service.SaveJobTitle(allotId, sub_Jobtitle);
-            return new ApiResponse(Status.Ok, a);
+            bool result = _service.SaveJobTitle(allotId, sub_Jobtitle);
+            return new ApiResponse(Status.Ok, result);
         }
 
         // 个人职称补贴结果查询
         [HttpGet("{allotId}/jobtitle/subsidy")]
         public ApiResponse GetJobTitleSubsidy(int allotId)
         {
-           List<sub_subsidy> a=_service.GetJobTitleSubsidy(allotId);
+           List<sub_subsidy> subsidies=_service.GetJobTitleSubsidy(allotId);
 
-            return new ApiResponse(Status.Ok, a);
+            return new ApiResponse(Status.Ok,subsidies);
         }
 
         // 个人职称补贴结果保存
         [HttpPost("{allotId}/jobtitle/subsidy")]
         public ApiResponse SaveJobTitleSubsidy(int allotId, [FromBody] List<sub_subsidy> subsidys)
         {
-            bool a = _service.SaveJobTitleSubsidy(allotId, subsidys);
-            return new ApiResponse(Status.Ok, a); 
+            bool result = _service.SaveJobTitleSubsidy(allotId, subsidys);
+            return new ApiResponse(Status.Ok, result); 
         }
     }
 }

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

@@ -134,15 +134,14 @@ 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;
-            
+            CreateDefault.Execute("call proc_performance_subsidy(@allotId) ;", new { allotId });
+            return modify>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 });
+			select*from sub_subsidy where RealAmount is not null and AllotID=@allotId and  RealAmount is not null ", new { allotId });
             return _Subsidies?.ToList();
         }
 
@@ -150,7 +149,7 @@ 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;
+            GiveAmount = Attendance * BasicPerforFee, RealAmount = @RealAmount where AllotID=@allotId and PersonnelNumber=@PersonnelNumber;",result)>0;
         }
     }
 }