lijingtong
/
PublicAffairs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lijingtong:bbd9f9a98e10c4d71f9e8d18f670ffbc96b7cb32
Branches Tags
lijingtong:master
..
compare: lijingtong:c667ab6f30b348155d0285a1f015d322b1ddfa3e
Branches Tags
lijingtong:master

No commits in common. "bbd9f9a98e10c4d71f9e8d18f670ffbc96b7cb32" and "c667ab6f30b348155d0285a1f015d322b1ddfa3e" have entirely different histories.
bbd9f9a98e ... c667ab6f30

2 changed files with 7 additions and 10 deletions
Show Stats Expand all files Collapse all files

12
gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
View File

@ -80,9 +80,9 @@ public class ApprovalProcessController extends BaseController {
} else {
process.setApprovalStatus(1);
}
} else {
continue;
}
}else {
continue;
}
}
if (process.getMatterType() == 3) {
@ -99,9 +99,9 @@ public class ApprovalProcessController extends BaseController {
} else {
process.setApprovalStatus(1);
}
}else {
continue;
}
}else {
continue;
}
}
if (process.getMatterType() == 4) {
@ -118,9 +118,9 @@ public class ApprovalProcessController extends BaseController {
} else {
process.setApprovalStatus(1);
}
}else {
continue;
}
}else {
continue;
}
}
// 如果创建时间为当天的时间

5
gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java
View File

@ -51,7 +51,7 @@ public class ApprovalProcess {
@ApiModelProperty("事项类型 4-喝酒 3-请假 2-出差 1-出县")
private Integer matterType;
@TableField(exist = false)
@ApiModelProperty("日期类型 4-自定义日期 3-近三十日 2-近七日 1-近三日")
private Integer timeType;
@ApiModelProperty("审批状态：0-未审核 1-通过 2-不通过")
@ -140,7 +140,4 @@ public class ApprovalProcess {
@TableField(exist = false)
private String leaveTypeCn;
@TableField(exist = false)
private String processTitles;
}