From 24c7242181f02ff6bb5e98ebd42c734aea120c13 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 20 五月 2024 15:37:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
index d01ba84..feccc95 100644
--- a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/Job_ApplicantProfileController.cs
@@ -36,6 +36,7 @@
using SqlSugar.Extensions;
using NPOI.OpenXmlFormats.Spreadsheet;
using CoreCms.Net.Auth.HttpContextUser;
+using System.Collections.Generic;
namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -305,7 +306,7 @@
foreach (var job_ApplicantProfile in list)
{
job_ApplicantProfile.createTimetxt = job_ApplicantProfile.createTime.HasValue? job_ApplicantProfile.createTime.Value.ToString("yyyy-MM-dd"):"";
- job_ApplicantProfile.dateOfBirthName = job_ApplicantProfile.dateOfBirth.ToString("yyyy-MM-dd");
+ job_ApplicantProfile.dateOfBirthName = job_ApplicantProfile.dateOfBirth.HasValue?job_ApplicantProfile.dateOfBirth.Value.ToString("yyyy-MM-dd"):"";
var job_JobSeting = await _Job_jobSetingServices.QueryByIdAsync(job_ApplicantProfile.jobId, false);
if (job_JobSeting != null)
{
@@ -339,7 +340,7 @@
//杩斿洖鏁版嵁
var jm = new AdminUiCallBack { code = 0 };
- var job_JobSetings = await _Job_jobSetingServices.QueryListByClauseAsync(p => p.isdelete == false);
+ var job_JobSetings = await _Job_jobSetingServices.QueryListByClauseAsync(p => p.isdelete == false && p.isEN == true);
jm.data = job_JobSetings;
return jm;
@@ -409,7 +410,7 @@
return jm;
}
model.jobName = job_JobSeting.position;
- model.dateOfBirthName = model.dateOfBirth.ToString("yyyy/MM/dd");
+ model.dateOfBirthName = model.dateOfBirth.HasValue?model.dateOfBirth.Value.ToString("yyyy/MM/dd"):"";
var job_FamilyMembers = _Job_ApplicantProfileServices.getJobFamilyMember(model.id);
@@ -417,16 +418,25 @@
var job_EmploymentRecords = _Job_ApplicantProfileServices.getJobEmploymentRecord(model.id);
foreach (var job_EmploymentRecord in job_EmploymentRecords)
{
- job_EmploymentRecord.startDatetxt = job_EmploymentRecord.startDate.ToString("yyyy/MM") +
+ job_EmploymentRecord.startDatetxt = (job_EmploymentRecord.startDate.HasValue? job_EmploymentRecord.startDate.Value.ToString("yyyy/MM"):"") +
(job_EmploymentRecord.endDate.HasValue ? "-" + job_EmploymentRecord.endDate.Value.ToString("yyyy/MM") : "");
}
+
+ var tupian = new List<string>();
+ if (!string.IsNullOrEmpty(model.iDPicture))
+ {
+ tupian = model.iDPicture.Split(',').ToList();
+ }
+
+
jm.code = 0;
jm.data = new
{
model,
job_FamilyMembers,
- job_EmploymentRecords
+ job_EmploymentRecords,
+ tupian
};
return jm;
@@ -533,7 +543,7 @@
return jm;
}
model.jobName = job_JobSeting.position;
- model.dateOfBirthName = model.dateOfBirth.ToString("yyyy/MM/dd");
+ model.dateOfBirthName = model.dateOfBirth.HasValue? model.dateOfBirth.Value.ToString("yyyy/MM/dd"):"";
var job_FamilyMembers =_Job_ApplicantProfileServices.getJobFamilyMember(model.id);
@@ -541,16 +551,22 @@
var job_EmploymentRecords = _Job_ApplicantProfileServices.getJobEmploymentRecord(model.id);
foreach (var job_EmploymentRecord in job_EmploymentRecords)
{
- job_EmploymentRecord.startDatetxt = job_EmploymentRecord.startDate.ToString("yyyy/MM") +
+ job_EmploymentRecord.startDatetxt = (job_EmploymentRecord.startDate.HasValue? job_EmploymentRecord.startDate.Value.ToString("yyyy/MM"):"") +
(job_EmploymentRecord.endDate.HasValue ? "-"+ job_EmploymentRecord.endDate.Value.ToString("yyyy/MM") : "");
}
-
+ var tupian = new List<string>();
+ if (!string.IsNullOrEmpty(model.iDPicture))
+ {
+ tupian = model.iDPicture.Split(',').ToList();
+ }
+
jm.code = 0;
jm.data = new
{
model,
job_FamilyMembers,
- job_EmploymentRecords
+ job_EmploymentRecords,
+ tupian
};
return jm;
--
Gitblit v1.9.1