From d14b82fec13361486c49165371b5dee1b7089c09 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 十二月 2021 13:35:23 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 102 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs b/zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs
index 4e86c06..69f3893 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs
@@ -29,8 +29,10 @@
private readonly ICooperOrderService _cooperOrderService;
private readonly IFiAccountService _fiAccountService;
private readonly IFiAccountRecordService _iFiAccountRecordService;
+ private readonly IAreaService _iAreaService;
public ExpertController(ILogger<ExpertController> logger, IExpertService expertService, IProjectService projectService, ILiaotianService liaotianService, IUserService userService
- , IFiSubjectService ifiSubjectService, ICooperOrderService cooperOrderService, IFiAccountService fiAccountService, IFiAccountRecordService iFiAccountRecordService)
+ , IFiSubjectService ifiSubjectService, ICooperOrderService cooperOrderService, IFiAccountService fiAccountService, IFiAccountRecordService iFiAccountRecordService
+ , IAreaService iAreaService)
{
_logger = logger;
_expertService = expertService;
@@ -41,6 +43,7 @@
_cooperOrderService = cooperOrderService;
_fiAccountService = fiAccountService;
_iFiAccountRecordService = iFiAccountRecordService;
+ _iAreaService = iAreaService;
}
[CheckLogin]
public IActionResult Index()
@@ -115,13 +118,16 @@
ViewBag.users = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
+ ViewBag.YearJiou = _liaotianService.GetSYScode("experts", "year_jiou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ ViewBag.Createtime = DateTime.Now.ToString("yyyy-MM-dd");
+ ViewBag.Createtimebe = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
return View();
}
#region 缂栬緫
[CheckLogin]
- public ActionResult Edit(string id = null)
+ public ActionResult Edit(string id = null, string Province = null, string City = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -144,8 +150,28 @@
}
else
{
- expertDTO.Province = "510000";
- expertDTO.City = "510100";
+ if (string.IsNullOrEmpty(Province))
+ {
+ expertDTO.Province = "510000";
+ }
+ else
+ {
+ expertDTO.Province = Province;
+ }
+ if (string.IsNullOrEmpty(City))
+ {
+ expertDTO.City = "510100";
+ }
+ else
+ {
+ expertDTO.City = City;
+ }
+ expertDTO.ExpertType = "4";
+ expertDTO.Level = "1";
+ expertDTO.CertiNumber = "SC";
+ expertDTO.InfoSource = "01";
+ expertDTO.Sex = "1";
+ expertDTO.YearJiou = "1";
}
// var sheng = _projectService.Getsheng();
@@ -159,6 +185,7 @@
ViewBag.Province = _projectService.Getsheng();//.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
ViewBag.City = _projectService.Getshi(expertDTO.Province);//.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
+ ViewBag.YearJiou = _liaotianService.GetSYScode("experts", "year_jiou");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewData.Model = expertDTO;
return View();
}
@@ -626,7 +653,7 @@
resultEntity.Message = "鏃犺仈绯荤數璇�";
}
- string sss = SMSHelper.PushWToUserMES(number.ToString(), "鎮ㄥソ锛屼笓瀹�. 璇︽儏瑙�" + neirong);
+ string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong );
if (int.Parse(sss) <= 0)
{
resultEntity.Result = false;
@@ -638,5 +665,75 @@
return new JsonResult(resultEntity);
}
+
+ /// <summary>
+ /// 鍒ゆ柇韬唤璇佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="shengid">鐪乮d</param>
+ /// <returns></returns>
+ ///
+ [CheckLogin]
+ public string IdCardChongfu(string IdCard = "",string Id = "")
+ {
+ ResultEntity resultEntity = _expertService.IdCardChongfu(IdCard, Id);
+
+ return JsonConvert.SerializeObject(resultEntity);
+
+ }
+
+
+ /// <summary>
+ /// 鍒ゆ柇涓撳璇佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="shengid">鐪乮d</param>
+ /// <returns></returns>
+ ///
+ [CheckLogin]
+ public string CertiNumberChongfu(string CertiNumber = "", string Id = "")
+ {
+ ResultEntity resultEntity = _expertService.CertiNumberChongfu(CertiNumber, Id);
+ if (resultEntity.Result)
+ {
+ //鎷嗚В涓撳璇佸彿
+
+ var CertiNumber11 = CertiNumber.Replace("SC", "");
+ var sysCodeDtls = _liaotianService.GetSYScode("experts", "City");
+
+ var chengshis = sysCodeDtls.Where(x => CertiNumber11.StartsWith(x.CodeSn)).ToList();
+ if (chengshis.Count > 0)
+ {
+ var areaDTOs = _iAreaService.GetList();
+
+ var chengshi = areaDTOs.Where(x => x.Name == chengshis[0].Comments).FirstOrDefault();
+ if (chengshi != null)
+ {
+ resultEntity.Message = chengshi.CodeId;
+ resultEntity.Remark = chengshi.ParentId;
+ }
+
+ }
+
+ }
+
+ return JsonConvert.SerializeObject(resultEntity);
+
+ }
+
+
+ /// <summary>
+ /// 鍒ゆ柇鐢佃瘽鏄惁閲嶅
+ /// </summary>
+ /// <param name="shengid">鐪乮d</param>
+ /// <returns></returns>
+ ///
+ [CheckLogin]
+ public string Phone1Chongfu(string Phone1 = "", string Id = "")
+ {
+ ResultEntity resultEntity = _expertService.Phone1Chongfu(Phone1, Id);
+
+ return JsonConvert.SerializeObject(resultEntity);
+
+ }
+
}
}
--
Gitblit v1.9.1