lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

手动打卡

This commit is contained in:
李超 2026-01-26 17:59:07 +08:00
parent a5a8b130e5
commit 065a7de588
5 changed files with 82 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
SGGL/BLL/Common/YunMouHelper.cs
View File

@ -17,10 +17,18 @@ namespace BLL.Common
public static string getToken()
{
string data = "client_id=" + ClientId + "&client_secret=" + ClientSecret + "&grant_type=client_credentials&scope=app";
string result = Post(YunMouUrl + "oauth/token", data, "application/x-www-form-urlencoded", "");
var j2 = JsonConvert.DeserializeObject<dynamic>(result);
return j2.access_token;
try
{
string data = "client_id=" + ClientId + "&client_secret=" + ClientSecret + "&grant_type=client_credentials&scope=app";
string result = Post(YunMouUrl + "oauth/token", data, "application/x-www-form-urlencoded", "");
var j2 = JsonConvert.DeserializeObject<dynamic>(result);
return j2.access_token;
}
catch (Exception e)
{
}
return "";
}
/// <summary>
@ -393,14 +401,17 @@ namespace BLL.Common
/// <returns></returns>
public static string addConsumer(string access_token)
{
string result = Post(YunMouUrl + "api/v1/mq/consumer/group1", "", "application/json;charset=UTF-8", access_token);
var j2 = JsonConvert.DeserializeObject<dynamic>(result);
if (j2.code == "200")
return j2.data.consumerId;
else
try
{
return "";
string result = Post(YunMouUrl + "api/v1/mq/consumer/group1", "", "application/json;charset=UTF-8", access_token);
var j2 = JsonConvert.DeserializeObject<dynamic>(result);
if (j2.code == "200")
return j2.data.consumerId;
}
catch (Exception e) { }
return "";
}
/// <summary>
/// 提交偏移量
@ -423,9 +434,14 @@ namespace BLL.Common
/// <returns></returns>
public static string consumerMessage(string consumerId, string access_token)
{
string data = "consumerId=" + consumerId + "&autoCommit=true";
string result = Post(YunMouUrl + "api/v1/mq/consumer/messages", data, "application/x-www-form-urlencoded", access_token);
return result;
try
{
string data = "consumerId=" + consumerId + "&autoCommit=true";
string result = Post(YunMouUrl + "api/v1/mq/consumer/messages", data, "application/x-www-form-urlencoded", access_token);
return result;
}
catch (Exception e) { }
return "";
}
/// <summary>

6
SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs
View File

@ -142,13 +142,13 @@ namespace BLL
};
Model.SitePerson_Person getPerson = new Model.SitePerson_Person();
if (!string.IsNullOrEmpty(personInOut.PersonId))
if (!string.IsNullOrEmpty(personInOut.IdentityCard))
{
getPerson = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(personInOut.ProjectId, personInOut.PersonId);
getPerson = SitePerson_PersonService.GetSitePersonByProjectIdIdentityCard(personInOut.ProjectId, personInOut.IdentityCard);
}
if (getPerson == null || string.IsNullOrEmpty(getPerson.PersonId))
{
getPerson = SitePerson_PersonService.GetSitePersonByProjectIdIdentityCard(personInOut.ProjectId, personInOut.IdentityCard);
getPerson = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(personInOut.ProjectId, personInOut.PersonId);
}
if (getPerson != null && !string.IsNullOrEmpty(getPerson.PersonId))
{

12
SGGL/BLL/OpenService/YunMouService.cs
View File

@ -1,4 +1,5 @@
using BLL.Common;
using Model;
using Newtonsoft.Json;
using System;
using System.Linq;
@ -322,7 +323,16 @@ namespace BLL
AmEndTime1 = AmEndTime1.Add(-time1);
PmEndTime1 = PmEndTime1.Add(-time1);
var personModel = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == model.IdentityCard && x.ProjectId == model.ProjectId);
SitePerson_Person personModel = null;
if (!string.IsNullOrEmpty(model.PersonId))
{
personModel = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == model.PersonId && x.ProjectId == model.ProjectId);
model.IdentityCard = personModel.IdentityCard;
}
else
{
personModel = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == model.IdentityCard && x.ProjectId == model.ProjectId);
}
if (personModel != null)
{
//状态：0上午上班 1上午下班 2下午上班 3下午下班

6
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx
View File

@ -81,11 +81,11 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpType" runat="server" Label="进出时间" ShowRedStar="true">
<f:ListItem Value="1" Text="入场时间" />
<f:DropDownList ID="drpType" runat="server" Label="进出时间" ShowRedStar="true" Hidden="true">
<f:ListItem Value="1" Text="入场时间" Selected="true"/>
<f:ListItem Value="0" Text="出场时间" />
</f:DropDownList>
<f:DatePicker ID="txtTime" runat="server">
<f:DatePicker ID="txtTime" runat="server" Label="进出时间" ShowRedStar="true">
</f:DatePicker>
<f:TextBox ID="txtTime2" runat="server">
</f:TextBox>

59
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs
View File

@ -232,33 +232,46 @@ namespace FineUIPro.Web.HSSE.SitePerson
// string[] personIds = this.drpPersonId.Value.Split(',');
foreach (var item in this.drpPersonId.Values)
{
Model.SitePerson_PersonInOut newPersonInfo = new Model.SitePerson_PersonInOut
{
PersonId = item,
ProjectId = this.ProjectId,
WorkAreaName = this.txtWorkArea.Text.Trim(),
Address = this.txtAddress.Text.Trim(),
InOutWay = Const.InOutWay_2,
};
if (!string.IsNullOrEmpty(this.drpWorkArea.SelectedValue))
{
newPersonInfo.WorkAreaId = this.drpWorkArea.SelectedValue;
}
//Model.SitePerson_PersonInOut newPersonInfo = new Model.SitePerson_PersonInOut
//{
// PersonId = item,
// ProjectId = this.ProjectId,
// WorkAreaName = this.txtWorkArea.Text.Trim(),
// Address = this.txtAddress.Text.Trim(),
// InOutWay = Const.InOutWay_2,
//};
//if (!string.IsNullOrEmpty(this.drpWorkArea.SelectedValue))
//{
// newPersonInfo.WorkAreaId = this.drpWorkArea.SelectedValue;
//}
//string date = string.IsNullOrEmpty(this.txtTime.Text) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : this.txtTime.Text.Trim();
//string time = string.IsNullOrEmpty(this.txtTime2.Text) ? string.Format("{0:HH:mm:ss}", DateTime.Now) : this.txtTime2.Text.Trim();
//newPersonInfo.ChangeTime = Funs.GetNewDateTimeOrNow(date + " " + time);
//if (this.drpType.SelectedValue == "1")
//{
// newPersonInfo.IsIn = true;
//}
//else
//{
// newPersonInfo.IsIn = false;
//}
//BLL.PersonInOutService.AddPersonInOut(newPersonInfo);
string date = string.IsNullOrEmpty(this.txtTime.Text) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : this.txtTime.Text.Trim();
string time = string.IsNullOrEmpty(this.txtTime2.Text) ? string.Format("{0:HH:mm:ss}", DateTime.Now) : this.txtTime2.Text.Trim();
newPersonInfo.ChangeTime = Funs.GetNewDateTimeOrNow(date + " " + time);
if (this.drpType.SelectedValue == "1")
Model.SitePerson_PersonInOut newInOut = new Model.SitePerson_PersonInOut
{
newPersonInfo.IsIn = true;
}
else
{
newPersonInfo.IsIn = false;
}
BLL.PersonInOutService.AddPersonInOut(newPersonInfo);
BLL.LogService.AddSys_Log(this.CurrUser, newPersonInfo.IdentityCard, newPersonInfo.PersonInOutId, BLL.Const.PersonalInfoMenuId, BLL.Const.BtnDelete);
ProjectId = this.ProjectId,
PersonId = item,
//IdentityCard = employeeNo,
IsIn = true,
ChangeTime = Funs.GetNewDateTimeOrNow(date + " " + time),
InOutWay = Const.InOutWay_2,
};
YunMouService.InsertInOut(newInOut);
// BLL.LogService.AddSys_Log(this.CurrUser, newPersonInfo.IdentityCard, newPersonInfo.PersonInOutId, BLL.Const.PersonalInfoMenuId, BLL.Const.BtnDelete);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());