团组模块 - 出入境费用-移动端 - OP --> 国际旅费 Step2 代码逻辑调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -7515,7 +7515,6 @@ FROM
                     AirGW = eecInfo.AirGW,
                     AirTD = eecInfo.AirTD,
                     CityTranffic = eecInfo.CityTranffic
-
                 };
                 return Ok(JsonView(twoData));
             }
@@ -7688,21 +7687,21 @@ FROM
         {
             try
             {
-                //生成默认文件pdf并且通知人员
-                var fileView = await GeneralMethod.EnterExitCostDownload(new EnterExitCostDownloadDto()
-                {
-                    DiId = diid,
-                    ExportType = 1,
-                    SubTypeId = 1005
-                }, "pdf");
-
-                //发送通知
-                string fileUrl = (string)fileView.Data.GetType().GetProperty("Url").GetValue(fileView.Data, null);
-                string md5Sign = GeneralMethod.Encrypt($"{id}&fileName={fileUrl}");
-                string url = string.Format("http://oa.pan-american-intl.com:4399/#/Sankunginfo?sign={0}&fileName={1}", id, fileUrl);
-                await AppNoticeLibrary.SendUserMsg_GroupShare_ToGM(diid, new List<string>() { "208", "233", "21" }, currUserId, url);
-                //汇率信息记录
-                await GeneralMethod.RateRecordSave(currUserId, id, "出入境费用");
+                ////生成默认文件pdf并且通知人员
+                //var fileView = await GeneralMethod.EnterExitCostDownload(new EnterExitCostDownloadDto()
+                //{
+                //    DiId = diid,
+                //    ExportType = 1,
+                //    SubTypeId = 1005
+                //}, "pdf");
+
+                ////发送通知
+                //string fileUrl = (string)fileView.Data.GetType().GetProperty("Url").GetValue(fileView.Data, null);
+                //string md5Sign = GeneralMethod.Encrypt($"{id}&fileName={fileUrl}");
+                //string url = string.Format("http://oa.pan-american-intl.com:4399/#/Sankunginfo?sign={0}&fileName={1}", id, fileUrl);
+                //await AppNoticeLibrary.SendUserMsg_GroupShare_ToGM(diid, new List<string>() { "208", "233", "21" }, currUserId, url);
+                ////汇率信息记录
+                //await GeneralMethod.RateRecordSave(currUserId, id, "出入境费用");
             }
             catch (Exception ex)
             {
@@ -8010,9 +8009,17 @@ FROM
             if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
 
             var info = _mapper.Map<Grp_EnterExitCost>(dto);
-            info.AirJJC_Checked = dto.ChoiceTwoJJ;
-            info.AirGWC_Checked = dto.ChoiceTwoGW;
-            info.AirTDC_Checked = dto.ChoiceTwoTD;
+
+            info.OutsideJJPay = dto.OutsideJJPay;
+            info.OutsideGWPay = dto.OutsideGWPay;
+            info.OutsideTDPay = dto.OutsideTDPay;
+            info.AirJJ = dto.AirJJ;
+            info.AirGW = dto.AirGW;
+            info.AirTD = dto.AirTD;
+            info.CityTranffic = dto.CityTranffic;
+            info.SumJJC = dto.ChoiceTwoJJ;
+            info.SumGWC = dto.ChoiceTwoGW;
+            info.SumTDC = dto.ChoiceTwoTD;
 
             int id = dto.Id;
             decimal jjcItemTotal = 0.00M, gwcItemTotal = 0.00M, tdcItemTotal = 0.00M;
@@ -8028,11 +8035,11 @@ FROM
             {
                 var upd = await _sqlSugar.Updateable(info)
                     .UpdateColumns(x => new {
-                        x.AirJJC_Checked,
+                        x.SumJJC,
                         x.OutsideJJPay,
-                        x.AirGWC_Checked,
+                        x.SumGWC,
                         x.OutsideGWPay,
-                        x.AirTDC_Checked,
+                        x.SumTDC,
                         x.OutsideTDPay,
                         x.AirJJ,
                         x.AirGW,