diff --git a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml index b60b562..5dcfc5f 100644 --- a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml @@ -417,6 +417,7 @@ bw.checkup_date as checkupDate, checkup.PHOTO_PATH as checkupFilePath, CASE + WHEN IFNULL(bw.checkup_date, '') = '' THEN '未体检' WHEN STR_TO_DATE(bw.checkup_date, '%Y-%m-%d') < DATE_SUB(CURDATE(), INTERVAL 1 YEAR) THEN '过期' ELSE '有效' END AS checkupState diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.js index 397b686..32c3599 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.js @@ -167,12 +167,17 @@ function init(){ "defaultContent": "", "orderable": false, "render": function (data, type, row) { + var checkupFilePath = row['checkupFilePath']; var checkupState = row['checkupState']; var html = ''; - if (checkupState === "有效") { - html = "有效"; + if(checkupFilePath == null || checkupFilePath == "" || checkupFilePath == "null"){ + html = "未上传"; }else{ - html = "过期"; + if(checkupState === "有效"){ + html = "已上传"; + }else if(checkupState === "过期"){ + html = "已过期"; + } } return html; } diff --git a/modules/lineProtector/src/main/java/com/bonus/lineProtector/LineProtectorApplication.java b/modules/lineProtector/src/main/java/com/bonus/lineProtector/LineProtectorApplication.java index 56a6cd9..15c7477 100644 --- a/modules/lineProtector/src/main/java/com/bonus/lineProtector/LineProtectorApplication.java +++ b/modules/lineProtector/src/main/java/com/bonus/lineProtector/LineProtectorApplication.java @@ -2,7 +2,7 @@ package com.bonus.lineProtector; import com.bonus.common.security.annotation.EnableCustomConfig; 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.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -16,7 +16,7 @@ import org.springframework.core.env.Environment; @EnableCustomConfig @EnableRyFeignClients @SpringBootApplication -@EnableCustomSwagger2 +//@EnableCustomSwagger2 @MapperScan({"com.bonus.lineProtector.*.dao"}) @ServletComponentScan public class LineProtectorApplication {