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

Compare commits

base: bonus:bfc15a29d68e3f65bb4e6f80f2ab399119ae48ae
Branches Tags
bonus:main
..
compare: bonus:279e5837cd8ac3692f34573604830207eb03593b
Branches Tags
bonus:main

No commits in common. "bfc15a29d68e3f65bb4e6f80f2ab399119ae48ae" and "279e5837cd8ac3692f34573604830207eb03593b" have entirely different histories.
bfc15a29d6 ... 279e5837cd

5 changed files with 6 additions and 15 deletions
Show Stats Expand all files Collapse all files

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

@ -417,7 +417,6 @@
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

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

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

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

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

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

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

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.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 {