From 473a007e3f8dc9f54d73f691578624251bdc7185 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Mon, 09 Dec 2024 13:27:08 +0800
Subject: [PATCH] 考评增加劳务字段
---
expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
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 e5f0a8b..63b845f 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);
}
@@ -317,7 +320,7 @@
projectManagementUp.setId(req.getId());
projectManagementUp.setState(4L);
projectManagementUp.setStep(4L);
- projectManagementUp.setDesc(req.getDesc());
+// projectManagementUp.setDesc(req.getDesc());
projectManagementUp.setProjectEndTime(req.getProjectEndTime());
projectManagementUp.setUpdateBy(SecurityUtils.getUsername());
int i = projectManagementMapper.updateProjectManagement(projectManagementUp);
@@ -485,11 +488,17 @@
projectDetailResp.setDeptId(projectManagement.getDeptId());
projectDetailResp.setDeptName(projectDetailResp.getDeptName());
projectDetailResp.setProjectName(projectManagement.getProjectName());
+ projectDetailResp.setProjectDateStart(projectManagement.getProjectDateStart());
+ projectDetailResp.setProjectDateEnd(projectManagement.getProjectDateEnd());
+ if (StringUtils.isNotEmpty(projectManagement.getJobCategory())){
+ projectDetailResp.setJobCategory(projectManagement.getJobCategory());
+ }
SysExpertInfo sysExpertInfo = sysExpertInfoMapper.selectById(projectDetailResp.getExpertId());
if (sysExpertInfo != null){
projectDetailResp.setTitle(sysExpertInfo.getTitle());
projectDetailResp.setJob(sysExpertInfo.getJob());
}
+
}
return projectDetailResp;
}
@@ -552,4 +561,8 @@
}
return projectManagement;
}
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.9.2