From 2b2ef5f1a07b3632546aef59046e7a048b3b3d8e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 07 六月 2021 16:44:45 +0800
Subject: [PATCH] 专家管理 前台申请专家 ，后台审批专家 ，评审品目为下拉多选框 项目录入 专家替换字符：'（组长）','(组长)',',','（评审组长）','(评审组长)','；','评审组长：','组长：'
---
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs | 85 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
index 2bfd86d..ee4d050 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -10,6 +10,7 @@
using zhengcaioa.Models;
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json.Linq;
+using System.Transactions;
namespace zhengcaioa.Controllers.AdmManagement
{
@@ -18,12 +19,15 @@
private readonly ILogger<SigninController> _logger;
private readonly IAdmSigninService _signinService;
private readonly ISysAttachmentService _sysAttachmentService;
+ private readonly IAdmAttendanceRuleService _attendanceRuleService;
[CheckLogin]
- public SigninController(ILogger<SigninController> logger, IAdmSigninService signinService, ISysAttachmentService sysAttachmentService)
+ public SigninController(ILogger<SigninController> logger, IAdmSigninService signinService, ISysAttachmentService sysAttachmentService
+ , IAdmAttendanceRuleService attendanceRuleService)
{
_logger = logger;
_signinService = signinService;
_sysAttachmentService = sysAttachmentService;
+ _attendanceRuleService = attendanceRuleService;
}
#region 鑰冨嫟绛惧埌鎵撳崱
@@ -236,25 +240,80 @@
#region 鑰冨嫟瑙勫垯
public IActionResult AttendanceRule()
{
+ AdmAttendanceRuleDTO admAttendanceRuleDTO = _attendanceRuleService.Get("");
+ admAttendanceRuleDTO.admAttendanceRulesDtlDTOs = _attendanceRuleService.GetDtlList("");
+
+ ViewData.Model = admAttendanceRuleDTO;
return View();
}
- public string SaveAttendanceRule(object leaveOff)
+ public string SaveAttendanceRule(AdmAttendanceRuleDTO dto)
{
+ ResultEntity resultEntity = new ResultEntity();
+ dto.Holiday = "1";
+ dto.Rest = "1";
+ resultEntity.Result = false;
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
- //leaveOff.RecStatus = "A";
- //if (String.IsNullOrEmpty(leaveOff.Id))
- //{
- // leaveOff.Creater = curentuser.Id;
- // leaveOff.Createtime = DateTime.Now;
- //}
- //leaveOff.Modifier = curentuser.Id;
- //leaveOff.Modifytime = DateTime.Now;
+ using (TransactionScope scope = new TransactionScope())
+ {
+ dto.RecStatus = "A";
+ if (String.IsNullOrEmpty(dto.Id))
+ {
+ dto.Creater = curentuser.Id;
+ dto.Createtime = DateTime.Now;
+ }
+ dto.Modifier = curentuser.Id;
+ dto.Modifytime = DateTime.Now;
- //ResultEntity resultEntity = _signinService.SaveAskLeaveOff(leaveOff);
- var ss = leaveOff;
- return JsonConvert.SerializeObject(null);
+ resultEntity = _attendanceRuleService.save(dto);
+
+
+ _attendanceRuleService.RemoveDtlList(dto.Id);
+
+ for (int i = 0; i < dto.holiday_s.Length; i++)
+ {
+ if(!String.IsNullOrEmpty(dto.holiday_s[i]) && !String.IsNullOrEmpty(dto.holiday_e[i]))
+ {
+ AdmAttendanceRulesDtlDTO admAttendanceRulesDtlDTO = new AdmAttendanceRulesDtlDTO();
+ admAttendanceRulesDtlDTO.Pid = dto.Id;
+ admAttendanceRulesDtlDTO.ValueStart = dto.holiday_s[i];
+ admAttendanceRulesDtlDTO.ValueEnd = dto.holiday_e[i];
+ admAttendanceRulesDtlDTO.Name = "jiejiari";
+ admAttendanceRulesDtlDTO.RecStatus = "A";
+ admAttendanceRulesDtlDTO.Creater = curentuser.Id;
+ admAttendanceRulesDtlDTO.Createtime = DateTime.Now;
+ admAttendanceRulesDtlDTO.Modifier = admAttendanceRulesDtlDTO.Creater;
+ admAttendanceRulesDtlDTO.Modifytime = admAttendanceRulesDtlDTO.Createtime;
+ resultEntity = _attendanceRuleService.saveDtl(admAttendanceRulesDtlDTO);
+ }
+
+ }
+ for (int i = 0; i < dto.rest_s.Length; i++)
+ {
+ if (!String.IsNullOrEmpty(dto.rest_s[i]) && !String.IsNullOrEmpty(dto.rest_e[i]))
+ {
+ AdmAttendanceRulesDtlDTO admAttendanceRulesDtlDTO = new AdmAttendanceRulesDtlDTO();
+ admAttendanceRulesDtlDTO.Pid = dto.Id;
+ admAttendanceRulesDtlDTO.ValueStart = dto.rest_s[i];
+ admAttendanceRulesDtlDTO.ValueEnd = dto.rest_e[i];
+ admAttendanceRulesDtlDTO.Name = "tiaoxiuri";
+ admAttendanceRulesDtlDTO.RecStatus = "A";
+ admAttendanceRulesDtlDTO.Creater = curentuser.Id;
+ admAttendanceRulesDtlDTO.Createtime = DateTime.Now;
+ admAttendanceRulesDtlDTO.Modifier = admAttendanceRulesDtlDTO.Creater;
+ admAttendanceRulesDtlDTO.Modifytime = admAttendanceRulesDtlDTO.Createtime;
+ resultEntity = _attendanceRuleService.saveDtl(admAttendanceRulesDtlDTO);
+ }
+
+
+ }
+ scope.Complete();
+ }
+
+
+ // var ss = leaveOff;
+ return JsonConvert.SerializeObject(resultEntity);
}
#endregion
}
--
Gitblit v1.9.1