|
@@ -21,6 +21,8 @@ import org.jeecg.modules.ctop.mapper.ProjectMapper;
|
|
import org.jeecg.modules.ctop.service.IAdvertiserService;
|
|
import org.jeecg.modules.ctop.service.IAdvertiserService;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecg.modules.ctop.service.IProjectService;
|
|
import org.jeecg.modules.ctop.service.IProjectService;
|
|
|
|
+import org.jeecg.modules.system.entity.SysUser;
|
|
|
|
+import org.jeecg.modules.system.service.ISysUserService;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
@@ -84,29 +86,12 @@ public class ProjectController {
|
|
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);
|
|
|
|
- if (Check.isNull(roleCode)) {
|
|
|
|
- map.put("code", -1);
|
|
|
|
- return map;
|
|
|
|
- }
|
|
|
|
|
|
+ String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
|
|
QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
|
|
if (!"admin".equals(roleCode)) {
|
|
if (!"admin".equals(roleCode)) {
|
|
- QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
|
- userCompanyQueryWrapper.eq("user_id", userId);
|
|
|
|
- userCompanyQueryWrapper.orderByDesc("create_time");
|
|
|
|
- userCompanyQueryWrapper.last("limit 1");
|
|
|
|
- UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
|
|
- queryWrapper.eq("company_id", userCompany.getCompanyId());
|
|
|
|
- if ("kuaishouOperationManager".equals(roleCode)) {
|
|
|
|
-
|
|
|
|
- queryWrapper.eq("media_id", "2");
|
|
|
|
- } else if ("toutiaoOperationManager".equals(roleCode)) {
|
|
|
|
- queryWrapper.eq("media_id", "1");
|
|
|
|
- }
|
|
|
|
- }*/
|
|
|
|
- QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
|
|
|
|
- queryWrapper.eq("responsible_id", userId);
|
|
|
|
- queryWrapper.orderByDesc("create_time");
|
|
|
|
|
|
+ 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);
|
|
@@ -148,6 +133,9 @@ public class ProjectController {
|
|
* @param project
|
|
* @param project
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysUserService sysUserService;
|
|
|
|
+
|
|
@AutoLog(value = "项目-添加")
|
|
@AutoLog(value = "项目-添加")
|
|
@ApiOperation(value = "项目-添加", notes = "项目-添加")
|
|
@ApiOperation(value = "项目-添加", notes = "项目-添加")
|
|
@PostMapping(value = "/add")
|
|
@PostMapping(value = "/add")
|
|
@@ -159,6 +147,10 @@ public class ProjectController {
|
|
if (!Check.isNull(advertiser)) {
|
|
if (!Check.isNull(advertiser)) {
|
|
project.setCompanyId(advertiser.getCompanyId());
|
|
project.setCompanyId(advertiser.getCompanyId());
|
|
}
|
|
}
|
|
|
|
+ SysUser sysUser = sysUserService.getById(project.getResponsibleId());
|
|
|
|
+ if (!Check.isNull(sysUser)) {
|
|
|
|
+ project.setResponsibleName(sysUser.getRealname());
|
|
|
|
+ }
|
|
projectService.save(project);
|
|
projectService.save(project);
|
|
Long id = project.getId();
|
|
Long id = project.getId();
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
@@ -169,7 +161,9 @@ public class ProjectController {
|
|
member.setProjectId(id);
|
|
member.setProjectId(id);
|
|
member.setProjectName(project.getProjectName());
|
|
member.setProjectName(project.getProjectName());
|
|
member.setUserId(project.getResponsibleId());
|
|
member.setUserId(project.getResponsibleId());
|
|
- member.setUserName(project.getResponsibleName());
|
|
|
|
|
|
+ if (!Check.isNull(sysUser)) {
|
|
|
|
+ member.setUserName(sysUser.getRealname());
|
|
|
|
+ }
|
|
String roleCode = materialReportMapper.getRoleCodeByUserId(project.getUserId());
|
|
String roleCode = materialReportMapper.getRoleCodeByUserId(project.getUserId());
|
|
if (!Check.isNull(roleCode)) {
|
|
if (!Check.isNull(roleCode)) {
|
|
member.setRoleCode(roleCode);
|
|
member.setRoleCode(roleCode);
|
|
@@ -177,7 +171,7 @@ public class ProjectController {
|
|
projectMemberService.save(member);
|
|
projectMemberService.save(member);
|
|
result.success("添加成功!");
|
|
result.success("添加成功!");
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(), e);
|
|
|
|
|
|
+ e.printStackTrace();
|
|
result.error500("操作失败");
|
|
result.error500("操作失败");
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
@@ -194,6 +188,12 @@ public class ProjectController {
|
|
@PutMapping(value = "/edit")
|
|
@PutMapping(value = "/edit")
|
|
public Result<Project> edit(@RequestBody Project project) {
|
|
public Result<Project> edit(@RequestBody Project project) {
|
|
Result<Project> result = new Result<Project>();
|
|
Result<Project> result = new Result<Project>();
|
|
|
|
+
|
|
|
|
+ SysUser sysUser = sysUserService.getById(project.getResponsibleId());
|
|
|
|
+ if (!Check.isNull(sysUser)) {
|
|
|
|
+ project.setResponsibleName(sysUser.getRealname());
|
|
|
|
+ }
|
|
|
|
+
|
|
Project projectEntity = projectService.getById(project.getId());
|
|
Project projectEntity = projectService.getById(project.getId());
|
|
if (projectEntity == null) {
|
|
if (projectEntity == null) {
|
|
result.error500("未找到对应实体");
|
|
result.error500("未找到对应实体");
|