From ce222173a9f29ca8291530f9da7ba5d9ecacbe39 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 06 一月 2023 09:49:24 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs | 111 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 42 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs
index 1a0e812..d1c5008 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs
@@ -32,21 +32,39 @@
private readonly IFiServiceService _fiServiceService;
private readonly IFiMemberService _fiMemberService;
private readonly IFiBookService _fiBookService;
+ private readonly IPltPageService _pltPageService;
- public ServiceChargeController(ILogger<ServiceChargeController> logger, IFiServiceService fiServiceService, IFiMemberService fiMemberService, IFiBookService fiBookService)
+ public ServiceChargeController(ILogger<ServiceChargeController> logger, IFiServiceService fiServiceService, IFiMemberService fiMemberService, IFiBookService fiBookService
+ , IPltPageService pltPageService)
{
_logger = logger;
_fiServiceService = fiServiceService;
_fiMemberService = fiMemberService;
_fiBookService = fiBookService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
{
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/ServiceCharge/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
List<FiServiceDTO> fiServiceDTOs = _fiServiceService.GetList();
List<FiMemberDTO> fiMemberDTOs = _fiMemberService.GetList();
List<FiBookDTO> fiBookDTOs = _fiBookService.GetList();
+ foreach (var fiBookDTO in fiBookDTOs)
+ {
+ if (fiBookDTO.Chubantime.HasValue)
+ {
+ fiBookDTO.ChubantimeName = fiBookDTO.Chubantime.Value.ToString("yyyy-MM-dd");
+ }
+
+ }
+
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
decimal? Dianhuazixun = fiServiceDTOs.Where(x => x.ServiceType == "鐢佃瘽鍜ㄨ").FirstOrDefault().Feiyong;
serviceChargeDTO.Dianhuazixun = Dianhuazixun.HasValue? Dianhuazixun.Value.ToString("F2"): "";
@@ -65,31 +83,31 @@
decimal? Xuqiulunzheng5 = fiServiceDTOs.Where(x => x.ServiceType == "闇�姹傝璇�" && x.ServiceTypeTwo == "1000涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Xuqiulunzheng5 = Xuqiulunzheng5.HasValue ? Xuqiulunzheng5.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian1 = Zhudaotoubiaowenjian1.HasValue ? Zhudaotoubiaowenjian1.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian2 = Zhudaotoubiaowenjian2.HasValue ? Zhudaotoubiaowenjian2.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian3 = Zhudaotoubiaowenjian3.HasValue ? Zhudaotoubiaowenjian3.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian4 = Zhudaotoubiaowenjian4.HasValue ? Zhudaotoubiaowenjian4.Value.ToString("F2") : "";
- decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi1 = Daishuzhiyi1.HasValue ? Daishuzhiyi1.Value.ToString("F2") : "";
- decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi2 = Daishuzhiyi2.HasValue ? Daishuzhiyi2.Value.ToString("F2") : "";
- decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi3 = Daishuzhiyi3.HasValue ? Daishuzhiyi3.Value.ToString("F2") : "";
- decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi4 = Daishuzhiyi4.HasValue ? Daishuzhiyi4.Value.ToString("F2") : "";
- decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu1 = Daushutousu1.HasValue ? Daushutousu1.Value.ToString("F2") : "";
- decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu2 = Daushutousu2.HasValue ? Daushutousu2.Value.ToString("F2") : "";
- decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu3 = Daushutousu3.HasValue ? Daushutousu3.Value.ToString("F2") : "";
- decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu4 = Daushutousu4.HasValue ? Daushutousu4.Value.ToString("F2") : "";
decimal? Dainizhiyiwenda = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒绛斿").FirstOrDefault().Feiyong;
@@ -98,7 +116,7 @@
decimal? Dainitousuchulijueding = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾").FirstOrDefault().Feiyong;
serviceChargeDTO.Dainitousuchulijueding = Dainitousuchulijueding.HasValue ? Dainitousuchulijueding.Value.ToString("F2") : "";
- decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹舵煡璇�").FirstOrDefault().Feiyong;
+ decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�").FirstOrDefault().Feiyong;
serviceChargeDTO.Jinzhengfuishou = Jinzhengfuishou.HasValue ? Jinzhengfuishou.Value.ToString("F2") : "";
decimal? Zhengcaidai = fiServiceDTOs.Where(x => x.ServiceType == "鏀块噰璐�").FirstOrDefault().Feiyong;
@@ -255,64 +273,64 @@
Xuqiulunzheng5.Feiyong = Xuqiulunzheng5decimal;
resultEntity = _fiServiceService.save(Xuqiulunzheng5);
- FiServiceDTO Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
+ FiServiceDTO Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
decimal Zhudaotoubiaowenjian1decimal;
decimal.TryParse(data.Zhudaotoubiaowenjian1, out Zhudaotoubiaowenjian1decimal);
Zhudaotoubiaowenjian1.Feiyong = Zhudaotoubiaowenjian1decimal;
resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian1);
- FiServiceDTO Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
+ FiServiceDTO Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
decimal Zhudaotoubiaowenjian2decimal;
decimal.TryParse(data.Zhudaotoubiaowenjian2, out Zhudaotoubiaowenjian2decimal);
Zhudaotoubiaowenjian2.Feiyong = Zhudaotoubiaowenjian2decimal;
resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian2);
- FiServiceDTO Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
+ FiServiceDTO Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
decimal Zhudaotoubiaowenjian3decimal;
decimal.TryParse(data.Zhudaotoubiaowenjian3, out Zhudaotoubiaowenjian3decimal);
Zhudaotoubiaowenjian3.Feiyong = Zhudaotoubiaowenjian3decimal;
resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian3);
- FiServiceDTO Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
+ FiServiceDTO Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
decimal Zhudaotoubiaowenjian4decimal;
decimal.TryParse(data.Zhudaotoubiaowenjian4, out Zhudaotoubiaowenjian4decimal);
Zhudaotoubiaowenjian4.Feiyong = Zhudaotoubiaowenjian4decimal;
resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian4);
- FiServiceDTO Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
+ FiServiceDTO Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
decimal Daishuzhiyi1decimal;
decimal.TryParse(data.Daishuzhiyi1, out Daishuzhiyi1decimal);
Daishuzhiyi1.Feiyong = Daishuzhiyi1decimal;
resultEntity = _fiServiceService.save(Daishuzhiyi1);
- FiServiceDTO Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
+ FiServiceDTO Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
decimal Daishuzhiyi2decimal;
decimal.TryParse(data.Daishuzhiyi2, out Daishuzhiyi2decimal);
Daishuzhiyi2.Feiyong = Daishuzhiyi2decimal;
resultEntity = _fiServiceService.save(Daishuzhiyi2);
- FiServiceDTO Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
+ FiServiceDTO Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
decimal Daishuzhiyi3decimal;
decimal.TryParse(data.Daishuzhiyi3, out Daishuzhiyi3decimal);
Daishuzhiyi3.Feiyong = Daishuzhiyi3decimal;
resultEntity = _fiServiceService.save(Daishuzhiyi3);
- FiServiceDTO Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
+ FiServiceDTO Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
decimal Daishuzhiyi4decimal;
decimal.TryParse(data.Daishuzhiyi4, out Daishuzhiyi4decimal);
Daishuzhiyi4.Feiyong = Daishuzhiyi4decimal;
resultEntity = _fiServiceService.save(Daishuzhiyi4);
- FiServiceDTO Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
+ FiServiceDTO Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
decimal Daushutousu1decimal;
decimal.TryParse(data.Daushutousu1, out Daushutousu1decimal);
Daushutousu1.Feiyong = Daushutousu1decimal;
resultEntity = _fiServiceService.save(Daushutousu1);
- FiServiceDTO Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
+ FiServiceDTO Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
decimal Daushutousu2decimal;
decimal.TryParse(data.Daushutousu2, out Daushutousu2decimal);
Daushutousu2.Feiyong = Daushutousu2decimal;
resultEntity = _fiServiceService.save(Daushutousu2);
- FiServiceDTO Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
+ FiServiceDTO Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
decimal Daushutousu3decimal;
decimal.TryParse(data.Daushutousu3, out Daushutousu3decimal);
Daushutousu3.Feiyong = Daushutousu3decimal;
resultEntity = _fiServiceService.save(Daushutousu3);
- FiServiceDTO Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
+ FiServiceDTO Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
decimal Daushutousu4decimal;
decimal.TryParse(data.Daushutousu4, out Daushutousu4decimal);
Daushutousu4.Feiyong = Daushutousu4decimal;
@@ -330,7 +348,7 @@
Dainitousuchulijueding.Feiyong = Dainitousuchulijuedingdecimal;
resultEntity = _fiServiceService.save(Dainitousuchulijueding);
- FiServiceDTO Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹舵煡璇�").FirstOrDefault();
+ FiServiceDTO Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�").FirstOrDefault();
decimal Jinzhengfuishoudecimal;
decimal.TryParse(data.Jinzhengfuishou, out Jinzhengfuishoudecimal);
Jinzhengfuishou.Feiyong = Jinzhengfuishoudecimal;
@@ -470,8 +488,9 @@
if (!string.IsNullOrEmpty(id))
{
dto = _fiBookService.Get(id);
- dto.DanjiaName = dto.Danjia.Value.ToString("F2"); ;
- dto.ChubantimeName = dto.Chubantime.Value.ToString("yyyy-MM-dd");
+ dto.DanjiaName = dto.Danjia.Value.ToString("F2");
+ if(dto.Chubantime.HasValue)
+ dto.ChubantimeName = dto.Chubantime.Value.ToString("yyyy-MM-dd");
}
ViewData.Model = dto;
return View();
@@ -510,6 +529,14 @@
List<FiServiceDTO> fiServiceDTOs = _fiServiceService.GetList();
List<FiMemberDTO> fiMemberDTOs = _fiMemberService.GetList();
List<FiBookDTO> fiBookDTOs = _fiBookService.GetList();
+ foreach (var fiBookDTO in fiBookDTOs)
+ {
+ if (fiBookDTO.Chubantime.HasValue)
+ {
+ fiBookDTO.ChubantimeName = fiBookDTO.Chubantime.Value.ToString("yyyy-MM-dd");
+ }
+
+ }
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
decimal? Dianhuazixun = fiServiceDTOs.Where(x => x.ServiceType == "鐢佃瘽鍜ㄨ").FirstOrDefault().Feiyong;
serviceChargeDTO.Dianhuazixun = Dianhuazixun.HasValue ? Dianhuazixun.Value.ToString("F2") : "";
@@ -528,31 +555,31 @@
decimal? Xuqiulunzheng5 = fiServiceDTOs.Where(x => x.ServiceType == "闇�姹傝璇�" && x.ServiceTypeTwo == "1000涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Xuqiulunzheng5 = Xuqiulunzheng5.HasValue ? Xuqiulunzheng5.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian1 = Zhudaotoubiaowenjian1.HasValue ? Zhudaotoubiaowenjian1.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian2 = Zhudaotoubiaowenjian2.HasValue ? Zhudaotoubiaowenjian2.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian3 = Zhudaotoubiaowenjian3.HasValue ? Zhudaotoubiaowenjian3.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian4 = Zhudaotoubiaowenjian4.HasValue ? Zhudaotoubiaowenjian4.Value.ToString("F2") : "";
- decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi1 = Daishuzhiyi1.HasValue ? Daishuzhiyi1.Value.ToString("F2") : "";
- decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi2 = Daishuzhiyi2.HasValue ? Daishuzhiyi2.Value.ToString("F2") : "";
- decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi3 = Daishuzhiyi3.HasValue ? Daishuzhiyi3.Value.ToString("F2") : "";
- decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi4 = Daishuzhiyi4.HasValue ? Daishuzhiyi4.Value.ToString("F2") : "";
- decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu1 = Daushutousu1.HasValue ? Daushutousu1.Value.ToString("F2") : "";
- decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu2 = Daushutousu2.HasValue ? Daushutousu2.Value.ToString("F2") : "";
- decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu3 = Daushutousu3.HasValue ? Daushutousu3.Value.ToString("F2") : "";
- decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu4 = Daushutousu4.HasValue ? Daushutousu4.Value.ToString("F2") : "";
decimal? Dainizhiyiwenda = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒绛斿").FirstOrDefault().Feiyong;
@@ -561,7 +588,7 @@
decimal? Dainitousuchulijueding = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾").FirstOrDefault().Feiyong;
serviceChargeDTO.Dainitousuchulijueding = Dainitousuchulijueding.HasValue ? Dainitousuchulijueding.Value.ToString("F2") : "";
- decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹舵煡璇�").FirstOrDefault().Feiyong;
+ decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�").FirstOrDefault().Feiyong;
serviceChargeDTO.Jinzhengfuishou = Jinzhengfuishou.HasValue ? Jinzhengfuishou.Value.ToString("F2") : "";
decimal? Zhengcaidai = fiServiceDTOs.Where(x => x.ServiceType == "鏀块噰璐�").FirstOrDefault().Feiyong;
--
Gitblit v1.9.1