人员入场

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

modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js

@@ -506,7 +506,7 @@ function completeClick(){
         //上传合同
         contractId,
         uploadContractSwitch: uploadContractSwitch, //上传合同 是否填写
-        contractCode: contractRef, //上传合同 合同编号
+        contractCode: '0001-zdsc', //上传合同 合同编号
         laborContractType: contractTermType, //上传合同 合同期限类型
         contractValidDate: contractStartTime, //上传合同 合同签订日期
         contractInvalidDate: contractEndTime, //上传合同 合同终止日期

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 = "<span style='color: green'>有效</span>";
+                        if(checkupFilePath == null || checkupFilePath == "" || checkupFilePath == "null"){
+                            html = "<span style='color: red'>未上传</span>";
                         }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;
                     }

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

@@ -2003,6 +2003,9 @@ function nextClick(e) {
                     contractRef != null
                 ) {
                     contractTf = uploadContractRequired();
+                }else{
+                    layer.alert("合同编号为空，请在合同管理先上传合同", { icon: 0 });
+                    return false;
                 }
                 if (contractTf) {
                     completeClick();

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 {