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

Compare commits

base: lijingtong:ac57acc4b27b7d1dd76542f5e7190ac426d1e9ee
Branches Tags
lijingtong:master
..
compare: lijingtong:41cb9852ca7f6225d2ecc283e90532aa4584c4ce
Branches Tags
lijingtong:master

No commits in common. "ac57acc4b27b7d1dd76542f5e7190ac426d1e9ee" and "41cb9852ca7f6225d2ecc283e90532aa4584c4ce" have entirely different histories.
ac57acc4b2 ... 41cb9852ca

1 changed files with 23 additions and 78 deletions
Show Stats Expand all files Collapse all files

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

@ -47,25 +47,21 @@ public class ApprovalProcessController extends BaseController {
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
if (approvalProcess.getTimeType() != null) { if (approvalProcess.getTimeType() != null) {
if (approvalProcess.getTimeType() == 1) { if (approvalProcess.getTimeType() == 1) {
queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000L); queryWrapper.le("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000);
} else if (approvalProcess.getTimeType() == 2) { } else if (approvalProcess.getTimeType() == 2) {
queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000L); queryWrapper.le("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000);
} else if (approvalProcess.getTimeType() == 3) { } else if (approvalProcess.getTimeType() == 3) {
queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000L); queryWrapper.le("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000);
} }
} }
if (approvalProcess.getProcessTitle() != null) {
queryWrapper.like("process_title", approvalProcess.getProcessTitle())
.or().like("submitter_name", approvalProcess.getProcessTitle());
}
if (approvalProcess.getSubmitterId() != null) { if (approvalProcess.getSubmitterId() != null) {
queryWrapper.eq("submitter_id", getLoginUser().getUserId()); queryWrapper.eq("submitter_id", getLoginUser().getUserId());
} }
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper); List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
List<ApprovalProcess> newList = new ArrayList<>();
for (ApprovalProcess process : list) { for (ApprovalProcess process : list) {
if (process.getMatterType() == 2) { if (process.getMatterType() == 2) {
gwglLog one = gwglLogService.lambdaQuery() gwglLog one = gwglLogService.lambdaQuery()
.eq(gwglLog::getUuid, process.getUuid()) .eq(gwglLog::getUuid, process.getUuid())
@ -73,54 +69,11 @@ public class ApprovalProcessController extends BaseController {
.last("LIMIT 1") .last("LIMIT 1")
.one(); .one();
if (one != null) { if (one != null) {
if ((one.getCheckUserId() != null && one.getCheckUserId().equals(getUserId().toString()))
|| (one.getChecker() != null && one.getChecker().equals(getNickname()))) {
if (one.getCheckState() == 0) { if (one.getCheckState() == 0) {
process.setApprovalStatus(0); process.setApprovalStatus(0);
} else { } else {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
} else {
continue;
}
}
}
if (process.getMatterType() == 3) {
gwglLog one = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo())
.orderByDesc(gwglLog::getCreateTime)
.last("LIMIT 1")
.one();
if (one != null) {
if ((one.getCheckUserId() != null && one.getCheckUserId().equals(getUserId().toString()))
|| (one.getChecker() != null && one.getChecker().equals(getNickname()))) {
if (one.getCheckState() == 0) {
process.setApprovalStatus(0);
} else {
process.setApprovalStatus(1);
}
}else {
continue;
}
}
}
if (process.getMatterType() == 4) {
gwglLog one = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo())
.orderByDesc(gwglLog::getCreateTime)
.last("LIMIT 1")
.one();
if (one != null) {
if ((one.getCheckUserId() != null && one.getCheckUserId().equals(getUserId().toString()))
|| (one.getChecker() != null && one.getChecker().equals(getNickname()))) {
if (one.getCheckState() == 0) {
process.setApprovalStatus(0);
} else {
process.setApprovalStatus(1);
}
}else {
continue;
}
} }
} }
// 如果创建时间为当天的时间 // 如果创建时间为当天的时间
@ -167,15 +120,14 @@ public class ApprovalProcessController extends BaseController {
String formattedTime = localDateTime.format(formatter); String formattedTime = localDateTime.format(formatter);
process.setShowTime(formattedTime); process.setShowTime(formattedTime);
} }
newList.add(process);
} }
return getDataTable(newList); return getDataTable(list);
} }
public static void main(String[] args) { public static void main(String[] args) {
Long createTime = 1749279303395L; Long createTime = System.currentTimeMillis();
Instant instant = Instant.ofEpochMilli(createTime); Instant instant = Instant.ofEpochMilli(createTime);
Long time = createTime - 24 * 60 * 60 * 1000 * 3;
// 2. 转换为本地时区（如北京时间 UTC+8） // 2. 转换为本地时区（如北京时间 UTC+8）
LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, ZoneId.of("Asia/Shanghai")); LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, ZoneId.of("Asia/Shanghai"));
@ -184,7 +136,7 @@ public class ApprovalProcessController extends BaseController {
// 4. 格式化为字符串 // 4. 格式化为字符串
String formattedTime = localDateTime.format(formatter); String formattedTime = localDateTime.format(formatter);
System.out.println(formattedTime); System.out.println(time);
} }
@ApiOperation("根据编号查") @ApiOperation("根据编号查")
@ -200,24 +152,17 @@ public class ApprovalProcessController extends BaseController {
@ApiOperation("根据用户id查") @ApiOperation("根据用户id查")
@PostMapping("/getByuserId") @PostMapping("/getByuserId")
public TableDataInfo getByuserId(@RequestBody ApprovalProcess approvalProcess) { public TableDataInfo getByuserId(ApprovalProcess approvalProcess) {
QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess); List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
queryWrapper.orderByDesc("create_time"); .eq(ApprovalProcess::getSubmitterId, approvalProcess.getSubmitterId())
if (approvalProcess.getTimeType() != null) { .eq(approvalProcess.getApprovalStatus() != null, ApprovalProcess::getApprovalStatus, approvalProcess.getApprovalStatus())
if (approvalProcess.getTimeType() == 1) { .eq(approvalProcess.getCcName() != null, ApprovalProcess::getCcName, approvalProcess.getCcName())
queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000L); .eq(approvalProcess.getProcessTitle() != null, ApprovalProcess::getProcessTitle, approvalProcess.getProcessTitle())
} else if (approvalProcess.getTimeType() == 2) { .eq(approvalProcess.getSubmitterName() != null, ApprovalProcess::getSubmitterName, approvalProcess.getSubmitterName())
queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000L); .eq(approvalProcess.getTimeType() != null, ApprovalProcess::getTimeType, approvalProcess.getTimeType())
} else if (approvalProcess.getTimeType() == 3) { .orderByDesc(ApprovalProcess::getCreateTime)
queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000L); .list();
}
}
if (approvalProcess.getProcessTitle() != null) {
queryWrapper.like("process_title", approvalProcess.getProcessTitle())
.or().like("submitter_name", approvalProcess.getProcessTitle());
}
queryWrapper.eq("submitter_id", getLoginUser().getUserId());
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
for (ApprovalProcess process : list) { for (ApprovalProcess process : list) {
// 如果创建时间为当天的时间 // 如果创建时间为当天的时间