Browse Source

Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev

master
PoffyZhang 1 year ago
parent
commit
ba2780012b
2 changed files with 5 additions and 0 deletions
  1. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
  2. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/TodoServiceImpl.java

+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java View File

@@ -42,6 +42,7 @@ import com.ningdatech.pmapi.projectlib.model.vo.AnnualPlanListItemVO;
import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService;
import com.ningdatech.pmapi.projectlib.service.IProjectRenewalFundDeclarationService;
import com.ningdatech.pmapi.projectlib.service.IProjectService;
import com.ningdatech.pmapi.todocenter.constant.TodoCenterConstant;
import com.ningdatech.pmapi.user.security.auth.model.UserFullInfoDTO;
import com.ningdatech.pmapi.user.util.LoginUserUtil;
import lombok.AllArgsConstructor;
@@ -165,6 +166,7 @@ public class AnnualPlanLibManage {
// 项目编号不变,版本号加1
project.setProjectCode(oldProject.getProjectCode());
project.setVersion(oldProject.getVersion() + 1);
project.setInstCode(TodoCenterConstant.Declared.NULL_INST_CODE);
if(projectService.save(project)){
applicationService.saveApplication(project,oldProject,Boolean.TRUE);
// 将旧的项目版本置为不是最新


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/TodoServiceImpl.java View File

@@ -60,6 +60,7 @@ public class TodoServiceImpl implements ITodoService {
* @param request 请求参数
* @return 流程进度及表单详情
*/
@Override
public ProcessProgressDetailVo getProcessDetail(ProcessDetailReq request) {
String employeeCode = LoginUserUtil.loginUserDetail().getEmployeeCode();
String instanceId = request.getInstanceId();
@@ -137,6 +138,7 @@ public class TodoServiceImpl implements ITodoService {
* @param projectId
* @return
*/
@Override
public Boolean isChangeRecord(Long projectId) {
//1.先判断下 项目存不存在
Project project = projectService.getById(projectId);
@@ -158,6 +160,7 @@ public class TodoServiceImpl implements ITodoService {
//还要看 项目当前的流程实例code 是不是 关联的最新实例
if( pis.size() < 2 ||
!pis.get(0).getInstCode().equals(project.getInstCode()) ||
pis.get(0).getProjectId().equals(pis.get(1).getProjectId()) ||
!pis.get(0).getInstType().equals(pis.get(1).getInstType())) {
return Boolean.FALSE;
}


Loading…
Cancel
Save