bonus
/
lp_smz_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
fl 2025-03-06 10:30:37 +08:00
parent 2a5bdb65e8 4d38884136
commit 66a7e99647
8 changed files with 2623 additions and 2329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java
View File

@ -51,7 +51,7 @@ public class WorkPlanAllServiceImpl implements WorkPlanAllService {
if (list.size() > 0) { if (list.size() > 0) {
for (WorkPlanAllBean item : list) { for (WorkPlanAllBean item : list) {
//计算完成率 //计算完成率
if (item.getTotalNum() == null || "".equals(item.getTotalNum())) { if (item.getTotalNum() == null || "".equals(item.getTotalNum())||item.getWorkNum() == null || "".equals(item.getWorkNum())) {
item.setCompleteRate("0%"); item.setCompleteRate("0%");
} else { } else {
//计算完成率 //计算完成率

18
modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java
View File

@ -83,6 +83,16 @@ public class PersonTrainServiceImpl implements PersonTrainService {
personComprehensiveDao.updateRedPersonData(id); personComprehensiveDao.updateRedPersonData(id);
} }
} }
//判断分数是否为空 20250207
if (StringUtils.isNull(bean.getCompanyExamScore())){
bean.setCompanyExamScore(0);
}
if (StringUtils.isNull(bean.getDeptExamScore())){
bean.setDeptExamScore(0);
}
if (StringUtils.isNull(bean.getTeamExamScore())){
bean.setTeamExamScore(0);
}
dao.updateWorkerLight(bean); dao.updateWorkerLight(bean);
return i > 0 ? R.ok(Constants.INSERT_SUCCESS) : R.fail(Constants.INSERT_FAIL); return i > 0 ? R.ok(Constants.INSERT_SUCCESS) : R.fail(Constants.INSERT_FAIL);
} }
@ -152,12 +162,8 @@ public class PersonTrainServiceImpl implements PersonTrainService {
private void getLight(PersonTrainBean o) { private void getLight(PersonTrainBean o) {
String light = "0"; String light = "0";
if (o.getCompanyExamScore() != null && if (o.getCompanyExamScore() != null && o.getDeptExamScore() != null && o.getTeamExamScore() != null) {
o.getDeptExamScore() != null && if (o.getCompanyExamScore() >= 80 && o.getDeptExamScore() >= 80 && o.getTeamExamScore() >= 80) {
o.getTeamExamScore() != null) {
if (o.getCompanyExamScore() >= 80 &&
o.getDeptExamScore() >= 80 &&
o.getTeamExamScore() >= 80) {
light = "1"; light = "1";
o.setIsPass("1"); o.setIsPass("1");
if (StringUtils.isNotEmpty(o.getTeamId()) && if (StringUtils.isNotEmpty(o.getTeamId()) &&

2149
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js
View File

File diff suppressed because it is too large Load Diff

1207
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html
View File

File diff suppressed because it is too large Load Diff

467
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js
View File

@ -1,38 +1,40 @@
let upload let upload;
var teamAndProChooseSwitch = true var teamAndProChooseSwitch = true;
var uploadWageCardSwitch = true var uploadWageCardSwitch = true;
var uploadContractSwitch = true var uploadContractSwitch = true;
var createUserSwitch = true var createUserSwitch = true;
var uploadNum = 3 var uploadNum = 3;
let einStatus, subId, attendanceMachine; let einStatus, subId, attendanceMachine;
layui.use(['form', 'laydate', 'upload', 'element'], function () { layui.use(["form", "laydate", "upload", "element"], function () {
let form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功 let form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
let laydate = layui.laydate; let laydate = layui.laydate;
var element = layui.element; var element = layui.element;
upload = layui.upload; upload = layui.upload;
form.render(); form.render();
form.verify( form.verify({
{ name: [/^[\u4e00-\u9fa5_a-zA-Z0-9_]{2,50}$/, "请输入2-50中英文字符"],
name: [/^[\u4e00-\u9fa5_a-zA-Z0-9_]{2,50}$/, '请输入2-50中英文字符'], idNumber: [
idNumber: [/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, '请正确输入身份证'], /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
phone: [/^1[3456789]\d{9}$/, '请输入11位手机号码'], "请正确输入身份证",
bankCard: [/(^$)|^[0-9]\d{1,50}$/, '请输入正确银行卡号'], ],
urgentPersonPhone: [/(^$)|^1[3456789]\d{9}$/, '请输入11位手机号码'], phone: [/^1[3456789]\d{9}$/, "请输入11位手机号码"],
} bankCard: [/(^$)|^[0-9]\d{1,50}$/, "请输入正确银行卡号"],
); urgentPersonPhone: [/(^$)|^1[3456789]\d{9}$/, "请输入11位手机号码"],
});
var minListDate = '1990-01-01';//最小可选时间，例：1990-02-01 var minListDate = "1990-01-01"; //最小可选时间，例：1990-02-01
var maxListDate = '2200-12-31';//最大可选时间，例：2200-12-31 var maxListDate = "2200-12-31"; //最大可选时间，例：2200-12-31
var begin = "#signDate", end = "#expiryDate";//开始时间选择框、结束时间选择框：文本框 var begin = "#signDate",
end = "#expiryDate"; //开始时间选择框、结束时间选择框：文本框
var endChange = function (val, date) { var endChange = function (val, date) {
if (date && date.year) if (date && date.year)
signDate.config.max = { signDate.config.max = {
year: date.year, year: date.year,
month: date.month - 1,//必须减1才是正确值 month: date.month - 1, //必须减1才是正确值
date: date.date, date: date.date,
hours: date.hours, hours: date.hours,
minutes: date.minutes, minutes: date.minutes,
seconds: date.seconds seconds: date.seconds,
}; };
else { else {
var dateInit = new Date(maxListDate.replace(/-/g, "/")); var dateInit = new Date(maxListDate.replace(/-/g, "/"));
@ -42,7 +44,7 @@ layui.use(['form', 'laydate', 'upload', 'element'], function () {
date: dateInit.getDate(), date: dateInit.getDate(),
hours: dateInit.getHours(), hours: dateInit.getHours(),
minutes: dateInit.getMinutes(), minutes: dateInit.getMinutes(),
seconds: dateInit.getSeconds() seconds: dateInit.getSeconds(),
}; };
} }
}; };
@ -52,44 +54,45 @@ layui.use(['form', 'laydate', 'upload', 'element'], function () {
year: date.year, year: date.year,
month: date.month - 1, month: date.month - 1,
date: date.date, date: date.date,
hours: date.hours hours: date.hours,
}; };
else { else {
var dateInit = new Date(minListDate.replace(/-/g, "/")); var dateInit = new Date(minListDate.replace(/-/g, "/"));
expiryDate.config.min = { expiryDate.config.min = {
year: dateInit.getFullYear(), year: dateInit.getFullYear(),
month: dateInit.getMonth(), month: dateInit.getMonth(),
date: dateInit.getDate() date: dateInit.getDate(),
}; };
} }
}; };
var expiryDate = laydate.render({ var expiryDate = laydate.render({
elem: end, elem: end,
trigger:"click", trigger: "click",
format: 'yyyy-MM-dd', format: "yyyy-MM-dd",
min: minListDate, min: minListDate,
max: maxListDate, max: maxListDate,
done: endChange done: endChange,
}); });
var signDate = laydate.render({ var signDate = laydate.render({
elem: begin, elem: begin,
trigger:"click", trigger: "click",
format: 'yyyy-MM-dd', format: "yyyy-MM-dd",
min: minListDate, min: minListDate,
max: maxListDate, max: maxListDate,
done: beginChange done: beginChange,
}); });
var begin = "#contractStartTime", end = "#contractEndTime";//开始时间选择框、结束时间选择框：文本框 var begin = "#contractStartTime",
end = "#contractEndTime"; //开始时间选择框、结束时间选择框：文本框
var contractEnd = function (val, date) { var contractEnd = function (val, date) {
if (date && date.year) if (date && date.year)
contractEndDate.config.max = { contractEndDate.config.max = {
year: date.year, year: date.year,
month: date.month - 1,//必须减1才是正确值 month: date.month - 1, //必须减1才是正确值
date: date.date, date: date.date,
hours: date.hours, hours: date.hours,
minutes: date.minutes, minutes: date.minutes,
seconds: date.seconds seconds: date.seconds,
}; };
else { else {
var dateInit = new Date(maxListDate.replace(/-/g, "/")); var dateInit = new Date(maxListDate.replace(/-/g, "/"));
@ -99,7 +102,7 @@ layui.use(['form', 'laydate', 'upload', 'element'], function () {
date: dateInit.getDate(), date: dateInit.getDate(),
hours: dateInit.getHours(), hours: dateInit.getHours(),
minutes: dateInit.getMinutes(), minutes: dateInit.getMinutes(),
seconds: dateInit.getSeconds() seconds: dateInit.getSeconds(),
}; };
} }
}; };
@ -109,58 +112,58 @@ layui.use(['form', 'laydate', 'upload', 'element'], function () {
year: date.year, year: date.year,
month: date.month - 1, month: date.month - 1,
date: date.date, date: date.date,
hours: date.hours hours: date.hours,
}; };
else { else {
var dateInit = new Date(minListDate.replace(/-/g, "/")); var dateInit = new Date(minListDate.replace(/-/g, "/"));
contractStartDate.config.min = { contractStartDate.config.min = {
year: dateInit.getFullYear(), year: dateInit.getFullYear(),
month: dateInit.getMonth(), month: dateInit.getMonth(),
date: dateInit.getDate() date: dateInit.getDate(),
}; };
} }
}; };
var contractStartDate = laydate.render({ var contractStartDate = laydate.render({
elem: end, elem: end,
trigger:"click", trigger: "click",
format: 'yyyy-MM-dd', format: "yyyy-MM-dd",
min: minListDate, min: minListDate,
max: maxListDate, max: maxListDate,
done: contractEnd done: contractEnd,
}); });
var contractEndDate = laydate.render({ var contractEndDate = laydate.render({
elem: begin, elem: begin,
trigger:"click", trigger: "click",
format: 'yyyy-MM-dd', format: "yyyy-MM-dd",
min: minListDate, min: minListDate,
max: maxListDate, max: maxListDate,
done: contractStart done: contractStart,
}); });
form.on('select(employmentType)', function (data) { form.on("select(employmentType)", function (data) {
employmentTypeChange(data.value); employmentTypeChange(data.value);
}); });
form.on('select(proId)', function (data) { form.on("select(proId)", function (data) {
proChange(data.value); proChange(data.value);
}); });
}); });
function proChange(value){ function proChange(value) {
getSubByProId(value); getSubByProId(value);
} }
function employmentTypeChange(value) { function employmentTypeChange(value) {
if(value === '0'){ if (value === "0") {
$('#socialSecurityModule').css('display', 'none'); $("#socialSecurityModule").css("display", "none");
$('#subTeamModule').css('display', 'none'); $("#subTeamModule").css("display", "none");
$('#contractModule').css('display', 'none'); $("#contractModule").css("display", "none");
$('#wagesModule').css('display', 'none'); $("#wagesModule").css("display", "none");
}else{ } else {
$('#socialSecurityModule').css('display', ''); $("#socialSecurityModule").css("display", "");
$('#subTeamModule').css('display', ''); $("#subTeamModule").css("display", "");
$('#contractModule').css('display', ''); $("#contractModule").css("display", "");
$('#wagesModule').css('display', ''); $("#wagesModule").css("display", "");
} }
} }
@ -172,12 +175,15 @@ function openPdf() {
localStorage.setItem("filePaths", fileUrl + "/" + contractUrl); localStorage.setItem("filePaths", fileUrl + "/" + contractUrl);
localStorage.removeItem("fileTimes"); localStorage.removeItem("fileTimes");
localStorage.removeItem("fileNames"); localStorage.removeItem("fileNames");
var height = '525px'; var height = "525px";
var width = '800px'; var width = "800px";
var index = layer.open({ var index = layer.open({
title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], title: [
"查看",
"color:#3B70A1;background-color:#E8ECEB;font-size:20px",
],
type: 2, type: 2,
content: '../../publicFileView.html', content: "../../publicFileView.html",
area: [width, height], area: [width, height],
maxmin: false, maxmin: false,
}); });
@ -187,165 +193,215 @@ function openPdf() {
function setData(data) { function setData(data) {
attendanceMachine = getAttendanceMachineByProId(data.proId); attendanceMachine = getAttendanceMachineByProId(data.proId);
einStatus = data.einStatus; einStatus = data.einStatus;
if(data.einStatus === "1"){ if (data.einStatus === "1") {
$('#proId').attr('disabled','true'); $("#proId").attr("disabled", "true");
} }
$('#id').val(data.idNumber) $("#id").val(data.idNumber);
//基础信息 //基础信息
$('#name').val(data.name) //基础信息 姓名 $("#name").val(data.name); //基础信息 姓名
$('#idNumber').val(data.idNumber) //基础信息 身份证 $("#idNumber").val(data.idNumber); //基础信息 身份证
$('#sex').val(data.sex) //基础信息 性别 $("#sex").val(data.sex); //基础信息 性别
$('#birthday').val(data.birthday) //基础信息 出生日期 $("#birthday").val(data.birthday); //基础信息 出生日期
$('#ethnic').val(data.ethnic) //基础信息 民族 $("#ethnic").val(data.ethnic); //基础信息 民族
getHoliday(data.ethnic); getHoliday(data.ethnic);
$('#issueauthority').val(data.issueauthority) //基础信息 签发机关 $("#issueauthority").val(data.issueauthority); //基础信息 签发机关
$('#signDate').val(data.signDate) //基础信息 身份证生效日期 $("#signDate").val(data.signDate); //基础信息 身份证生效日期
$('#expiryDate').val(data.expiryDate) //基础信息 身份证失效效日期 $("#expiryDate").val(data.expiryDate); //基础信息 身份证失效效日期
$('#address').val(data.address) //基础信息 身份证住址 $("#address").val(data.address); //基础信息 身份证住址
showDictSelectToLayui("postId", "postType", true, data.postId); showDictSelectToLayui("postId", "postType", true, data.postId);
$('#postId').val(data.postId) //基础信息 工种 $("#postId").val(data.postId); //基础信息 工种
$('#phone').val(data.phone) //基础信息 手机号码 $("#phone").val(data.phone); //基础信息 手机号码
$('#socialSecurityNumber').val(data.socialSecurityNumber) //基础信息 社保号 $("#socialSecurityNumber").val(data.socialSecurityNumber); //基础信息 社保号
$('#socialSecurityUnit').val(data.socialSecurityUnit) //基础信息 社保单位 $("#socialSecurityUnit").val(data.socialSecurityUnit); //基础信息 社保单位
//社保图片 //社保图片
var socialSecurityPath = []; var socialSecurityPath = [];
if(data.socialSecurityPath != null){ if (data.socialSecurityPath != null) {
socialSecurityPath = NoNull(data.socialSecurityPath).split(',') socialSecurityPath = NoNull(data.socialSecurityPath).split(",");
} }
var htmlProve = '' var htmlProve = "";
for (var i = 0; i < socialSecurityPath.length; i++) { for (var i = 0; i < socialSecurityPath.length; i++) {
htmlProve += '<div id="' + i + '" style="display: inline-block;text-align: center;width:150px">' htmlProve +=
htmlProve += '<img src="' + (fileUrl +"/"+ socialSecurityPath[i]) + '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">' '<div id="' +
i +
'" style="display: inline-block;text-align: center;width:150px">';
htmlProve +=
'<img src="' +
(fileUrl + "/" + socialSecurityPath[i]) +
'" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
// htmlProve += '<div><span>' + (socialSecurityUnit[i].length > 8 ? (socialSecurityUnit[i].substr(0, 8) + "..") : socialSecurityUnit[i]) + '</span></div>' // htmlProve += '<div><span>' + (socialSecurityUnit[i].length > 8 ? (socialSecurityUnit[i].substr(0, 8) + "..") : socialSecurityUnit[i]) + '</span></div>'
htmlProve += '</div>' htmlProve += "</div>";
} }
$('#demoProve').append(htmlProve); $("#demoProve").append(htmlProve);
$('#bankName').val(data.bankName) //基础信息 银行名称 $("#bankName").val(data.bankName); //基础信息 银行名称
$('#bankCard').val(data.bankCard) //基础信息 银行卡号 $("#bankCard").val(data.bankCard); //基础信息 银行卡号
let img = document.getElementById("face_img"); let img = document.getElementById("face_img");
img.src = fileUrl + "/" + data.facePhoto; img.src = fileUrl + "/" + data.facePhoto;
$('#personType').val(data.personType) //基础信息 人员类型 $("#personType").val(data.personType); //基础信息 人员类型
$('#workerSkill').val(data.workerSkill) //基础信息 工人技能 $("#workerSkill").val(data.workerSkill); //基础信息 工人技能
$('#urgentPerson').val(data.urgentPerson) //基础信息 紧急联系人 $("#urgentPerson").val(data.urgentPerson); //基础信息 紧急联系人
$('#urgentPersonPhone').val(data.urgentPersonPhone) //基础信息 紧急联系人电话 $("#urgentPersonPhone").val(data.urgentPersonPhone); //基础信息 紧急联系人电话
$('#politicalOutlook').val(data.politicalOutlook) //基础信息 政治面貌 $("#politicalOutlook").val(data.politicalOutlook); //基础信息 政治面貌
$('#cultrue').val(data.cultrue) //基础信息 文化程度 $("#cultrue").val(data.cultrue); //基础信息 文化程度
$('#importantPerson').val(data.importantPerson) //基础信息 重要人员 $("#importantPerson").val(data.importantPerson); //基础信息 重要人员
$('#addressPhone').val(data.addressPhone) //基础信息 家庭电话 $("#addressPhone").val(data.addressPhone); //基础信息 家庭电话
//班组、工程选择 //班组、工程选择
$('#fallProject').val(data.proName) //班组、工程选择 所属工程 $("#fallProject").val(data.proName); //班组、工程选择 所属工程
if(data.isRegularPerson === '' || data.isRegularPerson === null){ if (data.isRegularPerson === "" || data.isRegularPerson === null) {
$('#teamRegularSwitch').val(0); $("#teamRegularSwitch").val(0);
}else{ } else {
$('#teamRegularSwitch').val(data.isRegularPerson);//班组、工程选择 是否为班组固定人员 $("#teamRegularSwitch").val(data.isRegularPerson); //班组、工程选择 是否为班组固定人员
} }
$('#isForeman').val(data.isForeman); $("#isForeman").val(data.isForeman);
//上传工资卡 //上传工资卡
//工资卡 //工资卡
var wageCardPath = []; var wageCardPath = [];
if(data.wageCardPath != null){ if (data.wageCardPath != null) {
wageCardPath = NoNull(data.wageCardPath).split(',') wageCardPath = NoNull(data.wageCardPath).split(",");
} }
var htmlCardPath = '' var htmlCardPath = "";
for (var i = 0; i < wageCardPath.length; i++) { for (var i = 0; i < wageCardPath.length; i++) {
htmlCardPath += '<div id="' + i + '" style="display: inline-block;text-align: center;width:150px">' htmlCardPath +=
htmlCardPath += '<img src="' + (fileUrl +"/"+ wageCardPath[i]) + '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">' '<div id="' +
i +
'" style="display: inline-block;text-align: center;width:150px">';
htmlCardPath +=
'<img src="' +
(fileUrl + "/" + wageCardPath[i]) +
'" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
// htmlCardPath += '<div><span>' + (socialSecurityUnit[i].length > 8 ? (socialSecurityUnit[i].substr(0, 8) + "..") : socialSecurityUnit[i]) + '</span></div>' // htmlCardPath += '<div><span>' + (socialSecurityUnit[i].length > 8 ? (socialSecurityUnit[i].substr(0, 8) + "..") : socialSecurityUnit[i]) + '</span></div>'
htmlCardPath += '</div>' htmlCardPath += "</div>";
} }
$('#demoWageCard').append(htmlCardPath); $("#demoWageCard").append(htmlCardPath);
$('#bankName2').val(data.wageBankName) //上传工资卡 银行名称 $("#bankName2").val(data.wageBankName); //上传工资卡 银行名称
$('#bankCard2').val(data.wageBankCard) //上传工资卡 银行卡号 $("#bankCard2").val(data.wageBankCard); //上传工资卡 银行卡号
$('#subBranch').val(data.wageBankSubBranchName) //上传工资卡 银行支行名称 $("#subBranch").val(data.wageBankSubBranchName); //上传工资卡 银行支行名称
//上传合同 //上传合同
//Contract //Contract
//合同卡 //合同卡
if(data.contractType == '纸质合同' || data.contractType == null) { if (data.contractType == "纸质合同" || data.contractType == null) {
var contractPath = []; var contractPath = [];
if (data.contractPath != null) { if (data.contractPath != null) {
contractPath = data.contractPath.split(',') contractPath = data.contractPath.split(",");
} }
var htmlContract = '' var htmlContract = "";
for (var i = 0; i < contractPath.length; i++) { for (var i = 0; i < contractPath.length; i++) {
let path = fileUrl +"/"+ contractPath[i]; let path = fileUrl + "/" + contractPath[i];
if(contractPath[i].lastIndexOf(".pdf") > 0){ if (contractPath[i].lastIndexOf(".pdf") > 0) {
path = "../../../../img/filetype/pdf.png"; path = "../../../../img/filetype/pdf.png";
} }
htmlContract += '<div id="' + i + '" onclick="onclickPdf(\''+ contractPath[i] +'\')" style="display: inline-block;text-align: center;width:150px">' htmlContract +=
htmlContract += '<img src="' + (path) + '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">' '<div id="' +
htmlContract += '</div>' i +
'" onclick="onclickPdf(\'' +
contractPath[i] +
'\')" style="display: inline-block;text-align: center;width:150px">';
htmlContract +=
'<img src="' +
path +
'" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
htmlContract += "</div>";
} }
$('#demoContract').append(htmlContract); $("#demoContract").append(htmlContract);
$('#contractRef').val(data.contractCode) //上传合同 合同编号 $("#contractRef").val(data.contractCode); //上传合同 合同编号
$('#contractTermType').val(data.laborContractType) //上传合同 合同期限类型 $("#contractTermType").val(data.laborContractType); //上传合同 合同期限类型
$('#contractStartTime').val(data.contractValidDate) //上传合同 合同签订日期 $("#contractStartTime").val(data.contractValidDate); //上传合同 合同签订日期
$('#contractEndTime').val(data.contractInvalidDate) //上传合同 合同终止日期 $("#contractEndTime").val(data.contractInvalidDate); //上传合同 合同终止日期
$('#salaryApprovalMode').val(data.wageApprovedWay) //上传合同 工资核定方式 $("#salaryApprovalMode").val(data.wageApprovedWay); //上传合同 工资核定方式
$('#salaryApprovalStandard').val(data.wageCriterion) //上传合同 工资核定标准 $("#salaryApprovalStandard").val(data.wageCriterion); //上传合同 工资核定标准
$('#personRole').val(data.role) //上传合同 人员角色 $("#personRole").val(data.role); //上传合同 人员角色
$('#contractType').val(data.contractType) //上传合同 合同类型 $("#contractType").val(data.contractType); //上传合同 合同类型
$('#isHealthCare').val(data.miurInsurance) //上传合同 是否参加城乡居民医疗保险 $("#isHealthCare").val(data.miurInsurance); //上传合同 是否参加城乡居民医疗保险
$('#isRetirement').val(data.endowmentInsurance) //上传合同 是否参加城乡居民养老保险 $("#isRetirement").val(data.endowmentInsurance); //上传合同 是否参加城乡居民养老保险
$('#isJob').val(data.whetherOnJob) //上传合同 是否在职 $("#isJob").val(data.whetherOnJob); //上传合同 是否在职
}else{ } else {
$('#contractModule').css('display', 'none'); $("#contractModule").css("display", "none");
$('#electronicContractModule').css('display', ''); $("#electronicContractModule").css("display", "");
contractUrl = data.contractUrl; contractUrl = data.contractUrl;
} }
$('#employmentType').val(data.employmentType); $("#employmentType").val(data.employmentType);
$('#employmentTypes').val(data.employmentTypes); $("#employmentTypes").val(data.employmentTypes);
employmentTypeChange(data.employmentType); employmentTypeChange(data.employmentType);
getProByOrgId('', '', data.proId); getProByOrgId("", "", data.proId);
$('#proId').val(data.proId); $("#proId").val(data.proId);
proChange(data.proId); proChange(data.proId);
subId = data.subId; subId = data.subId;
if(subId !== '' && subId !== null){ if (subId !== "" && subId !== null) {
$('#subId').attr('disabled','true'); $("#subId").attr("disabled", "true");
} }
if(data.teamId !== '' && data.teamId !== null){ if (data.teamId !== "" && data.teamId !== null) {
$('#teamId').attr('disabled','true'); $("#teamId").attr("disabled", "true");
} }
getSubByProId(data.proId, data.subId); getSubByProId(data.proId, data.subId);
// getSub(data.subId)//班组、工程选择 所属分包 // getSub(data.subId)//班组、工程选择 所属分包
getTeamBySubId(data.subId,data.teamId) //班组、工程选择 所属班组 getTeamBySubId(data.subId, data.teamId); //班组、工程选择 所属班组
getTeamBySubIdToData(data.subId,data.teamId); getTeamBySubIdToData(data.subId, data.teamId);
let companyExamFilePath = data.companyExamFilePath; let companyExamFilePath = data.companyExamFilePath;
let deptExamFilePath = data.deptExamFilePath; let deptExamFilePath = data.deptExamFilePath;
let teamExamFilePath = data.teamExamFilePath; let teamExamFilePath = data.teamExamFilePath;
$('#companyExamScore').val(data.companyExamScore); $("#companyExamScore").val(data.companyExamScore);
$('#deptExamScore').val(data.deptExamScore); $("#deptExamScore").val(data.deptExamScore);
$('#teamExamScore').val(data.teamExamScore); $("#teamExamScore").val(data.teamExamScore);
if(companyExamFilePath !== null && companyExamFilePath !== '' && companyExamFilePath !== 'null'){ if (
$('#companyExamTestProve').css("display","none"); companyExamFilePath !== null &&
var htmlCompany = '' companyExamFilePath !== "" &&
htmlCompany += '<div id="' + i + '" style="display: inline-block;text-align: center;width:150px">' companyExamFilePath !== "null"
htmlCompany += '<img src="' + (fileUrl +"/"+ data.teamExamFilePath) + '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">' ) {
htmlCompany += '</div>' $("#companyExamTestProve").css("display", "none");
$('#companyExamDemoProve').append(htmlCompany); var htmlCompany = "";
htmlCompany +=
'<div id="' +
i +
'" style="display: inline-block;text-align: center;width:150px">';
htmlCompany +=
'<img src="' +
(fileUrl + "/" + data.companyExamFilePath) +
'" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
htmlCompany += "</div>";
$("#companyExamDemoProve").append(htmlCompany);
} }
if(deptExamFilePath !== null && deptExamFilePath !== '' && deptExamFilePath !== 'null'){ if (
$('#deptExamTestProve').css("display","none"); deptExamFilePath !== null &&
var htmlDept = '' deptExamFilePath !== "" &&
htmlDept += '<div id="' + i + '" style="display: inline-block;text-align: center;width:150px">' deptExamFilePath !== "null"
htmlDept += '<img src="' + (fileUrl +"/"+ data.deptExamFilePath) + '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">' ) {
htmlDept += '</div>' $("#deptExamTestProve").css("display", "none");
$('#deptExamDemoProve').append(htmlDept); var htmlDept = "";
htmlDept +=
'<div id="' +
i +
'" style="display: inline-block;text-align: center;width:150px">';
htmlDept +=
'<img src="' +
(fileUrl + "/" + data.deptExamFilePath) +
'" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
htmlDept += "</div>";
$("#deptExamDemoProve").append(htmlDept);
} }
if(teamExamFilePath !== null && teamExamFilePath !== '' && teamExamFilePath !== 'null'){ if (
$('#teamExamTestProve').css("display","none"); teamExamFilePath !== null &&
var htmlTeam = '' teamExamFilePath !== "" &&
htmlTeam += '<div id="' + i + '" style="display: inline-block;text-align: center;width:150px">' teamExamFilePath !== "null"
htmlTeam += '<img src="' + (fileUrl +"/"+ data.teamExamFilePath) + '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">' ) {
htmlTeam += '</div>' $("#teamExamTestProve").css("display", "none");
$('#teamExamDemoProve').append(htmlTeam); var htmlTeam = "";
htmlTeam +=
'<div id="' +
i +
'" style="display: inline-block;text-align: center;width:150px">';
htmlTeam +=
'<img src="' +
(fileUrl + "/" + data.teamExamFilePath) +
'" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
htmlTeam += "</div>";
$("#teamExamDemoProve").append(htmlTeam);
} }
layui.form.render("select"); layui.form.render("select");
} }
@ -357,15 +413,15 @@ function reloading() {
window.parent.location.reload(); window.parent.location.reload();
} }
function getHoliday(value){ function getHoliday(value) {
let holiday; let holiday;
$.ajax({ $.ajax({
type: 'POST', type: "POST",
async: false, // 默认异步true,false表示同步 async: false, // 默认异步true,false表示同步
url: ctxPath + "/personComprehensive/getHolidaysList", // 请求地址 url: ctxPath + "/personComprehensive/getHolidaysList", // 请求地址
dataType: 'json', // 服务器返回数据类型 dataType: "json", // 服务器返回数据类型
data: { data: {
nation: value nation: value,
}, //获取提交的表单字段 }, //获取提交的表单字段
success: function (data) { success: function (data) {
let values = []; let values = [];
@ -373,65 +429,61 @@ function getHoliday(value){
let resultObj = data.data; let resultObj = data.data;
for (let i = 0; i < resultObj.length; i++) { for (let i = 0; i < resultObj.length; i++) {
let obj = { let obj = {
name : resultObj[i], name: resultObj[i],
value : resultObj[i], value: resultObj[i],
selected : true selected: true,
}; };
values.push(obj); values.push(obj);
} }
} else { } else {
} }
holiday = xmSelect.render({ holiday = xmSelect.render({
el: '#holidays', el: "#holidays",
language: 'zn', language: "zn",
data: values data: values,
}); });
}, },
error: function (XMLHttpRequest, textStatus, e) { error: function (XMLHttpRequest, textStatus, e) {
layer.close(loadingMsg); layer.close(loadingMsg);
layer.msg('数据请求发生异常,请稍后重试', {icon: 16, scrollbar: false}); layer.msg("数据请求发生异常,请稍后重试", {
} icon: 16,
scrollbar: false,
});
},
}); });
} }
//创建班组 //创建班组
function createTeam(){ function createTeam() {}
}
//刷新班组下拉表 //刷新班组下拉表
function refreshTeamSelect(){ function refreshTeamSelect() {}
}
//下一步 //下一步
function nextClick(e){ function nextClick(e) {
$('form>div:gt(1)').css('display','none') $("form>div:gt(1)").css("display", "none");
$(e).parent().parent().parent().next().css('display','') $(e).parent().parent().parent().next().css("display", "");
} }
//上一步 //上一步
function prevClick(e){ function prevClick(e) {
$('form>div:gt(1)').css('display','none') $("form>div:gt(1)").css("display", "none");
$(e).parent().parent().parent().prev().css('display','') $(e).parent().parent().parent().prev().css("display", "");
} }
function getTeamBySubIdToData(subId,teamId) { function getTeamBySubIdToData(subId, teamId) {
$.ajax({ $.ajax({
type: 'get', type: "get",
url: systemPath + '/select/getTeamBySubId', url: systemPath + "/select/getTeamBySubId",
data: { data: {
subId: subId subId: subId,
}, },
async: false, async: false,
success: function (data) { success: function (data) {
if(data.code == 200){ if (data.code == 200) {
let resultObj = data.data; let resultObj = data.data;
for (let i = 0; i < resultObj.length; i++) { for (let i = 0; i < resultObj.length; i++) {
if (teamId == resultObj[i].id) { if (teamId == resultObj[i].id) {
$("#fallPro").val(resultObj[i].proName); $("#fallPro").val(resultObj[i].proName);
$("#fallContract").val(resultObj[i].subContractName); $("#fallContract").val(resultObj[i].subContractName);
} }
} }
} }
@ -439,12 +491,12 @@ function getTeamBySubIdToData(subId,teamId) {
}, },
error: function (err) { error: function (err) {
console.log("获取班组下拉列表出错：", err); console.log("获取班组下拉列表出错：", err);
} },
}); });
} }
function onclickPdf(url){ function onclickPdf(url) {
if(url.lastIndexOf(".pdf") > 0){ if (url.lastIndexOf(".pdf") > 0) {
openPdfView(url); openPdfView(url);
} }
} }
@ -453,12 +505,15 @@ function openPdfView(url) {
localStorage.setItem("filePaths", fileUrl + "/" + url); localStorage.setItem("filePaths", fileUrl + "/" + url);
localStorage.removeItem("fileTimes"); localStorage.removeItem("fileTimes");
localStorage.removeItem("fileNames"); localStorage.removeItem("fileNames");
var height = '425px'; var height = "425px";
var width = '800px'; var width = "800px";
var index = layer.open({ var index = layer.open({
title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], title: [
"查看",
"color:#3B70A1;background-color:#E8ECEB;font-size:20px",
],
type: 2, type: 2,
content: '../../publicFileView.html', content: "../../publicFileView.html",
area: [width, height], area: [width, height],
maxmin: false, maxmin: false,
}); });

1093
modules/bmw/src/main/resources/static/pages/work/Person/personEntry/personEntryView.html
View File

File diff suppressed because it is too large Load Diff

6
modules/bmw/src/main/resources/static/pages/work/Person/train/personTrainFrom.js
View File

@ -318,9 +318,9 @@ function completeClick(){
companyExamScore: companyExamScore, companyExamScore: companyExamScore,
deptExamScore: deptExamScore, deptExamScore: deptExamScore,
teamExamScore: teamExamScore, teamExamScore: teamExamScore,
companyExamFilePath: companyExamFilePath, companyExamFile: companyExamFilePath,
deptExamFilePath: deptExamFilePath, deptExamFile: deptExamFilePath,
teamExamFilePath: teamExamFilePath teamExamFile: teamExamFilePath
} }
addPerson(data) addPerson(data)
} }

2
modules/file/src/main/java/com/bonus/file/upload/service/LocalSysFileServiceImpl.java
View File

@ -469,7 +469,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
: R.fail(FaceStatusCodeReturn.faceStatusCodeReturn(Integer.parseInt(code))); : R.fail(FaceStatusCodeReturn.faceStatusCodeReturn(Integer.parseInt(code)));
} catch (Exception e) { } catch (Exception e) {
log.error("上传文件失败", e); log.error("上传文件失败", e);
return R.fail(e.getMessage()); return R.fail("人脸识别失败，请重试");
} }
} }