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

Compare commits

base: lijingtong:a0e79e24ab72f68ef53d65c1715b6872e8f91845
Branches Tags
lijingtong:master
..
compare: lijingtong:87a09f20d1f8b704203e30964c6bba786d633f88
Branches Tags
lijingtong:master

No commits in common. "a0e79e24ab72f68ef53d65c1715b6872e8f91845" and "87a09f20d1f8b704203e30964c6bba786d633f88" have entirely different histories.
a0e79e24ab ... 87a09f20d1

3 changed files with 15 additions and 22 deletions
Show Stats Expand all files Collapse all files

26
gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
View File

@ -127,15 +127,15 @@ public class BusinessTripApprovalController extends BaseController {
List<Long> longs = new ArrayList<>();
if (isLeader == 1) {
if (dto.getHasOffcialCar() == 1) {
approvalProcess.setApprovalStatusH(100);
approvalProcess.setApprovalStatus(100);
longs.add(2165L);
} else {
approvalProcess.setApprovalStatusH(400);
approvalProcess.setApprovalStatus(400);
longs.add(1660L);
longs.add(1661L);
}
} else {
approvalProcess.setApprovalStatusH(1);
approvalProcess.setApprovalStatus(1);
longs.add(user.getDept().getLeaderId());
}
addLog(approvalProcess, longs);
@ -278,16 +278,16 @@ public class BusinessTripApprovalController extends BaseController {
.eq(BusinessTripApproval::getUuid,uuid)
.last("LIMIT 1")
.one();
Integer approvalStatus = approvalProcess.getApprovalStatusH();
Integer approvalStatus = approvalProcess.getApprovalStatus();
if (dto.getState() == 1) {
if (approvalStatus == 1) {
List<Long> userIds = new ArrayList<>();
if (businessTripApproval.getHasOffcialCar() == 1) {
approvalProcess.setApprovalStatusH(100);
approvalProcess.setApprovalStatus(100);
userIds.add(2165L);
} else {
approvalProcess.setApprovalStatusH(400);
approvalProcess.setApprovalStatus(400);
userIds.add(1660L);
userIds.add(1661L);
}
@ -300,7 +300,7 @@ public class BusinessTripApprovalController extends BaseController {
if (dto.getPlateNo() == null) {
throw new RuntimeException("车牌号不可为空");
}
approvalProcess.setApprovalStatusH(200);
approvalProcess.setApprovalStatus(200);
List<Long> userIds = new ArrayList<>();
userIds.add(2157L);
addLog(approvalProcess, userIds);
@ -309,20 +309,20 @@ public class BusinessTripApprovalController extends BaseController {
if (dto.getLeaderId() == null) {
throw new RuntimeException("请选择分管局领导");
}
approvalProcess.setApprovalStatusH(300);
approvalProcess.setApprovalStatus(300);
List<Long> userIds = new ArrayList<>();
userIds.add(dto.getLeaderId());
addLog(approvalProcess, userIds);
}
if (approvalStatus == 300) {
approvalProcess.setApprovalStatusH(400);
approvalProcess.setApprovalStatus(400);
List<Long> userIds = new ArrayList<>();
userIds.add(1660L);
userIds.add(1661L);
addLog(approvalProcess, userIds);
}
if (approvalStatus == 400) {
approvalProcess.setApprovalStatusH(500);
approvalProcess.setApprovalStatus(500);
}
one.setCheckState(dto.getState());
one.setCheckTime(System.currentTimeMillis() / 1000L);
@ -335,13 +335,13 @@ public class BusinessTripApprovalController extends BaseController {
throw new RuntimeException("驳回意见不可为空");
}
if (approvalStatus == 100 || approvalStatus == 200 || approvalStatus == 300) {
approvalProcess.setApprovalStatusH(400);
approvalProcess.setApprovalStatus(400);
List<Long> userIds = new ArrayList<>();
userIds.add(1660L);
userIds.add(1661L);
addLog(approvalProcess, userIds);
}else {
approvalProcess.setApprovalStatusH(0);
approvalProcess.setApprovalStatus(0);
List<Long> userIds = new ArrayList<>();
userIds.add(approvalProcess.getSubmitterId());
addLog(approvalProcess, userIds);
@ -364,7 +364,7 @@ public class BusinessTripApprovalController extends BaseController {
gwglLog.setUserName(approvalProcess.getSubmitterName());
gwglLog.setCheckState(0);
gwglLog.setUuid(approvalProcess.getUuid());
gwglLog.setApprovalStatusH(approvalProcess.getApprovalStatusH());
gwglLog.setApprovalStatus(approvalProcess.getApprovalStatus());
gwglLog.setCreateTime(System.currentTimeMillis() / 1000L);
SysUser user = new SysUser();
StringBuilder name = new StringBuilder();

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

@ -57,16 +57,9 @@ public class ApprovalProcess {
@ApiModelProperty("审批状态：0-未审核 1-通过 2-不通过")
@TableField(condition = SqlCondition.LIKE)
private Integer approvalStatus;
@ApiModelProperty("审批状态")
private Integer approvalStatusH;
@TableField(exist = false)
private String approvalStatusCn;
@TableField(exist = false)
private String approvalStatusHCn;
@ApiModelProperty("到达日期")
private Long arrivalDate;
@TableField(exist = false)

4
gather-app/src/main/java/com/ruoyi/database/domain/gwglLog.java
View File

@ -77,7 +77,7 @@ public class gwglLog {
@ApiModelProperty("审批状态")
private Integer approvalStatusH;
private Integer approvalStatus;
@TableField(exist = false)
private String approvalStatusHCn;
private String approvalStatusCn;
}