|
@@ -87,19 +87,20 @@ public class ProjectController {
|
|
@GetMapping(value = "/responsibleList")
|
|
@GetMapping(value = "/responsibleList")
|
|
public Map<String, Object> responsibleList(String userId) {
|
|
public Map<String, Object> responsibleList(String userId) {
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
-
|
|
|
|
String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
|
|
String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
|
|
QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
|
|
if (!"admin".equals(roleCode)) {
|
|
if (!"admin".equals(roleCode)) {
|
|
- queryWrapper.eq("responsible_id", userId);
|
|
|
|
- queryWrapper.orderByDesc("create_time");
|
|
|
|
|
|
+ if ("designTeamLeader".equals(roleCode)) {
|
|
|
|
+ queryWrapper.eq("design_responsible_id", userId);
|
|
|
|
+ } else {
|
|
|
|
+ queryWrapper.eq("responsible_id", userId);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+ queryWrapper.orderByDesc("create_time");
|
|
List<Project> projects = projectMapper.selectList(queryWrapper);
|
|
List<Project> projects = projectMapper.selectList(queryWrapper);
|
|
map.put("success", true);
|
|
map.put("success", true);
|
|
map.put("code", 0);
|
|
map.put("code", 0);
|
|
map.put("result", projects);
|
|
map.put("result", projects);
|
|
-
|
|
|
|
-
|
|
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -158,31 +159,50 @@ public class ProjectController {
|
|
try {
|
|
try {
|
|
String advertiserId = project.getAdvertiserId();
|
|
String advertiserId = project.getAdvertiserId();
|
|
Advertiser advertiser = advertiserService.getById(advertiserId);
|
|
Advertiser advertiser = advertiserService.getById(advertiserId);
|
|
|
|
+ Map<String, String> memberMap = new HashMap<>();
|
|
if (!Check.isNull(advertiser)) {
|
|
if (!Check.isNull(advertiser)) {
|
|
project.setCompanyId(advertiser.getCompanyId());
|
|
project.setCompanyId(advertiser.getCompanyId());
|
|
|
|
+
|
|
}
|
|
}
|
|
SysUser sysUser = sysUserService.getById(project.getResponsibleId());
|
|
SysUser sysUser = sysUserService.getById(project.getResponsibleId());
|
|
if (!Check.isNull(sysUser)) {
|
|
if (!Check.isNull(sysUser)) {
|
|
project.setResponsibleName(sysUser.getRealname());
|
|
project.setResponsibleName(sysUser.getRealname());
|
|
|
|
+ memberMap.put(sysUser.getId(), sysUser.getRealname());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
|
|
|
|
+ if (!Check.isNull(designSysUser)) {
|
|
|
|
+ project.setDesignResponsibleName(designSysUser.getRealname());
|
|
|
|
+ memberMap.put(designSysUser.getId(), designSysUser.getRealname());
|
|
}
|
|
}
|
|
|
|
+
|
|
projectService.save(project);
|
|
projectService.save(project);
|
|
|
|
+
|
|
|
|
+
|
|
Long id = project.getId();
|
|
Long id = project.getId();
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
|
- map.put("project_id", id);
|
|
|
|
- map.put("user_id", project.getResponsibleId());
|
|
|
|
- projectMemberService.removeByMap(map);
|
|
|
|
- ProjectMember member = new ProjectMember();
|
|
|
|
- member.setProjectId(id);
|
|
|
|
- member.setProjectName(project.getProjectName());
|
|
|
|
- member.setUserId(project.getResponsibleId());
|
|
|
|
- if (!Check.isNull(sysUser)) {
|
|
|
|
- member.setUserName(sysUser.getRealname());
|
|
|
|
- }
|
|
|
|
- String roleCode = materialReportMapper.getRoleCodeByUserId(project.getUserId());
|
|
|
|
- if (!Check.isNull(roleCode)) {
|
|
|
|
- member.setRoleCode(roleCode);
|
|
|
|
|
|
+ for (Map.Entry<String, String> projectMember : memberMap.entrySet()) {
|
|
|
|
+
|
|
|
|
+ String userId = projectMember.getKey();
|
|
|
|
+ String userName = projectMember.getValue();
|
|
|
|
+
|
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
|
+ map.put("project_id", id);
|
|
|
|
+ map.put("user_id", userId);
|
|
|
|
+ projectMemberService.removeByMap(map);
|
|
|
|
+ ProjectMember member = new ProjectMember();
|
|
|
|
+ member.setProjectId(id);
|
|
|
|
+ member.setProjectName(project.getProjectName());
|
|
|
|
+ member.setUserId(userId);
|
|
|
|
+ member.setUserName(userName);
|
|
|
|
+ String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
|
|
|
|
+ if (!Check.isNull(roleCode)) {
|
|
|
|
+ member.setRoleCode(roleCode);
|
|
|
|
+ }
|
|
|
|
+ projectMemberService.save(member);
|
|
}
|
|
}
|
|
- projectMemberService.save(member);
|
|
|
|
|
|
+
|
|
|
|
+
|
|
result.success("添加成功!");
|
|
result.success("添加成功!");
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|