|
|
@@ -131,7 +131,15 @@ namespace MySystem
|
|
|
string Name = DataListInfo[7]; //发放人姓名
|
|
|
|
|
|
string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.Substring(6, 2);
|
|
|
- string PrizeDateString = PrizeDate.Substring(0, 4) + "-" + PrizeDate.Substring(4, 2) + "-" + PrizeDate.Substring(6, 2);
|
|
|
+ string PrizeDateString = "";
|
|
|
+ if(PrizeDate == "None")
|
|
|
+ {
|
|
|
+ PrizeDate = Date;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ PrizeDateString = PrizeDate.Substring(0, 4) + "-" + PrizeDate.Substring(4, 2) + "-" + PrizeDate.Substring(6, 2);
|
|
|
+ }
|
|
|
|
|
|
string ProductType = "0";
|
|
|
if(PosKind == "好哒语音王Y512") ProductType = "18";
|