方亮
parent
e209b430db
commit
02fc76cedf
|
|
@ -51,7 +51,7 @@ public class SuspendPersonServiceImpl implements SuspendPersonService{
|
|||
bean.setOperate(1);
|
||||
List<String> attendanceMachineArr = basePersonDao.
|
||||
selectAttendanceMachineArr(c.getProId());
|
||||
if(attendanceMachineArr.size() != 0) {
|
||||
if(!attendanceMachineArr.isEmpty()) {
|
||||
attendanceMachineArr.forEach(v -> {
|
||||
bean.setAttendanceMachineId(v);
|
||||
bean.setFacePhoto(facePhoto);
|
||||
|
|
|
|||
|
|
@ -1206,69 +1206,15 @@
|
|||
</select>
|
||||
|
||||
<select id="getBasePersonLists" resultType="com.bonus.bmw.person.entity.PersonComprehensiveBean">
|
||||
/*select
|
||||
bw.name as name,bw.id_number as idNumber,bw.phone as phone,
|
||||
td.value as postName,bp.name as proName,bw.is_furlough_person as isFurloughPerson,
|
||||
CASE
|
||||
bw.employment_type
|
||||
WHEN '0' THEN
|
||||
'固定用工'
|
||||
WHEN '1' THEN
|
||||
'临时用工'
|
||||
WHEN '2' THEN
|
||||
'分包管理人员'
|
||||
END employmentType,
|
||||
CASE
|
||||
bw.light_status
|
||||
WHEN '0' THEN
|
||||
'红灯'
|
||||
WHEN '1' THEN
|
||||
'黄灯'
|
||||
WHEN '2' THEN
|
||||
'绿灯'
|
||||
END lightStatus,
|
||||
CASE
|
||||
WHEN bweh.exit_status = '-1' AND bw.is_furlough_person = '0' THEN
|
||||
'未出场'
|
||||
WHEN bweh.exit_status = '-1' AND bw.is_furlough_person = '1' THEN
|
||||
'临时离场'
|
||||
WHEN bweh.exit_status = '1' THEN
|
||||
'出场审核通过'
|
||||
WHEN bweh.exit_status = '0' THEN
|
||||
'出场未审核'
|
||||
WHEN bweh.exit_status = '2' THEN
|
||||
'出场审核不通过'
|
||||
ELSE
|
||||
'未入场'
|
||||
END AS exitStatus,
|
||||
bw.checkup_date as checkupDate,
|
||||
checkup.PHOTO_PATH as checkupFilePath,
|
||||
CASE
|
||||
WHEN STR_TO_DATE(bw.checkup_date, '%Y-%m-%d') < DATE_SUB(CURDATE(), INTERVAL 1 YEAR) THEN '过期'
|
||||
ELSE '有效'
|
||||
END AS checkupState
|
||||
from bm_worker bw
|
||||
LEFT JOIN t_dict td ON td.id = bw.post_id
|
||||
AND td.is_active = '1'
|
||||
LEFT JOIN bm_worker_ein_history bweh ON bweh.id_number = bw.id_number
|
||||
and bweh.is_active = '1'
|
||||
LEFT JOIN bm_project bp ON bp.id = bweh.project_id
|
||||
AND bp.is_active = '1'
|
||||
LEFT JOIN bm_worker_checkup checkup ON checkup.ID_NUMBER = bw.id_number
|
||||
AND checkup.IS_ACTIVE = '1'
|
||||
where bw.is_active='1'*/
|
||||
|
||||
SELECT
|
||||
bw.name as name,bw.id_number as idNumber,bw.phone as phone,
|
||||
td.value as postName,bp.name as proName,bw.is_furlough_person as isFurloughPerson,
|
||||
CASE
|
||||
bw.employment_type
|
||||
WHEN '0' THEN
|
||||
'固定用工'
|
||||
'本地务工'
|
||||
WHEN '1' THEN
|
||||
'临时用工'
|
||||
WHEN '2' THEN
|
||||
'分包管理人员'
|
||||
'外地务工'
|
||||
END employmentType,
|
||||
CASE
|
||||
bw.light_status
|
||||
|
|
@ -1330,7 +1276,10 @@
|
|||
LEFT JOIN sys_role sr ON sr.id = sru.roleId
|
||||
AND sr.is_active = '1'
|
||||
WHERE
|
||||
bw.IS_ACTIVE = 1 and bw.worker_type != 0
|
||||
bw.IS_ACTIVE = 1
|
||||
<if test="params.workerType != null and params.workerType != ''">
|
||||
and bw.worker_type = #{params.workerType}
|
||||
</if>
|
||||
<if test="params.name != null and params.name != ''">
|
||||
and locate (#{params.name},bw.name)
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -52,15 +52,6 @@
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-input-inline">
|
||||
<select id="employmentType" name="employmentType" class="form-control input-sm" lay-search="">
|
||||
<option value="">人员类型</option>
|
||||
<option value="0">临时用工</option>
|
||||
<option value="1">固定用工</option>
|
||||
<option value="2">分包管理人员</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="layui-input-inline">
|
||||
<select id="lightStatus" name="lightStatus" class="form-control input-sm" lay-search="">
|
||||
<option value="">红绿灯状态</option>
|
||||
|
|
|
|||
|
|
@ -130,11 +130,9 @@ function init(){
|
|||
var employmentType = row['employmentType'];
|
||||
var html = '';
|
||||
if (employmentType === "0") {
|
||||
html = "临时用工";
|
||||
html = "本地务工";
|
||||
}else if (employmentType === "1"){
|
||||
html = "固定用工";
|
||||
}else if (employmentType === "2"){
|
||||
html = "分包管理人员";
|
||||
html = "外地务工";
|
||||
}
|
||||
return html;
|
||||
}
|
||||
|
|
@ -295,7 +293,7 @@ function add() {
|
|||
// 获取当前页码
|
||||
var table = $('#dt-table').DataTable();
|
||||
var currentPage = table.page(); // 当前页码（从0开始）
|
||||
|
||||
|
||||
var index = layer.open({
|
||||
title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
|
||||
type: 2,
|
||||
|
|
@ -535,10 +533,9 @@ function exportPersonnelOnSite() {
|
|||
+ "&name=" + name
|
||||
+ "&proId=" + proId
|
||||
+ "&idNumber=" + idNumber
|
||||
+ "&employmentType=" + employmentType
|
||||
+ "&workerType=1"
|
||||
+ "&einStatus=" + einStatus
|
||||
+ "&lightStatus=" + lightStatus
|
||||
//+ "&keyWord=" + keyWord;
|
||||
+ "&lightStatus=" + lightStatus;
|
||||
}
|
||||
|
||||
// 全局定义 onSaveSuccess 函数
|
||||
|
|
|
|||
|
|
@ -52,14 +52,6 @@
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-input-inline">
|
||||
<select id="employmentType" name="employmentType" class="form-control input-sm" lay-search="">
|
||||
<option value="">人员类型</option>
|
||||
<option value="0">临时用工</option>
|
||||
<option value="1">固定用工</option>
|
||||
<option value="2">分包管理人员</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="layui-input-inline">
|
||||
<select id="lightStatus" name="lightStatus" class="form-control input-sm" lay-search="">
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ function init(){
|
|||
d.name = $("#name").val();
|
||||
d.proName = $("#proName").val();
|
||||
d.idNumber = $("#idNumber").val();
|
||||
d.employmentType = $("#employmentType").val();
|
||||
d.einStatus = $("#einStatus").val();
|
||||
d.lightStatus = $("#lightStatus").val();
|
||||
d.keyWord = $("#keyWord").val();
|
||||
|
|
@ -130,11 +129,9 @@ function init(){
|
|||
var employmentType = row['employmentType'];
|
||||
var html = '';
|
||||
if (employmentType === "0") {
|
||||
html = "临时用工";
|
||||
html = "本地务工";
|
||||
}else if (employmentType === "1"){
|
||||
html = "固定用工";
|
||||
}else if (employmentType === "2"){
|
||||
html = "分包管理人员";
|
||||
html = "外地务工";
|
||||
}
|
||||
return html;
|
||||
}
|
||||
|
|
@ -295,7 +292,7 @@ function add() {
|
|||
// 获取当前页码
|
||||
var table = $('#dt-table').DataTable();
|
||||
var currentPage = table.page(); // 当前页码（从0开始）
|
||||
|
||||
|
||||
var index = layer.open({
|
||||
title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
|
||||
type: 2,
|
||||
|
|
@ -521,23 +518,16 @@ function checkViewEn(idNumber) {
|
|||
//导出excel表格
|
||||
function exportPersonnelOnSite() {
|
||||
var name = $("#name").val();
|
||||
var proName = $("#proName").val();
|
||||
var idNumber = $("#idNumber").val();
|
||||
var employmentType = $("#employmentType").val();
|
||||
var einStatus = $("#einStatus").val();
|
||||
var lightStatus = $("#lightStatus").val();
|
||||
var keyWord = $("#keyWord").val();
|
||||
|
||||
|
||||
|
||||
window.location.href = ctxPath + "/personComprehensive/exportBtnOut?token=" + token
|
||||
+ "&name=" + name
|
||||
+ "&proName=" + proName
|
||||
+ "&idNumber=" + idNumber
|
||||
+ "&employmentType=" + employmentType
|
||||
+ "&workerType=0"
|
||||
+ "&einStatus=" + einStatus
|
||||
+ "&lightStatus=" + lightStatus
|
||||
+ "&keyWord=" + keyWord;
|
||||
+ "&lightStatus=" + lightStatus;
|
||||
}
|
||||
|
||||
// 全局定义 onSaveSuccess 函数
|
||||
|
|
|
|||
|
|
@ -117,15 +117,18 @@ function init(){
|
|||
"data": "",
|
||||
"render": function (data, type, full) {
|
||||
var node = '';
|
||||
node = '<input id="unchecked" class="checkall" name="checked" onclick="showCheck(this)" value=\"' + full.name + "," + full.idNumber + "," + full.postName + "," + full.proName + "," + full.subName + "," + full.teamName + "," + full.exitVideoPath + "," + full.exitSignPath +'\" type="checkbox"/>';
|
||||
// node = '<input id="unchecked" class="checkall" name="checked" onclick="showCheck(this)" value=\"' + full.name + "," + full.idNumber + "," + full.postName + "," + full.proName + "," + full.subName + "," + full.teamName + "," + full.exitVideoPath + "," + full.exitSignPath +'\" type="checkbox"/>';
|
||||
node = '<input id="unchecked" class="checkall" name="checked" onclick="showCheck(this)" value=\"' + full.idNumber + "," + full.proId +'\" type="checkbox"/>';
|
||||
if (checkList.length > 0) {//循环记忆数据
|
||||
for (let i = 0; i < checkList.length; i++) {
|
||||
if (full.idNumber == checkList[i].id.split(',')[0]) {
|
||||
if (checkList[i].type == '1') {//如果是1 则选中
|
||||
pageCheckNum++;
|
||||
node = '<input class="checkall" onclick="showCheck(this)" id="checked" name="checked" checked="true" value=\"' + full.name + "," + full.idNumber + "," + full.postName + "," + full.proName + "," + full.subName + "," + full.teamName + "," + full.exitVideoPath + "," + full.exitSignPath + '\" type="checkbox"/>';
|
||||
// node = '<input class="checkall" onclick="showCheck(this)" id="checked" name="checked" checked="true" value=\"' + full.name + "," + full.idNumber + "," + full.postName + "," + full.proName + "," + full.subName + "," + full.teamName + "," + full.exitVideoPath + "," + full.exitSignPath + '\" type="checkbox"/>';
|
||||
node = '<input class="checkall" onclick="showCheck(this)" id="checked" name="checked" checked="true" value=\"' + full.idNumber + "," + full.proId + '\" type="checkbox"/>';
|
||||
} else {//为2 不选中
|
||||
node = '<input class="checkall" onclick="showCheck(this)" name="checked" id="unchecked" value=\"' + full.name + "," + full.idNumber + "," + full.postName + "," + full.proName + "," + full.subName + "," + full.teamName + "," + full.exitVideoPath + "," + full.exitSignPath + '\" type="checkbox"/>';
|
||||
// node = '<input class="checkall" onclick="showCheck(this)" name="checked" id="unchecked" value=\"' + full.name + "," + full.idNumber + "," + full.postName + "," + full.proName + "," + full.subName + "," + full.teamName + "," + full.exitVideoPath + "," + full.exitSignPath + '\" type="checkbox"/>';
|
||||
node = '<input class="checkall" onclick="showCheck(this)" name="checked" id="unchecked" value=\"' + "," + full.idNumber + "," + full.proId + '\" type="checkbox"/>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -416,4 +419,4 @@ function batchOutApplyView() {
|
|||
submited.click();
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue