Browse Source

modify:

1. 工作台项目进度统计修改;
tags/24110601
WendyYang 4 weeks ago
parent
commit
bad2ac59a2
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/user/manage/AuthCodeLoginManage.java
  2. +2
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java

+ 1
- 1
hz-pm-api/src/main/java/com/hz/pm/api/user/manage/AuthCodeLoginManage.java View File

@@ -33,7 +33,7 @@ public class AuthCodeLoginManage {

private String generateAuthCode(String userId, boolean checkSign, Long timestamp, String sign) {
if (checkSign) {
if (System.currentTimeMillis() - timestamp > 5000) {
if (Math.abs(System.currentTimeMillis() - timestamp) > 10000) {
throw BizException.wrap("签名无效");
}
HMac hmacMd5 = SecureUtil.hmacMd5(authCodeProps.getSecretKey());


+ 2
- 1
hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java View File

@@ -361,7 +361,8 @@ public class WorkbenchManage {
.eq(Project::getProjectYear, req.getProjectYear())
.eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip())
.eq(Project::getNewest, Boolean.TRUE)
.ne(Project::getStatus, ProjectStatus.CHANGE_APPLY_PASSED.getCode())
.notIn(Project::getStatus, ProjectStatus.CHANGE_APPLY_PASSED.getCode(),
ProjectStatus.STOPPED_PASSED.getCode())
.exists(ExistsSqlConst.PROJECT_EXISTS_STATUS_CHANGE + " and npsc.event = {0}",
ProjectStateChangeEvent.PROJECT_APPLICATION_SUBMIT)
.in(Project::getBuildOrgCode, CollUtils.convert(viewUnitIds, String::valueOf));


Loading…
Cancel
Save