调整

Areas/Api/Controllers/v1/Main2/MerchantChangeSettlementCardRecordController.cs

@@ -138,8 +138,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             Obj.Add("MerchantName", merchantAddInfo.CertMerchantName); //商户名称
             Obj.Add("AccountType", merchantAddInfo.AccountType); //账户类型(0 对公 1 对私)
             Obj.Add("IsChange", IsChange); //是否已提交修改结算卡(0 否 1 是)
-            Obj.Add("CreateDate", check.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交修改时间
-            Obj.Add("UpdateDate", check.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交更新时间
+            Obj.Add("CreateDate", check.Id == 0 ? "" : check.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交修改时间
+            Obj.Add("UpdateDate", check.Id == 0 ? "" : check.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交更新时间
             Obj.Add("ChangeStatus", check.Status); //提交修改状态(1 待审核 3 审核拒绝 4 任务失效 5 审核通过)
             Obj.Add("Remark", check.Remark); //提交备注
 

Util/Main2/MerchantChangeSettlementCardRecordUtil.cs

@@ -41,12 +41,12 @@ namespace MySystem.Service.Main2
         {
             WebCMSEntities maindb = new WebCMSEntities();
             MerchantChangeSettlementCardRecord merchantChangeSettlementCardRecord = new MerchantChangeSettlementCardRecord();
-            var AcctZbankCode = HaoDaAreaCodeService.Query("CityName like '%" + AcctZBankAreas + "%'").CityCode;
+            var AcctZbankCode = HaoDaAreaCodeService.Query(" and CityName like '%" + AcctZBankAreas + "%'").CityCode;
             if (string.IsNullOrEmpty(AcctZbankCode))
             {
                 return "未找到所选开户地区";
             }
-            var AcctZbankkNo = OpenBankAllService.Query(" BankChild='" + AcctZBankName + "'").BankChildNo;
+            var AcctZbankkNo = OpenBankAllService.Query(" and BankChild='" + AcctZBankName + "'").BankChildNo;
             if (string.IsNullOrEmpty(AcctZbankkNo))
             {
                 return "未找到所选开户支行";
@@ -66,8 +66,11 @@ namespace MySystem.Service.Main2
                 merchantChangeSettlementCardRecord.AccountName = AcctName;
                 merchantChangeSettlementCardRecord.AccountNo = AccountNo;
                 merchantChangeSettlementCardRecord.IdCard = IdCard;
-                merchantChangeSettlementCardRecord.AgentCardStartDate = DateTime.Parse(AgentCardStartDate);
-                merchantChangeSettlementCardRecord.AgentCardEndDate = DateTime.Parse(AgentCardEndDate);
+                if (!string.IsNullOrEmpty(AgentCardStartDate) && !string.IsNullOrEmpty(AgentCardEndDate))
+                {
+                    merchantChangeSettlementCardRecord.AgentCardStartDate = DateTime.Parse(AgentCardStartDate);
+                    merchantChangeSettlementCardRecord.AgentCardEndDate = DateTime.Parse(AgentCardEndDate);
+                }
                 merchantChangeSettlementCardRecord.BankCard = BankCard;
                 merchantChangeSettlementCardRecord.OpenAccountLicenses = OpenAccountLicenses;
                 merchantChangeSettlementCardRecord.PriLicAgreement = PriLicAgreement;
@@ -78,6 +81,13 @@ namespace MySystem.Service.Main2
             }
             else //添加
             {
+                var AgentCardStartDate1 = "9999-01-01";
+                var AgentCardEndDate1 = "9999-01-01";
+                if (!string.IsNullOrEmpty(AgentCardStartDate) && !string.IsNullOrEmpty(AgentCardEndDate))
+                {
+                    AgentCardStartDate1 = AgentCardStartDate;
+                    AgentCardEndDate1 = AgentCardEndDate;
+                }
                 merchantChangeSettlementCardRecord = maindb.MerchantChangeSettlementCardRecord.Add(new MerchantChangeSettlementCardRecord()
                 {
                     Id = MerchantId,
@@ -93,8 +103,8 @@ namespace MySystem.Service.Main2
                     AccountName = AcctName,
                     AccountNo = AccountNo,
                     IdCard = IdCard,
-                    AgentCardStartDate = DateTime.Parse(AgentCardStartDate),
-                    AgentCardEndDate = DateTime.Parse(AgentCardEndDate),
+                    AgentCardStartDate = DateTime.Parse(AgentCardStartDate1),
+                    AgentCardEndDate = DateTime.Parse(AgentCardEndDate1),
                     BankCard = BankCard,
                     OpenAccountLicenses = OpenAccountLicenses,
                     PriLicAgreement = PriLicAgreement,