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

人员入场

This commit is contained in:
lSun 2025-06-12 15:33:49 +08:00
parent 387333e9ca
commit bfc15a29d6
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
View File

@ -417,6 +417,7 @@
bw.checkup_date as checkupDate, bw.checkup_date as checkupDate,
checkup.PHOTO_PATH as checkupFilePath, checkup.PHOTO_PATH as checkupFilePath,
CASE CASE
WHEN IFNULL(bw.checkup_date, '') = '' THEN '未体检'
WHEN STR_TO_DATE(bw.checkup_date, '%Y-%m-%d') < DATE_SUB(CURDATE(), INTERVAL 1 YEAR) THEN '过期' WHEN STR_TO_DATE(bw.checkup_date, '%Y-%m-%d') < DATE_SUB(CURDATE(), INTERVAL 1 YEAR) THEN '过期'
ELSE '有效' ELSE '有效'
END AS checkupState END AS checkupState

11
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.js
View File

@ -167,12 +167,17 @@ function init(){
"defaultContent": "", "defaultContent": "",
"orderable": false, "orderable": false,
"render": function (data, type, row) { "render": function (data, type, row) {
var checkupFilePath = row['checkupFilePath'];
var checkupState = row['checkupState']; var checkupState = row['checkupState'];
var html = ''; var html = '';
if (checkupState === "有效") { if(checkupFilePath == null || checkupFilePath == "" || checkupFilePath == "null"){
html = "<span style='color: green'>有效</span>"; html = "<span style='color: red'>未上传</span>";
}else{ }else{
html = "<span style='color: red'>过期</span>"; if(checkupState === "有效"){
html = "<span style='color: green'>已上传</span>";
}else if(checkupState === "过期"){
html = "<span style='color: #F8B664'>已过期</span>";
}
} }
return html; return html;
} }

4
modules/lineProtector/src/main/java/com/bonus/lineProtector/LineProtectorApplication.java
View File

@ -2,7 +2,7 @@ package com.bonus.lineProtector;
import com.bonus.common.security.annotation.EnableCustomConfig; import com.bonus.common.security.annotation.EnableCustomConfig;
import com.bonus.common.security.annotation.EnableRyFeignClients; import com.bonus.common.security.annotation.EnableRyFeignClients;
import com.bonus.common.swagger.annotation.EnableCustomSwagger2; //import com.bonus.common.swagger.annotation.EnableCustomSwagger2;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -16,7 +16,7 @@ import org.springframework.core.env.Environment;
@EnableCustomConfig @EnableCustomConfig
@EnableRyFeignClients @EnableRyFeignClients
@SpringBootApplication @SpringBootApplication
@EnableCustomSwagger2 //@EnableCustomSwagger2
@MapperScan({"com.bonus.lineProtector.*.dao"}) @MapperScan({"com.bonus.lineProtector.*.dao"})
@ServletComponentScan @ServletComponentScan
public class LineProtectorApplication { public class LineProtectorApplication {