diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/service/FaceContrastNewServiceImp.java b/modules/bmw/src/main/java/com/bonus/bmw/person/service/FaceContrastNewServiceImp.java index 718df23..cfde43d 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/service/FaceContrastNewServiceImp.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/service/FaceContrastNewServiceImp.java @@ -50,11 +50,11 @@ public class FaceContrastNewServiceImp implements FaceContrastNewService { //把分公司下级全部查出来 List list = dao.getWorkAttendanceList(params, offset, limit); //1115将临时考勤人员查出来 - List list2 = dao.getWorkAttendanceTemporaryList(params, offset, limit); + // List list2 = dao.getWorkAttendanceTemporaryList(params, offset, limit); //将临时人员加到总人数上 - for (int i = 0; i < list.size(); i++) { - list.get(i).setAllPersonNum(list.get(i).getAllPersonNum() + list2.get(i).getAllPersonNum()); - } +// for (int i = 0; i < list.size(); i++) { +// list.get(i).setAllPersonNum(list.get(i).getAllPersonNum() + list2.get(i).getAllPersonNum()); +// } //考勤数据较慢单独查 List attList = dao.getWorkAttList(params, offset, limit); for (int i = 0; i < attList.size(); i++) { diff --git a/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml b/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml index f026c82..53f0102 100644 --- a/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml @@ -41,7 +41,7 @@ LEFT JOIN bm_sub_relation bsr on bsr.sub_contract_id = bsc.id and bsr.type = '3' and bsr.is_active = '1' LEFT JOIN bm_team_user_relation btur ON btur.team_id = bsr.`value` and btur.is_active = '1' - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = btur.ID_NUMBER and bw.is_active = '1' + LEFT JOIN bm_worker bw ON bw.ID_NUMBER = btur.ID_NUMBER and bw.is_active = '1' and worker_type = '1' GROUP BY pm.id ORDER BY @@ -60,7 +60,11 @@ ) pm LEFT JOIN bm_project bp ON bp.project_general_id = pm.id AND bp.is_active = '1' - LEFT JOIN ( SELECT id_number, pro_id FROM fc_face_contrast WHERE CURRENT_DAY = #{params.startTime} GROUP BY id_number, CURRENT_DAY ) ffc ON ffc.pro_id = bp.id + LEFT JOIN ( + SELECT fc.id_number, fc.pro_id FROM fc_face_contrast fc + LEFT JOIN bm_worker bw on bw.id_number = fc.ID_NUMBER and bw.worker_type = '1' + WHERE fc.CURRENT_DAY = #{params.startTime} GROUP BY fc.id_number, fc.CURRENT_DAY + ) ffc ON ffc.pro_id = bp.id GROUP BY pm.id ORDER BY @@ -252,7 +256,7 @@ LEFT JOIN bm_team_user_relation btur ON btur.team_id = bsr.`value` AND btur.is_active = '1' LEFT JOIN bm_worker bw ON bw.ID_NUMBER = btur.ID_NUMBER - AND bw.is_active = '1' + AND bw.is_active = '1' and bw.worker_type = '1' @@ -295,7 +299,7 @@ LEFT JOIN bm_sub_team bst ON bst.id = bsr.`value` LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.id and btur.is_active = '1' - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = btur.ID_NUMBER and bw.is_active = '1' + LEFT JOIN bm_worker bw ON bw.ID_NUMBER = btur.ID_NUMBER and bw.is_active = '1' and bw.worker_type = '1' WHERE bp.id = #{params.proId} and bst.id is not null @@ -474,7 +478,7 @@ bweh.is_active FROM bm_worker_ein_history bweh - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER + LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.worker_type = '1' bweh.project_id = #{params.proId} @@ -570,11 +574,13 @@ and project_id = #{params.proId} GROUP BY id_number)bweh ON bweh.project_id = bp.id - LEFT JOIN ( SELECT id_number, pro_id FROM fc_face_contrast WHERE CURRENT_DAY = #{params.startTime} + LEFT JOIN ( SELECT fc.id_number, fc.pro_id FROM fc_face_contrast fc + LEFT JOIN bm_worker bw on bw.id_number = fc.ID_NUMBER and bw.worker_type = '1' + WHERE fc.CURRENT_DAY = #{params.startTime} - and pro_id = #{params.proId} + and fc.pro_id = #{params.proId} - GROUP BY id_number, CURRENT_DAY ) ffc ON ffc.pro_id = bp.id + GROUP BY fc.id_number, fc.CURRENT_DAY ) ffc ON ffc.pro_id = bp.id and bp.id = #{params.proId} @@ -727,7 +733,7 @@ ) pm LEFT JOIN bm_project bp ON bp.project_general_id = pm.id and bp.is_active = '1' LEFT JOIN ( SELECT id_number, project_id FROM bm_worker_ein_history WHERE (sub_id is null or sub_id = 0)and is_active = '1' AND is_furlough_person = '0' AND exit_status != '1' GROUP BY id_number) bweh ON bweh.project_id = bp.id - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1' + LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1' and worker_type = '1' GROUP BY pm.id ORDER BY diff --git a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml index 0773b2d..da2c2d6 100644 --- a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml @@ -42,7 +42,7 @@ where `id_number` = #{idNumber}; INSERT INTO `bm_team_user_relation` (`team_id`, `id_number`, is_regular_person, is_foreman, `IS_ACTIVE`) - VALUES (#{teamId}, #{idNumber}, #{isRegularPerson}, #{isForeman}, '1'); + VALUES (#{teamId}, #{idNumber}, '0', '0', '1'); insert into bm_worker_contract diff --git a/modules/bmw/src/main/resources/static/js/work/Person/AttendanceManageNew/AttendanceByProList.js b/modules/bmw/src/main/resources/static/js/work/Person/AttendanceManageNew/AttendanceByProList.js index 0860e0b..4358ac6 100644 --- a/modules/bmw/src/main/resources/static/js/work/Person/AttendanceManageNew/AttendanceByProList.js +++ b/modules/bmw/src/main/resources/static/js/work/Person/AttendanceManageNew/AttendanceByProList.js @@ -204,12 +204,12 @@ function init() { var proName = row['proName']; var html = ''; html += "" + NoNull(teamName) + ""; - if(NoNull(teamName) == "无班组人员"){ - var str = '人员临时入场，还没有进入班组；' + - '进入班组后人员自动从无班组人员中去掉；' + - '无班组人员直接将出场无法通过工资册发工资。'; - html += "" - } + // if(NoNull(teamName) == "无班组人员"){ + // var str = '人员临时入场，还没有进入班组；' + + // '进入班组后人员自动从无班组人员中去掉；' + + // '无班组人员直接将出场无法通过工资册发工资。'; + // html += "" + // } return html; },width: '25%'}, {"data": "allPersonNum",width: '10%'}, diff --git a/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractList.js b/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractList.js index 2051a8a..9c71919 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractList.js +++ b/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractList.js @@ -106,22 +106,6 @@ function init() { }, "width": "5%" }, {"data": "principal", "defaultContent": "", "width": "5%"}, - { - "render": function (data, type, row) { - var id = row['id']; - var teamNumber = row['teamNumber']; - var html = " " + teamNumber + " "; - return html; - }, "width": "5%" - }, - /*{ - "render": function (data, type, row) { - var id = row['id']; - var personNumber = row['personNumber']; - var html = " " + personNumber + " "; - return html; - }, "width": "5%" - },*/ { "render": function (data, type, row) { var id = row['id']; @@ -327,7 +311,7 @@ function buttonCompleteData(id, permission, pers) { * 合同完工 * */ function completeView(id) { - let index = layer.confirm("确定完结该合同吗？
合同完结会将班组移除，非固定人员移出班组并出场，请谨慎操作", function () { + let index = layer.confirm("确定完结该合同吗？
合同完结会将班组移除，人员移出班组并出场，请谨慎操作", function () { $.ajax({ type: 'post', contentType: "application/x-www-form-urlencoded", diff --git a/modules/bmw/src/main/resources/static/js/work/team/BasicMsg/TeamBasicList.js b/modules/bmw/src/main/resources/static/js/work/team/BasicMsg/TeamBasicList.js index 2d253af..4159380 100644 --- a/modules/bmw/src/main/resources/static/js/work/team/BasicMsg/TeamBasicList.js +++ b/modules/bmw/src/main/resources/static/js/work/team/BasicMsg/TeamBasicList.js @@ -106,9 +106,9 @@ function init() { }, {"data": "subName", "defaultContent": "","width":"5%"}, {"data": "teamName", "defaultContent": "","width":"4%"}, - {"data": "foreman","orderable": false, "defaultContent": "","width":"4%"}, - {"data": "foremanIdNumber","orderable": false, "defaultContent": "","width":"8%"}, - {"data": "foremanPhone","orderable": false, "defaultContent": "","width":"9%"}, + // {"data": "foreman","orderable": false, "defaultContent": "","width":"4%"}, + // {"data": "foremanIdNumber","orderable": false, "defaultContent": "","width":"8%"}, + // {"data": "foremanPhone","orderable": false, "defaultContent": "","width":"9%"}, { "width":"7%", "data": "", @@ -126,6 +126,8 @@ function init() { if(idNumbers == '' || idNumbers == null || idNumbers == 'null' || idNumbers == undefined || idNumbers == 'undefined'){ html += buttonSwitchSub(id, "sys:teamBasic:update", pers); } + + html += buttonCheckData(id, "", pers); return html; } }, @@ -134,6 +136,39 @@ function init() { }); } + +function buttonCheckData(id, permission, pers) { + if (permission != "") { + if ($.inArray(permission, pers) < 0) { + return ""; + } + } + var btn = $(""); + return btn.prop("outerHTML"); +} + +/** + * 查看 + * */ +function checkView(id) { + localStorage.setItem("teamId", id); + let width = "80%"; + let height = "90%"; + var index = layer.open({ + title: ['班组成员查看', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: '../PersonSetting/TeamPersonList.html', + area: [width, height], + maxmin: false, + success: function (layero, index) { + + }, + yes: function (index, layero) { + + } + }); +} + /** * 新增页面 * */ diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html index 7d9704f..2a13fb3 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html @@ -252,6 +252,56 @@ + + +
+
分包班组信息 + （若没有分包、班组信息，请先签署分包合同） +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+
安全培训考试 @@ -467,76 +517,7 @@
- -
-
分包班组信息 - （固定人员生成工资册之前必须完善） -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - -
-
合同信息 diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js index a237e9a..c309a07 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js @@ -683,6 +683,9 @@ function keyContentRequired() { var phone = $("#phone").val(); //手机号码 var proId = $("#proId").val(); //工程 + var subId = $("#subId").val(); + var teamId = $("#teamId").val(); + var checkupDate = $("#checkupDate").val(); //体检日期 if (checkupDate === "" || checkupDate === "null" || checkupDate == null) { layer.alert("未填写体检日期", { icon: 0 }); @@ -702,28 +705,15 @@ function keyContentRequired() { layer.alert("未选择工程", { icon: 0 }); $("#proId").focus(); return false; + } else if(subId === "" || subId === "null" || subId == null){ + layer.alert("未选择所属分包", { icon: 0 }); + $("#subId").focus(); + return false; + } else if(teamId === "" || teamId === "null" || teamId == null){ + layer.alert("未选择所属班组", { icon: 0 }); + $("#teamId").focus(); + return false; } - // else{ - // //verifyPersonPhone - // let state = true; - // $.ajax({ - // type: 'post', - // url: ctxPath + '/personComprehensive/verifyPersonPhone', - // async: false, - // data: { - // phone: phone - // }, - // success: function (data) { - // if(data.code != '200'){ - // layer.alert(data.msg); - // state = false; - // } - // } - // }); - // if(!state){ - // return false; - // } - // } return true; } diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html index e5fa90f..1767cdf 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html @@ -227,6 +227,54 @@
+ + +
+
分包班组信息 + （固定人员生成工资册之前必须完善） +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+
安全培训考试 @@ -442,76 +490,7 @@
- -
-
分包班组信息 - （固定人员生成工资册之前必须完善） -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - -
-
-
- -
- -
-
- -
-
-
-
-
-