From c29921b4f40b1573d63f34906d36a356f0403664 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 05 十二月 2024 11:06:18 +0800
Subject: [PATCH] 修改及增加功能
---
expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDetailResp.java | 16 ++++++++++++++++
expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java | 11 +++++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDetailResp.java b/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDetailResp.java
index 873f551..6203d2a 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDetailResp.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDetailResp.java
@@ -1,11 +1,13 @@
package com.gkhy.system.domain.vo.response;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.system.domain.ProjectExpert;
import com.gkhy.system.domain.ProjectExpertDetail;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
import java.util.List;
@ApiModel(value = "项目专家详情", description = "项目专家详情")
@@ -35,4 +37,18 @@
@ApiModelProperty(value = "职务")
private String job;
+
+ /**
+ * 项目预计开始日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "项目预计开始日期")
+ private Date projectDateStart;
+
+ /**
+ * 项目预计结束日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "项目预计结束日期")
+ private Date projectDateEnd;
}
diff --git a/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java b/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
index 1a26d2f..f677602 100644
--- a/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
+++ b/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
@@ -238,8 +238,11 @@
@Override
public int deleteProjectManagementByIds(Long[] ids) {
// 校验
- for (Long id : ids) {
- checkDataPer(id);
+// for (Long id : ids) {
+// checkDataPer(id);
+// }
+ if (!SecurityUtils.isAdmin(SecurityUtils.getUserId()) ){
+ throw new ServiceException("无权操作！");
}
return projectManagementMapper.deleteProjectManagementByIds(ids);
}
@@ -485,10 +488,13 @@
projectDetailResp.setDeptId(projectManagement.getDeptId());
projectDetailResp.setDeptName(projectDetailResp.getDeptName());
projectDetailResp.setProjectName(projectManagement.getProjectName());
+ projectDetailResp.setProjectDateStart(projectManagement.getProjectDateStart());
+ projectDetailResp.setProjectDateEnd(projectManagement.getProjectDateEnd());
SysExpertInfo sysExpertInfo = sysExpertInfoMapper.selectById(projectDetailResp.getExpertId());
if (sysExpertInfo != null){
projectDetailResp.setTitle(sysExpertInfo.getTitle());
projectDetailResp.setJob(sysExpertInfo.getJob());
+
}
}
return projectDetailResp;
@@ -552,4 +558,5 @@
}
return projectManagement;
}
+
}
\ No newline at end of file
--
Gitblit v1.9.2