|
@@ -2,6 +2,7 @@ package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
|
|
|
|
import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
|
|
import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
|
|
|
|
+import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
@@ -28,7 +29,6 @@ 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.ctop.service.ITransferAccountService;
|
|
import org.jeecg.modules.ctop.service.ITransferAccountService;
|
|
import org.jeecg.modules.system.entity.SysUser;
|
|
import org.jeecg.modules.system.entity.SysUser;
|
|
-import org.jeecg.modules.system.mapper.UserCompanyMapper;
|
|
|
|
import org.jeecg.modules.system.service.ISysUserService;
|
|
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;
|
|
@@ -73,9 +73,9 @@ public class ProjectController {
|
|
@Autowired
|
|
@Autowired
|
|
private MaterialReportMapper materialReportMapper;
|
|
private MaterialReportMapper materialReportMapper;
|
|
@Autowired
|
|
@Autowired
|
|
- private UserCompanyMapper userCompanyMapper;
|
|
|
|
- @Autowired
|
|
|
|
private ITransferAccountService transferAccountService;
|
|
private ITransferAccountService transferAccountService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IUserAllocationService userAllocationService;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 根据 项目 媒体类型 查看项目
|
|
* 根据 项目 媒体类型 查看项目
|
|
@@ -303,13 +303,17 @@ public class ProjectController {
|
|
} else {
|
|
} else {
|
|
boolean ok = projectService.updateById(project);
|
|
boolean ok = projectService.updateById(project);
|
|
|
|
|
|
-
|
|
|
|
QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
|
|
memberQueryWrapper.eq("project_id", project.getId());
|
|
memberQueryWrapper.eq("project_id", project.getId());
|
|
ProjectMember updateMember = new ProjectMember();
|
|
ProjectMember updateMember = new ProjectMember();
|
|
updateMember.setProjectName(project.getProjectName());
|
|
updateMember.setProjectName(project.getProjectName());
|
|
projectMemberService.update(updateMember, memberQueryWrapper);
|
|
projectMemberService.update(updateMember, memberQueryWrapper);
|
|
- // projectMemberMapper.update()
|
|
|
|
|
|
+
|
|
|
|
+ QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ userAllocationQueryWrapper.eq("project_id", project.getId());
|
|
|
|
+ UserAllocation updateUserAllocation = new UserAllocation();
|
|
|
|
+ updateUserAllocation.setProjectName(project.getProjectName());
|
|
|
|
+ userAllocationService.update(updateUserAllocation, userAllocationQueryWrapper);
|
|
|
|
|
|
if (ok) {
|
|
if (ok) {
|
|
result.success("修改成功!");
|
|
result.success("修改成功!");
|
|
@@ -319,8 +323,6 @@ public class ProjectController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private IUserAllocationService userAllocationService;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 通过id删除
|
|
* 通过id删除
|