|
@@ -295,22 +295,21 @@ public class ProjectController {
|
|
|
if (!Check.isNull(advertiser)) {
|
|
|
project.setCompanyId(advertiser.getCompanyId());
|
|
|
}
|
|
|
- /* SysCategory category = sysCategoryService.getById(project.getIndustryId());
|
|
|
- if (null != category) {
|
|
|
- project.setIndustryCode(category.getCode());
|
|
|
- project.setIndustryId(category.getId());
|
|
|
- }*/
|
|
|
+ // 运营负责人
|
|
|
SysUser sysUser = sysUserService.getById(project.getResponsibleId());
|
|
|
if (!Check.isNull(sysUser)) {
|
|
|
- // 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());
|
|
|
}
|
|
|
+ // 销售
|
|
|
+ SysUser saleSysUser = sysUserService.getById(project.getSaleId());
|
|
|
+ if (!Check.isNull(saleSysUser)) {
|
|
|
+ memberMap.put(saleSysUser.getId(), saleSysUser.getRealname());
|
|
|
+ }
|
|
|
projectService.save(project);
|
|
|
|
|
|
Long id = project.getId();
|
|
@@ -357,20 +356,19 @@ public class ProjectController {
|
|
|
Result<Project> result = new Result<>();
|
|
|
SysUser sysUser = sysUserService.getById(project.getResponsibleId());
|
|
|
if (!Check.isNull(sysUser)) {
|
|
|
- // project.setResponsibleName(sysUser.getRealname());
|
|
|
projectMemberService.addMember(sysUser, project);
|
|
|
}
|
|
|
|
|
|
- /* SysCategory category = sysCategoryService.getById(project.getIndustryId());
|
|
|
- if (null != category) {
|
|
|
- project.setIndustryCode(category.getCode());
|
|
|
- project.setIndustryId(category.getId());
|
|
|
- }*/
|
|
|
SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
|
|
|
if (!Check.isNull(designSysUser)) {
|
|
|
- // project.setDesignResponsibleName(designSysUser.getRealname());
|
|
|
projectMemberService.addMember(designSysUser, project);
|
|
|
}
|
|
|
+
|
|
|
+ SysUser saleSysUser = sysUserService.getById(project.getSaleId());
|
|
|
+ if (!Check.isNull(saleSysUser)) {
|
|
|
+ projectMemberService.addMember(saleSysUser, project);
|
|
|
+ }
|
|
|
+
|
|
|
Project projectEntity = projectService.getById(project.getId());
|
|
|
if (projectEntity == null) {
|
|
|
result.error500("未找到对应实体");
|
|
@@ -381,7 +379,6 @@ public class ProjectController {
|
|
|
ProjectMember updateMember = new ProjectMember();
|
|
|
updateMember.setProjectName(project.getProjectName());
|
|
|
projectMemberService.update(updateMember, memberQueryWrapper);
|
|
|
-
|
|
|
if (!projectEntity.getSupplierCode().equals(project.getSupplierCode())) {
|
|
|
QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
|
|
|
materialInfoQueryWrapper.eq("project_id", project.getId());
|